From f7b949a4458250723380c1ed8d5f3dce5ffebb77 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Thu, 16 Dec 2021 14:59:55 +0100
Subject: [PATCH] remove service names

---
 accounts/pkg/config/mappings.go   | 4 ----
 idp/pkg/config/mappings.go        | 4 ----
 ocs/pkg/config/mappings.go        | 4 ----
 proxy/pkg/config/mappings.go      | 6 ------
 settings/pkg/config/mappings.go   | 4 ----
 store/pkg/config/mappings.go      | 4 ----
 thumbnails/pkg/config/mappings.go | 4 ----
 webdav/pkg/config/mappings.go     | 4 ----
 8 files changed, 34 deletions(-)

diff --git a/accounts/pkg/config/mappings.go b/accounts/pkg/config/mappings.go
index d50464d1e..fdcdbcecd 100644
--- a/accounts/pkg/config/mappings.go
+++ b/accounts/pkg/config/mappings.go
@@ -72,10 +72,6 @@ func structMappings(cfg *Config) []shared.EnvBinding {
 			EnvVars:     []string{"ACCOUNTS_GRPC_ADDR"},
 			Destination: &cfg.GRPC.Addr,
 		},
-		{
-			EnvVars:     []string{"ACCOUNTS_SERVICE_NAME"},
-			Destination: &cfg.Service.Name,
-		},
 		{
 			EnvVars:     []string{"ACCOUNTS_HASH_DIFFICULTY"},
 			Destination: &cfg.HashDifficulty,
diff --git a/idp/pkg/config/mappings.go b/idp/pkg/config/mappings.go
index 6e316eaba..c5b01cf74 100644
--- a/idp/pkg/config/mappings.go
+++ b/idp/pkg/config/mappings.go
@@ -91,10 +91,6 @@ func structMappings(cfg *Config) []shared.EnvBinding {
 			EnvVars:     []string{"IDP_HTTP_NAMESPACE"},
 			Destination: &cfg.HTTP.Namespace,
 		},
-		{
-			EnvVars:     []string{"IDP_SERVICE_NAME"},
-			Destination: &cfg.Service.Name,
-		},
 		{
 			EnvVars:     []string{"IDP_IDENTITY_MANAGER"},
 			Destination: &cfg.IDP.IdentityManager,
diff --git a/ocs/pkg/config/mappings.go b/ocs/pkg/config/mappings.go
index 7fe449dd5..b32177739 100644
--- a/ocs/pkg/config/mappings.go
+++ b/ocs/pkg/config/mappings.go
@@ -87,10 +87,6 @@ func structMappings(cfg *Config) []shared.EnvBinding {
 			EnvVars:     []string{"OCS_HTTP_NAMESPACE"},
 			Destination: &cfg.HTTP.Namespace,
 		},
-		{
-			EnvVars:     []string{"OCS_SERVICE_NAME"},
-			Destination: &cfg.Service.Name,
-		},
 		{
 			EnvVars:     []string{"OCS_HTTP_ROOT"},
 			Destination: &cfg.HTTP.Root,
diff --git a/proxy/pkg/config/mappings.go b/proxy/pkg/config/mappings.go
index 1bb038a26..101d9a70d 100644
--- a/proxy/pkg/config/mappings.go
+++ b/proxy/pkg/config/mappings.go
@@ -118,12 +118,6 @@ func structMappings(cfg *Config) []shared.EnvBinding {
 			Destination: &cfg.HTTP.TLS,
 		},
 
-		// Service
-		{
-			EnvVars:     []string{"PROXY_SERVICE_NAME"},
-			Destination: &cfg.Service.Name,
-		},
-
 		// Other
 		{
 			EnvVars:     []string{"OCIS_JWT_SECRET", "PROXY_JWT_SECRET"},
diff --git a/settings/pkg/config/mappings.go b/settings/pkg/config/mappings.go
index da12fcfa6..d4910269c 100644
--- a/settings/pkg/config/mappings.go
+++ b/settings/pkg/config/mappings.go
@@ -103,10 +103,6 @@ func structMappings(cfg *Config) []shared.EnvBinding {
 			EnvVars:     []string{"SETTINGS_GRPC_NAMESPACE"},
 			Destination: &cfg.GRPC.Namespace,
 		},
-		{
-			EnvVars:     []string{"SETTINGS_SERVICE_NAME"},
-			Destination: &cfg.Service.Name,
-		},
 		{
 			EnvVars:     []string{"SETTINGS_DATA_PATH"},
 			Destination: &cfg.Service.DataPath,
diff --git a/store/pkg/config/mappings.go b/store/pkg/config/mappings.go
index 189f293ec..9d883ca23 100644
--- a/store/pkg/config/mappings.go
+++ b/store/pkg/config/mappings.go
@@ -72,10 +72,6 @@ func structMappings(cfg *Config) []shared.EnvBinding {
 			EnvVars:     []string{"STORE_GRPC_ADDR"},
 			Destination: &cfg.GRPC.Addr,
 		},
-		{
-			EnvVars:     []string{"STORE_SERVICE_NAME"},
-			Destination: &cfg.Service.Name,
-		},
 		{
 			EnvVars:     []string{"STORE_DATA_PATH"},
 			Destination: &cfg.Datapath,
diff --git a/thumbnails/pkg/config/mappings.go b/thumbnails/pkg/config/mappings.go
index d26a27603..3cc0699bf 100644
--- a/thumbnails/pkg/config/mappings.go
+++ b/thumbnails/pkg/config/mappings.go
@@ -79,10 +79,6 @@ func structMappings(cfg *Config) []shared.EnvBinding {
 			EnvVars:     []string{"THUMBNAILS_DEBUG_ZPAGES"},
 			Destination: &cfg.Debug.Zpages,
 		},
-		{
-			EnvVars:     []string{"THUMBNAILS_SERVICE_NAME"},
-			Destination: &cfg.Service.Name,
-		},
 		{
 			EnvVars:     []string{"THUMBNAILS_GRPC_ADDR"},
 			Destination: &cfg.GRPC.Addr,
diff --git a/webdav/pkg/config/mappings.go b/webdav/pkg/config/mappings.go
index 7e5fcb808..a4a417d5a 100644
--- a/webdav/pkg/config/mappings.go
+++ b/webdav/pkg/config/mappings.go
@@ -87,10 +87,6 @@ func structMappings(cfg *Config) []shared.EnvBinding {
 			EnvVars:     []string{"WEBDAV_HTTP_NAMESPACE"},
 			Destination: &cfg.HTTP.Namespace,
 		},
-		{
-			EnvVars:     []string{"WEBDAV_SERVICE_NAME"},
-			Destination: &cfg.Service.Name,
-		},
 		{
 			EnvVars:     []string{"WEBDAV_HTTP_ROOT"},
 			Destination: &cfg.HTTP.Root,