From 449a0169f6682733dfe01dfbf26a456351790665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 3 May 2022 21:17:14 +0000 Subject: [PATCH] approvider -> app-provider MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- .drone.star | 4 ++-- .vscode/launch.json | 2 +- Makefile | 2 +- .../oc10_ocis_parallel/docker-compose.yml | 2 +- .../ocis_individual_services/docker-compose.yml | 3 ++- .../{appprovider => app-provider}/_index.md | 2 +- docs/extensions/app-provider/configuration.md | 15 +++++++++++++++ docs/extensions/app-registry/apps.md | 2 +- docs/extensions/appprovider/configuration.md | 15 --------------- docs/extensions/storage/ports.md | 4 ++-- extensions/{appprovider => app-provider}/Makefile | 0 extensions/app-provider/cmd/app-provider/main.go | 14 ++++++++++++++ .../pkg/command/health.go | 6 +++--- .../pkg/command/root.go | 4 ++-- .../pkg/command/server.go | 12 ++++++------ .../pkg/command/version.go | 2 +- .../pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- .../pkg/config/parser/parse.go | 4 ++-- .../pkg/config/reva.go | 0 .../pkg/logging/logging.go | 2 +- .../pkg/revaconfig/config.go | 2 +- .../pkg/server/debug/option.go | 2 +- .../pkg/server/debug/server.go | 2 +- .../pkg/tracing/tracing.go | 2 +- extensions/appprovider/cmd/appprovider/main.go | 14 -------------- go.sum | 2 -- ocis-pkg/config/config.go | 4 ++-- ocis-pkg/config/defaultconfig.go | 8 ++++---- ocis/pkg/command/appprovider.go | 2 +- ocis/pkg/runtime/service/service.go | 8 ++++---- 31 files changed, 73 insertions(+), 74 deletions(-) rename docs/extensions/{appprovider => app-provider}/_index.md (79%) create mode 100644 docs/extensions/app-provider/configuration.md delete mode 100644 docs/extensions/appprovider/configuration.md rename extensions/{appprovider => app-provider}/Makefile (100%) create mode 100644 extensions/app-provider/cmd/app-provider/main.go rename extensions/{appprovider => app-provider}/pkg/command/health.go (83%) rename extensions/{appprovider => app-provider}/pkg/command/root.go (93%) rename extensions/{appprovider => app-provider}/pkg/command/server.go (86%) rename extensions/{appprovider => app-provider}/pkg/command/version.go (95%) rename extensions/{appprovider => app-provider}/pkg/config/config.go (98%) rename extensions/{appprovider => app-provider}/pkg/config/defaults/defaultconfig.go (96%) rename extensions/{appprovider => app-provider}/pkg/config/parser/parse.go (86%) rename extensions/{appprovider => app-provider}/pkg/config/reva.go (100%) rename extensions/{appprovider => app-provider}/pkg/logging/logging.go (84%) rename extensions/{appprovider => app-provider}/pkg/revaconfig/config.go (96%) rename extensions/{appprovider => app-provider}/pkg/server/debug/option.go (93%) rename extensions/{appprovider => app-provider}/pkg/server/debug/server.go (96%) rename extensions/{appprovider => app-provider}/pkg/tracing/tracing.go (86%) delete mode 100644 extensions/appprovider/cmd/appprovider/main.go diff --git a/.drone.star b/.drone.star index 874a370376..5d4687fb5c 100644 --- a/.drone.star +++ b/.drone.star @@ -44,8 +44,8 @@ config = { "modules": [ # if you add a module here please also add it to the root level Makefile "extensions/accounts", + "extensions/app-provider", "extensions/app-registry", - "extensions/appprovider", "extensions/audit", "extensions/auth-basic", "extensions/auth-bearer", @@ -1721,7 +1721,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "SHARING_USER_OWNCLOUDSQL_DB_NAME": "owncloud", # General oCIS config # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services - "OCIS_RUN_EXTENSIONS": "settings,storage-metadata,graph,graph-explorer,ocs,store,thumbnails,web,webdav,frontend,gateway,user,group,auth-basic,auth-bearer,auth-machine,storage-users,storage-shares,storage-publiclink,appprovider,sharing,proxy,nats,ocdav", + "OCIS_RUN_EXTENSIONS": "settings,storage-metadata,graph,graph-explorer,ocs,store,thumbnails,web,webdav,frontend,gateway,user,group,auth-basic,auth-bearer,auth-machine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,proxy,nats,ocdav", "OCIS_LOG_LEVEL": "info", "OCIS_URL": OCIS_URL, "OCIS_BASE_DATA_PATH": "/mnt/data/ocis", diff --git a/.vscode/launch.json b/.vscode/launch.json index e7629b586f..21b5235837 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -41,7 +41,7 @@ // metadata storage "METADATA_USER_ID": "some-metadata-user-id" // OCIS_RUN_EXTENSIONS allows to start a subset of extensions even in the supervised mode - //"OCIS_RUN_EXTENSIONS": "settings,storage-metadata,glauth,graph,graph-explorer,idp,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,storage-appprovider,storage-sharing,accounts,proxy,ocdav", + //"OCIS_RUN_EXTENSIONS": "settings,storage-metadata,glauth,graph,graph-explorer,idp,ocs,store,thumbnails,web,webdav,frontend,gateway,user,group,auth-basic,auth-bearer,storage-authmachine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,accounts,proxy,ocdav", } } ] diff --git a/Makefile b/Makefile index 6d751c283d..430252af56 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,8 @@ L10N_MODULES := $(shell find . -path '*.tx*' -name 'config' | sed 's|/[^/]*$$||' # if you add a module here please also add it to the .drone.star file OCIS_MODULES = \ extensions/accounts \ + extensions/app-provider \ extensions/app-registry \ - extensions/appprovider \ extensions/audit \ extensions/auth-basic \ extensions/auth-bearer \ diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index edd065c6c3..23882fac2a 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -108,7 +108,7 @@ services: OCIS_STORAGE_READ_ONLY: "false" # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303 # General oCIS config # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services - OCIS_RUN_EXTENSIONS: settings,storage-metadata,graph,graph-explorer,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,storage-appprovider,storage-sharing,proxy,nats + OCIS_RUN_EXTENSIONS: settings,storage-metadata,graph,graph-explorer,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,app-provider,storage-sharing,proxy,nats OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose OCIS_URL: https://${CLOUD_DOMAIN:-cloud.owncloud.test} PROXY_TLS: "false" # do not use SSL between Traefik and oCIS diff --git a/deployments/examples/ocis_individual_services/docker-compose.yml b/deployments/examples/ocis_individual_services/docker-compose.yml index 2af750b9a9..634a1cce57 100644 --- a/deployments/examples/ocis_individual_services/docker-compose.yml +++ b/deployments/examples/ocis_individual_services/docker-compose.yml @@ -664,7 +664,8 @@ services: STORAGE_FRONTEND_LOG_COLOR: "${OCIS_LOG_COLOR:-false}" STORAGE_FRONTEND_LOG_PRETTY: "${OCIS_LOG_PRETTY:-false}" - STORAGE_FRONTEND_APPPROVIDER_INSECURE: "true" + # FIXME this now lives in a dedicated service + APP_PROVIDER_WOPI_INSECURE: "true" STORAGE_FRONTEND_ARCHIVER_INSECURE: "true" STORAGE_FRONTEND_OCDAV_INSECURE: "true" diff --git a/docs/extensions/appprovider/_index.md b/docs/extensions/app-provider/_index.md similarity index 79% rename from docs/extensions/appprovider/_index.md rename to docs/extensions/app-provider/_index.md index 6f1ff50f05..cbe1886e55 100644 --- a/docs/extensions/appprovider/_index.md +++ b/docs/extensions/app-provider/_index.md @@ -3,7 +3,7 @@ title: App Provider date: 2022-03-02T00:00:00+00:00 weight: 20 geekdocRepo: https://github.com/owncloud/ocis -geekdocEditPath: edit/master/docs/extensions/appprovider +geekdocEditPath: edit/master/docs/extensions/app-provider geekdocFilePath: _index.md geekdocCollapseSection: true --- diff --git a/docs/extensions/app-provider/configuration.md b/docs/extensions/app-provider/configuration.md new file mode 100644 index 0000000000..6f4d3e066d --- /dev/null +++ b/docs/extensions/app-provider/configuration.md @@ -0,0 +1,15 @@ +--- +title: Service Configuration +date: 2018-05-02T00:00:00+00:00 +weight: 20 +geekdocRepo: https://github.com/owncloud/ocis +geekdocEditPath: edit/master/docs/extensions/app-provider +geekdocFilePath: configuration.md +geekdocCollapseSection: true +--- + +## Example YAML Config + +{{< include file="extensions/_includes/app-provider-config-example.yaml" language="yaml" >}} + +{{< include file="extensions/_includes/app-provider_configvars.md" >}} diff --git a/docs/extensions/app-registry/apps.md b/docs/extensions/app-registry/apps.md index 32a18287b5..7bcff036b1 100644 --- a/docs/extensions/app-registry/apps.md +++ b/docs/extensions/app-registry/apps.md @@ -3,7 +3,7 @@ title: "Apps" date: 2018-05-02T00:00:00+00:00 weight: 10 geekdocRepo: https://github.com/owncloud/ocis -geekdocEditPath: edit/master/docs/extensions/appprovider +geekdocEditPath: edit/master/docs/extensions/app-registry geekdocFilePath: apps.md --- diff --git a/docs/extensions/appprovider/configuration.md b/docs/extensions/appprovider/configuration.md deleted file mode 100644 index 1f828107d9..0000000000 --- a/docs/extensions/appprovider/configuration.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: Service Configuration -date: 2018-05-02T00:00:00+00:00 -weight: 20 -geekdocRepo: https://github.com/owncloud/ocis -geekdocEditPath: edit/master/docs/extensions/appprovider -geekdocFilePath: configuration.md -geekdocCollapseSection: true ---- - -## Example YAML Config - -{{< include file="extensions/_includes/appprovider-config-example.yaml" language="yaml" >}} - -{{< include file="extensions/_includes/appprovider_configvars.md" >}} diff --git a/docs/extensions/storage/ports.md b/docs/extensions/storage/ports.md index 62bd6ac82e..b594dd85bb 100644 --- a/docs/extensions/storage/ports.md +++ b/docs/extensions/storage/ports.md @@ -34,8 +34,8 @@ For now, the storage service uses these ports to preconfigure those services: | 9159 | storage users debug | | 9160 | groups | | 9161 | groups debug | -| 9164 | storage appprovider | -| 9165 | storage appprovider debug | +| 9164 | storage app-provider | +| 9165 | storage app-provider debug | | 9178 | storage public link | | 9179 | storage public link data | | 9180 | accounts grpc | diff --git a/extensions/appprovider/Makefile b/extensions/app-provider/Makefile similarity index 100% rename from extensions/appprovider/Makefile rename to extensions/app-provider/Makefile diff --git a/extensions/app-provider/cmd/app-provider/main.go b/extensions/app-provider/cmd/app-provider/main.go new file mode 100644 index 0000000000..e16c590b72 --- /dev/null +++ b/extensions/app-provider/cmd/app-provider/main.go @@ -0,0 +1,14 @@ +package main + +import ( + "os" + + "github.com/owncloud/ocis/extensions/app-provider/pkg/command" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config/defaults" +) + +func main() { + if err := command.Execute(defaults.DefaultConfig()); err != nil { + os.Exit(1) + } +} diff --git a/extensions/appprovider/pkg/command/health.go b/extensions/app-provider/pkg/command/health.go similarity index 83% rename from extensions/appprovider/pkg/command/health.go rename to extensions/app-provider/pkg/command/health.go index 4306bbf926..64c46626d0 100644 --- a/extensions/appprovider/pkg/command/health.go +++ b/extensions/app-provider/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/extensions/appprovider/pkg/config" - "github.com/owncloud/ocis/extensions/appprovider/pkg/config/parser" - "github.com/owncloud/ocis/extensions/appprovider/pkg/logging" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config/parser" + "github.com/owncloud/ocis/extensions/app-provider/pkg/logging" "github.com/urfave/cli/v2" ) diff --git a/extensions/appprovider/pkg/command/root.go b/extensions/app-provider/pkg/command/root.go similarity index 93% rename from extensions/appprovider/pkg/command/root.go rename to extensions/app-provider/pkg/command/root.go index 37218bdacb..eb42d7289b 100644 --- a/extensions/appprovider/pkg/command/root.go +++ b/extensions/app-provider/pkg/command/root.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/owncloud/ocis/extensions/appprovider/pkg/config" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config" "github.com/owncloud/ocis/ocis-pkg/clihelper" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/thejerf/suture/v4" @@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands { // Execute is the entry point for the ocis-accounts command. func Execute(cfg *config.Config) error { app := clihelper.DefaultApp(&cli.App{ - Name: "appprovider", + Name: "app-provider", Usage: "Provide apps for oCIS", Commands: GetCommands(cfg), }) diff --git a/extensions/appprovider/pkg/command/server.go b/extensions/app-provider/pkg/command/server.go similarity index 86% rename from extensions/appprovider/pkg/command/server.go rename to extensions/app-provider/pkg/command/server.go index 282ee46cbc..78ee4ef420 100644 --- a/extensions/appprovider/pkg/command/server.go +++ b/extensions/app-provider/pkg/command/server.go @@ -9,12 +9,12 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/extensions/appprovider/pkg/config" - "github.com/owncloud/ocis/extensions/appprovider/pkg/config/parser" - "github.com/owncloud/ocis/extensions/appprovider/pkg/logging" - "github.com/owncloud/ocis/extensions/appprovider/pkg/revaconfig" - "github.com/owncloud/ocis/extensions/appprovider/pkg/server/debug" - "github.com/owncloud/ocis/extensions/appprovider/pkg/tracing" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config/parser" + "github.com/owncloud/ocis/extensions/app-provider/pkg/logging" + "github.com/owncloud/ocis/extensions/app-provider/pkg/revaconfig" + "github.com/owncloud/ocis/extensions/app-provider/pkg/server/debug" + "github.com/owncloud/ocis/extensions/app-provider/pkg/tracing" "github.com/owncloud/ocis/ocis-pkg/service/external" "github.com/owncloud/ocis/ocis-pkg/sync" "github.com/owncloud/ocis/ocis-pkg/version" diff --git a/extensions/appprovider/pkg/command/version.go b/extensions/app-provider/pkg/command/version.go similarity index 95% rename from extensions/appprovider/pkg/command/version.go rename to extensions/app-provider/pkg/command/version.go index 3558839521..9ca6e23d86 100644 --- a/extensions/appprovider/pkg/command/version.go +++ b/extensions/app-provider/pkg/command/version.go @@ -8,7 +8,7 @@ import ( "github.com/owncloud/ocis/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/extensions/appprovider/pkg/config" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/extensions/appprovider/pkg/config/config.go b/extensions/app-provider/pkg/config/config.go similarity index 98% rename from extensions/appprovider/pkg/config/config.go rename to extensions/app-provider/pkg/config/config.go index 84e77c4d42..ca0c569ff7 100644 --- a/extensions/appprovider/pkg/config/config.go +++ b/extensions/app-provider/pkg/config/config.go @@ -23,7 +23,7 @@ type Config struct { Drivers Drivers `yaml:"drivers"` Supervised bool `yaml:"-"` - Context context.Context `yaml:"-"` + Context context.Context `yaml:"-"` } type Tracing struct { diff --git a/extensions/appprovider/pkg/config/defaults/defaultconfig.go b/extensions/app-provider/pkg/config/defaults/defaultconfig.go similarity index 96% rename from extensions/appprovider/pkg/config/defaults/defaultconfig.go rename to extensions/app-provider/pkg/config/defaults/defaultconfig.go index c42611f739..22a4d5a0fd 100644 --- a/extensions/appprovider/pkg/config/defaults/defaultconfig.go +++ b/extensions/app-provider/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/extensions/appprovider/pkg/config" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config" "github.com/owncloud/ocis/ocis-pkg/shared" ) @@ -26,7 +26,7 @@ func DefaultConfig() *config.Config { Protocol: "tcp", }, Service: config.Service{ - Name: "appprovider", + Name: "app-provider", }, Reva: &config.Reva{ Address: "127.0.0.1:9142", diff --git a/extensions/appprovider/pkg/config/parser/parse.go b/extensions/app-provider/pkg/config/parser/parse.go similarity index 86% rename from extensions/appprovider/pkg/config/parser/parse.go rename to extensions/app-provider/pkg/config/parser/parse.go index ff554af475..78439f269d 100644 --- a/extensions/appprovider/pkg/config/parser/parse.go +++ b/extensions/app-provider/pkg/config/parser/parse.go @@ -3,8 +3,8 @@ package parser import ( "errors" - "github.com/owncloud/ocis/extensions/appprovider/pkg/config" - "github.com/owncloud/ocis/extensions/appprovider/pkg/config/defaults" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config/defaults" ociscfg "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/shared" diff --git a/extensions/appprovider/pkg/config/reva.go b/extensions/app-provider/pkg/config/reva.go similarity index 100% rename from extensions/appprovider/pkg/config/reva.go rename to extensions/app-provider/pkg/config/reva.go diff --git a/extensions/appprovider/pkg/logging/logging.go b/extensions/app-provider/pkg/logging/logging.go similarity index 84% rename from extensions/appprovider/pkg/logging/logging.go rename to extensions/app-provider/pkg/logging/logging.go index 91ed77da75..33f9128ba8 100644 --- a/extensions/appprovider/pkg/logging/logging.go +++ b/extensions/app-provider/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/owncloud/ocis/extensions/appprovider/pkg/config" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" ) diff --git a/extensions/appprovider/pkg/revaconfig/config.go b/extensions/app-provider/pkg/revaconfig/config.go similarity index 96% rename from extensions/appprovider/pkg/revaconfig/config.go rename to extensions/app-provider/pkg/revaconfig/config.go index 9d1ebf814f..3f4217e9f3 100644 --- a/extensions/appprovider/pkg/revaconfig/config.go +++ b/extensions/app-provider/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/extensions/appprovider/pkg/config" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config" ) // AppProviderConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/extensions/appprovider/pkg/server/debug/option.go b/extensions/app-provider/pkg/server/debug/option.go similarity index 93% rename from extensions/appprovider/pkg/server/debug/option.go rename to extensions/app-provider/pkg/server/debug/option.go index d072eb56e8..fb0d4fdf43 100644 --- a/extensions/appprovider/pkg/server/debug/option.go +++ b/extensions/app-provider/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/owncloud/ocis/extensions/appprovider/pkg/config" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" ) diff --git a/extensions/appprovider/pkg/server/debug/server.go b/extensions/app-provider/pkg/server/debug/server.go similarity index 96% rename from extensions/appprovider/pkg/server/debug/server.go rename to extensions/app-provider/pkg/server/debug/server.go index e2ef65074a..04b52c3ce9 100644 --- a/extensions/appprovider/pkg/server/debug/server.go +++ b/extensions/app-provider/pkg/server/debug/server.go @@ -4,7 +4,7 @@ import ( "io" "net/http" - "github.com/owncloud/ocis/extensions/appprovider/pkg/config" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config" "github.com/owncloud/ocis/ocis-pkg/service/debug" "github.com/owncloud/ocis/ocis-pkg/version" ) diff --git a/extensions/appprovider/pkg/tracing/tracing.go b/extensions/app-provider/pkg/tracing/tracing.go similarity index 86% rename from extensions/appprovider/pkg/tracing/tracing.go rename to extensions/app-provider/pkg/tracing/tracing.go index 36e5b9e2b5..fa358604ba 100644 --- a/extensions/appprovider/pkg/tracing/tracing.go +++ b/extensions/app-provider/pkg/tracing/tracing.go @@ -1,7 +1,7 @@ package tracing import ( - "github.com/owncloud/ocis/extensions/appprovider/pkg/config" + "github.com/owncloud/ocis/extensions/app-provider/pkg/config" "github.com/owncloud/ocis/ocis-pkg/log" "github.com/owncloud/ocis/ocis-pkg/tracing" "go.opentelemetry.io/otel/trace" diff --git a/extensions/appprovider/cmd/appprovider/main.go b/extensions/appprovider/cmd/appprovider/main.go deleted file mode 100644 index decb2d8f3e..0000000000 --- a/extensions/appprovider/cmd/appprovider/main.go +++ /dev/null @@ -1,14 +0,0 @@ -package main - -import ( - "os" - - "github.com/owncloud/ocis/extensions/appprovider/pkg/command" - "github.com/owncloud/ocis/extensions/appprovider/pkg/config/defaults" -) - -func main() { - if err := command.Execute(defaults.DefaultConfig()); err != nil { - os.Exit(1) - } -} diff --git a/go.sum b/go.sum index 2b608d1351..d0a58a377b 100644 --- a/go.sum +++ b/go.sum @@ -236,8 +236,6 @@ github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBW github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/c-bata/go-prompt v0.2.5/go.mod h1:vFnjEGDIIA/Lib7giyE4E9c50Lvl8j0S+7FVlAwDAVw= -github.com/c0rby/reva/v2 v2.0.0-20220502195635-b3d192b975d0 h1:r4XeggvJMiYTugpgmPsOWF/ulRFUHOj/oWep/5Q+xZY= -github.com/c0rby/reva/v2 v2.0.0-20220502195635-b3d192b975d0/go.mod h1:2e/4HcIy54Mic3V7Ow0bz4n5dkZU0dHIZSWomFe5vng= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go index 40a1d9842b..3ace931c41 100644 --- a/ocis-pkg/config/config.go +++ b/ocis-pkg/config/config.go @@ -4,8 +4,8 @@ import ( "github.com/owncloud/ocis/ocis-pkg/shared" accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config" + appProvider "github.com/owncloud/ocis/extensions/app-provider/pkg/config" appRegistry "github.com/owncloud/ocis/extensions/app-registry/pkg/config" - appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/config" audit "github.com/owncloud/ocis/extensions/audit/pkg/config" authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config" authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config" @@ -73,7 +73,7 @@ type Config struct { Runtime Runtime `yaml:"runtime"` Accounts *accounts.Config `yaml:"accounts"` - AppProvider *appprovider.Config `yaml:"appprovider"` + AppProvider *appProvider.Config `yaml:"app-provider"` AppRegistry *appRegistry.Config `yaml:"app-registry"` Audit *audit.Config `yaml:"audit"` AuthBasic *authbasic.Config `yaml:"auth-basic"` diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go index b6ee829a10..332d6de0e4 100644 --- a/ocis-pkg/config/defaultconfig.go +++ b/ocis-pkg/config/defaultconfig.go @@ -2,8 +2,8 @@ package config import ( accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults" - appregistry "github.com/owncloud/ocis/extensions/app-registry/pkg/config/defaults" - appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/config/defaults" + appProvider "github.com/owncloud/ocis/extensions/app-provider/pkg/config/defaults" + appRegistry "github.com/owncloud/ocis/extensions/app-registry/pkg/config/defaults" audit "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults" authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/config/defaults" authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/config/defaults" @@ -43,8 +43,8 @@ func DefaultConfig() *Config { }, Accounts: accounts.DefaultConfig(), - AppProvider: appprovider.DefaultConfig(), - AppRegistry: appregistry.DefaultConfig(), + AppProvider: appProvider.DefaultConfig(), + AppRegistry: appRegistry.DefaultConfig(), Audit: audit.DefaultConfig(), AuthBasic: authbasic.DefaultConfig(), AuthBearer: authbearer.DefaultConfig(), diff --git a/ocis/pkg/command/appprovider.go b/ocis/pkg/command/appprovider.go index bf76eba894..0c10f0d2bc 100644 --- a/ocis/pkg/command/appprovider.go +++ b/ocis/pkg/command/appprovider.go @@ -3,7 +3,7 @@ package command import ( "fmt" - "github.com/owncloud/ocis/extensions/appprovider/pkg/command" + "github.com/owncloud/ocis/extensions/app-provider/pkg/command" "github.com/owncloud/ocis/ocis-pkg/config" "github.com/owncloud/ocis/ocis-pkg/config/parser" "github.com/owncloud/ocis/ocis/pkg/register" diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index 612c67cab9..2a1ff379bf 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -20,8 +20,8 @@ import ( "github.com/olekukonko/tablewriter" accounts "github.com/owncloud/ocis/extensions/accounts/pkg/command" - appregistry "github.com/owncloud/ocis/extensions/app-registry/pkg/command" - appprovider "github.com/owncloud/ocis/extensions/appprovider/pkg/command" + appProvider "github.com/owncloud/ocis/extensions/app-provider/pkg/command" + appRegistry "github.com/owncloud/ocis/extensions/app-registry/pkg/command" authbasic "github.com/owncloud/ocis/extensions/auth-basic/pkg/command" authbearer "github.com/owncloud/ocis/extensions/auth-bearer/pkg/command" authmachine "github.com/owncloud/ocis/extensions/auth-machine/pkg/command" @@ -123,7 +123,7 @@ func NewService(options ...Option) (*Service, error) { s.ServicesRegistry[opts.Config.Frontend.Service.Name] = frontend.NewSutureService s.ServicesRegistry[opts.Config.OCDav.Service.Name] = ocdav.NewSutureService s.ServicesRegistry[opts.Config.Gateway.Service.Name] = gateway.NewSutureService - s.ServicesRegistry[opts.Config.AppRegistry.Service.Name] = appregistry.NewSutureService + s.ServicesRegistry[opts.Config.AppRegistry.Service.Name] = appRegistry.NewSutureService s.ServicesRegistry[opts.Config.User.Service.Name] = user.NewSutureService s.ServicesRegistry[opts.Config.Group.Service.Name] = group.NewSutureService s.ServicesRegistry[opts.Config.AuthBasic.Service.Name] = authbasic.NewSutureService @@ -132,7 +132,7 @@ func NewService(options ...Option) (*Service, error) { s.ServicesRegistry[opts.Config.StorageUsers.Service.Name] = storageusers.NewSutureService s.ServicesRegistry[opts.Config.StorageShares.Service.Name] = storageshares.NewSutureService s.ServicesRegistry[opts.Config.StoragePublicLink.Service.Name] = storagepublic.NewSutureService - s.ServicesRegistry[opts.Config.AppProvider.Service.Name] = appprovider.NewSutureService + s.ServicesRegistry[opts.Config.AppProvider.Service.Name] = appProvider.NewSutureService s.ServicesRegistry[opts.Config.Notifications.Service.Name] = notifications.NewSutureService s.ServicesRegistry[opts.Config.Search.Service.Name] = search.NewSutureService