fix storage subcommands

2026-02-22 13:39:24 -06:00 · 2021-06-29 15:43:59 +02:00
parent 2e28582c1b
commit 72f6a3613a
22 changed files with 4 additions and 63 deletions
--- a/accounts/pkg/flagset/flagset.go
+++ b/accounts/pkg/flagset/flagset.go
@@ -239,6 +239,10 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"ACCOUNTS_GID_INDEX_UPPER_BOUND"},
 			Destination: &cfg.Index.GID.Upper,
 		},
+		&cli.StringFlag{
+			Name:  "extensions",
+			Usage: "Run specific extensions during supervised mode",
+		},
 	}
 }

--- a/storage/pkg/flagset/authbasic.go
+++ b/storage/pkg/flagset/authbasic.go
@@ -76,7 +76,6 @@ func AuthBasicWithConfig(cfg *config.Config) []cli.Flag {
 	flags = append(flags, DebugWithConfig(cfg)...)
 	flags = append(flags, SecretWithConfig(cfg)...)
 	flags = append(flags, LDAPWithConfig(cfg)...)
-	flags = append(flags, RuntimeConfig(cfg)...)

 	return flags
 }
--- a/storage/pkg/flagset/authbearer.go
+++ b/storage/pkg/flagset/authbearer.go
@@ -102,7 +102,6 @@ func AuthBearerWithConfig(cfg *config.Config) []cli.Flag {
 	flags = append(flags, TracingWithConfig(cfg)...)
 	flags = append(flags, DebugWithConfig(cfg)...)
 	flags = append(flags, SecretWithConfig(cfg)...)
-	flags = append(flags, RuntimeConfig(cfg)...)

 	return flags
 }
--- a/storage/pkg/flagset/drivereos.go
+++ b/storage/pkg/flagset/drivereos.go
@@ -131,9 +131,5 @@ func DriverEOSWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_DRIVER_EOS_GATEWAYSVC"},
 			Destination: &cfg.Reva.Storages.EOS.GatewaySVC,
 		},
-		&cli.StringFlag{
-			Name:  "extensions",
-			Usage: "Run specific extensions during supervised mode",
-		},
 	}
 }
--- a/storage/pkg/flagset/driverlocal.go
+++ b/storage/pkg/flagset/driverlocal.go
@@ -16,9 +16,5 @@ func DriverLocalWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_DRIVER_LOCAL_ROOT"},
 			Destination: &cfg.Reva.Storages.Local.Root,
 		},
-		&cli.StringFlag{
-			Name:  "extensions",
-			Usage: "Run specific extensions during supervised mode",
-		},
 	}
 }
--- a/storage/pkg/flagset/driverocis.go
+++ b/storage/pkg/flagset/driverocis.go
@@ -37,9 +37,5 @@ func DriverOCISWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_DRIVER_OCIS_SERVICE_USER_UUID"},
 			Destination: &cfg.Reva.Storages.OCIS.ServiceUserUUID,
 		},
-		&cli.StringFlag{
-			Name:  "extensions",
-			Usage: "Run specific extensions during supervised mode",
-		},
 	}
 }
--- a/storage/pkg/flagset/driverowncloud.go
+++ b/storage/pkg/flagset/driverowncloud.go
@@ -58,9 +58,5 @@ func DriverOwnCloudWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_DRIVER_OWNCLOUD_LAYOUT"},
 			Destination: &cfg.Reva.Storages.OwnCloud.UserLayout,
 		},
-		&cli.StringFlag{
-			Name:  "extensions",
-			Usage: "Run specific extensions during supervised mode",
-		},
 	}
 }
--- a/storage/pkg/flagset/drivers3ng.go
+++ b/storage/pkg/flagset/drivers3ng.go
@@ -65,9 +65,5 @@ func DriverS3NGWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_DRIVER_S3NG_BUCKET"},
 			Destination: &cfg.Reva.Storages.S3NG.Bucket,
 		},
-		&cli.StringFlag{
-			Name:  "extensions",
-			Usage: "Run specific extensions during supervised mode",
-		},
 	}
 }
--- a/storage/pkg/flagset/frontend.go
+++ b/storage/pkg/flagset/frontend.go
@@ -183,7 +183,6 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
 	flags = append(flags, TracingWithConfig(cfg)...)
 	flags = append(flags, DebugWithConfig(cfg)...)
 	flags = append(flags, SecretWithConfig(cfg)...)
-	flags = append(flags, RuntimeConfig(cfg)...)

 	return flags
 }
--- a/storage/pkg/flagset/gateway.go
+++ b/storage/pkg/flagset/gateway.go
@@ -264,7 +264,6 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag {
 	flags = append(flags, TracingWithConfig(cfg)...)
 	flags = append(flags, DebugWithConfig(cfg)...)
 	flags = append(flags, SecretWithConfig(cfg)...)
-	flags = append(flags, RuntimeConfig(cfg)...)

 	return flags
 }
--- a/storage/pkg/flagset/groups.go
+++ b/storage/pkg/flagset/groups.go
@@ -79,7 +79,6 @@ func GroupsWithConfig(cfg *config.Config) []cli.Flag {
 	flags = append(flags, SecretWithConfig(cfg)...)
 	flags = append(flags, LDAPWithConfig(cfg)...)
 	flags = append(flags, RestWithConfig(cfg)...)
-	flags = append(flags, RuntimeConfig(cfg)...)

 	return flags
 }
