update webdav import paths and module name

webdav/.github/config.yml

@@ -2,7 +2,7 @@
 
 # Comment to be posted to on PRs that don't update documentation
 updateDocsComment: >
-  Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis-webdav/blob/master/changelog/README.md) item based on your changes.
+  Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis/webdav/blob/master/changelog/README.md) item based on your changes.
 updateDocsWhiteList:
   - Tests-only
   - tests-only

webdav/CHANGELOG.md

@@ -13,15 +13,15 @@ The following sections list the changes for 0.1.1.
 
    ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead.
 
-   https://github.com/owncloud/ocis-webdav/pull/22
+   https://github.com/owncloud/ocis/webdav/pull/22
 
  * Change #20: Change status not found on missing thumbnail
 
    The service returned a bad request when no thumbnail was generated. It is now changed to not
    found.
 
-   https://github.com/owncloud/ocis-webdav/issues/20
+   https://github.com/owncloud/ocis/webdav/issues/20
-   https://github.com/owncloud/ocis-webdav/pull/21
+   https://github.com/owncloud/ocis/webdav/pull/21
 
 
 # Changelog for 0.1.0
@@ -42,25 +42,25 @@ The following sections list the changes for 0.1.0.
    Just prepared an initial basic version to serve webdav for the ownCloud Infinite Scale
    project. It just provides a minimal viable product to demonstrate the microservice pattern.
 
-   https://github.com/owncloud/ocis-webdav/issues/1
+   https://github.com/owncloud/ocis/webdav/issues/1
 
  * Change #16: Update ocis-pkg to version 2.2.0
 
    Updated ocis-pkg to include the cors header changes.
 
-   https://github.com/owncloud/ocis-webdav/issues/16
+   https://github.com/owncloud/ocis/webdav/issues/16
 
  * Enhancement #14: Configuration
 
    Extensions should be responsible of configuring themselves. We use Viper for config loading
    from default paths. Environment variables **WILL** take precedence over config files.
 
-   https://github.com/owncloud/ocis-webdav/pull/14
+   https://github.com/owncloud/ocis/webdav/pull/14
 
  * Enhancement #13: Implement preview API
 
    Added the API endpoint for file previews.
 
-   https://github.com/owncloud/ocis-webdav/pull/13
+   https://github.com/owncloud/ocis/webdav/pull/13
 
 

webdav/changelog/0.1.0_2020-03-31/config-management.md

@@ -2,4 +2,4 @@ Enhancement: Configuration
 
 Extensions should be responsible of configuring themselves. We use Viper for config loading from default paths. Environment variables **WILL** take precedence over config files.
 
-https://github.com/owncloud/ocis-webdav/pull/14
+https://github.com/owncloud/ocis/webdav/pull/14

webdav/changelog/0.1.0_2020-03-31/initial-release.md

@@ -4,4 +4,4 @@ Just prepared an initial basic version to serve webdav for the ownCloud
 Infinite Scale project. It just provides a minimal viable product to
 demonstrate the microservice pattern.
 
-https://github.com/owncloud/ocis-webdav/issues/1
+https://github.com/owncloud/ocis/webdav/issues/1

webdav/changelog/0.1.0_2020-03-31/preview-api.md

@@ -2,4 +2,4 @@ Enhancement: implement preview API
 
 Added the API endpoint for file previews.
 
-https://github.com/owncloud/ocis-webdav/pull/13
+https://github.com/owncloud/ocis/webdav/pull/13

webdav/changelog/0.1.0_2020-03-31/update-ocis-pkg.md

@@ -2,4 +2,4 @@ Change: update ocis-pkg to version 2.2.0
 
 Updated ocis-pkg to include the cors header changes.
 
-https://github.com/owncloud/ocis-webdav/issues/16
+https://github.com/owncloud/ocis/webdav/issues/16

webdav/changelog/0.1.1_2020-07-23/change-status-code-on-missing-thumbnail.md

@@ -3,5 +3,5 @@ Change: change status not found on missing thumbnail
 The service returned a bad request when no thumbnail was generated.
 It is now changed to not found.
 
-https://github.com/owncloud/ocis-webdav/issues/20
+https://github.com/owncloud/ocis/webdav/issues/20
-https://github.com/owncloud/ocis-webdav/pull/21
+https://github.com/owncloud/ocis/webdav/pull/21

