Update log message for SSM-Setup-CLI regarding latest checksum valida…

…tion cr: https://code.amazon.com/reviews/CR-128710407
aws · May 29, 2024 · eda6065 · eda6065
1 parent 0117b6e
commit eda6065
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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)