sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cherrypick extensions to start v1

Browse Source
This commit is contained in:
A.Unger
2021-06-29 15:28:19 +02:00
parent f02f2a3d42
commit 2e28582c1b
34 changed files with 156 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
storage/pkg/flagset/authbasic.go
+1
View File
@@ -76,6 +76,7 @@ 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
}
storage/pkg/flagset/authbearer.go
+1
View File
@@ -102,6 +102,7 @@ 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
}
storage/pkg/flagset/drivereos.go
+4
View File
@@ -131,5 +131,9 @@ 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",
},
}
}
storage/pkg/flagset/driverlocal.go
+4
View File
@@ -16,5 +16,9 @@ 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",
},
}
}
storage/pkg/flagset/driverocis.go
+4
View File
@@ -37,5 +37,9 @@ 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",
},
}
}
storage/pkg/flagset/driverowncloud.go
+4
View File
@@ -58,5 +58,9 @@ 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",
},
}
}
storage/pkg/flagset/drivers3ng.go
+4
View File
@@ -65,5 +65,9 @@ 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",
},
}
}
storage/pkg/flagset/frontend.go
+1
View File
@@ -183,6 +183,7 @@ 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
}
storage/pkg/flagset/gateway.go
+1
View File
@@ -264,6 +264,7 @@ 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
}
storage/pkg/flagset/groups.go
+1
View File
@@ -79,6 +79,7 @@ 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
}
storage/pkg/flagset/ldap.go
+4
View File
@@ -208,5 +208,9 @@ 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",
},
}
}
storage/pkg/flagset/rest.go
+4
View File
@@ -72,5 +72,9 @@ 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",
},
}
}
storage/pkg/flagset/root.go
+4
View File
@@ -33,5 +33,9 @@ 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",
},
}
}
storage/pkg/flagset/runtime_extensions.go
+16
View File
@@ -0,0 +1,16 @@
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",
},
}
}
storage/pkg/flagset/sharing.go
+1
View File
@@ -98,6 +98,7 @@ 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
}
storage/pkg/flagset/sharingsql.go
+4
View File
@@ -44,5 +44,9 @@ 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",
},
}
}
storage/pkg/flagset/storagehome.go
+1
View File
@@ -157,6 +157,7 @@ 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
}
storage/pkg/flagset/storagemetadata.go
+2
View File
@@ -106,6 +106,8 @@ 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
}
storage/pkg/flagset/storagepubliclink.go
+1
View File
@@ -53,6 +53,7 @@ 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
}
storage/pkg/flagset/storageusers.go
+1
View File
@@ -147,6 +147,7 @@ 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
}
storage/pkg/flagset/users.go
+1
View File
@@ -79,6 +79,7 @@ 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
}