Detect no matching resources

api/internal/target/kusttarget_configplugin.go

@@ -250,10 +250,10 @@ var transformerConfigurators = map[builtinhelpers.BuiltinPluginType]func(
 			return
 		}
 		var c struct {
-			Path    string          `json:"path,omitempty" yaml:"path,omitempty"`
-			Patch   string          `json:"patch,omitempty" yaml:"patch,omitempty"`
-			Target  *types.Selector `json:"target,omitempty" yaml:"target,omitempty"`
-			Options map[string]bool `json:"options,omitempty" yaml:"options,omitempty"`
+			Path    string           `json:"path,omitempty" yaml:"path,omitempty"`
+			Patch   string           `json:"patch,omitempty" yaml:"patch,omitempty"`
+			Target  *types.Selector  `json:"target,omitempty" yaml:"target,omitempty"`
+			Options *types.PatchArgs `json:"options,omitempty" yaml:"options,omitempty"`
 		}
 		for _, pc := range kt.kustomization.Patches {
 			c.Target = pc.Target

api/krusty/extendedpatch_test.go

@@ -6,6 +6,7 @@ package krusty_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
@@ -816,6 +817,32 @@ patches:
 	th.WriteF("base/patch.yaml", `
 apiVersion: apps/v1
 kind: Deployment
+metadata:
+  name: busybox
+  annotations:
+    new-key: new-value
+`)
+	err := th.RunWithErr("base", th.MakeDefaultOptions())
+	assert.Contains(t, err.Error(), "patches target not found for [noKind].[noVer].[noGrp]/no-match.[noNs]")
+}
+
+func TestExtendedPatchAllowNoMatch(t *testing.T) {
+	th := kusttest_test.MakeHarness(t)
+	makeCommonFileForExtendedPatchTest(th)
+	th.WriteK("base", `
+resources:
+- deployment.yaml
+- service.yaml
+patches:
+- path: patch.yaml
+  target:
+    name: no-match
+  options:
+    allowNoTargetMatch: true     
+`)
+	th.WriteF("base/patch.yaml", `
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: busybox
   annotations:
@@ -1016,6 +1043,38 @@ patches:
 	th.WriteF("base/patch.yaml", `
 apiVersion: apps/v1
 kind: Deployment
+metadata:
+  name: busybox
+  annotations:
+    new-key: new-value
+`)
+	err := th.RunWithErr("base", th.MakeDefaultOptions())
+	assert.Contains(t, err.Error(), "patches target not found for [noKind].[noVer].[noGrp]/no-match.[noNs]")
+}
+
+func TestExtendedPatchAllowNoMatchMultiplePatch(t *testing.T) {
+	th := kusttest_test.MakeHarness(t)
+	makeCommonFileForExtendedPatchTest(th)
+	th.WriteK("base", `
+resources:
+- deployment.yaml
+- service.yaml
+patches:
+- path: patch.yaml
+  target:
+    name: no-match
+  options:
+    allowNoTargetMatch: true
+- path: patch.yaml
+  target:
+    name: busybox
+    kind: Job
+  options:
+    allowNoTargetMatch: true
+`)
+	th.WriteF("base/patch.yaml", `
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: busybox
   annotations:
@@ -1213,3 +1272,95 @@ spec:
     app: busybox
 `)
 }
+
+func TestTargetMissingPatchJson6902Error(t *testing.T) {
+	th := kusttest_test.MakeHarness(t)
+	makeCommonFileForExtendedPatchTest(th)
+	th.WriteK("base", `
+resources:
+- service.yaml
+patchesJson6902:
+- target:
+    kind: Service
+    name: busybox
+    version: v2
+  path: patch.yaml
+`)
+	th.WriteF("base/patch.yaml", `
+- op: add
+  path: /metadata/labels/release
+  value: this-label-will-not-go-through
+`)
+	err := th.RunWithErr("base", th.MakeDefaultOptions())
+	assert.Contains(t, err.Error(), "patchesJson6902 target not found for Service.v2.[noGrp]/busybox.[noNs]")
+}
+
+func TestTargetMissingJsonPatchError(t *testing.T) {
+	th := kusttest_test.MakeHarness(t)
+	makeCommonFileForExtendedPatchTest(th)
+	th.WriteK("base", `
+resources:
+- service.yaml
+patches:
+- target:
+    kind: Service
+    name: busybox
+    version: v2
+  path: patch.yaml
+`)
+	th.WriteF("base/patch.yaml", `
+- op: add
+  path: /metadata/labels/release
+  value: this-label-will-not-go-through
+`)
+	err := th.RunWithErr("base", th.MakeDefaultOptions())
+	assert.Contains(t, err.Error(), "patches target not found for Service.v2.[noGrp]/busybox.[noNs]")
+}
+
+func TestAllowNoTargetMatchPatchTransformerOptions(t *testing.T) {
+	th := kusttest_test.MakeHarness(t)
+	makeCommonFileForExtendedPatchTest(th)
+	th.WriteK("base", `
+resources:
+- service.yaml
+patches:
+- target:
+    kind: Service
+    name: busybox
+    version: v2
+  path: patch.yaml
+  options:
+    allowNoTargetMatch: true
+`)
+	th.WriteF("base/patch.yaml", `
+- op: add
+  path: /metadata/labels/release
+  value: this-label-will-not-go-through
+`)
+	m := th.Run("base", th.MakeDefaultOptions())
+	th.AssertActualEqualsExpected(m, `
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: nginx
+  name: nginx
+spec:
+  ports:
+  - port: 80
+  selector:
+    app: nginx
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: busybox
+  name: busybox
+spec:
+  ports:
+  - port: 8080
+  selector:
+    app: busybox
+`)
+}

api/types/patch.go

@@ -3,8 +3,6 @@
 
 package types
 
-import "reflect"
-
 // Patch represent either a Strategic Merge Patch or a JSON patch
 // and its targets.
 // The content of the patch can either be from a file
@@ -20,15 +18,17 @@ type Patch struct {
 	Target *Selector `json:"target,omitempty" yaml:"target,omitempty"`
 
 	// Options is a list of options for the patch
-	Options map[string]bool `json:"options,omitempty" yaml:"options,omitempty"`
+	Options *PatchArgs `json:"options,omitempty" yaml:"options,omitempty"`
 }
 
 // Equals return true if p equals o.
 func (p *Patch) Equals(o Patch) bool {
 	targetEqual := (p.Target == o.Target) ||
 		(p.Target != nil && o.Target != nil && *p.Target == *o.Target)
+	optionsEqual := (p.Options == o.Options) ||
+		(p.Options != nil && o.Options != nil && *p.Options == *o.Options)
 	return p.Path == o.Path &&
 		p.Patch == o.Patch &&
 		targetEqual &&
-		reflect.DeepEqual(p.Options, o.Options)
+		optionsEqual
 }

api/types/patch_test.go

@@ -101,6 +101,28 @@ func TestPatchEquals(t *testing.T) {
 			},
 			expect: true,
 		},
+		{
+			name: "same options",
+			patch1: Patch{
+				Path:   "foo",
+				Patch:  "bar",
+				Target: &selector,
+				Options: &PatchArgs{
+					AllowNameChange:    true,
+					AllowNoTargetMatch: true,
+				},
+			},
+			patch2: Patch{
+				Path:   "foo",
+				Patch:  "bar",
+				Target: &selector,
+				Options: &PatchArgs{
+					AllowNameChange:    true,
+					AllowNoTargetMatch: true,
+				},
+			},
+			expect: true,
+		},
 		{
 			name: "one nil target",
 			patch1: Patch{
@@ -124,6 +146,28 @@ func TestPatchEquals(t *testing.T) {
 			},
 			expect: false,
 		},
+		{
+			name: "different options",
+			patch1: Patch{
+				Path:   "foo",
+				Patch:  "bar",
+				Target: &selector,
+				Options: &PatchArgs{
+					AllowNameChange:    false,
+					AllowNoTargetMatch: true,
+				},
+			},
+			patch2: Patch{
+				Path:   "foo",
+				Patch:  "bar",
+				Target: &selector,
+				Options: &PatchArgs{
+					AllowNameChange:    true,
+					AllowNoTargetMatch: true,
+				},
+			},
+			expect: false,
+		},
 	}
 
 	for _, tc := range testcases {