Annotate With Subpackages

Delete Setters And Subst With Subpkgs

cmd/config/internal/commands/cmddeletesetter_test.go

@@ -7,12 +7,13 @@ import (
 	"bytes"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/config/ext"
 	"sigs.k8s.io/kustomize/cmd/config/internal/commands"
+	"sigs.k8s.io/kustomize/kyaml/copyutil"
 	"sigs.k8s.io/kustomize/kyaml/openapi"
 )
 
@@ -52,6 +53,7 @@ openAPI:
           value: "3"
           setBy: me
 `,
+			out: `deleted setter "replicas-setter" in package "${baseDir}"`,
 			expectedOpenAPI: `
 apiVersion: v1alpha1
 kind: Example
@@ -95,6 +97,7 @@ openAPI:
           name: image
           value: nginx
 `,
+			out: `deleted setter "replicas-setter" in package "${baseDir}"`,
 			expectedOpenAPI: `
 apiVersion: v1alpha1
 kind: Example
@@ -158,6 +161,7 @@ spec:
   - "b"
   - "c"
  `,
+			out: `deleted setter "list" in package "${baseDir}"`,
 			expectedResources: `
 apiVersion: example.com/v1beta1
 kind: Example1
@@ -226,7 +230,7 @@ metadata:
 spec:
   replicas: 3 # {"$openapi" : "replicas-setter"}
  `,
-			err: `setter with name image does not exist`,
+			err: `setter "image" does not exist`,
 		},
 		{
 			name: "delete setter used in substitution error",
@@ -287,7 +291,7 @@ openAPI:
 apiVersion: apps/v1
 kind: Deployment
  `,
-			err: `setter is used in substitution image, please delete the parent substitution first`,
+			err: `setter "image-name" is used in substitution "image", please delete the parent substitution first`,
 		},
 	}
 	for i := range tests {
@@ -297,24 +301,18 @@ kind: Deployment
 			openapi.ResetOpenAPI()
 			defer openapi.ResetOpenAPI()
 
-			f, err := ioutil.TempFile("", "k8s-cli-")
+			baseDir, err := ioutil.TempDir("", "")
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
-			defer os.Remove(f.Name())
-
-			err = ioutil.WriteFile(f.Name(), []byte(test.inputOpenAPI), 0600)
+			defer os.RemoveAll(baseDir)
+			f := filepath.Join(baseDir, "Krmfile")
+			err = ioutil.WriteFile(f, []byte(test.inputOpenAPI), 0600)
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
 
-			old := ext.GetOpenAPIFile
-			defer func() { ext.GetOpenAPIFile = old }()
-			ext.GetOpenAPIFile = func(args []string) (s string, err error) {
-				return f.Name(), nil
-			}
-
-			r, err := ioutil.TempFile("", "k8s-cli-*.yaml")
+			r, err := ioutil.TempFile(baseDir, "k8s-cli-*.yaml")
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
@@ -327,21 +325,29 @@ kind: Deployment
 			runner := commands.NewDeleteSetterRunner("")
 			out := &bytes.Buffer{}
 			runner.Command.SetOut(out)
-			runner.Command.SetArgs(append([]string{r.Name()}, test.args...))
+			runner.Command.SetArgs(append([]string{baseDir}, test.args...))
 			err = runner.Command.Execute()
+
 			if test.err != "" {
 				if !assert.NotNil(t, err) {
 					t.FailNow()
-				} else {
-					assert.Equal(t, err.Error(), test.err)
-					return
 				}
+				assert.Equal(t, test.err, err.Error())
+				return
 			}
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
 
-			if !assert.Equal(t, test.out, out.String()) {
+			// normalize path format for windows
+			actualNorm := strings.Replace(
+				strings.Replace(out.String(), "\\", "/", -1),
+				"//", "/", -1)
+
+			expectedOut := strings.Replace(test.out, "${baseDir}", baseDir, -1)
+			expectedNormalized := strings.Replace(expectedOut, "\\", "/", -1)
+
+			if !assert.Equal(t, expectedNormalized, strings.TrimSpace(actualNorm)) {
 				t.FailNow()
 			}
 
@@ -355,7 +361,7 @@ kind: Deployment
 				t.FailNow()
 			}
 
-			actualOpenAPI, err := ioutil.ReadFile(f.Name())
+			actualOpenAPI, err := ioutil.ReadFile(f)
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
@@ -367,3 +373,74 @@ kind: Deployment
 		})
 	}
 }
+
+func TestDeleteSetterSubPackages(t *testing.T) {
+	var tests = []struct {
+		name        string
+		dataset     string
+		packagePath string
+		args        []string
+		expected    string
+	}{
+		{
+			name:    "delete-setter-recurse-subpackages",
+			dataset: "dataset-with-setters",
+			args:    []string{"namespace", "-R"},
+			expected: `
+deleted setter "namespace" in package "${baseDir}/mysql"
+
+setter "namespace" does not exist in package "${baseDir}/mysql/nosetters"
+
+deleted setter "namespace" in package "${baseDir}/mysql/storage"
+`,
+		},
+		{
+			name:        "delete-setter-top-level-pkg-no-recurse-subpackages",
+			dataset:     "dataset-with-setters",
+			packagePath: "mysql",
+			args:        []string{"namespace"},
+			expected:    `deleted setter "namespace" in package "${baseDir}/mysql"`,
+		},
+		{
+			name:        "delete-setter-nested-pkg-no-recurse-subpackages",
+			dataset:     "dataset-with-setters",
+			packagePath: "mysql/storage",
+			args:        []string{"namespace"},
+			expected:    `deleted setter "namespace" in package "${baseDir}/mysql/storage"`,
+		},
+	}
+	for i := range tests {
+		test := tests[i]
+		t.Run(test.name, func(t *testing.T) {
+			// reset the openAPI afterward
+			openapi.ResetOpenAPI()
+			defer openapi.ResetOpenAPI()
+			sourceDir := filepath.Join("test", "testdata", test.dataset)
+			baseDir, err := ioutil.TempDir("", "")
+			if !assert.NoError(t, err) {
+				t.FailNow()
+			}
+			copyutil.CopyDir(sourceDir, baseDir)
+			//defer os.RemoveAll(baseDir)
+			runner := commands.NewDeleteSetterRunner("")
+			actual := &bytes.Buffer{}
+			runner.Command.SetOut(actual)
+			runner.Command.SetArgs(append([]string{filepath.Join(baseDir, test.packagePath)}, test.args...))
+			err = runner.Command.Execute()
+			if !assert.NoError(t, err) {
+				t.FailNow()
+			}
+
+			// normalize path format for windows
+			actualNormalized := strings.Replace(
+				strings.Replace(actual.String(), "\\", "/", -1),
+				"//", "/", -1)
+
+			expected := strings.Replace(test.expected, "${baseDir}", baseDir, -1)
+			expectedNormalized := strings.Replace(expected, "\\", "/", -1)
+			if !assert.Equal(t, strings.TrimSpace(expectedNormalized), strings.TrimSpace(actualNormalized)) {
+				t.FailNow()
+			}
+		})
+	}
+}