leave out OCIS_URL, cleanup

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
owncloud · May 4, 2022 · 080ad7c · 080ad7c
1 parent 6ce9f76
commit 080ad7c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/extensions/settings/pkg/config/config.go b/extensions/settings/pkg/config/config.go
@@ -39,7 +39,7 @@ type Metadata struct {
 	GatewayAddress string `yaml:"gateway_addr" env:"STORAGE_GATEWAY_GRPC_ADDR"`
 	StorageAddress string `yaml:"storage_addr" env:"STORAGE_GRPC_ADDR"`
 
-	SystemUserID      string `yaml:"system_user_id" env:"OCIS_SYSTEM_USER_ID;METADATA_SYSTEM_USER_UUID"`
-	SystemUserIDP     string `yaml:"system_user_idp" env:"OCIS_URL;OCIS_SYSTEM_USER_IDP;METADATA_SYSTEM_USER_IDP"`
+	SystemUserID      string `yaml:"system_user_id" env:"OCIS_SYSTEM_USER_ID;SETTINGS_SYSTEM_USER_ID"`
+	SystemUserIDP     string `yaml:"system_user_idp" env:"OCIS_SYSTEM_USER_IDP;SETTINGS_SYSTEM_USER_IDP"`
 	MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY"`
 }
diff --git a/extensions/sharing/pkg/config/config.go b/extensions/sharing/pkg/config/config.go
@@ -95,8 +95,8 @@ type UserSharingOwnCloudSQLDriver struct {
 
 type UserSharingCS3Driver struct {
 	ProviderAddr      string `yaml:"provider_addr" env:"SHARING_USER_CS3_PROVIDER_ADDR"`
-	SystemUserID      string `yaml:"system_user_id" env:"OCIS_SYSTEM_USER_ID;SHARING_USER_CS3_SERVICE_USER_ID"`
-	SystemUserIDP     string `yaml:"system_user_idp" env:"OCIS_URL;OCIS_SYSTEM_USER_IDP;SHARING_USER_CS3_SERVICE_USER_IDP"`
+	SystemUserID      string `yaml:"system_user_id" env:"OCIS_SYSTEM_USER_ID;SHARING_USER_CS3_SYSTEM_USER_ID"`
+	SystemUserIDP     string `yaml:"system_user_idp" env:"OCIS_SYSTEM_USER_IDP;SHARING_USER_CS3_SYSTEM_USER_IDP"`
 	MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SHARING_USER_CS3_MACHINE_AUTH_API_KEY"`
 }
 
@@ -126,7 +126,7 @@ type PublicSharingSQLDriver struct {
 type PublicSharingCS3Driver struct {
 	ProviderAddr      string `yaml:"provider_addr" env:"SHARING_PUBLIC_CS3_PROVIDER_ADDR"`
 	SystemUserID      string `yaml:"system_user_id" env:"OCIS_SYSTEM_USER_ID;SHARING_PUBLIC_CS3_SYSTEM_USER_ID"`
-	SystemUserIDP     string `yaml:"system_user_idp" env:"OCIS_URL;OCIS_SYSTEM_USER_IDP;SHARING_PUBLIC_CS3_SERVICE_USER_IDP"`
+	SystemUserIDP     string `yaml:"system_user_idp" env:"OCIS_SYSTEM_USER_IDP;SHARING_PUBLIC_CS3_SYSTEM_USER_IDP"`
 	MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SHARING_PUBLIC_CS3_MACHINE_AUTH_API_KEY"`
 }
 

diff --git a/extensions/sharing/pkg/revaconfig/config.go b/extensions/sharing/pkg/revaconfig/config.go
@@ -50,8 +50,8 @@ func SharingConfigFromStruct(cfg *config.Config) map[string]interface{} {
 						},
 						"cs3": map[string]interface{}{
 							"provider_addr":       cfg.UserSharingDrivers.CS3.ProviderAddr,
-							"system_user_id":      cfg.UserSharingDrivers.CS3.SystemUserID,
-							"system_user_idp":     cfg.UserSharingDrivers.CS3.SystemUserIDP,
+							"service_user_id":     cfg.UserSharingDrivers.CS3.SystemUserID,
+							"service_user_idp":    cfg.UserSharingDrivers.CS3.SystemUserIDP,
 							"machine_auth_apikey": cfg.UserSharingDrivers.CS3.MachineAuthAPIKey,
 						},
 					},
@@ -75,8 +75,8 @@ func SharingConfigFromStruct(cfg *config.Config) map[string]interface{} {
 						},
 						"cs3": map[string]interface{}{
 							"provider_addr":       cfg.PublicSharingDrivers.CS3.ProviderAddr,
-							"system_user_id":      cfg.PublicSharingDrivers.CS3.SystemUserID,
-							"system_user_idp":     cfg.PublicSharingDrivers.CS3.SystemUserIDP,
+							"service_user_id":     cfg.PublicSharingDrivers.CS3.SystemUserID,
+							"service_user_idp":    cfg.PublicSharingDrivers.CS3.SystemUserIDP,
 							"machine_auth_apikey": cfg.PublicSharingDrivers.CS3.MachineAuthAPIKey,
 						},
 					},