From eda606531ed48cac8553e25ec2d1137e9bd8385e Mon Sep 17 00:00:00 2001 From: Vishnu Karthik Ravindran Date: Thu, 23 May 2024 17:12:17 -0400 Subject: [PATCH] Update log message for SSM-Setup-CLI regarding latest checksum validation cr: https://code.amazon.com/reviews/CR-128710407 --- agent/setupcli/managers/downloadmanager/downloadmanager.go | 2 +- agent/setupcli/managers/downloadmanager/downloadmanager_test.go | 2 +- agent/setupcli/setupcli.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/setupcli/managers/downloadmanager/downloadmanager.go b/agent/setupcli/managers/downloadmanager/downloadmanager.go index 0d1ee6bbd..6d793cac3 100644 --- a/agent/setupcli/managers/downloadmanager/downloadmanager.go +++ b/agent/setupcli/managers/downloadmanager/downloadmanager.go @@ -189,7 +189,7 @@ func (d *downloadManager) DownloadLatestSSMSetupCLI(artifactsStorePath string, e } if downloadedCLICheckSum != expectedSetupCLICheckSum { - return fmt.Errorf("checksum validation for ssm-setup-cli fail: %v", err) + return fmt.Errorf("checksum mismatch with latest ssm-setup-cli. Please retry after downloading latest ssm-setup-cli") } logger.Infof("Downloaded SSM-Setup-CLI successfully") diff --git a/agent/setupcli/managers/downloadmanager/downloadmanager_test.go b/agent/setupcli/managers/downloadmanager/downloadmanager_test.go index b7a39a2f2..a6740b3fe 100644 --- a/agent/setupcli/managers/downloadmanager/downloadmanager_test.go +++ b/agent/setupcli/managers/downloadmanager/downloadmanager_test.go @@ -261,7 +261,7 @@ func (suite *DownloadManagerTestSuite) TestDownloadManager_DownloadLatestSSMSetu expectedLatestSSMSetupCLIURL := "https://s3.us-east-1.amazonaws.com/amazon-ssm-us-east-1/latest/linux_amd64/ssm-setup-cli" err := downloadMgr.DownloadLatestSSMSetupCLI("temp1", checkSum) - assert.Contains(suite.T(), err.Error(), "checksum validation for ssm-setup-cli fail", "should throw error") + assert.Contains(suite.T(), err.Error(), "checksum mismatch with latest ssm-setup-cli", "should throw error") assert.Contains(suite.T(), actualSSMSetupCLIURL, expectedLatestSSMSetupCLIURL, "mismatched version URL") } diff --git a/agent/setupcli/setupcli.go b/agent/setupcli/setupcli.go index 7a7a5b696..308283b5b 100644 --- a/agent/setupcli/setupcli.go +++ b/agent/setupcli/setupcli.go @@ -361,7 +361,7 @@ func performOnpremSteps(log log.T, packageManager packagemanagers.IPackageManage } err = downloadManager.DownloadLatestSSMSetupCLI(setupCLIArtifactsPath, latestExecutableCheckSum) if err != nil { - return fmt.Errorf("error downloading latest SSM-Setup-CLI executable: %v", err) + return fmt.Errorf("error while verifying installed ssm-setup-cli checksum: %v", err) } err = installAndVerifyAgent(log, packageManager, verificationManager, serviceManager, downloadManager, setupCLIArtifactsPath, isNano)