From a8cbc612ccb9cb4d910130220ad957d4ce7a8958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Tue, 30 Apr 2024 18:18:31 +0200
Subject: [PATCH] chore: remove unused return value from BindSourcesToStructs
 (#9033)

---
 ocis-pkg/config/helpers.go                        | 15 +++++++--------
 ocis-pkg/config/helpers_test.go                   |  6 +++---
 ocis-pkg/config/parser/parse.go                   |  2 +-
 services/antivirus/pkg/config/parser/parse.go     |  2 +-
 services/app-provider/pkg/config/parser/parse.go  |  2 +-
 services/app-registry/pkg/config/parser/parse.go  |  2 +-
 services/audit/pkg/config/parser/parse.go         |  2 +-
 services/auth-basic/pkg/config/parser/parse.go    |  2 +-
 services/auth-bearer/pkg/config/parser/parse.go   |  2 +-
 services/auth-machine/pkg/config/parser/parse.go  |  2 +-
 services/auth-service/pkg/config/parser/parse.go  |  2 +-
 services/clientlog/pkg/config/parser/parse.go     |  2 +-
 services/collaboration/pkg/config/parser/parse.go |  2 +-
 services/eventhistory/pkg/config/parser/parse.go  |  2 +-
 services/frontend/pkg/config/parser/parse.go      |  2 +-
 services/gateway/pkg/config/parser/parse.go       |  2 +-
 services/graph/pkg/config/parser/parse.go         |  2 +-
 services/groups/pkg/config/parser/parse.go        |  2 +-
 services/idm/pkg/config/parser/parse.go           |  2 +-
 services/idp/pkg/config/parser/parse.go           |  2 +-
 services/invitations/pkg/config/parser/parse.go   |  2 +-
 services/nats/pkg/config/parser/parse.go          |  2 +-
 services/notifications/pkg/config/parser/parse.go |  2 +-
 services/ocdav/pkg/config/parser/parse.go         |  2 +-
 services/ocm/pkg/config/parser/parse.go           |  2 +-
 services/ocs/pkg/config/parser/parse.go           |  2 +-
 services/policies/pkg/config/parser/parse.go      |  2 +-
 .../postprocessing/pkg/config/parser/parse.go     |  2 +-
 services/proxy/pkg/config/parser/parse.go         |  2 +-
 services/search/pkg/config/parser/parse.go        |  2 +-
 services/settings/pkg/config/parser/parse.go      |  2 +-
 services/sharing/pkg/config/parser/parse.go       |  2 +-
 services/sse/pkg/config/parser/parse.go           |  2 +-
 .../storage-publiclink/pkg/config/parser/parse.go |  2 +-
 .../storage-shares/pkg/config/parser/parse.go     |  2 +-
 .../storage-system/pkg/config/parser/parse.go     |  2 +-
 services/storage-users/pkg/config/parser/parse.go |  2 +-
 services/store/pkg/config/parser/parse.go         |  2 +-
 services/thumbnails/pkg/config/parser/parse.go    |  2 +-
 services/userlog/pkg/config/parser/parse.go       |  2 +-
 services/users/pkg/config/parser/parse.go         |  2 +-
 services/web/pkg/config/parser/parse.go           |  4 ++--
 services/webdav/pkg/config/parser/parse.go        |  2 +-
 services/webfinger/pkg/config/parser/parse.go     |  2 +-
 44 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/ocis-pkg/config/helpers.go b/ocis-pkg/config/helpers.go
index d2f867ef62..d8e4722bb8 100644
--- a/ocis-pkg/config/helpers.go
+++ b/ocis-pkg/config/helpers.go
@@ -17,15 +17,14 @@ var (
 	decoderConfigTagName = "yaml"
 )
 
-// BindSourcesToStructs assigns any config value from a config file / env variable to struct `dst`. Its only purpose
-// is to solely modify `dst`, not dealing with the config structs; and do so in a thread safe manner.
-func BindSourcesToStructs(service string, dst interface{}) (*gofig.Config, error) {
+// BindSourcesToStructs assigns any config value from a config file / env variable to struct `dst`.
+func BindSourcesToStructs(service string, dst interface{}) error {
 	fileSystem := os.DirFS("/")
 	filePath := strings.TrimLeft(path.Join(defaults.BaseConfigPath(), service+".yaml"), "/")
 	return bindSourcesToStructs(fileSystem, filePath, service, dst)
 }
 
-func bindSourcesToStructs(fileSystem fs.FS, filePath, service string, dst interface{}) (*gofig.Config, error) {
+func bindSourcesToStructs(fileSystem fs.FS, filePath, service string, dst interface{}) error {
 	cnf := gofig.NewWithOptions(service)
 	cnf.WithOptions(func(options *gofig.Options) {
 		options.ParseEnv = true
@@ -36,17 +35,17 @@ func bindSourcesToStructs(fileSystem fs.FS, filePath, service string, dst interf
 	yamlContent, err := fs.ReadFile(fileSystem, filePath)
 	if err != nil {
 		if os.IsNotExist(err) {
-			return cnf, nil
+			return nil
 		}
 
-		return nil, err
+		return err
 	}
 	_ = cnf.LoadSources("yaml", yamlContent)
 
 	err = cnf.BindStruct("", &dst)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	return cnf, nil
+	return nil
 }
diff --git a/ocis-pkg/config/helpers_test.go b/ocis-pkg/config/helpers_test.go
index 447cdda458..7b73787038 100644
--- a/ocis-pkg/config/helpers_test.go
+++ b/ocis-pkg/config/helpers_test.go
@@ -25,7 +25,7 @@ c: "${CODE_VAR|code}"
 	}
 	// perform test
 	c := TestConfig{}
-	_, err := bindSourcesToStructs(fs, filePath, "foo", &c)
+	err := bindSourcesToStructs(fs, filePath, "foo", &c)
 	if err != nil {
 		t.Error(err)
 	}
@@ -41,7 +41,7 @@ func TestBindSourcesToStructs_UnknownFile(t *testing.T) {
 	fs := fstest.MapFS{}
 	// perform test
 	c := TestConfig{}
-	_, err := bindSourcesToStructs(fs, filePath, "foo", &c)
+	err := bindSourcesToStructs(fs, filePath, "foo", &c)
 	if err != nil {
 		t.Error(err)
 	}
@@ -179,7 +179,7 @@ clientlog:
 	}
 	// perform test
 	c := Config{}
-	_, err := bindSourcesToStructs(fs, filePath, "foo", &c)
+	err := bindSourcesToStructs(fs, filePath, "foo", &c)
 	if err != nil {
 		t.Error(err)
 	}
diff --git a/ocis-pkg/config/parser/parse.go b/ocis-pkg/config/parser/parse.go
index e2f5d0fb29..27d98f7b1e 100644
--- a/ocis-pkg/config/parser/parse.go
+++ b/ocis-pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 // copies applicable parts into the commons part, from
 // where the services can copy it into their own config
 func ParseConfig(cfg *config.Config, skipValidate bool) error {
-	_, err := config.BindSourcesToStructs("ocis", cfg)
+	err := config.BindSourcesToStructs("ocis", cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/antivirus/pkg/config/parser/parse.go b/services/antivirus/pkg/config/parser/parse.go
index be14dc7b45..b762b9eb57 100644
--- a/services/antivirus/pkg/config/parser/parse.go
+++ b/services/antivirus/pkg/config/parser/parse.go
@@ -14,7 +14,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/app-provider/pkg/config/parser/parse.go b/services/app-provider/pkg/config/parser/parse.go
index 290a970b3e..575041aec3 100644
--- a/services/app-provider/pkg/config/parser/parse.go
+++ b/services/app-provider/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/app-registry/pkg/config/parser/parse.go b/services/app-registry/pkg/config/parser/parse.go
index 6b0d7e0fb5..4fb879c6b8 100644
--- a/services/app-registry/pkg/config/parser/parse.go
+++ b/services/app-registry/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/audit/pkg/config/parser/parse.go b/services/audit/pkg/config/parser/parse.go
index f4e5f3d683..6eb0d12dd7 100644
--- a/services/audit/pkg/config/parser/parse.go
+++ b/services/audit/pkg/config/parser/parse.go
@@ -12,7 +12,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/auth-basic/pkg/config/parser/parse.go b/services/auth-basic/pkg/config/parser/parse.go
index bf000769c1..77a36f5025 100644
--- a/services/auth-basic/pkg/config/parser/parse.go
+++ b/services/auth-basic/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/auth-bearer/pkg/config/parser/parse.go b/services/auth-bearer/pkg/config/parser/parse.go
index 01890e2e99..77e3df436b 100644
--- a/services/auth-bearer/pkg/config/parser/parse.go
+++ b/services/auth-bearer/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/auth-machine/pkg/config/parser/parse.go b/services/auth-machine/pkg/config/parser/parse.go
index 1b9c1606a9..1f6b850d9a 100644
--- a/services/auth-machine/pkg/config/parser/parse.go
+++ b/services/auth-machine/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/auth-service/pkg/config/parser/parse.go b/services/auth-service/pkg/config/parser/parse.go
index 5e78330523..5eb858c534 100644
--- a/services/auth-service/pkg/config/parser/parse.go
+++ b/services/auth-service/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/clientlog/pkg/config/parser/parse.go b/services/clientlog/pkg/config/parser/parse.go
index 2006207e0e..16a73bef01 100644
--- a/services/clientlog/pkg/config/parser/parse.go
+++ b/services/clientlog/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/collaboration/pkg/config/parser/parse.go b/services/collaboration/pkg/config/parser/parse.go
index 7fc029fc42..6f926fc4bb 100644
--- a/services/collaboration/pkg/config/parser/parse.go
+++ b/services/collaboration/pkg/config/parser/parse.go
@@ -12,7 +12,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/eventhistory/pkg/config/parser/parse.go b/services/eventhistory/pkg/config/parser/parse.go
index 196ef16a74..e21eae15f4 100644
--- a/services/eventhistory/pkg/config/parser/parse.go
+++ b/services/eventhistory/pkg/config/parser/parse.go
@@ -12,7 +12,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/frontend/pkg/config/parser/parse.go b/services/frontend/pkg/config/parser/parse.go
index 121e033bb0..baca0098cf 100644
--- a/services/frontend/pkg/config/parser/parse.go
+++ b/services/frontend/pkg/config/parser/parse.go
@@ -14,7 +14,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/gateway/pkg/config/parser/parse.go b/services/gateway/pkg/config/parser/parse.go
index 7ca0fddc16..f86f8f4c61 100644
--- a/services/gateway/pkg/config/parser/parse.go
+++ b/services/gateway/pkg/config/parser/parse.go
@@ -14,7 +14,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/graph/pkg/config/parser/parse.go b/services/graph/pkg/config/parser/parse.go
index 06813a7ce8..4cdb938797 100644
--- a/services/graph/pkg/config/parser/parse.go
+++ b/services/graph/pkg/config/parser/parse.go
@@ -16,7 +16,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/groups/pkg/config/parser/parse.go b/services/groups/pkg/config/parser/parse.go
index 074f6972d1..ed312dfc44 100644
--- a/services/groups/pkg/config/parser/parse.go
+++ b/services/groups/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/idm/pkg/config/parser/parse.go b/services/idm/pkg/config/parser/parse.go
index e1446c1759..105792280a 100644
--- a/services/idm/pkg/config/parser/parse.go
+++ b/services/idm/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/idp/pkg/config/parser/parse.go b/services/idp/pkg/config/parser/parse.go
index 3939baccdb..9f13ae4107 100644
--- a/services/idp/pkg/config/parser/parse.go
+++ b/services/idp/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/invitations/pkg/config/parser/parse.go b/services/invitations/pkg/config/parser/parse.go
index f0a3e66673..d1e09361bc 100644
--- a/services/invitations/pkg/config/parser/parse.go
+++ b/services/invitations/pkg/config/parser/parse.go
@@ -12,7 +12,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/nats/pkg/config/parser/parse.go b/services/nats/pkg/config/parser/parse.go
index b741cf3a09..07dfdd3707 100644
--- a/services/nats/pkg/config/parser/parse.go
+++ b/services/nats/pkg/config/parser/parse.go
@@ -12,7 +12,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/notifications/pkg/config/parser/parse.go b/services/notifications/pkg/config/parser/parse.go
index 127a26cc68..032d2a6b34 100644
--- a/services/notifications/pkg/config/parser/parse.go
+++ b/services/notifications/pkg/config/parser/parse.go
@@ -15,7 +15,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/ocdav/pkg/config/parser/parse.go b/services/ocdav/pkg/config/parser/parse.go
index 545dfe45af..ada294bfaf 100644
--- a/services/ocdav/pkg/config/parser/parse.go
+++ b/services/ocdav/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/ocm/pkg/config/parser/parse.go b/services/ocm/pkg/config/parser/parse.go
index b13a2d4fbc..d0a7788010 100644
--- a/services/ocm/pkg/config/parser/parse.go
+++ b/services/ocm/pkg/config/parser/parse.go
@@ -14,7 +14,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/ocs/pkg/config/parser/parse.go b/services/ocs/pkg/config/parser/parse.go
index bff72f8e7d..257052fb59 100644
--- a/services/ocs/pkg/config/parser/parse.go
+++ b/services/ocs/pkg/config/parser/parse.go
@@ -14,7 +14,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/policies/pkg/config/parser/parse.go b/services/policies/pkg/config/parser/parse.go
index ce3f1f2cbf..f89b989da9 100644
--- a/services/policies/pkg/config/parser/parse.go
+++ b/services/policies/pkg/config/parser/parse.go
@@ -12,7 +12,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/postprocessing/pkg/config/parser/parse.go b/services/postprocessing/pkg/config/parser/parse.go
index c1fc11d5e0..e10e15291a 100644
--- a/services/postprocessing/pkg/config/parser/parse.go
+++ b/services/postprocessing/pkg/config/parser/parse.go
@@ -15,7 +15,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/proxy/pkg/config/parser/parse.go b/services/proxy/pkg/config/parser/parse.go
index af176ccf9f..f4d96a484e 100644
--- a/services/proxy/pkg/config/parser/parse.go
+++ b/services/proxy/pkg/config/parser/parse.go
@@ -14,7 +14,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/search/pkg/config/parser/parse.go b/services/search/pkg/config/parser/parse.go
index c16ccebac7..7e8ee90937 100644
--- a/services/search/pkg/config/parser/parse.go
+++ b/services/search/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/settings/pkg/config/parser/parse.go b/services/settings/pkg/config/parser/parse.go
index bbfcd1175d..ef1edf14fc 100644
--- a/services/settings/pkg/config/parser/parse.go
+++ b/services/settings/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/sharing/pkg/config/parser/parse.go b/services/sharing/pkg/config/parser/parse.go
index c22fb4c0a3..f03d02aeaa 100644
--- a/services/sharing/pkg/config/parser/parse.go
+++ b/services/sharing/pkg/config/parser/parse.go
@@ -17,7 +17,7 @@ const (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/sse/pkg/config/parser/parse.go b/services/sse/pkg/config/parser/parse.go
index dc9375210d..87429b8a22 100644
--- a/services/sse/pkg/config/parser/parse.go
+++ b/services/sse/pkg/config/parser/parse.go
@@ -12,7 +12,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/storage-publiclink/pkg/config/parser/parse.go b/services/storage-publiclink/pkg/config/parser/parse.go
index b081f858be..1b037a9215 100644
--- a/services/storage-publiclink/pkg/config/parser/parse.go
+++ b/services/storage-publiclink/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/storage-shares/pkg/config/parser/parse.go b/services/storage-shares/pkg/config/parser/parse.go
index 6c7b5c3716..6eda2da7a0 100644
--- a/services/storage-shares/pkg/config/parser/parse.go
+++ b/services/storage-shares/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/storage-system/pkg/config/parser/parse.go b/services/storage-system/pkg/config/parser/parse.go
index ce706ed670..d18bea7bdc 100644
--- a/services/storage-system/pkg/config/parser/parse.go
+++ b/services/storage-system/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/storage-users/pkg/config/parser/parse.go b/services/storage-users/pkg/config/parser/parse.go
index e9d69cc9e2..fcea9c9333 100644
--- a/services/storage-users/pkg/config/parser/parse.go
+++ b/services/storage-users/pkg/config/parser/parse.go
@@ -15,7 +15,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/store/pkg/config/parser/parse.go b/services/store/pkg/config/parser/parse.go
index 5fb6a3c557..ebe57d4150 100644
--- a/services/store/pkg/config/parser/parse.go
+++ b/services/store/pkg/config/parser/parse.go
@@ -12,7 +12,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/thumbnails/pkg/config/parser/parse.go b/services/thumbnails/pkg/config/parser/parse.go
index 020c137473..6334261084 100644
--- a/services/thumbnails/pkg/config/parser/parse.go
+++ b/services/thumbnails/pkg/config/parser/parse.go
@@ -12,7 +12,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/userlog/pkg/config/parser/parse.go b/services/userlog/pkg/config/parser/parse.go
index 7cb43fb0f9..0f556aafc8 100644
--- a/services/userlog/pkg/config/parser/parse.go
+++ b/services/userlog/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/users/pkg/config/parser/parse.go b/services/users/pkg/config/parser/parse.go
index b776daa64c..1dd9a8bd31 100644
--- a/services/users/pkg/config/parser/parse.go
+++ b/services/users/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/web/pkg/config/parser/parse.go b/services/web/pkg/config/parser/parse.go
index c5bb6f03f5..ee53a35e6b 100644
--- a/services/web/pkg/config/parser/parse.go
+++ b/services/web/pkg/config/parser/parse.go
@@ -13,7 +13,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
@@ -29,7 +29,7 @@ func ParseConfig(cfg *config.Config) error {
 	}
 
 	// apps are a special case, as they are not part of the main config, but are loaded from a separate config file
-	_, err = ociscfg.BindSourcesToStructs("apps", &cfg.Apps)
+	err = ociscfg.BindSourcesToStructs("apps", &cfg.Apps)
 	if err != nil {
 		return err
 	}
diff --git a/services/webdav/pkg/config/parser/parse.go b/services/webdav/pkg/config/parser/parse.go
index f1f34ba495..6c3dd66bc6 100644
--- a/services/webdav/pkg/config/parser/parse.go
+++ b/services/webdav/pkg/config/parser/parse.go
@@ -12,7 +12,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}
diff --git a/services/webfinger/pkg/config/parser/parse.go b/services/webfinger/pkg/config/parser/parse.go
index 014f95a27d..14b570cedf 100644
--- a/services/webfinger/pkg/config/parser/parse.go
+++ b/services/webfinger/pkg/config/parser/parse.go
@@ -12,7 +12,7 @@ import (
 
 // ParseConfig loads configuration from known paths.
 func ParseConfig(cfg *config.Config) error {
-	_, err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
+	err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
 	if err != nil {
 		return err
 	}