Merge pull request #69344 from zegl/improve-kubectl-apply-prune-output

Fix dry-run output in kubectl apply --prune
kubernetes · Nov 14, 2018 · 54243e1 · 54243e1
2 parents cc4d38c + 37c253a
commit 54243e1
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 26 deletions.
diff --git a/pkg/kubectl/cmd/apply/apply.go b/pkg/kubectl/cmd/apply/apply.go
@@ -389,13 +389,14 @@ func (o *ApplyOptions) Run() error {
 					return cmdutil.AddSourceToErr("creating", info.Source, err)
 				}
 				info.Refresh(obj, true)
-				metadata, err := meta.Accessor(info.Object)
-				if err != nil {
-					return err
-				}
-				visitedUids.Insert(string(metadata.GetUID()))
 			}
 
+			metadata, err := meta.Accessor(info.Object)
+			if err != nil {
+				return err
+			}
+			visitedUids.Insert(string(metadata.GetUID()))
+
 			count++
 
 			if printObject {
@@ -410,12 +411,13 @@ func (o *ApplyOptions) Run() error {
 			return printer.PrintObj(info.Object, o.Out)
 		}
 
-		if !o.DryRun {
-			metadata, err := meta.Accessor(info.Object)
-			if err != nil {
-				return err
-			}
+		metadata, err := meta.Accessor(info.Object)
+		if err != nil {
+			return err
+		}
+		visitedUids.Insert(string(metadata.GetUID()))
 
+		if !o.DryRun {
 			annotationMap := metadata.GetAnnotations()
 			if _, ok := annotationMap[corev1.LastAppliedConfigAnnotation]; !ok {
 				fmt.Fprintf(o.ErrOut, warningNoLastAppliedConfigAnnotation, o.cmdBaseName)
@@ -443,8 +445,6 @@ func (o *ApplyOptions) Run() error {
 
 			info.Refresh(patchedObject, true)
 
-			visitedUids.Insert(string(metadata.GetUID()))
-
 			if string(patchBytes) == "{}" && !printObject {
 				count++
 

diff --git a/pkg/kubectl/cmd/apply/apply_test.go b/pkg/kubectl/cmd/apply/apply_test.go
@@ -103,19 +103,24 @@ const (
 	filenameWidgetServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-serverside.yaml"
 )
 
-func readConfigMapList(t *testing.T, filename string) []byte {
+func readConfigMapList(t *testing.T, filename string) [][]byte {
 	data := readBytesFromFile(t, filename)
 	cmList := corev1.ConfigMapList{}
 	if err := runtime.DecodeInto(codec, data, &cmList); err != nil {
 		t.Fatal(err)
 	}
 
-	cmListBytes, err := runtime.Encode(codec, &cmList)
-	if err != nil {
-		t.Fatal(err)
+	var listCmBytes [][]byte
+
+	for _, cm := range cmList.Items {
+		cmBytes, err := runtime.Encode(codec, &cm)
+		if err != nil {
+			t.Fatal(err)
+		}
+		listCmBytes = append(listCmBytes, cmBytes)
 	}
 
-	return cmListBytes
+	return listCmBytes
 }
 
 func readBytesFromFile(t *testing.T, filename string) []byte {
@@ -270,7 +275,7 @@ func walkMapPath(t *testing.T, start map[string]interface{}, path []string) map[
 
 func TestRunApplyPrintsValidObjectList(t *testing.T) {
 	cmdtesting.InitTestErrorHandler(t)
-	cmBytes := readConfigMapList(t, filenameCM)
+	configMapList := readConfigMapList(t, filenameCM)
 	pathCM := "/namespaces/test/configmaps"
 
 	tf := cmdtesting.NewTestFactory().WithNamespace("test")
@@ -280,12 +285,21 @@ func TestRunApplyPrintsValidObjectList(t *testing.T) {
 		NegotiatedSerializer: resource.UnstructuredPlusDefaultContentConfig().NegotiatedSerializer,
 		Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
 			switch p, m := req.URL.Path, req.Method; {
-			case strings.HasPrefix(p, pathCM) && m != "GET":
-				pod := ioutil.NopCloser(bytes.NewReader(cmBytes))
-				return &http.Response{StatusCode: 200, Header: cmdtesting.DefaultHeader(), Body: pod}, nil
-			case strings.HasPrefix(p, pathCM) && m != "PATCH":
-				pod := ioutil.NopCloser(bytes.NewReader(cmBytes))
-				return &http.Response{StatusCode: 200, Header: cmdtesting.DefaultHeader(), Body: pod}, nil
+			case strings.HasPrefix(p, pathCM) && m == "GET":
+				fallthrough
+			case strings.HasPrefix(p, pathCM) && m == "PATCH":
+				var body io.ReadCloser
+
+				switch p {
+				case pathCM + "/test0":
+					body = ioutil.NopCloser(bytes.NewReader(configMapList[0]))
+				case pathCM + "/test1":
+					body = ioutil.NopCloser(bytes.NewReader(configMapList[1]))
+				default:
+					t.Errorf("unexpected request to %s", p)
+				}
+
+				return &http.Response{StatusCode: 200, Header: cmdtesting.DefaultHeader(), Body: body}, nil
 			default:
 				t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
 				return nil, nil
@@ -306,6 +320,16 @@ func TestRunApplyPrintsValidObjectList(t *testing.T) {
 	if err := runtime.DecodeInto(codec, buf.Bytes(), &cmList); err != nil {
 		t.Fatal(err)
 	}
+
+	if len(cmList.Items) != 2 {
+		t.Fatalf("Expected 2 items in the result; got %d", len(cmList.Items))
+	}
+	if !strings.Contains(string(cmList.Items[0].Raw), "key1") {
+		t.Fatalf("Did not get first ConfigMap at the first position")
+	}
+	if !strings.Contains(string(cmList.Items[1].Raw), "key2") {
+		t.Fatalf("Did not get second ConfigMap at the second position")
+	}
 }
 
 func TestRunApplyViewLastApplied(t *testing.T) {

diff --git a/test/fixtures/pkg/kubectl/cmd/apply/cm.yaml b/test/fixtures/pkg/kubectl/cmd/apply/cm.yaml
@@ -3,13 +3,13 @@ items:
 - kind: ConfigMap
   apiVersion: v1
   metadata:
-    name: test
+    name: test0
   data:
     key1: apple
 - kind: ConfigMap
   apiVersion: v1
   metadata:
-    name: test2
+    name: test1
   data:
     key2: apple
 kind: ConfigMapList