From d488b80f239d4aa2df6aa8b65b07960e71937b7d Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 6 May 2021 13:21:36 -0400 Subject: [PATCH] 17590: Improve log messages when old AWS config keys are used. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/config/deprecated.go | 1 + lib/config/deprecated_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go index acaf0c5da7..8306f814f0 100644 --- 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 3fba765888..50cc16b7d3 100644 --- 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) { -- 2.30.2