--- a/storage/pkg/flagset/ldap.go
+++ b/storage/pkg/flagset/ldap.go
@@ -208,9 +208,5 @@ func LDAPWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_LDAP_GROUP_SCHEMA_GID_NUMBER"},
 			Destination: &cfg.Reva.LDAP.GroupSchema.GIDNumber,
 		},
-		&cli.StringFlag{
-			Name:  "extensions",
-			Usage: "Run specific extensions during supervised mode",
-		},
 	}
 }
--- a/storage/pkg/flagset/rest.go
+++ b/storage/pkg/flagset/rest.go
@@ -72,9 +72,5 @@ func RestWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_REST_TARGET_API"},
 			Destination: &cfg.Reva.UserGroupRest.TargetAPI,
 		},
-		&cli.StringFlag{
-			Name:  "extensions",
-			Usage: "Run specific extensions during supervised mode",
-		},
 	}
 }
--- a/storage/pkg/flagset/root.go
+++ b/storage/pkg/flagset/root.go
@@ -33,9 +33,5 @@ func RootWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_LOG_COLOR", "OCIS_LOG_COLOR"},
 			Destination: &cfg.Log.Color,
 		},
-		&cli.StringFlag{
-			Name:  "extensions",
-			Usage: "Run specific extensions during supervised mode",
-		},
 	}
 }
--- a/storage/pkg/flagset/runtime_extensions.go
+++ b/storage/pkg/flagset/runtime_extensions.go
@@ -1,16 +0,0 @@
-package flagset
-
-import (
-	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/storage/pkg/config"
-)
-
-// RuntimeConfig applies common debug config cfg to the flagset
-func RuntimeConfig(cfg *config.Config) []cli.Flag {
-	return []cli.Flag{
-		&cli.StringFlag{
-			Name:  "extensions",
-			Usage: "Run specific extensions during supervised mode",
-		},
-	}
-}
--- a/storage/pkg/flagset/sharing.go
+++ b/storage/pkg/flagset/sharing.go
@@ -98,7 +98,6 @@ func SharingWithConfig(cfg *config.Config) []cli.Flag {
 	flags = append(flags, DebugWithConfig(cfg)...)
 	flags = append(flags, SecretWithConfig(cfg)...)
 	flags = append(flags, SharingSQLWithConfig(cfg)...)
-	flags = append(flags, RuntimeConfig(cfg)...)

 	return flags
 }
--- a/storage/pkg/flagset/sharingsql.go
+++ b/storage/pkg/flagset/sharingsql.go
@@ -44,9 +44,5 @@ func SharingSQLWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_SHARING_USER_SQL_NAME"},
 			Destination: &cfg.Reva.Sharing.UserSQLName,
 		},
-		&cli.StringFlag{
-			Name:  "extensions",
-			Usage: "Run specific extensions during supervised mode",
-		},
 	}
 }
--- a/storage/pkg/flagset/storagehome.go
+++ b/storage/pkg/flagset/storagehome.go
@@ -157,7 +157,6 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag {
 	flags = append(flags, DriverOwnCloudWithConfig(cfg)...)
 	flags = append(flags, DriverOCISWithConfig(cfg)...)
 	flags = append(flags, DriverS3NGWithConfig(cfg)...)
-	flags = append(flags, RuntimeConfig(cfg)...)

 	return flags
 }
--- a/storage/pkg/flagset/storagemetadata.go
+++ b/storage/pkg/flagset/storagemetadata.go
@@ -106,7 +106,6 @@ func StorageMetadata(cfg *config.Config) []cli.Flag {
 	f = append(f, DriverOwnCloudWithConfig(cfg)...)
 	f = append(f, DriverOCISWithConfig(cfg)...)
 	f = append(f, DriverS3NGWithConfig(cfg)...)
-	f = append(f, RuntimeConfig(cfg)...)

 	return f

--- a/storage/pkg/flagset/storagepubliclink.go
+++ b/storage/pkg/flagset/storagepubliclink.go
@@ -53,7 +53,6 @@ func StoragePublicLink(cfg *config.Config) []cli.Flag {
 	flags = append(flags, TracingWithConfig(cfg)...)
 	flags = append(flags, DebugWithConfig(cfg)...)
 	flags = append(flags, SecretWithConfig(cfg)...)
-	flags = append(flags, RuntimeConfig(cfg)...)

 	return flags
 }
--- a/storage/pkg/flagset/storageusers.go
+++ b/storage/pkg/flagset/storageusers.go
@@ -147,7 +147,6 @@ func StorageUsersWithConfig(cfg *config.Config) []cli.Flag {
 	flags = append(flags, DriverOwnCloudWithConfig(cfg)...)
 	flags = append(flags, DriverOCISWithConfig(cfg)...)
 	flags = append(flags, DriverS3NGWithConfig(cfg)...)
-	flags = append(flags, RuntimeConfig(cfg)...)

 	return flags
 }
--- a/storage/pkg/flagset/users.go
+++ b/storage/pkg/flagset/users.go
@@ -79,7 +79,6 @@ func UsersWithConfig(cfg *config.Config) []cli.Flag {
 	flags = append(flags, SecretWithConfig(cfg)...)
 	flags = append(flags, LDAPWithConfig(cfg)...)
 	flags = append(flags, RestWithConfig(cfg)...)
-	flags = append(flags, RuntimeConfig(cfg)...)

 	return flags
 }