kubectl apply edit-last-applied should fail when version is missing

If a user edits last-applied-configuration and it doesn't have an apiVersion or kind, the command should error out. Now that we check for kind and version on the unstructured object typer, the previously passing test now correctly fails. Add a new explicit failure test and make the existing test pass.

kubectl apply edit-last-applied should fail when version is missing
f8cc69ca · Clayton Coleman · 5519a7c5 · f8cc69ca · f8cc69ca · f8cc69ca
Unverified Commit f8cc69ca authored Nov 16, 2017 by Clayton Coleman
15 changed files
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/0.request
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/0.request
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/0.response
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/0.response
+{
+    "kind": "ConfigMap",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "cm1",
+        "namespace": "myproject",
+        "selfLink": "/api/v1/namespaces/myproject/configmaps/cm1",
+        "uid": "cc08a131-3d6f-11e7-8ef0-c85b76034b7b",
+        "resourceVersion": "3518",
+        "creationTimestamp": "2017-05-20T15:20:03Z",
+        "annotations": {
+            "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"data\":{\"baz\":\"qux\",\"foo\":\"changed-value\",\"new-data\":\"new-value\",\"new-data2\":\"new-value\"},\"kind\":\"ConfigMap\",\"metadata\":{\"annotations\":{},\"name\":\"cm1\",\"namespace\":\"myproject\"}}\n"
+        }
+    },
+    "data": {
+        "baz": "qux",
+        "foo": "changed-value",
+        "new-data": "new-value",
+        "new-data2": "new-value"
+    }
+}
\ No newline at end of file
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/1.request
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/1.request
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/1.response
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/1.response
+{
+    "kind": "Service",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "svc1",
+        "namespace": "myproject",
+        "selfLink": "/api/v1/namespaces/myproject/services/svc1",
+        "uid": "d8b96f0b-3d6f-11e7-8ef0-c85b76034b7b",
+        "resourceVersion": "3525",
+        "creationTimestamp": "2017-05-20T15:20:24Z",
+        "labels": {
+            "app": "svc1",
+            "new-label": "foo"
+        },
+        "annotations": {
+            "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"labels\":{\"app\":\"svc1\",\"new-label\":\"foo\"},\"name\":\"svc1\",\"namespace\":\"myproject\"},\"spec\":{\"ports\":[{\"name\":\"80\",\"port\":81,\"protocol\":\"TCP\",\"targetPort\":81}],\"sessionAffinity\":\"None\",\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n"
+        }
+    },
+    "spec": {
+        "ports": [
+            {
+                "name": "80",
+                "protocol": "TCP",
+                "port": 81,
+                "targetPort": 81
+            }
+        ],
+        "clusterIP": "172.30.32.183",
+        "type": "ClusterIP",
+        "sessionAffinity": "None"
+    },
+    "status": {
+        "loadBalancer": {}
+    }
+}
\ No newline at end of file
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/2.edited
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/2.edited
+# Please edit the 'last-applied-configuration' annotations below.
+# Lines beginning with a '#' will be ignored, and an empty file will abort the edit.
+#
+apiVersion: v1
+items:
+- apiVersion: v1
+  data:
+    baz: qux
+    foo: changed-value
+    new-data: new-value
+    new-data2: new-value
+    new-data3: newivalue
+  kind: ConfigMap
+  metadata:
+    annotations: {}
+    name: cm1
+    namespace: myproject
+- kind: Service
+  metadata:
+    annotations: {}
+    labels:
+      app: svc1
+      new-label: foo
+      new-label2: foo2
+    name: svc1
+    namespace: myproject
+  spec:
+    ports:
+    - name: "80"
+      port: 82
+      protocol: TCP
+      targetPort: 81
+    sessionAffinity: None
+    type: ClusterIP
+  status:
+    loadBalancer: {}
+kind: List
+metadata: {}
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/2.original
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/2.original
+# Please edit the 'last-applied-configuration' annotations below.
+# Lines beginning with a '#' will be ignored, and an empty file will abort the edit.
+#
+apiVersion: v1
+items:
+- apiVersion: v1
+  data:
+    baz: qux
+    foo: changed-value
+    new-data: new-value
+    new-data2: new-value
+  kind: ConfigMap
+  metadata:
+    annotations: {}
+    name: cm1
+    namespace: myproject
+- kind: Service
+  metadata:
+    annotations: {}
+    labels:
+      app: svc1
+      new-label: foo
+    name: svc1
+    namespace: myproject
+  spec:
+    ports:
+    - name: "80"
+      port: 81
+      protocol: TCP
+      targetPort: 81
+    sessionAffinity: None
+    type: ClusterIP
+  status:
+    loadBalancer: {}
+kind: List
+metadata: {}
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/3.edited
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/3.edited
+# Please edit the 'last-applied-configuration' annotations below.
+# Lines beginning with a '#' will be ignored, and an empty file will abort the edit.
+#
+# The edited file had a syntax error: error converting YAML to JSON: yaml: line 12: could not find expected ':'
+#
+apiVersion: v1
+items:
+- apiVersion: v1
+  data:
+    baz: qux
+    foo: changed-value
+    new-data: new-value
+    new-data2: new-value
+    new-data3: newivalue
+  kind: ConfigMap
+  metadata:
+    annotations: {}
+    name: cm1
+    namespace: myproject
+- kind: Service
+  apiVersion: v1
+  metadata:
+    annotations: {}
+    labels:
+      app: svc1
+      new-label: foo
+      new-label2: foo2
+    name: svc1
+    namespace: myproject
+  spec:
+    ports:
+    - name: "80"
+      port: 82
+      protocol: TCP
+      targetPort: 81
+    sessionAffinity: None
+    type: ClusterIP
+  status:
+    loadBalancer: {}
+kind: List
+metadata: {}
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/3.original
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/3.original
+# Please edit the 'last-applied-configuration' annotations below.
+# Lines beginning with a '#' will be ignored, and an empty file will abort the edit.
+#
+# The edited file had a syntax error: unable to get type info from the object "*unstructured.Unstructured": Object 'apiVersion' is missing in 'unstructured object has no version'
+#
+apiVersion: v1
+items:
+- apiVersion: v1
+  data:
+    baz: qux
+    foo: changed-value
+    new-data: new-value
+    new-data2: new-value
+    new-data3: newivalue
+  kind: ConfigMap
+  metadata:
+    annotations: {}
+    name: cm1
+    namespace: myproject
+- kind: Service
+  metadata:
+    annotations: {}
+    labels:
+      app: svc1
+      new-label: foo
+      new-label2: foo2
+    name: svc1
+    namespace: myproject
+  spec:
+    ports:
+    - name: "80"
+      port: 82
+      protocol: TCP
+      targetPort: 81
+    sessionAffinity: None
+    type: ClusterIP
+  status:
+    loadBalancer: {}
+kind: List
+metadata: {}
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/4.request
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/4.request
+{
+    "metadata": {
+        "annotations": {
+            "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"data\":{\"baz\":\"qux\",\"foo\":\"changed-value\",\"new-data\":\"new-value\",\"new-data2\":\"new-value\",\"new-data3\":\"newivalue\"},\"kind\":\"ConfigMap\",\"metadata\":{\"annotations\":{},\"name\":\"cm1\",\"namespace\":\"myproject\"}}\n"
+        }
+    }
+}
\ No newline at end of file
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/4.response
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/4.response
+{
+    "kind": "ConfigMap",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "cm1",
+        "namespace": "myproject",
+        "selfLink": "/api/v1/namespaces/myproject/configmaps/cm1",
+        "uid": "cc08a131-3d6f-11e7-8ef0-c85b76034b7b",
+        "resourceVersion": "3554",
+        "creationTimestamp": "2017-05-20T15:20:03Z",
+        "annotations": {
+            "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"data\":{\"baz\":\"qux\",\"foo\":\"changed-value\",\"new-data\":\"new-value\",\"new-data2\":\"new-value\",\"new-data3\":\"newivalue\"},\"kind\":\"ConfigMap\",\"metadata\":{\"annotations\":{},\"name\":\"cm1\",\"namespace\":\"myproject\"}}\n"
+        }
+    },
+    "data": {
+        "baz": "qux",
+        "foo": "changed-value",
+        "new-data": "new-value",
+        "new-data2": "new-value"
+    }
+}
\ No newline at end of file
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/5.request
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/5.request
+{
+    "metadata": {
+        "annotations": {
+            "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"labels\":{\"app\":\"svc1\",\"new-label\":\"foo\",\"new-label2\":\"foo2\"},\"name\":\"svc1\",\"namespace\":\"myproject\"},\"spec\":{\"ports\":[{\"name\":\"80\",\"port\":82,\"protocol\":\"TCP\",\"targetPort\":81}],\"sessionAffinity\":\"None\",\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n"
+        }
+    }
+}
\ No newline at end of file
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/5.response
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/5.response
+{
+    "kind": "Service",
+    "apiVersion": "v1",
+    "metadata": {
+        "name": "svc1",
+        "namespace": "myproject",
+        "selfLink": "/api/v1/namespaces/myproject/services/svc1",
+        "uid": "d8b96f0b-3d6f-11e7-8ef0-c85b76034b7b",
+        "resourceVersion": "3555",
+        "creationTimestamp": "2017-05-20T15:20:24Z",
+        "labels": {
+            "app": "svc1",
+            "new-label": "foo"
+        },
+        "annotations": {
+            "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"labels\":{\"app\":\"svc1\",\"new-label\":\"foo\",\"new-label2\":\"foo2\"},\"name\":\"svc1\",\"namespace\":\"myproject\"},\"spec\":{\"ports\":[{\"name\":\"80\",\"port\":82,\"protocol\":\"TCP\",\"targetPort\":81}],\"sessionAffinity\":\"None\",\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n"
+        }
+    },
+    "spec": {
+        "ports": [
+            {
+                "name": "80",
+                "protocol": "TCP",
+                "port": 81,
+                "targetPort": 81
+            }
+        ],
+        "clusterIP": "172.30.32.183",
+        "type": "ClusterIP",
+        "sessionAffinity": "None"
+    },
+    "status": {
+        "loadBalancer": {}
+    }
+}
\ No newline at end of file
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/test.yaml
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list-fail/test.yaml
+description: if the user omits an API version, edit will fail
+mode: edit-last-applied
+args:
+- configmaps/cm1
+- service/svc1
+namespace: "myproject"
+expectedStdout:
+- configmap "cm1" edited
+- service "svc1" edited
+expectedExitCode: 0
+steps:
+- type: request
+  expectedMethod: GET
+  expectedPath: /api/v1/namespaces/myproject/configmaps/cm1
+  expectedInput: 0.request
+  resultingStatusCode: 200
+  resultingOutput: 0.response
+- type: request
+  expectedMethod: GET
+  expectedPath: /api/v1/namespaces/myproject/services/svc1
+  expectedInput: 1.request
+  resultingStatusCode: 200
+  resultingOutput: 1.response
+- type: edit
+  expectedInput: 2.original
+  resultingOutput: 2.edited
+- type: edit
+  expectedInput: 3.original
+  resultingOutput: 3.edited
+- type: request
+  expectedMethod: PATCH
+  expectedPath: /api/v1/namespaces/myproject/configmaps/cm1
+  expectedContentType: application/merge-patch+json
+  expectedInput: 4.request
+  resultingStatusCode: 200
+  resultingOutput: 4.response
+- type: request
+  expectedMethod: PATCH
+  expectedPath: /api/v1/namespaces/myproject/services/svc1
+  expectedContentType: application/merge-patch+json
+  expectedInput: 5.request
+  resultingStatusCode: 200
+  resultingOutput: 5.response
--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/2.edited
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/2.edited
@@ -16,6 +16,7 @@ items:
    name: cm1
    namespace: myproject
 - kind: Service
+  apiVersion: v1
  metadata:
    annotations: {}
    labels:

--- a/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/4.request
+++ b/pkg/kubectl/cmd/testdata/edit/testcase-apply-edit-last-applied-list/4.request
 {
-    "metadata": {
+	"metadata": {
-        "annotations": {
+		"annotations": {
-            "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"labels\":{\"app\":\"svc1\",\"new-label\":\"foo\",\"new-label2\":\"foo2\"},\"name\":\"svc1\",\"namespace\":\"myproject\"},\"spec\":{\"ports\":[{\"name\":\"80\",\"port\":82,\"protocol\":\"TCP\",\"targetPort\":81}],\"sessionAffinity\":\"None\",\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n"
+			"kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"labels\":{\"app\":\"svc1\",\"new-label\":\"foo\",\"new-label2\":\"foo2\"},\"name\":\"svc1\",\"namespace\":\"myproject\"},\"spec\":{\"ports\":[{\"name\":\"80\",\"port\":82,\"protocol\":\"TCP\",\"targetPort\":81}],\"sessionAffinity\":\"None\",\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n"
-        }
+		}
-    }
+	}
 }
\ No newline at end of file