fix(applier): ensure proper deletion logic for components with updated manifest handling (#575)

Author: floreks

internal/mcpserver/agent/tool/updateanalysis.go

@@ -69,7 +69,7 @@ func (in *UpdateAnalysis) fromRequest(request mcp.CallToolRequest) (result clien
 		result.Bullets = lo.ToSlicePtr(bullets)
 	}
 
-	return
+	return result, nil
 }
 
 func NewUpdateAnalysis(client console.Client, agentRunID string) Tool {

pkg/streamline/applier/applier.go

@@ -5,8 +5,6 @@ import (
 	"time"
 
 	"github.com/pluralsh/console/go/client"
-	discoverycache "github.com/pluralsh/deployment-operator/pkg/cache/discovery"
-	"github.com/pluralsh/deployment-operator/pkg/common"
 	"github.com/pluralsh/polly/algorithms"
 	"github.com/pluralsh/polly/containers"
 	"github.com/samber/lo"
@@ -16,6 +14,9 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/klog/v2"
 
+	discoverycache "github.com/pluralsh/deployment-operator/pkg/cache/discovery"
+	"github.com/pluralsh/deployment-operator/pkg/common"
+
 	"github.com/pluralsh/deployment-operator/internal/helpers"
 	"github.com/pluralsh/deployment-operator/pkg/log"
 	smcommon "github.com/pluralsh/deployment-operator/pkg/streamline/common"
@@ -280,6 +281,11 @@ func (in *Applier) getDeleteFilterFunc(serviceID string) (func(resources []unstr
 		return nil, err
 	}
 
+	componentsSet := containers.NewSet[smcommon.Key]()
+	for _, component := range components {
+		componentsSet.Add(component.StoreKey().VersionlessKey())
+	}
+
 	hooks, err := in.store.GetHookComponents(serviceID)
 	if err != nil {
 		return nil, err
@@ -328,8 +334,8 @@ func (in *Applier) getDeleteFilterFunc(serviceID string) (func(resources []unstr
 			if ok && hook.HasDesiredState(deletePolicies) && !hook.HasManifestChanged(resource) {
 				skipApply.Add(key)
 
-				if r, exists := keyToResource[key]; exists {
-					toDelete = append(toDelete, r)
+				if componentsSet.Has(key) {
+					toDelete = append(toDelete, resource)
 				}
 
 				continue