diff --git a/graph/.github/config.yml b/graph/.github/config.yml index 110195ace..0ad896715 100644 --- a/graph/.github/config.yml +++ b/graph/.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-graph/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/graph/blob/master/changelog/README.md) item based on your changes. updateDocsWhiteList: - Tests-only - tests-only diff --git a/graph/CHANGELOG.md b/graph/CHANGELOG.md index 25b3752bf..6b8fbc48a 100644 --- a/graph/CHANGELOG.md +++ b/graph/CHANGELOG.md @@ -14,20 +14,20 @@ The following sections list the changes for unreleased. ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - https://github.com/owncloud/ocis-graph/pull/32 + https://github.com/owncloud/ocis/graph/pull/32 * Change #7: Initial release of basic version Just prepare an initial basic version to serve a graph world API that can be used by Phoenix or other extensions. - https://github.com/owncloud/ocis-graph/issues/7 + https://github.com/owncloud/ocis/graph/issues/7 * Enhancement #27: 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-graph/pull/27 + https://github.com/owncloud/ocis/graph/pull/27 diff --git a/graph/changelog/TEMPLATE b/graph/changelog/TEMPLATE index a28466866..9dfce7837 100644 --- a/graph/changelog/TEMPLATE +++ b/graph/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-graph/issues/1234 -https://github.com/owncloud/ocis-graph/pull/55555 +https://github.com/owncloud/ocis/graph/issues/1234 +https://github.com/owncloud/ocis/graph/pull/55555 diff --git a/graph/changelog/unreleased/config-management.md b/graph/changelog/unreleased/config-management.md index 903a0420d..adb8d058a 100644 --- a/graph/changelog/unreleased/config-management.md +++ b/graph/changelog/unreleased/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-graph/pull/27 +https://github.com/owncloud/ocis/graph/pull/27 diff --git a/graph/changelog/unreleased/initial-release.md b/graph/changelog/unreleased/initial-release.md index e744c86a3..eef4db3b8 100644 --- a/graph/changelog/unreleased/initial-release.md +++ b/graph/changelog/unreleased/initial-release.md @@ -3,4 +3,4 @@ Change: Initial release of basic version Just prepare an initial basic version to serve a graph world API that can be used by Phoenix or other extensions. -https://github.com/owncloud/ocis-graph/issues/7 +https://github.com/owncloud/ocis/graph/issues/7 diff --git a/graph/changelog/unreleased/remove-incompatible-dependency.md b/graph/changelog/unreleased/remove-incompatible-dependency.md index 54fd21aaa..6ee500461 100644 --- a/graph/changelog/unreleased/remove-incompatible-dependency.md +++ b/graph/changelog/unreleased/remove-incompatible-dependency.md @@ -2,4 +2,4 @@ Bugfix: remove redigo 2.0.0+incompatible dependency get rid of redigo v2.0.0 -https://github.com/owncloud/ocis-graph/pull/33 +https://github.com/owncloud/ocis/graph/pull/33 diff --git a/graph/changelog/unreleased/use-alpine-latest.md b/graph/changelog/unreleased/use-alpine-latest.md index 56ba6cbfa..9049abbde 100644 --- a/graph/changelog/unreleased/use-alpine-latest.md +++ b/graph/changelog/unreleased/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-graph/pull/32 +https://github.com/owncloud/ocis/graph/pull/32 diff --git a/graph/cmd/ocis-graph/main.go b/graph/cmd/ocis-graph/main.go index 57f458702..bc98213e3 100644 --- a/graph/cmd/ocis-graph/main.go +++ b/graph/cmd/ocis-graph/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/ocis-graph/pkg/command" + "github.com/owncloud/ocis/graph/pkg/command" ) func main() { diff --git a/graph/docs/content/getting-started.md b/graph/docs/content/getting-started.md index ea7072d37..3de31b20e 100644 --- a/graph/docs/content/getting-started.md +++ b/graph/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-graph/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/graph.yml`, `${HOME}/.ocis/graph.yml` or `$(pwd)/config/graph.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/graph/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/graph.yml`, `${HOME}/.ocis/graph.yml` or `$(pwd)/config/graph.yml`. ### Usage diff --git a/graph/docs/content/license.md b/graph/docs/content/license.md index 50a5ad1de..5400a0450 100644 --- a/graph/docs/content/license.md +++ b/graph/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-graph/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/graph/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. diff --git a/graph/go.mod b/graph/go.mod index f180a981a..29ecdd8e1 100644 --- a/graph/go.mod +++ b/graph/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis-graph +module github.com/owncloud/ocis/graph go 1.13 diff --git a/graph/go.sum b/graph/go.sum index 0e002db3f..4e33b7270 100644 --- a/graph/go.sum +++ b/graph/go.sum @@ -122,6 +122,7 @@ github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA= github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= @@ -168,6 +169,7 @@ github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpu/goacmedns v0.0.1/go.mod h1:sesf/pNnCYwUevQEQfEwY0Y3DydlQWSGZbaMElOWxok= +github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -431,6 +433,7 @@ github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= github.com/golang/gddo v0.0.0-20180828051604-96d2a289f41e/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4= @@ -586,6 +589,7 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/justinas/alice v1.2.0 h1:+MHSA/vccVCF4Uq37S42jwlkvI2Xzl7zTPCN5BnZNVo= @@ -877,6 +881,7 @@ github.com/rs/zerolog v1.17.2/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF github.com/rs/zerolog v1.19.0 h1:hYz4ZVdUgjXTBUmrkrw55j1nHx68LfOKIQk5IYtyScg= github.com/rs/zerolog v1.19.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= github.com/rubenv/sql-migrate v0.0.0-20190212093014-1007f53448d7/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY= +github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -909,9 +914,11 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -931,6 +938,7 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -1255,6 +1263,7 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 h1:xQwXv67TxFo9nC1GJFyab5eq/5B590r6RlnL/G8Sz7w= golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1420,6 +1429,7 @@ gopkg.in/h2non/gock.v1 v1.0.14/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdOD gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.44.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw= gopkg.in/ns1/ns1-go.v2 v2.0.0-20190730140822-b51389932cbc/go.mod h1:VV+3haRsgDiVLxyifmMBrBIuCWFBPYKbRssXB9z67Hw= diff --git a/graph/pkg/command/health.go b/graph/pkg/command/health.go index 9dccd1221..7da27c3ce 100644 --- a/graph/pkg/command/health.go +++ b/graph/pkg/command/health.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/flagset" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/flagset" ) // Health is the entrypoint for the health command. diff --git a/graph/pkg/command/root.go b/graph/pkg/command/root.go index 9e48b23b0..e2fcf7db8 100644 --- a/graph/pkg/command/root.go +++ b/graph/pkg/command/root.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/flagset" - "github.com/owncloud/ocis-graph/pkg/version" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/flagset" + "github.com/owncloud/ocis/graph/pkg/version" "github.com/owncloud/ocis-pkg/v2/log" "github.com/spf13/viper" ) diff --git a/graph/pkg/command/server.go b/graph/pkg/command/server.go index ef48d2a81..902d5550d 100644 --- a/graph/pkg/command/server.go +++ b/graph/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-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/flagset" - "github.com/owncloud/ocis-graph/pkg/metrics" - "github.com/owncloud/ocis-graph/pkg/server/debug" - "github.com/owncloud/ocis-graph/pkg/server/http" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/flagset" + "github.com/owncloud/ocis/graph/pkg/metrics" + "github.com/owncloud/ocis/graph/pkg/server/debug" + "github.com/owncloud/ocis/graph/pkg/server/http" "go.opencensus.io/stats/view" "go.opencensus.io/trace" ) diff --git a/graph/pkg/flagset/flagset.go b/graph/pkg/flagset/flagset.go index e78104d97..6e90116de 100644 --- a/graph/pkg/flagset/flagset.go +++ b/graph/pkg/flagset/flagset.go @@ -2,7 +2,7 @@ package flagset import ( "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/config" ) // RootWithConfig applies cfg to the root flagset diff --git a/graph/pkg/server/debug/option.go b/graph/pkg/server/debug/option.go index 5cb3e5127..6054c9933 100644 --- a/graph/pkg/server/debug/option.go +++ b/graph/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/owncloud/ocis-graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/graph/pkg/server/debug/server.go b/graph/pkg/server/debug/server.go index 5bebcabe3..d7dc1a67d 100644 --- a/graph/pkg/server/debug/server.go +++ b/graph/pkg/server/debug/server.go @@ -4,8 +4,8 @@ import ( "io" "net/http" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/version" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/version" "github.com/owncloud/ocis-pkg/v2/service/debug" ) diff --git a/graph/pkg/server/http/option.go b/graph/pkg/server/http/option.go index 4e6daad5a..79ba8c3df 100644 --- a/graph/pkg/server/http/option.go +++ b/graph/pkg/server/http/option.go @@ -4,8 +4,8 @@ import ( "context" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/metrics" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/metrics" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/graph/pkg/server/http/server.go b/graph/pkg/server/http/server.go index 0d762e7e5..443129a6e 100644 --- a/graph/pkg/server/http/server.go +++ b/graph/pkg/server/http/server.go @@ -1,8 +1,8 @@ package http import ( - svc "github.com/owncloud/ocis-graph/pkg/service/v0" - "github.com/owncloud/ocis-graph/pkg/version" + svc "github.com/owncloud/ocis/graph/pkg/service/v0" + "github.com/owncloud/ocis/graph/pkg/version" "github.com/owncloud/ocis-pkg/v2/middleware" "github.com/owncloud/ocis-pkg/v2/oidc" "github.com/owncloud/ocis-pkg/v2/service/http" diff --git a/graph/pkg/service/v0/graph.go b/graph/pkg/service/v0/graph.go index 35ea17513..0f070e7a5 100644 --- a/graph/pkg/service/v0/graph.go +++ b/graph/pkg/service/v0/graph.go @@ -5,8 +5,8 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/go-chi/chi" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/cs3" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/cs3" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/graph/pkg/service/v0/groups.go b/graph/pkg/service/v0/groups.go index aaac64bbe..f2fef81f3 100644 --- a/graph/pkg/service/v0/groups.go +++ b/graph/pkg/service/v0/groups.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis-graph/pkg/service/v0/errorcode" + "github.com/owncloud/ocis/graph/pkg/service/v0/errorcode" "github.com/go-chi/chi" "github.com/go-chi/render" diff --git a/graph/pkg/service/v0/instrument.go b/graph/pkg/service/v0/instrument.go index b427a0c51..878945f78 100644 --- a/graph/pkg/service/v0/instrument.go +++ b/graph/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis-graph/pkg/metrics" + "github.com/owncloud/ocis/graph/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/graph/pkg/service/v0/option.go b/graph/pkg/service/v0/option.go index 107b74563..adae954ff 100644 --- a/graph/pkg/service/v0/option.go +++ b/graph/pkg/service/v0/option.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis-graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/graph/pkg/service/v0/users.go b/graph/pkg/service/v0/users.go index 673e461cc..fb4579f07 100644 --- a/graph/pkg/service/v0/users.go +++ b/graph/pkg/service/v0/users.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis-graph/pkg/service/v0/errorcode" + "github.com/owncloud/ocis/graph/pkg/service/v0/errorcode" "github.com/go-chi/chi" "github.com/go-chi/render"