Merge pull request #1372 from rhafer/watchfs-test

[full-ci] Bump reva to latest main

services/storage-users/pkg/config/config.go

@@ -103,7 +103,6 @@ type Drivers struct {
 	OwnCloudSQL  OwnCloudSQLDriver  `yaml:"owncloudsql"`
 	Posix        PosixDriver        `yaml:"posix"`
 
-	S3    S3Driver    `yaml:",omitempty"` // not supported by the OpenCloud product, therefore not part of docs
 	EOS   EOSDriver   `yaml:",omitempty"` // not supported by the OpenCloud product, therefore not part of docs
 	Local LocalDriver `yaml:",omitempty"` // not supported by the OpenCloud product, therefore not part of docs
 }
@@ -256,17 +255,6 @@ type IDCache struct {
 	AuthPassword       string        `yaml:"password" env:"OC_CACHE_AUTH_PASSWORD;STORAGE_USERS_ID_CACHE_AUTH_PASSWORD" desc:"The password to authenticate with the cache store. Only applies when store type 'nats-js-kv' is configured." introductionVersion:"1.0.0"`
 }
 
-// S3Driver is the storage driver configuration when using 's3' storage driver
-type S3Driver struct {
-	// Root is the absolute path to the location of the data
-	Root      string `yaml:"root"`
-	Region    string `yaml:"region"`
-	AccessKey string `yaml:"access_key"`
-	SecretKey string `yaml:"secret_key"`
-	Endpoint  string `yaml:"endpoint"`
-	Bucket    string `yaml:"bucket"`
-}
-
 // EOSDriver is the storage driver configuration when using 'eos' storage driver
 type EOSDriver struct {
 	// Root is the absolute path to the location of the data

services/storage-users/pkg/revaconfig/drivers.go

@@ -278,19 +278,6 @@ func DecomposedNoEvents(cfg *config.Config) map[string]interface{} {
 	}
 }
 
-// S3 is the config mapping for the s3 storage driver
-func S3(cfg *config.Config) map[string]interface{} {
-	return map[string]interface{}{
-		"enable_home": false,
-		"region":      cfg.Drivers.S3.Region,
-		"access_key":  cfg.Drivers.S3.AccessKey,
-		"secret_key":  cfg.Drivers.S3.SecretKey,
-		"endpoint":    cfg.Drivers.S3.Endpoint,
-		"bucket":      cfg.Drivers.S3.Bucket,
-		"prefix":      cfg.Drivers.S3.Root,
-	}
-}
-
 // DecomposedS3 is the config mapping for the decomposeds3 storage driver
 func DecomposedS3(cfg *config.Config) map[string]interface{} {
 	return map[string]interface{}{

services/storage-users/pkg/revaconfig/user.go

@@ -14,7 +14,6 @@ func StorageProviderDrivers(cfg *config.Config) map[string]interface{} {
 		"localhome":    LocalHome(cfg),
 		"owncloudsql":  OwnCloudSQL(cfg),
 		"decomposed":   DecomposedNoEvents(cfg),
-		"s3":           S3(cfg),
 		"decomposeds3": DecomposedS3NoEvents(cfg),
 		"posix":        Posix(cfg, true, cfg.Drivers.Posix.WatchFS),
 
@@ -34,7 +33,6 @@ func DataProviderDrivers(cfg *config.Config) map[string]interface{} {
 		"localhome":    LocalHome(cfg),
 		"owncloudsql":  OwnCloudSQL(cfg),
 		"decomposed":   Decomposed(cfg),
-		"s3":           S3(cfg),
 		"decomposeds3": DecomposedS3(cfg),
 		"posix":        Posix(cfg, false, false),