From: Ward Vandewege <ward@curii.com>
Date: Wed, 13 Apr 2022 13:18:24 +0000 (-0400)
Subject: 18995: remove dead code
X-Git-Tag: 2.5.0~204^2~8
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/403afd6c31b4a76ca92e4df605b8cf15ba77b9a7

18995: remove dead code

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index e9c5da1064..d53e7ae340 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -125,7 +125,6 @@ func (ldr *Loader) applyDeprecatedVolumeDriverParameters(cfg *arvados.Config) er
 				if params.AccessKey != "" || params.SecretKey != "" {
 					if params.AccessKeyID != "" || params.SecretAccessKey != "" {
 						return fmt.Errorf("cannot use old keys (AccessKey/SecretKey) and new keys (AccessKeyID/SecretAccessKey) at the same time in %s.Volumes.%s.DriverParameters -- you must remove the old config keys", clusterID, volID)
-						continue
 					}
 					var allparams map[string]interface{}
 					err = json.Unmarshal(vol.DriverParameters, &allparams)