[fix] patch prefix

Signed-off-by: Stepan Paksashvili <stepan.paksashvili@flant.com>

Author: ipaqsa

go.mod

@@ -37,7 +37,7 @@ require (
 replace github.com/go-openapi/validate => github.com/flant/go-openapi-validate v0.19.12-flant.0
 
 require (
-	github.com/deckhouse/module-sdk v0.10.0
+	github.com/deckhouse/module-sdk v0.10.2-0.20260304160619-6b32d3428382
 	github.com/gojuno/minimock/v3 v3.4.7
 	github.com/itchyny/gojq v0.12.17
 	github.com/muesli/termenv v0.16.0

go.sum

@@ -39,6 +39,8 @@ github.com/deckhouse/deckhouse/pkg/metrics-storage v0.3.0 h1:xZvbKuexrSQGEw6CB4n
 github.com/deckhouse/deckhouse/pkg/metrics-storage v0.3.0/go.mod h1:Rz++SzCLkFW03WGgftnn91TimGU2shiKb5S/YuxcBuE=
 github.com/deckhouse/module-sdk v0.10.0 h1:VPhYvMVQ3pT32I2WL1ITtQyrYdpiUR0RocLw7S4TfNg=
 github.com/deckhouse/module-sdk v0.10.0/go.mod h1:Z1jfmd0fICoYww0daMijWAU+OZTxeJUXfMciKKuYAYA=
+github.com/deckhouse/module-sdk v0.10.2-0.20260304160619-6b32d3428382 h1:EjnN5+q6/FI1N+JmPpRz7vm/Vfz8nW7FOT2/TtwS07Y=
+github.com/deckhouse/module-sdk v0.10.2-0.20260304160619-6b32d3428382/go.mod h1:Z1jfmd0fICoYww0daMijWAU+OZTxeJUXfMciKKuYAYA=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=

pkg/kube/object_patch/operation.go

@@ -3,6 +3,7 @@ package object_patch
 import (
 	"fmt"
 	"log/slog"
+	"strings"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
 	sdkpkg "github.com/deckhouse/module-sdk/pkg"
@@ -99,36 +100,20 @@ func (op *createOperation) Description() string {
 	return fmt.Sprintf("Create object %s/%s/%s/%s", u.GetAPIVersion(), u.GetKind(), u.GetNamespace(), u.GetName())
 }
 
-func (op *createOperation) GetName() string {
-	u, err := toUnstructured(op.object)
-	if err != nil {
-		return ""
-	}
-	return u.GetName()
-}
-
-func (op *createOperation) SetName(name string) {
+// SetObjectPrefix sets prefix for object name.
+func (op *createOperation) SetObjectPrefix(prefix string) {
 	u, err := toUnstructured(op.object)
 	if err != nil {
 		return
 	}
-	u.SetName(name)
-	op.object = u
-}
 
-func (op *createOperation) SetNamePrefix(prefix string) {
-	name := op.GetName()
-	if name != "" {
-		op.SetName(prefix + name)
+	name := u.GetName()
+	if strings.HasPrefix(name, prefix) {
+		return
 	}
-}
 
-func (op *createOperation) GetNamespace() string {
-	u, err := toUnstructured(op.object)
-	if err != nil {
-		return ""
-	}
-	return u.GetNamespace()
+	u.SetName(fmt.Sprintf("%s-%s", prefix, name))
+	op.object = u
 }
 
 func (op *createOperation) WithSubresource(subresource string) {
@@ -163,20 +148,13 @@ func (op *deleteOperation) WithSubresource(subresource string) {
 	op.subresource = subresource
 }
 
-func (op *deleteOperation) GetName() string {
-	return op.name
-}
-
-func (op *deleteOperation) SetName(name string) {
-	op.name = name
-}
-
-func (op *deleteOperation) SetNamePrefix(prefix string) {
-	op.name = prefix + op.name
-}
+// SetObjectPrefix sets prefix for object name.
+func (op *deleteOperation) SetObjectPrefix(prefix string) {
+	if strings.HasPrefix(op.name, prefix) {
+		return
+	}
 
-func (op *deleteOperation) GetNamespace() string {
-	return op.namespace
+	op.name = fmt.Sprintf("%s-%s", prefix, op.name)
 }
 
 type patchOperation struct {
@@ -198,24 +176,17 @@ type patchOperation struct {
 	ignoreHookError     bool
 }
 
-func (op *patchOperation) GetName() string {
-	return op.name
-}
-
-func (op *patchOperation) SetName(name string) {
-	op.name = name
-}
-
-func (op *patchOperation) SetNamePrefix(prefix string) {
-	op.name = prefix + op.name
+func (op *patchOperation) Description() string {
+	return fmt.Sprintf("Filter object %s/%s/%s/%s", op.apiVersion, op.kind, op.namespace, op.name)
 }
 
-func (op *patchOperation) GetNamespace() string {
-	return op.namespace
-}
+// SetObjectPrefix sets prefix for object name.
+func (op *patchOperation) SetObjectPrefix(prefix string) {
+	if strings.HasPrefix(op.name, prefix) {
+		return
+	}
 
-func (op *patchOperation) Description() string {
-	return fmt.Sprintf("Filter object %s/%s/%s/%s", op.apiVersion, op.kind, op.namespace, op.name)
+	op.name = fmt.Sprintf("%s-%s", prefix, op.name)
 }
 
 func (op *patchOperation) hasFilterFn() bool {

pkg/kube/object_patch/patch_collector.go

@@ -1,8 +1,6 @@
 package object_patch
 
 import (
-	"io"
-
 	sdkpkg "github.com/deckhouse/module-sdk/pkg"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
@@ -153,8 +151,3 @@ func (dop *PatchCollector) PatchWithJSON(jsonPatch any, apiVersion string, kind
 func (dop *PatchCollector) PatchWithMerge(mergePatch any, apiVersion string, kind string, namespace string, name string, opts ...sdkpkg.PatchCollectorOption) {
 	dop.add(NewMergePatchOperation(mergePatch, apiVersion, kind, namespace, name, opts...))
 }
-
-func (dop *PatchCollector) WriteOutput(_ io.Writer) error {
-	// TODO implement me
-	return nil
-}