approvider -> app-provider

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

.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",

.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",
             }
         }
     ]

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 \

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

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"
 

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
 ---

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" >}}

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
 ---
 

docs/extensions/appprovider/configuration.md

@@ -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" >}}

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                                 |

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)
+	}
+}

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"
 )
 

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),
 	})

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"

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"
 )
 

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 {

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",

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"
 

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"
 )
 

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.

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"
 )
 

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"
 )

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"

extensions/appprovider/cmd/appprovider/main.go

@@ -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)
-	}
-}

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=

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"`

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(),

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"

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