chore(install): refactor to use InstallComplete with optional error

newrelic · Apr 8, 2021 · aa76b9d · aa76b9d
1 parent 99899ff
commit aa76b9d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/internal/install/execution/install_status.go b/internal/install/execution/install_status.go
@@ -175,19 +175,8 @@ func (s *InstallStatus) RecipeSkipped(event RecipeStatusEvent) {
 	}
 }
 
-func (s *InstallStatus) InstallError(err error) {
-	statusError := StatusError{
-		Message: "unknown error",
-	}
-	if err != nil {
-		statusError.Message = err.Error()
-	}
-	s.Error = statusError
-	s.InstallComplete()
-}
-
-func (s *InstallStatus) InstallComplete() {
-	s.completed()
+func (s *InstallStatus) InstallComplete(err error) {
+	s.completed(err)
 
 	for _, r := range s.statusSubscriber {
 		if err := r.InstallComplete(s); err != nil {
@@ -355,10 +344,17 @@ func (s *InstallStatus) withRecipeEvent(e RecipeStatusEvent, rs RecipeStatusType
 	s.Timestamp = utils.GetTimestamp()
 }
 
-func (s *InstallStatus) completed() {
+func (s *InstallStatus) completed(err error) {
 	s.Complete = true
 	s.Timestamp = utils.GetTimestamp()
 
+	if err != nil {
+		statusError := StatusError{
+			Message: err.Error(),
+		}
+		s.Error = statusError
+	}
+
 	log.WithFields(log.Fields{
 		"timestamp": s.Timestamp,
 	}).Debug("completed")

diff --git a/internal/install/execution/install_status_test.go b/internal/install/execution/install_status_test.go
@@ -148,7 +148,7 @@ func TestInstallStatus_statusUpdateMethods(t *testing.T) {
 	require.Equal(t, result.Status, RecipeStatusTypes.SKIPPED)
 	require.False(t, s.hasFailed())
 
-	s.InstallComplete()
+	s.InstallComplete(nil)
 	require.True(t, s.Complete)
 	require.NotNil(t, s.Timestamp)
 }
@@ -159,7 +159,7 @@ func TestInstallStatus_failAvailableOnComplete(t *testing.T) {
 
 	s.RecipesAvailable([]types.Recipe{r})
 
-	s.InstallComplete()
+	s.InstallComplete(nil)
 	require.Equal(t, RecipeStatusTypes.FAILED, s.Statuses[0].Status)
 }
 

diff --git a/internal/install/recipe_installer.go b/internal/install/recipe_installer.go
@@ -115,7 +115,7 @@ func (i *RecipeInstaller) Install() error {
 			return err
 		}
 
-		i.status.InstallError(err)
+		i.status.InstallComplete(err)
 
 		return err
 	}