[ARVADOS] updated: 2.1.0-768-gd488b80f2

[Git user]

Summary of changes:
 lib/config/deprecated.go      | 1 +
 lib/config/deprecated_test.go | 1 +
 2 files changed, 2 insertions(+)

       via  d488b80f239d4aa2df6aa8b65b07960e71937b7d (commit)
      from  cef860fc944f66b4b52aa2ea6d66561944a7c065 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d488b80f239d4aa2df6aa8b65b07960e71937b7d
Author: Tom Clegg <tom at curii.com>
Date:   Thu May 6 13:21:36 2021 -0400

    17590: Improve log messages when old AWS config keys are used.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index acaf0c5da..8306f814f 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 3fba76588..50cc16b7d 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) {

-----------------------------------------------------------------------


hooks/post-receive
--