17590: Improve log messages when old AWS config keys are used.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index acaf0c5da71c2cd064407bbb5fdd0bf7e38574b9..8306f814f0cc0d61d8858c776377e9507dd49845 100644 (file)
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -149,6 +149,7 @@ func (ldr *Loader) applyDeprecatedVolumeDriverParameters(cfg *arvados.Config) er
                                                        delete(allparams, k)
                                                }
                                        }
+                                       ldr.Logger.Warnf("using your old config keys %s.Volumes.%s.DriverParameters.AccessKey/SecretKey -- but you should rename them to AccessKeyID/SecretAccessKey", clusterID, volID)
                                        allparams["AccessKeyID"] = params.AccessKey
                                        allparams["SecretAccessKey"] = params.SecretKey
                                        vol.DriverParameters, err = json.Marshal(allparams)

diff --git a/lib/config/deprecated_test.go b/lib/config/deprecated_test.go
index 3fba765888e910e5b7bc8dd6e2ad9dcf744a0ff2..50cc16b7d38ed917cec6dd101e0523fbb03492aa 100644 (file)
--- a/lib/config/deprecated_test.go
+++ b/lib/config/deprecated_test.go
@@ -73,6 +73,7 @@ Clusters:
 `)
        c.Check(logs, check.Matches, `(?ms).*deprecated or unknown config entry: .*AccessKey.*`)
        c.Check(logs, check.Matches, `(?ms).*deprecated or unknown config entry: .*SecretKey.*`)
+       c.Check(logs, check.Matches, `(?ms).*using your old config keys z1111\.Volumes\.z1111-nyw5e-aaaaaaaaaaaaaaa\.DriverParameters\.AccessKey/SecretKey -- but you should rename them to AccessKeyID/SecretAccessKey.*`)
 }
 
 func (s *LoadSuite) TestDeprecatedNodeProfilesToServices(c *check.C) {