Fix CR comments

cr https://code.amazon.com/reviews/CR-661192
aws · Oct 2, 2017 · 6e29a18 · 6e29a18
1 parent 7bdc06d
commit 6e29a18
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/agent/plugins/configurepackage/configurepackage_execute.go b/agent/plugins/configurepackage/configurepackage_execute.go
@@ -91,7 +91,7 @@ func executeInstall(
 	installtrace.WithExitcode(int64(result.GetExitCode()))
 
 	if result.GetStatus() == contracts.ResultStatusSuccess {
-		validatetrace := tracer.BeginSection(fmt.Sprintf("valiate %s/%s - rollback: %t", inst.PackageName(), inst.Version(), isRollback))
+		validatetrace := tracer.BeginSection(fmt.Sprintf("validate %s/%s - rollback: %t", inst.PackageName(), inst.Version(), isRollback))
 		result = inst.Validate(tracer, context)
 		validatetrace.WithExitcode(int64(result.GetExitCode()))
 	}

diff --git a/agent/plugins/configurepackage/ssminstaller/ssminstaller.go b/agent/plugins/configurepackage/ssminstaller/ssminstaller.go
@@ -390,6 +390,6 @@ func (inst *Installer) executeDocument(
 			exectrace.WithError(pluginOut.Error)
 			output.MarkAsFailed(nil, nil)
 		}
-		output.SetStatus(pluginOut.Status)
+		output.SetStatus(contracts.MergeResultStatus(output.GetStatus(), pluginOut.Status))
 	}
 }
diff --git a/agent/plugins/configurepackage/ssms3/ssms3.go b/agent/plugins/configurepackage/ssms3/ssms3.go
@@ -225,7 +225,7 @@ func getLatestS3Version(tracer trace.Tracer, packageURL string, name string) (st
 	folders, err := networkdep.ListS3Folders(logger, amazonS3URL)
 	if err != nil {
 		versiontrace.WithError(err).End()
-		return "", nil
+		return "", err
 	}
 
 	latestVersion := getLatestVersion(folders[:], "")