webdav/changelog/0.1.1_2020-07-23/use-alpine-latest.md

@@ -2,4 +2,4 @@ Bugfix: build docker images with alpine:latest instead of alpine:edge
 
 ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead.
 
-https://github.com/owncloud/ocis-webdav/pull/22
+https://github.com/owncloud/ocis/webdav/pull/22

webdav/changelog/TEMPLATE

@@ -7,5 +7,5 @@ The text in the paragraphs is written in past tense. The last section is a list
 of issue URLs, PR URLs and other URLs. The first issue ID (or the first PR ID,
 in case there aren't any issue links) is used as the primary ID.
 
-https://github.com/owncloud/ocis-webdav/issues/1234
+https://github.com/owncloud/ocis/webdav/issues/1234
-https://github.com/owncloud/ocis-webdav/pull/55555
+https://github.com/owncloud/ocis/webdav/pull/55555

webdav/cmd/ocis-webdav/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis-webdav/pkg/command"
+	"github.com/owncloud/ocis/webdav/pkg/command"
 )
 
 func main() {

webdav/docs/content/getting-started.md

@@ -142,7 +142,7 @@ If you prefer to configure the service with commandline flags you can see the av
 
 #### Configuration file
 
-So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis-webdav/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/webdav.yml`, `${HOME}/.ocis/webdav.yml` or `$(pwd)/config/webdav.yml`.
+So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/webdav/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/webdav.yml`, `${HOME}/.ocis/webdav.yml` or `$(pwd)/config/webdav.yml`.
 
 ### Usage
 

webdav/docs/content/license.md

@@ -5,4 +5,4 @@ anchor: "license"
 weight: 40
 ---
 
-This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis-webdav/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources.
+This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis/webdav/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources.

webdav/go.mod

@@ -1,4 +1,4 @@
-module github.com/owncloud/ocis-webdav
+module github.com/owncloud/ocis/webdav
 
 go 1.13
 
@@ -16,3 +16,5 @@ require (
 	github.com/spf13/viper v1.5.0
 	go.opencensus.io v0.22.2
 )
+
+replace google.golang.org/grpc => google.golang.org/grpc v1.26.0

webdav/go.sum

@@ -364,6 +364,7 @@ github.com/micro/go-micro v1.18.0 h1:gP70EZVHpJuUIT0YWth192JmlIci+qMOEByHm83XE9E
 github.com/micro/go-micro v1.18.0/go.mod h1:klwUJL1gkdY1MHFyz+fFJXn52dKcty4hoe95Mp571AA=
 github.com/micro/go-micro/v2 v2.0.0 h1:bMx549RwJ9Yuiui8cDVlfYhVNP8I8KBJTMyLthEXpRw=
 github.com/micro/go-micro/v2 v2.0.0/go.mod h1:v7QP5UhKRt37ixjJe8DouWmg0/eE6dltr5h0idJ9BpE=
+github.com/micro/go-plugins/wrapper/trace/opencensus/v2 v2.0.1 h1:7IkXfl94MdLZQwk0lNmu9Cg5WP42Zak9EtQMeN4SvVs=
 github.com/micro/go-plugins/wrapper/trace/opencensus/v2 v2.0.1/go.mod h1:QrkcwcDtIs2hIJpIEhozekyf6Rfz5C36kFI8+zzCpX0=
 github.com/micro/mdns v0.3.0 h1:bYycYe+98AXR3s8Nq5qvt6C573uFTDPIYzJemWON0QE=
 github.com/micro/mdns v0.3.0/go.mod h1:KJ0dW7KmicXU2BV++qkLlmHYcVv7/hHnbtguSWt9Aoc=
@@ -416,6 +417,7 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
+github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/nlopes/slack v0.6.0/go.mod h1:JzQ9m3PMAqcpeCam7UaHSuBuupz7CmpjehYMayT6YOk=
 github.com/nlopes/slack v0.6.1-0.20191106133607-d06c2a2b3249/go.mod h1:JzQ9m3PMAqcpeCam7UaHSuBuupz7CmpjehYMayT6YOk=
@@ -551,6 +553,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
@@ -652,12 +655,14 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE=
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -776,9 +781,11 @@ golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20191216173652-a0e659d51361 h1:RIIXAeV6GvDBuADKumTODatUqANFZ+5BPMnzsy4hulY=
 golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200421042724-cfa8b22178d2 h1:fVXd7Kf16vo/CTZCrBFb6BeEhaSbBtsPz9oWmWAoyl8=
 golang.org/x/tools v0.0.0-20200421042724-cfa8b22178d2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
@@ -857,6 +864,7 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

webdav/pkg/command/health.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-webdav/pkg/config"
+	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis-webdav/pkg/flagset"
+	"github.com/owncloud/ocis/webdav/pkg/flagset"
 )
 
 // Health is the entrypoint for the health command.

