pr resolution

Author: t-feadeaga

internal/actionplan/executehelper.go

@@ -43,7 +43,9 @@ func (actionPlan *ActionPlan) executeHelper(registryHandler packageregistry.IPac
 	// return early for Cleanup operation
 	if vmAppPackageCurrent.OngoingOperation == packageregistry.Cleanup {
 		delete(registry, appName)
-		return ewc, registryHandler.WriteToDisk(registry)
+		err := registryHandler.WriteToDisk(registry)
+		ewc = vmextensionhelper.NewErrorWithClarification(utils.WriteToDiskError, err)
+		return ewc, err
 	}
 	err := registryHandler.WriteToDisk(registry)
 	if err != nil {

main/main.go

@@ -238,11 +238,7 @@ func customEnable(ext *vmextensionhelper.VMExtension, hostgaCommunicator hostgac
 		switch statusResult {
 		case status.StatusError:
 			ewc := executeError.GetErrorWithClarification()
-			supportEwc := false
 			if ewc != (vmextensionhelper.ErrorWithClarification{}) {
-				supportEwc = true
-			}
-			if supportEwc {
 				err = utils.ReportStatusWithError(ext.HandlerEnv, requestedSequenceNumber, vmextensionhelper.EnableOperation.ToStatusName(), ewc)
 			} else {
 				err = utils.ReportStatus(ext.HandlerEnv, requestedSequenceNumber, statusResult, vmextensionhelper.EnableOperation.ToStatusName(), statusMessage)

main/main_test.go

@@ -643,7 +643,7 @@ func Test_customEnable_ErrorWithClarification_ComparisonLogic(t *testing.T) {
 	}{
 		{
 			name:               "Empty error clarification",
-			errorCode:          0,
+			errorCode:          utils.NoError,
 			errorMessage:       "",
 			expectedSupportEwc: false,
 		},
@@ -723,16 +723,16 @@ func Test_customEnable_StatusErrorPath_WithClarification(t *testing.T) {
 	}
 
 	// Should be false for empty clarification
-	assert.False(t, supportEwc, "supportEwc should be false when no error clarification is set")
+	assert.False(t, supportEwc, "testapp: supportEwc should be false when no error clarification is set")
 
 	// Test with ReportStatus for empty clarification
 	err := utils.ReportStatus(ext.HandlerEnv, requestedSequenceNumber, status.StatusError, vmextensionhelper.EnableOperation.ToStatusName(), statusMessage)
-	assert.NoError(t, err)
+	assert.NoError(t, err, "testapp: ReportStatus should not return an error for empty clarification")
 
 	// Verify status was written
 	statusType, err := utils.GetStatusType(ext.HandlerEnv, requestedSequenceNumber)
-	require.NoError(t, err)
-	assert.Equal(t, status.StatusError, statusType)
+	require.NoError(t, err, "testapp: GetStatusType should not return an error")
+	assert.Equal(t, status.StatusError, statusType, "testapp: status should be error")
 }
 
 func Test_customEnable_StatusErrorPath_WithoutClarification(t *testing.T) {
@@ -757,22 +757,16 @@ func Test_customEnable_StatusErrorPath_WithoutClarification(t *testing.T) {
 
 	ewc := vmextensionhelper.NewErrorWithClarification(errorCode, testError)
 
-	supportEwc := false
-	if ewc != (vmextensionhelper.ErrorWithClarification{}) {
-		supportEwc = true
-	}
-
-	// Should be true for populated clarification
-	assert.True(t, supportEwc, "supportEwc should be true when error clarification is set")
+	assert.True(t, (ewc != (vmextensionhelper.ErrorWithClarification{})), "testapp2: error clarification should not be empty")
 
 	// Test with ReportStatusWithError for populated clarification
 	err := utils.ReportStatusWithError(ext.HandlerEnv, requestedSequenceNumber, vmextensionhelper.EnableOperation.ToStatusName(), ewc)
 	assert.NoError(t, err)
 
 	// Verify status was written
 	statusType, err := utils.GetStatusType(ext.HandlerEnv, requestedSequenceNumber)
-	require.NoError(t, err)
-	assert.Equal(t, status.StatusError, statusType)
+	require.NoError(t, err, "testapp2: GetStatusType should not return an error")
+	assert.Equal(t, status.StatusError, statusType, "testapp2: status should be error")
 }
 
 func Test_customEnable_StatusSuccess_NoErrorHandling(t *testing.T) {
@@ -796,11 +790,11 @@ func Test_customEnable_StatusSuccess_NoErrorHandling(t *testing.T) {
 	if executeError.GetErrorIfDeploymentFailed() == nil {
 		// For success, we go to the default case in the switch statement
 		err := utils.ReportStatus(ext.HandlerEnv, requestedSequenceNumber, status.StatusSuccess, vmextensionhelper.EnableOperation.ToStatusName(), statusMessage)
-		assert.NoError(t, err)
+		assert.NoError(t, err, "ReportStatus should not return an error for successapp")
 
 		// Verify status was written as success
 		statusType, err := utils.GetStatusType(ext.HandlerEnv, requestedSequenceNumber)
-		require.NoError(t, err)
+		require.NoError(t, err, "Successapp: GetStatusType should not return an error")
 		assert.Equal(t, status.StatusSuccess, statusType)
 	}
 }

pkg/utils/errroclarification.go

@@ -1,12 +1,15 @@
 package utils
 
-var WriteToDiskError = -1
-var UnexpectedActionError = -2
-var FailedToCreateDirectoryError = -3
-var FailedToDownloadPackageError = -4
-var FailedToDownloadConfigError = -5
-var DeleteOperationError = -6
+const (
+	WriteToDiskError             = -1
+	UnexpectedActionError        = -2
+	FailedToCreateDirectoryError = -3
+	FailedToDownloadPackageError = -4
+	FailedToDownloadConfigError  = -5
+	DeleteOperationError         = -6
+	CommandExecutionError        = 1
+	DeletedAppVersionError       = 2
+	NonZeroExitCodeError         = 3
 
-var CommandExecutionError = 1
-var DeletedAppVersionError = 2
-var NonZeroExitCodeError = 3
+	NoError = 0
+)