18995: remove dead code
authorWard Vandewege <ward@curii.com>
Wed, 13 Apr 2022 13:18:24 +0000 (09:18 -0400)
committerWard Vandewege <ward@curii.com>
Wed, 13 Apr 2022 13:18:24 +0000 (09:18 -0400)
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

lib/config/deprecated.go

index e9c5da1064848fe5917cfa882d937302e2b33c29..d53e7ae34096363f5f22c810d02d2da75c682f58 100644 (file)
@@ -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)