minor config cleanup

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

extensions/storage-metadata/pkg/command/command.go

@@ -131,9 +131,6 @@ func storageMetadataFromStruct(c *cli.Context, cfg *config.Config) map[string]in
 		"grpc": map[string]interface{}{
 			"network": cfg.GRPC.Protocol,
 			"address": cfg.GRPC.Addr,
-			//"interceptors": map[string]interface{}{
-			//	"log": map[string]interface{}{},
-			//},
 			"services": map[string]interface{}{
 				"gateway": map[string]interface{}{
 					// registries are located on the gateway
@@ -144,12 +141,8 @@ func storageMetadataFromStruct(c *cli.Context, cfg *config.Config) map[string]in
 					"groupprovidersvc": cfg.GRPC.Addr,
 					"permissionssvc":   cfg.GRPC.Addr,
 					// other
-					"disable_home_creation_on_login": true,
-					//"datagateway":                    cfg.Reva.StorageMetadata.HTTPAddr, // needs to start with a protocol
-					"transfer_shared_secret": cfg.TransferSecret,
-					"transfer_expires":       cfg.TransferExpires,
-					//"home_mapping":           cfg.Reva.Gateway.HomeMapping,
-					//"etag_cache_ttl":         cfg.Reva.Gateway.EtagCacheTTL,
+					"disable_home_creation_on_login": true, // metadata manually creates a space
+					// metadata always uses the simple upload, so no transfer secret or datagateway needed
 				},
 				"userprovider": map[string]interface{}{
 					"driver": "memory",
@@ -162,9 +155,7 @@ func storageMetadataFromStruct(c *cli.Context, cfg *config.Config) map[string]in
 										"idp":      "internal",
 										"type":     1, // user.UserType_USER_TYPE_PRIMARY
 									},
-									"username": "serviceuser",
-									// "secret":       // TODO should not have a secret
-									"mail":         "admin@example.org",
+									"username":     "serviceuser",
 									"display_name": "System User",
 								},
 							},
@@ -219,7 +210,7 @@ func storageMetadataFromStruct(c *cli.Context, cfg *config.Config) map[string]in
 		"http": map[string]interface{}{
 			"network": cfg.HTTP.Protocol,
 			"address": cfg.HTTP.Addr,
-			// TODO build services dynamically
+			// no datagateway needed as the metadata clients directly talk to the dataprovider with the simple protocol
 			"services": map[string]interface{}{
 				"dataprovider": map[string]interface{}{
 					"prefix":      "data",

extensions/storage-metadata/pkg/config/config.go

@@ -19,14 +19,11 @@ type Config struct {
 
 	Context               context.Context
 	JWTSecret             string
-	GatewayEndpoint       string
 	SkipUserGroupsInToken bool
 	Driver                string  `yaml:"driver" env:"STORAGE_METADATA_DRIVER" desc:"The driver which should be used by the service"`
 	Drivers               Drivers `yaml:"drivers"`
 	DataServerURL         string
 	TempFolder            string
-	TransferSecret        string `yaml:"transfer_secret" env:"STORAGE_METADATA_TRANSFER_SECRET"`
-	TransferExpires       int    `yaml:"transfer_expires" env:"STORAGE_METADATA_TRANSFER_EXPIRES"`
 	DataProviderInsecure  bool   `env:"OCIS_INSECURE;STORAGE_METADATA_DATAPROVIDER_INSECURE"`
 	MachineAuthAPIKey     string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;STORAGE_METADATA_MACHINE_AUTH_API_KEY"`
 }

extensions/storage-metadata/pkg/config/defaults/defaultconfig.go

@@ -24,11 +24,6 @@ func DefaultConfig() *config.Config {
 			Pprof:  false,
 			Zpages: false,
 		},
-		Logging: &config.Logging{
-			Level:  "debug",
-			Pretty: true,
-			Color:  true,
-		},
 		GRPC: config.GRPCConfig{
 			Addr:     "127.0.0.1:9215",
 			Protocol: "tcp",
@@ -40,12 +35,9 @@ func DefaultConfig() *config.Config {
 		Service: config.Service{
 			Name: "storage-metadata",
 		},
-		GatewayEndpoint:   "127.0.0.1:9215", // metadata is a self contained reva instance
 		JWTSecret:         "Pive-Fumkiu4",
 		TempFolder:        filepath.Join(defaults.BaseDataPath(), "tmp", "metadata"),
 		DataServerURL:     "http://localhost:9216/data",
-		TransferSecret:    "replace-me-with-a-transfer-secret-for-metadata",
-		TransferExpires:   24 * 60 * 60,
 		MachineAuthAPIKey: "change-me-please",
 		Driver:            "ocis",
 		Drivers: config.Drivers{
@@ -79,12 +71,12 @@ func DefaultConfig() *config.Config {
 				Root:                filepath.Join(defaults.BaseDataPath(), "storage", "metadata"),
 				UserLayout:          "{{.Id.OpaqueId}}",
 				Region:              "default",
-				PermissionsEndpoint: "127.0.0.1:9191", // fixme
+				PermissionsEndpoint: "127.0.0.1:9215",
 			},
 			OCIS: config.OCISDriver{
 				Root:                filepath.Join(defaults.BaseDataPath(), "storage", "metadata"),
 				UserLayout:          "{{.Id.OpaqueId}}",
-				PermissionsEndpoint: "127.0.0.1:9191", // fixme
+				PermissionsEndpoint: "127.0.0.1:9215",
 			},
 		},
 	}

extensions/storage-metadata/pkg/config/metadata.go

@@ -49,7 +49,7 @@ func MetadataDrivers(cfg *Config) map[string]interface{} {
 			"user_layout":         cfg.Drivers.OCIS.UserLayout,
 			"treetime_accounting": false,
 			"treesize_accounting": false,
-			"permissionssvc":      cfg.GRPC.Addr,
+			"permissionssvc":      cfg.Drivers.OCIS.PermissionsEndpoint,
 		},
 		"s3": map[string]interface{}{
 			"region":     cfg.Drivers.S3.Region,