webdav/pkg/command/root.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-webdav/pkg/config"
+	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis-webdav/pkg/flagset"
+	"github.com/owncloud/ocis/webdav/pkg/flagset"
-	"github.com/owncloud/ocis-webdav/pkg/version"
+	"github.com/owncloud/ocis/webdav/pkg/version"
 	"github.com/spf13/viper"
 )
 

webdav/pkg/command/server.go

@@ -14,11 +14,11 @@ import (
 	"github.com/oklog/run"
 	openzipkin "github.com/openzipkin/zipkin-go"
 	zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
-	"github.com/owncloud/ocis-webdav/pkg/config"
+	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis-webdav/pkg/flagset"
+	"github.com/owncloud/ocis/webdav/pkg/flagset"
-	"github.com/owncloud/ocis-webdav/pkg/metrics"
+	"github.com/owncloud/ocis/webdav/pkg/metrics"
-	"github.com/owncloud/ocis-webdav/pkg/server/debug"
+	"github.com/owncloud/ocis/webdav/pkg/server/debug"
-	"github.com/owncloud/ocis-webdav/pkg/server/http"
+	"github.com/owncloud/ocis/webdav/pkg/server/http"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/trace"
 )

webdav/pkg/flagset/flagset.go

@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis-webdav/pkg/config"
+	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // RootWithConfig applies cfg to the root flagset

webdav/pkg/server/debug/option.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-webdav/pkg/config"
+	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // Option defines a single option function.

webdav/pkg/server/debug/server.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/owncloud/ocis-pkg/v2/service/debug"
-	"github.com/owncloud/ocis-webdav/pkg/config"
+	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis-webdav/pkg/version"
+	"github.com/owncloud/ocis/webdav/pkg/version"
 )
 
 // Server initializes the debug service and server.

webdav/pkg/server/http/option.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-webdav/pkg/config"
+	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis-webdav/pkg/metrics"
+	"github.com/owncloud/ocis/webdav/pkg/metrics"
 )
 
 // Option defines a single option function.

webdav/pkg/server/http/server.go

@@ -3,8 +3,8 @@ package http
 import (
 	"github.com/owncloud/ocis-pkg/v2/middleware"
 	"github.com/owncloud/ocis-pkg/v2/service/http"
-	svc "github.com/owncloud/ocis-webdav/pkg/service/v0"
+	svc "github.com/owncloud/ocis/webdav/pkg/service/v0"
-	"github.com/owncloud/ocis-webdav/pkg/version"
+	"github.com/owncloud/ocis/webdav/pkg/version"
 )
 
 // Server initializes the http service and server.

webdav/pkg/service/v0/instrument.go

@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis-webdav/pkg/metrics"
+	"github.com/owncloud/ocis/webdav/pkg/metrics"
 )
 
 // NewInstrument returns a service that instruments metrics.

webdav/pkg/service/v0/option.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis-webdav/pkg/config"
+	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // Option defines a single option function.

webdav/pkg/service/v0/service.go

@@ -7,8 +7,8 @@ import (
 	"github.com/go-chi/chi"
 	"github.com/micro/go-micro/v2/client"
 	thumbnails "github.com/owncloud/ocis-thumbnails/pkg/proto/v0"
-	"github.com/owncloud/ocis-webdav/pkg/config"
+	"github.com/owncloud/ocis/webdav/pkg/config"
-	thumbnail "github.com/owncloud/ocis-webdav/pkg/dav/thumbnails"
+	thumbnail "github.com/owncloud/ocis/webdav/pkg/dav/thumbnails"
 )
 
 // Service defines the extension handlers.