fix(edge-agent): remove redundant status updates [BE-11683] (#497)

Author: viktigpetterr

edge/poll_async.go

@@ -259,35 +259,21 @@ func (service *PollService) processEdgeStackCommand(ctx context.Context, command
 		return newOperationError("stack", command.Operation, err)
 	}
 
-	if err := service.portainerClient.SetEdgeStackStatus(stackData.ID, stackData.Version, portainer.EdgeStackStatusAcknowledged, stackData.RollbackTo, ""); err != nil {
-		return newOperationError("stack", command.Operation, err)
-	}
-
 	switch command.Operation {
 	case "add", "replace":
 		if err := service.edgeStackManager.DeployStack(ctx, stackData); err != nil {
 			return service.portainerClient.SetEdgeStackStatus(stackData.ID, stackData.Version, portainer.EdgeStackStatusError, stackData.RollbackTo, fmt.Errorf("failed to deploy async stack: %w", err).Error())
 		}
-
-		if err := service.portainerClient.SetEdgeStackStatus(stackData.ID, stackData.Version, portainer.EdgeStackStatusDeploying, stackData.RollbackTo, ""); err != nil {
-			return newOperationError("stack", command.Operation, err)
-		}
-
 	case "remove":
-		if err := service.portainerClient.SetEdgeStackStatus(stackData.ID, stackData.Version, portainer.EdgeStackStatusRemoving, stackData.RollbackTo, ""); err != nil {
-			return newOperationError("stack", command.Operation, err)
-		}
-
 		if err := service.edgeStackManager.DeleteStack(ctx, stackData); err != nil {
 			return service.portainerClient.SetEdgeStackStatus(stackData.ID, stackData.Version, portainer.EdgeStackStatusError, stackData.RollbackTo, fmt.Errorf("failed to delete async stack: %w", err).Error())
 		}
-
-		if err := service.portainerClient.SetEdgeStackStatus(stackData.ID, stackData.Version, portainer.EdgeStackStatusRemoved, stackData.RollbackTo, ""); err != nil {
-			return newOperationError("stack", command.Operation, err)
-		}
-
 	default:
-		return newOperationError("schedule", command.Operation, errors.New("operation not supported"))
+		return service.portainerClient.SetEdgeStackStatus(stackData.ID, stackData.Version, portainer.EdgeStackStatusError, stackData.RollbackTo, fmt.Errorf("operation not supported: %s", command.Operation).Error())
+	}
+
+	if err := service.portainerClient.SetEdgeStackStatus(stackData.ID, stackData.Version, portainer.EdgeStackStatusAcknowledged, stackData.RollbackTo, ""); err != nil {
+		return newOperationError("stack", command.Operation, err)
 	}
 
 	return nil

go.mod

@@ -143,6 +143,7 @@ require (
 	github.com/miekg/dns v1.1.50 // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/go-ps v1.0.0 // indirect
 	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
 	github.com/moby/buildkit v0.17.2 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect

go.sum

@@ -433,6 +433,8 @@ github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceT
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
+github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
 github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=