Fix force-delete-replace and add filter to not copy YTT code (#302)

Author: kushnaidu

internal/kpt/util/update/fastforward_test.go

@@ -130,7 +130,7 @@ func TestUpdate_FastForward(t *testing.T) {
 						WithResource(pkgbuilder.DeploymentResource),
 				),
 		},
-		"doesn't update the Kptfile": {
+		"Updates the Kptfile": {
 			origin: pkgbuilder.NewRootPkg().
 				WithKptfile(
 					pkgbuilder.NewKptfile().
@@ -155,7 +155,7 @@ func TestUpdate_FastForward(t *testing.T) {
 			expected: pkgbuilder.NewRootPkg().
 				WithKptfile(
 					pkgbuilder.NewKptfile().
-						WithUpstream(kptRepo, "/", "master", "fast-forward").
+						WithUpstream(kptRepo, "/", "v1.0", "fast-forward").
 						WithUpstreamLock(kptRepo, "/", "master", "abc123"),
 				).
 				WithResource(pkgbuilder.ConfigMapResource),

internal/kpt/util/update/replace.go

@@ -22,6 +22,7 @@ import (
 	"github.com/nephio-project/porch/internal/kpt/pkg"
 	"github.com/nephio-project/porch/internal/kpt/types"
 	"github.com/nephio-project/porch/internal/kpt/util/pkgutil"
+	"github.com/nephio-project/porch/pkg/kpt/kptfileutil"
 )
 
 // Updater updates a package to a new upstream version.
@@ -32,11 +33,16 @@ type ReplaceUpdater struct{}
 
 func (u ReplaceUpdater) Update(options Options) error {
 	const op errors.Op = "update.Update"
+
+	// Update Kptfile for root package
+	if err := kptfileutil.UpdateKptfile(options.LocalPath, options.UpdatedPath, options.OriginPath, true); err != nil {
+		return errors.E(op, types.UniquePath(options.LocalPath), err)
+	}
+
 	paths, err := pkgutil.FindSubpackagesForPaths(pkg.Local, true, options.LocalPath, options.UpdatedPath)
 	if err != nil {
 		return errors.E(op, types.UniquePath(options.LocalPath), err)
 	}
-
 	for _, p := range append([]string{"."}, paths...) {
 		isRootPkg := false
 		if p == "." && options.IsRoot {

internal/kpt/util/update/replace_test.go

@@ -130,7 +130,7 @@ func TestUpdate_Replace(t *testing.T) {
 						WithResource(pkgbuilder.DeploymentResource),
 				),
 		},
-		"doesn't update the Kptfile": {
+		"Updates the Kptfile": {
 			origin: pkgbuilder.NewRootPkg().
 				WithKptfile(
 					pkgbuilder.NewKptfile().
@@ -155,7 +155,7 @@ func TestUpdate_Replace(t *testing.T) {
 			expected: pkgbuilder.NewRootPkg().
 				WithKptfile(
 					pkgbuilder.NewKptfile().
-						WithUpstream(kptRepo, "/", "master", "force-delete-replace").
+						WithUpstream(kptRepo, "/", "v1.0", "force-delete-replace").
 						WithUpstreamLock(kptRepo, "/", "master", "abc123"),
 				).
 				WithResource(pkgbuilder.ConfigMapResource),

pkg/task/generictaskhandler.go

@@ -17,6 +17,7 @@ package task
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	api "github.com/nephio-project/porch/api/porch/v1alpha1"
 	configapi "github.com/nephio-project/porch/api/porchconfig/v1alpha1"
@@ -358,7 +359,11 @@ func healConfig(old, new map[string]string) (map[string]string, error) {
 				if n.GetNamespace() == original.GetNamespace() &&
 					n.GetName() == original.GetName() &&
 					n.GetApiVersion() == original.GetApiVersion() &&
-					n.GetKind() == original.GetKind() {
+					n.GetKind() == original.GetKind() &&
+					// Support ytt templates with #@ and #! comments
+					!strings.Contains(n.MustString(), "#@") && !strings.Contains(original.MustString(), "#@") &&
+					!strings.Contains(n.MustString(), "#!") && !strings.Contains(original.MustString(), "#!") {
+
 					err = comments.CopyComments(original, n)
 					if err != nil {
 						return nil, fmt.Errorf("failed to copy comments: %w", err)