Adapt to changes to the sharesstorageprovider

owncloud · Sep 3, 2021 · 14d080f · 14d080f
1 parent 60dfc0e
commit 14d080f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 88 deletions.
diff --git a/storage/pkg/command/storageshares.go b/storage/pkg/command/storageshares.go
@@ -99,26 +99,9 @@ func storageSharesConfigFromStruct(c *cli.Context, cfg *config.Config) map[strin
 			},
 			"services": map[string]interface{}{
 				"sharesstorageprovider": map[string]interface{}{
-					"mount_path":   cfg.Reva.StorageShares.MountPath,
-					"gateway_addr": cfg.Reva.Gateway.Endpoint,
-					"driver":       cfg.Reva.Sharing.UserDriver,
-					"drivers": map[string]interface{}{
-						"json": map[string]interface{}{
-							"file": cfg.Reva.Sharing.UserJSONFile,
-						},
-						"sql": map[string]interface{}{
-							"gateway_addr":                  cfg.Reva.Gateway.Endpoint,
-							"storage_mount_id":              cfg.Reva.Sharing.UserStorageMountId,
-							"db_username":                   cfg.Reva.Sharing.UserSQLUsername,
-							"db_password":                   cfg.Reva.Sharing.UserSQLPassword,
-							"db_host":                       cfg.Reva.Sharing.UserSQLHost,
-							"db_port":                       cfg.Reva.Sharing.UserSQLPort,
-							"db_name":                       cfg.Reva.Sharing.UserSQLName,
-							"password_hash_cost":            cfg.Reva.Sharing.PublicPasswordHashCost,
-							"enable_expired_shares_cleanup": cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup,
-							"janitor_run_interval":          cfg.Reva.Sharing.PublicJanitorRunInterval,
-						},
-					},
+					"mount_path":           cfg.Reva.StorageShares.MountPath,
+					"gateway_addr":         cfg.Reva.Gateway.Endpoint,
+					"usershareprovidersvc": cfg.Reva.Sharing.Endpoint,
 				},
 			},
 		},

diff --git a/storage/pkg/flagset/storageshares.go b/storage/pkg/flagset/storageshares.go
@@ -58,74 +58,11 @@ func StorageShares(cfg *config.Config) []cli.Flag {
 		},
 
 		&cli.StringFlag{
-			Name:        "user-driver",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.UserDriver, "json"),
-			Usage:       "driver to use for the UserShareProvider",
-			EnvVars:     []string{"STORAGE_SHARING_USER_DRIVER"},
-			Destination: &cfg.Reva.Sharing.UserDriver,
-		},
-		&cli.StringFlag{
-			Name:        "user-json-file",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.UserJSONFile, "/var/tmp/ocis/storage/shares.json"),
-			Usage:       "file used to persist shares for the UserShareProvider",
-			EnvVars:     []string{"STORAGE_SHARING_USER_JSON_FILE"},
-			Destination: &cfg.Reva.Sharing.UserJSONFile,
-		},
-		&cli.StringFlag{
-			Name:        "user-sql-username",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.UserSQLUsername, ""),
-			Usage:       "Username to be used to connect to the SQL database",
-			EnvVars:     []string{"STORAGE_SHARING_USER_SQL_USERNAME"},
-			Destination: &cfg.Reva.Sharing.UserSQLUsername,
-		},
-		&cli.StringFlag{
-			Name:        "user-sql-password",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.UserSQLPassword, ""),
-			Usage:       "Password to be used to connect to the SQL database",
-			EnvVars:     []string{"STORAGE_SHARING_USER_SQL_PASSWORD"},
-			Destination: &cfg.Reva.Sharing.UserSQLPassword,
-		},
-		&cli.StringFlag{
-			Name:        "user-sql-host",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.UserSQLHost, ""),
-			Usage:       "Hostname of the SQL database",
-			EnvVars:     []string{"STORAGE_SHARING_USER_SQL_HOST"},
-			Destination: &cfg.Reva.Sharing.UserSQLHost,
-		},
-		&cli.IntFlag{
-			Name:        "user-sql-port",
-			Value:       flags.OverrideDefaultInt(cfg.Reva.Sharing.UserSQLPort, 1433),
-			Usage:       "The port on which the SQL database is exposed",
-			EnvVars:     []string{"STORAGE_SHARING_USER_SQL_PORT"},
-			Destination: &cfg.Reva.Sharing.UserSQLPort,
-		},
-		&cli.StringFlag{
-			Name:        "user-sql-name",
-			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.UserSQLName, ""),
-			Usage:       "Name of the SQL database",
-			EnvVars:     []string{"STORAGE_SHARING_USER_SQL_NAME"},
-			Destination: &cfg.Reva.Sharing.UserSQLName,
-		},
-		&cli.IntFlag{
-			Name:        "public-password-hash-cost",
-			Value:       flags.OverrideDefaultInt(cfg.Reva.Sharing.PublicPasswordHashCost, 11),
-			Usage:       "the cost of hashing the public shares passwords",
-			EnvVars:     []string{"STORAGE_SHARING_PUBLIC_PASSWORD_HASH_COST"},
-			Destination: &cfg.Reva.Sharing.PublicPasswordHashCost,
-		},
-		&cli.BoolFlag{
-			Name:        "public-enable-expired-shares-cleanup",
-			Value:       flags.OverrideDefaultBool(cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup, true),
-			Usage:       "whether to periodically delete expired public shares",
-			EnvVars:     []string{"STORAGE_SHARING_PUBLIC_ENABLE_EXPIRED_SHARES_CLEANUP"},
-			Destination: &cfg.Reva.Sharing.PublicEnableExpiredSharesCleanup,
-		},
-		&cli.IntFlag{
-			Name:        "public-janitor-run-interval",
-			Value:       flags.OverrideDefaultInt(cfg.Reva.Sharing.PublicJanitorRunInterval, 60),
-			Usage:       "the time period in seconds after which to start a janitor run",
-			EnvVars:     []string{"STORAGE_SHARING_PUBLIC_JANITOR_RUN_INTERVAL"},
-			Destination: &cfg.Reva.Sharing.PublicJanitorRunInterval,
+			Name:        "sharing-endpoint",
+			Value:       flags.OverrideDefaultString(cfg.Reva.Sharing.Endpoint, "localhost:9150"),
+			Usage:       "endpoint to use for the storage service",
+			EnvVars:     []string{"STORAGE_SHARING_ENDPOINT"},
+			Destination: &cfg.Reva.Sharing.Endpoint,
 		},
 	}