rebase

Rebase laxmikantbpandhare commits on top of master

Author: laxmikantbpandhare

api/internal/builtins/PatchJson6902Transformer.go

@@ -6,6 +6,7 @@ package krusty_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
@@ -821,82 +822,8 @@ metadata:
   annotations:
     new-key: new-value
 `)
-	m := th.Run("base", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: nginx
-spec:
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-        volumeMounts:
-        - mountPath: /tmp/ps
-          name: nginx-persistent-storage
-      volumes:
-      - emptyDir: {}
-        name: nginx-persistent-storage
-      - configMap:
-          name: configmap-in-base
-        name: configmap-in-base
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: busybox
-  name: busybox
-spec:
-  template:
-    metadata:
-      labels:
-        app: busybox
-    spec:
-      containers:
-      - image: busybox
-        name: busybox
-        volumeMounts:
-        - mountPath: /tmp/ps
-          name: busybox-persistent-storage
-      volumes:
-      - emptyDir: {}
-        name: busybox-persistent-storage
-      - configMap:
-          name: configmap-in-base
-        name: configmap-in-base
----
-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
-`)
+	err := th.RunWithErr("base", th.MakeDefaultOptions())
+	assert.Contains(t, err.Error(), "patches target not found for [noKind].[noVer].[noGrp]/no-match.[noNs]")
 }
 
 func TestExtendedPatchWithoutTarget(t *testing.T) {
@@ -1021,82 +948,8 @@ metadata:
   annotations:
     new-key: new-value
 `)
-	m := th.Run("base", th.MakeDefaultOptions())
-	th.AssertActualEqualsExpected(m, `
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: nginx
-  name: nginx
-spec:
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - image: nginx
-        name: nginx
-        volumeMounts:
-        - mountPath: /tmp/ps
-          name: nginx-persistent-storage
-      volumes:
-      - emptyDir: {}
-        name: nginx-persistent-storage
-      - configMap:
-          name: configmap-in-base
-        name: configmap-in-base
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: busybox
-  name: busybox
-spec:
-  template:
-    metadata:
-      labels:
-        app: busybox
-    spec:
-      containers:
-      - image: busybox
-        name: busybox
-        volumeMounts:
-        - mountPath: /tmp/ps
-          name: busybox-persistent-storage
-      volumes:
-      - emptyDir: {}
-        name: busybox-persistent-storage
-      - configMap:
-          name: configmap-in-base
-        name: configmap-in-base
----
-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
-`)
+	err := th.RunWithErr("base", th.MakeDefaultOptions())
+	assert.Contains(t, err.Error(), "patches target not found for [noKind].[noVer].[noGrp]/no-match.[noNs]")
 }
 
 func TestExtendedPatchMultiplePatchOverlapping(t *testing.T) {
@@ -1213,3 +1066,44 @@ spec:
     app: busybox
 `)
 }
+
+func TestTargetMissingPatchJson6902Error(t *testing.T) {
+	th := kusttest_test.MakeHarness(t)
+	makeCommonFileForExtendedPatchTest(th)
+	th.WriteK("base", `
+resources:
+- servicemonitor.yaml
+patchesJson6902:
+- target:
+    group: monitoring.coreos.com
+    kind: ServiceMonitor
+    name: starboard-exporter
+    namespace: starboard
+    version: v2
+  path: patch.0.yaml
+`)
+	th.WriteF("base/servicemonitor.yaml", `
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app: starboard-exporter
+  name: starboard-exporter
+  namespace: starboard
+spec:
+  endpoints:
+  - path: /metrics
+    port: metrics
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: starboard-exporter
+      app.kubernetes.io/name: starboard-exporter
+`)
+	th.WriteF("base/patch.0.yaml", `
+- op: add
+  path: /metadata/labels/release
+  value: kube-prometheus-stack
+`)
+	err := th.RunWithErr("base", th.MakeDefaultOptions())
+	assert.Contains(t, err.Error(), "patchesJson6902 target not found for ServiceMonitor.v2.monitoring.coreos.com/starboard-exporter.starboard")
+}

api/internal/builtins/PatchTransformer.go

@@ -81,6 +81,11 @@ func (p *plugin) Transform(m resmap.ResMap) error {
 	if err != nil {
 		return err
 	}
+
+	if len(resources) == 0 {
+		return fmt.Errorf("patchesJson6902 target not found for %s", p.Target.ResId)
+	}
+
 	for _, res := range resources {
 		internalAnnotations := kioutil.GetInternalAnnotations(&res.RNode)
 

api/krusty/extendedpatch_test.go

@@ -137,6 +137,11 @@ func (p *plugin) transformJson6902(m resmap.ResMap) error {
 	if err != nil {
 		return err
 	}
+
+	if len(resources) == 0 {
+		return fmt.Errorf("patches target not found for %s", p.Target.ResId)
+	}
+
 	for _, res := range resources {
 		res.StorePreviousId()
 		internalAnnotations := kioutil.GetInternalAnnotations(&res.RNode)