diff --git a/ocis-graph/.codacy.yml b/graph/.codacy.yml similarity index 100% rename from ocis-graph/.codacy.yml rename to graph/.codacy.yml diff --git a/ocis-graph/.dockerignore b/graph/.dockerignore similarity index 100% rename from ocis-graph/.dockerignore rename to graph/.dockerignore diff --git a/ocis-graph/.drone.star b/graph/.drone.star similarity index 100% rename from ocis-graph/.drone.star rename to graph/.drone.star diff --git a/ocis-graph/.editorconfig b/graph/.editorconfig similarity index 100% rename from ocis-graph/.editorconfig rename to graph/.editorconfig diff --git a/ocis-graph/.github/config.yml b/graph/.github/config.yml similarity index 100% rename from ocis-graph/.github/config.yml rename to graph/.github/config.yml diff --git a/ocis-graph/.github/issue_template.md b/graph/.github/issue_template.md similarity index 100% rename from ocis-graph/.github/issue_template.md rename to graph/.github/issue_template.md diff --git a/ocis-graph/.github/pull_request_template.md b/graph/.github/pull_request_template.md similarity index 100% rename from ocis-graph/.github/pull_request_template.md rename to graph/.github/pull_request_template.md diff --git a/ocis-graph/.github/settings.yml b/graph/.github/settings.yml similarity index 100% rename from ocis-graph/.github/settings.yml rename to graph/.github/settings.yml diff --git a/ocis-graph/.gitignore b/graph/.gitignore similarity index 100% rename from ocis-graph/.gitignore rename to graph/.gitignore diff --git a/ocis-graph/CHANGELOG.md b/graph/CHANGELOG.md similarity index 100% rename from ocis-graph/CHANGELOG.md rename to graph/CHANGELOG.md diff --git a/ocis-graph/LICENSE b/graph/LICENSE similarity index 100% rename from ocis-graph/LICENSE rename to graph/LICENSE diff --git a/ocis-graph/Makefile b/graph/Makefile similarity index 100% rename from ocis-graph/Makefile rename to graph/Makefile diff --git a/ocis-graph/README.md b/graph/README.md similarity index 100% rename from ocis-graph/README.md rename to graph/README.md diff --git a/ocis-graph/changelog/CHANGELOG.tmpl b/graph/changelog/CHANGELOG.tmpl similarity index 100% rename from ocis-graph/changelog/CHANGELOG.tmpl rename to graph/changelog/CHANGELOG.tmpl diff --git a/ocis-graph/changelog/README.md b/graph/changelog/README.md similarity index 100% rename from ocis-graph/changelog/README.md rename to graph/changelog/README.md diff --git a/ocis-graph/changelog/TEMPLATE b/graph/changelog/TEMPLATE similarity index 100% rename from ocis-graph/changelog/TEMPLATE rename to graph/changelog/TEMPLATE diff --git a/ocis-graph/changelog/unreleased/.keep b/graph/changelog/unreleased/.keep similarity index 100% rename from ocis-graph/changelog/unreleased/.keep rename to graph/changelog/unreleased/.keep diff --git a/ocis-graph/changelog/unreleased/config-management.md b/graph/changelog/unreleased/config-management.md similarity index 100% rename from ocis-graph/changelog/unreleased/config-management.md rename to graph/changelog/unreleased/config-management.md diff --git a/ocis-graph/changelog/unreleased/initial-release.md b/graph/changelog/unreleased/initial-release.md similarity index 100% rename from ocis-graph/changelog/unreleased/initial-release.md rename to graph/changelog/unreleased/initial-release.md diff --git a/ocis-graph/changelog/unreleased/remove-incompatible-dependency.md b/graph/changelog/unreleased/remove-incompatible-dependency.md similarity index 100% rename from ocis-graph/changelog/unreleased/remove-incompatible-dependency.md rename to graph/changelog/unreleased/remove-incompatible-dependency.md diff --git a/ocis-graph/changelog/unreleased/use-alpine-latest.md b/graph/changelog/unreleased/use-alpine-latest.md similarity index 100% rename from ocis-graph/changelog/unreleased/use-alpine-latest.md rename to graph/changelog/unreleased/use-alpine-latest.md diff --git a/ocis-graph/cmd/ocis-graph/main.go b/graph/cmd/graph/main.go similarity index 70% rename from ocis-graph/cmd/ocis-graph/main.go rename to graph/cmd/graph/main.go index 57f458702..bc98213e3 100644 --- a/ocis-graph/cmd/ocis-graph/main.go +++ b/graph/cmd/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/ocis-graph/config/example.json b/graph/config/example.json similarity index 100% rename from ocis-graph/config/example.json rename to graph/config/example.json diff --git a/ocis-graph/config/example.yml b/graph/config/example.yml similarity index 100% rename from ocis-graph/config/example.yml rename to graph/config/example.yml diff --git a/ocis-graph/docker/Dockerfile.linux.amd64 b/graph/docker/Dockerfile.linux.amd64 similarity index 100% rename from ocis-graph/docker/Dockerfile.linux.amd64 rename to graph/docker/Dockerfile.linux.amd64 diff --git a/ocis-graph/docker/Dockerfile.linux.arm b/graph/docker/Dockerfile.linux.arm similarity index 100% rename from ocis-graph/docker/Dockerfile.linux.arm rename to graph/docker/Dockerfile.linux.arm diff --git a/ocis-graph/docker/Dockerfile.linux.arm64 b/graph/docker/Dockerfile.linux.arm64 similarity index 100% rename from ocis-graph/docker/Dockerfile.linux.arm64 rename to graph/docker/Dockerfile.linux.arm64 diff --git a/ocis-graph/docker/manifest.tmpl b/graph/docker/manifest.tmpl similarity index 100% rename from ocis-graph/docker/manifest.tmpl rename to graph/docker/manifest.tmpl diff --git a/ocis-graph/docs/.gitignore b/graph/docs/.gitignore similarity index 100% rename from ocis-graph/docs/.gitignore rename to graph/docs/.gitignore diff --git a/ocis-graph/docs/archetypes/default.md b/graph/docs/archetypes/default.md similarity index 100% rename from ocis-graph/docs/archetypes/default.md rename to graph/docs/archetypes/default.md diff --git a/ocis-graph/docs/config.toml b/graph/docs/config.toml similarity index 100% rename from ocis-graph/docs/config.toml rename to graph/docs/config.toml diff --git a/ocis-graph/docs/content/about.md b/graph/docs/content/about.md similarity index 100% rename from ocis-graph/docs/content/about.md rename to graph/docs/content/about.md diff --git a/ocis-graph/docs/content/building.md b/graph/docs/content/building.md similarity index 100% rename from ocis-graph/docs/content/building.md rename to graph/docs/content/building.md diff --git a/ocis-graph/docs/content/getting-started.md b/graph/docs/content/getting-started.md similarity index 100% rename from ocis-graph/docs/content/getting-started.md rename to graph/docs/content/getting-started.md diff --git a/ocis-graph/docs/content/license.md b/graph/docs/content/license.md similarity index 100% rename from ocis-graph/docs/content/license.md rename to graph/docs/content/license.md diff --git a/ocis-graph/docs/layouts/_default/list.html b/graph/docs/layouts/_default/list.html similarity index 100% rename from ocis-graph/docs/layouts/_default/list.html rename to graph/docs/layouts/_default/list.html diff --git a/ocis-graph/docs/layouts/_default/single.html b/graph/docs/layouts/_default/single.html similarity index 100% rename from ocis-graph/docs/layouts/_default/single.html rename to graph/docs/layouts/_default/single.html diff --git a/ocis-graph/docs/layouts/index.html b/graph/docs/layouts/index.html similarity index 100% rename from ocis-graph/docs/layouts/index.html rename to graph/docs/layouts/index.html diff --git a/ocis-graph/docs/layouts/partials/style.html b/graph/docs/layouts/partials/style.html similarity index 100% rename from ocis-graph/docs/layouts/partials/style.html rename to graph/docs/layouts/partials/style.html diff --git a/ocis-graph/docs/static/styles.css b/graph/docs/static/styles.css similarity index 100% rename from ocis-graph/docs/static/styles.css rename to graph/docs/static/styles.css diff --git a/ocis-graph/docs/static/syntax.css b/graph/docs/static/syntax.css similarity index 100% rename from ocis-graph/docs/static/syntax.css rename to graph/docs/static/syntax.css diff --git a/ocis-graph/go.mod b/graph/go.mod similarity index 95% rename from ocis-graph/go.mod rename to graph/go.mod index f180a981a..29ecdd8e1 100644 --- a/ocis-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/ocis-graph/go.sum b/graph/go.sum similarity index 100% rename from ocis-graph/go.sum rename to graph/go.sum diff --git a/ocis-graph/pkg/command/health.go b/graph/pkg/command/health.go similarity index 90% rename from ocis-graph/pkg/command/health.go rename to graph/pkg/command/health.go index 9dccd1221..7da27c3ce 100644 --- a/ocis-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/ocis-graph/pkg/command/root.go b/graph/pkg/command/root.go similarity index 92% rename from ocis-graph/pkg/command/root.go rename to graph/pkg/command/root.go index 9e48b23b0..dd0ca3b5b 100644 --- a/ocis-graph/pkg/command/root.go +++ b/graph/pkg/command/root.go @@ -5,10 +5,10 @@ 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-pkg/v2/log" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/flagset" + "github.com/owncloud/ocis/graph/pkg/version" "github.com/spf13/viper" ) @@ -17,7 +17,7 @@ func Execute() error { cfg := config.New() app := &cli.App{ - Name: "ocis-graph", + Name: "graph", Version: version.String, Usage: "Serve Graph API for oCIS", Compiled: version.Compiled(), diff --git a/ocis-graph/pkg/command/server.go b/graph/pkg/command/server.go similarity index 94% rename from ocis-graph/pkg/command/server.go rename to graph/pkg/command/server.go index ef48d2a81..902d5550d 100644 --- a/ocis-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/ocis-graph/pkg/config/config.go b/graph/pkg/config/config.go similarity index 100% rename from ocis-graph/pkg/config/config.go rename to graph/pkg/config/config.go diff --git a/ocis-graph/pkg/cs3/client.go b/graph/pkg/cs3/client.go similarity index 100% rename from ocis-graph/pkg/cs3/client.go rename to graph/pkg/cs3/client.go diff --git a/ocis-graph/pkg/flagset/flagset.go b/graph/pkg/flagset/flagset.go similarity index 99% rename from ocis-graph/pkg/flagset/flagset.go rename to graph/pkg/flagset/flagset.go index e78104d97..6e90116de 100644 --- a/ocis-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/ocis-graph/pkg/metrics/metrics.go b/graph/pkg/metrics/metrics.go similarity index 100% rename from ocis-graph/pkg/metrics/metrics.go rename to graph/pkg/metrics/metrics.go diff --git a/ocis-graph/pkg/server/debug/option.go b/graph/pkg/server/debug/option.go similarity index 95% rename from ocis-graph/pkg/server/debug/option.go rename to graph/pkg/server/debug/option.go index 5cb3e5127..7cb1ee71d 100644 --- a/ocis-graph/pkg/server/debug/option.go +++ b/graph/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis-graph/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph/pkg/config" ) // Option defines a single option function. diff --git a/ocis-graph/pkg/server/debug/server.go b/graph/pkg/server/debug/server.go similarity index 93% rename from ocis-graph/pkg/server/debug/server.go rename to graph/pkg/server/debug/server.go index 5bebcabe3..ff5bd8e14 100644 --- a/ocis-graph/pkg/server/debug/server.go +++ b/graph/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/version" "github.com/owncloud/ocis-pkg/v2/service/debug" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/version" ) // Server initializes the debug service and server. diff --git a/ocis-graph/pkg/server/http/option.go b/graph/pkg/server/http/option.go similarity index 94% rename from ocis-graph/pkg/server/http/option.go rename to graph/pkg/server/http/option.go index 4e6daad5a..0835a4570 100644 --- a/ocis-graph/pkg/server/http/option.go +++ b/graph/pkg/server/http/option.go @@ -4,9 +4,9 @@ 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-pkg/v2/log" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/metrics" ) // Option defines a single option function. diff --git a/ocis-graph/pkg/server/http/server.go b/graph/pkg/server/http/server.go similarity index 93% rename from ocis-graph/pkg/server/http/server.go rename to graph/pkg/server/http/server.go index 0d762e7e5..758fdf62b 100644 --- a/ocis-graph/pkg/server/http/server.go +++ b/graph/pkg/server/http/server.go @@ -1,11 +1,11 @@ package http import ( - 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" + svc "github.com/owncloud/ocis/graph/pkg/service/v0" + "github.com/owncloud/ocis/graph/pkg/version" ) // Server initializes the http service and server. diff --git a/ocis-graph/pkg/service/v0/drives.go b/graph/pkg/service/v0/drives.go similarity index 100% rename from ocis-graph/pkg/service/v0/drives.go rename to graph/pkg/service/v0/drives.go diff --git a/ocis-graph/pkg/service/v0/errorcode/errorcode.go b/graph/pkg/service/v0/errorcode/errorcode.go similarity index 100% rename from ocis-graph/pkg/service/v0/errorcode/errorcode.go rename to graph/pkg/service/v0/errorcode/errorcode.go diff --git a/ocis-graph/pkg/service/v0/graph.go b/graph/pkg/service/v0/graph.go similarity index 90% rename from ocis-graph/pkg/service/v0/graph.go rename to graph/pkg/service/v0/graph.go index 35ea17513..40f466791 100644 --- a/ocis-graph/pkg/service/v0/graph.go +++ b/graph/pkg/service/v0/graph.go @@ -5,9 +5,9 @@ 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-pkg/v2/log" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/cs3" ) // Graph defines implements the business logic for Service. diff --git a/ocis-graph/pkg/service/v0/groups.go b/graph/pkg/service/v0/groups.go similarity index 97% rename from ocis-graph/pkg/service/v0/groups.go rename to graph/pkg/service/v0/groups.go index aaac64bbe..f2fef81f3 100644 --- a/ocis-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/ocis-graph/pkg/service/v0/instrument.go b/graph/pkg/service/v0/instrument.go similarity index 94% rename from ocis-graph/pkg/service/v0/instrument.go rename to graph/pkg/service/v0/instrument.go index b427a0c51..878945f78 100644 --- a/ocis-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/ocis-graph/pkg/service/v0/ldap.go b/graph/pkg/service/v0/ldap.go similarity index 100% rename from ocis-graph/pkg/service/v0/ldap.go rename to graph/pkg/service/v0/ldap.go diff --git a/ocis-graph/pkg/service/v0/logging.go b/graph/pkg/service/v0/logging.go similarity index 100% rename from ocis-graph/pkg/service/v0/logging.go rename to graph/pkg/service/v0/logging.go diff --git a/ocis-graph/pkg/service/v0/option.go b/graph/pkg/service/v0/option.go similarity index 95% rename from ocis-graph/pkg/service/v0/option.go rename to graph/pkg/service/v0/option.go index 107b74563..98c584f18 100644 --- a/ocis-graph/pkg/service/v0/option.go +++ b/graph/pkg/service/v0/option.go @@ -3,8 +3,8 @@ package svc import ( "net/http" - "github.com/owncloud/ocis-graph/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph/pkg/config" ) // Option defines a single option function. diff --git a/ocis-graph/pkg/service/v0/service.go b/graph/pkg/service/v0/service.go similarity index 100% rename from ocis-graph/pkg/service/v0/service.go rename to graph/pkg/service/v0/service.go diff --git a/ocis-graph/pkg/service/v0/tracing.go b/graph/pkg/service/v0/tracing.go similarity index 100% rename from ocis-graph/pkg/service/v0/tracing.go rename to graph/pkg/service/v0/tracing.go diff --git a/ocis-graph/pkg/service/v0/users.go b/graph/pkg/service/v0/users.go similarity index 97% rename from ocis-graph/pkg/service/v0/users.go rename to graph/pkg/service/v0/users.go index 673e461cc..fb4579f07 100644 --- a/ocis-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" diff --git a/ocis-graph/pkg/version/version.go b/graph/pkg/version/version.go similarity index 100% rename from ocis-graph/pkg/version/version.go rename to graph/pkg/version/version.go diff --git a/ocis-graph/reflex.conf b/graph/reflex.conf similarity index 100% rename from ocis-graph/reflex.conf rename to graph/reflex.conf