further refactoring & add changelog

Signed-off-by: Christian Richter <crichter@owncloud.com>

changelog/unreleased/refactor-extensions-to-services.md

@@ -0,0 +1,7 @@
+Enhancement: Refactor extensions to services
+
+We have decided to name all extensions, we maintain and provide with ocis,
+services from here on to avoid confusion between external extensions and code
+we provide and maintain.
+
+https://github.com/owncloud/ocis/pull/3980

ocis-pkg/config/config.go

@@ -49,7 +49,7 @@ type Mode int
 type Runtime struct {
 	Port       string `yaml:"port" env:"OCIS_RUNTIME_PORT"`
 	Host       string `yaml:"host" env:"OCIS_RUNTIME_HOST"`
-	Extensions string `yaml:"extensions" env:"OCIS_RUN_EXTENSIONS"`
+	Extensions string `yaml:"services" env:"OCIS_RUN_SERVICES"`
 }
 
 // Config combines all available configuration parts.

ocis/pkg/command/app-provider.go

@@ -16,7 +16,7 @@ func AppProviderCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.AppProvider.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.AppProvider.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/app-registry.go

@@ -16,7 +16,7 @@ func AppRegistryCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.AppRegistry.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.AppRegistry.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/audit.go

@@ -16,7 +16,7 @@ func AuditCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Audit.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Audit.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/auth-basic.go

@@ -16,7 +16,7 @@ func AuthBasicCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.AuthBasic.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.AuthBasic.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/auth-bearer.go

@@ -16,7 +16,7 @@ func AuthBearerCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.AuthBearer.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.AuthBearer.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/auth-machine.go

@@ -16,7 +16,7 @@ func AuthMachineCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.AuthMachine.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.AuthMachine.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/frontend.go

@@ -16,7 +16,7 @@ func FrontendCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Frontend.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Frontend.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/gateway.go

@@ -16,7 +16,7 @@ func GatewayCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Gateway.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Gateway.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/graph-explorer.go

@@ -16,7 +16,7 @@ func GraphExplorerCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.GraphExplorer.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.GraphExplorer.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/graph.go

@@ -16,7 +16,7 @@ func GraphCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Graph.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Graph.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/groups.go

@@ -16,7 +16,7 @@ func GroupsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Groups.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Groups.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/idm.go

@@ -16,7 +16,7 @@ func IDMCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.IDM.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.IDM.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/idp.go

@@ -16,7 +16,7 @@ func IDPCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.IDP.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.IDP.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/migrate.go

@@ -11,12 +11,12 @@ import (
 	publicregistry "github.com/cs3org/reva/v2/pkg/publicshare/manager/registry"
 	"github.com/cs3org/reva/v2/pkg/share"
 	"github.com/cs3org/reva/v2/pkg/share/manager/registry"
-	sharing "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config"
+
-	sharingparser "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
-
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/config"
+	sharingparser "github.com/owncloud/ocis/v2/services/sharing/pkg/config/parser"
 	"github.com/rs/zerolog"
 	"github.com/urfave/cli/v2"
 )

ocis/pkg/command/nats.go

@@ -16,7 +16,7 @@ func NatsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Nats.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Nats.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/notifications.go

@@ -16,7 +16,7 @@ func NotificationsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Notifications.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Notifications.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/ocdav.go

@@ -16,7 +16,7 @@ func OCDavCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.OCDav.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.OCDav.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/ocs.go

@@ -16,7 +16,7 @@ func OCSCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.OCS.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.OCS.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/proxy.go

@@ -16,7 +16,7 @@ func ProxyCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Proxy.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Proxy.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/search.go

@@ -16,7 +16,7 @@ func SearchCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Search.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Search.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/settings.go

@@ -16,7 +16,7 @@ func SettingsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Settings.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Settings.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/sharing.go

@@ -16,7 +16,7 @@ func SharingCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Sharing.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Sharing.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/storage-publiclink.go

@@ -16,7 +16,7 @@ func StoragePublicLinkCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.StoragePublicLink.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.StoragePublicLink.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/storage-shares.go

@@ -16,7 +16,7 @@ func StorageSharesCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.StorageShares.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.StorageShares.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/storage-system.go

@@ -16,7 +16,7 @@ func StorageSystemCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.StorageSystem.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.StorageSystem.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/storage-users.go

@@ -16,7 +16,7 @@ func StorageUsersCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.StorageUsers.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.StorageUsers.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/store.go

@@ -17,7 +17,7 @@ func StoreCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Store.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Store.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/thumbnails.go

@@ -16,7 +16,7 @@ func ThumbnailsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Thumbnails.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Thumbnails.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/users.go

@@ -16,7 +16,7 @@ func UsersCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Users.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Users.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/web.go

@@ -16,7 +16,7 @@ func WebCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Web.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Web.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/webdav.go

@@ -17,7 +17,7 @@ func WebDAVCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.WebDAV.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.WebDAV.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)