chore: add extra tests as requested in code review

Include tests to cover more scenarios as requested via code review.
kubernetes-sigs · Nov 28, 2023 · 8dd9328 · 8dd9328
1 parent 4fa894e
commit 8dd9328
Show file tree

Hide file tree

Showing 2 changed files with 162 additions and 60 deletions.
diff --git a/kustomize/commands/edit/remove/removeconfigmap_test.go b/kustomize/commands/edit/remove/removeconfigmap_test.go
@@ -13,9 +13,6 @@ import (
 )
 
 func TestRemoveConfigMap(t *testing.T) {
-	const configMapName01 = "example-configmap-01"
-	const configMapName02 = "example-configmap-02"
-
 	tests := map[string]struct {
 		input          string
 		args           []string
@@ -28,11 +25,11 @@ func TestRemoveConfigMap(t *testing.T) {
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 configMapGenerator:
-- name: %s
+- name: test-cm-1
   files:
   - application.properties
-`, configMapName01),
-			args: []string{configMapName01},
+`),
+			args: []string{"test-cm-1"},
 			expectedOutput: `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -43,54 +40,57 @@ kind: Kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 configMapGenerator:
-- name: %s
+- name: test-cm-1
   files:
   - application.properties
-- name: %s
+- name: test-cm-2
   files:
   - application.properties
-`, configMapName01, configMapName02),
+`),
 			args: []string{
-				fmt.Sprintf("%s,%s", configMapName01, configMapName02),
+				fmt.Sprintf("test-cm-1,test-cm-2"),
 			},
 			expectedOutput: `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 `,
 		},
-		"fails when single configmap name is specified and doesn't exist": {
+		"removes a configmap successfully when single configmap name is specified, it exists, but is not the only configmap present": {
 			input: fmt.Sprintf(`
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 configMapGenerator:
-- name: %s
+- name: test-cm-1
+  namespace: test-ns
   files:
   - application.properties
-`, configMapName01),
-			args:        []string{"foo"},
-			wantErr:     true,
-			expectedErr: "no specified configmap(s) were found",
-		},
-		"fails when no configmap name is specified": {
-			args:        []string{},
-			wantErr:     true,
-			expectedErr: "at least one configmap name must be specified",
-		},
-		"fails when too many configmap names are specified": {
-			args:        []string{"test1", "test2"},
-			wantErr:     true,
-			expectedErr: "too many arguments",
+- name: test-cm-2
+  namespace: default
+  literals:
+  - test-key=test-value
+`),
+			args:    []string{"test-cm-1", "--namespace=test-ns"},
+			wantErr: false,
+			expectedOutput: `
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+configMapGenerator:
+- literals:
+  - test-key=test-value
+  name: test-cm-2
+  namespace: default
+`,
 		},
 		"succeeds when one configmap name exists and one doesn't exist": {
 			input: fmt.Sprintf(`
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 configMapGenerator:
-- name: %s
+- name: test-cm-1
   files:
   - application.properties
-`, configMapName01),
-			args: []string{fmt.Sprintf("%s,%s", configMapName01, "foo")},
+`),
+			args: []string{fmt.Sprintf("test-cm-1,foo")},
 			expectedOutput: `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -146,6 +146,58 @@ kind: Kustomization
 			wantErr: false,
 			args:    []string{"test-cm", "--namespace=default"},
 		},
+		"fails when single configmap name is specified and doesn't exist": {
+			input: fmt.Sprintf(`
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+configMapGenerator:
+- name: test-cm-1
+  files:
+  - application.properties
+`),
+			args:        []string{"foo"},
+			wantErr:     true,
+			expectedErr: "no specified configmap(s) were found",
+		},
+		"fails when single configmap name is specified and doesn't exist in the specified namespace": {
+			input: fmt.Sprintf(`
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+configMapGenerator:
+- name: test-cm-1
+  namespace: test-ns
+  files:
+  - application.properties
+`),
+			args:        []string{"test-cm-1"},
+			wantErr:     true,
+			expectedErr: "no specified configmap(s) were found",
+		},
+
+		"fails when single configmap name is specified and doesn't exist in the specified namespace, and neither namespace is the default one": {
+			input: fmt.Sprintf(`
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+configMapGenerator:
+- name: test-cm-1
+  namespace: test-ns
+  files:
+  - application.properties
+`),
+			args:        []string{"test-cm-1", "--namespace=other-ns"},
+			wantErr:     true,
+			expectedErr: "no specified configmap(s) were found",
+		},
+		"fails when no configmap name is specified": {
+			args:        []string{},
+			wantErr:     true,
+			expectedErr: "at least one configmap name must be specified",
+		},
+		"fails when too many configmap names are specified": {
+			args:        []string{"test1", "test2"},
+			wantErr:     true,
+			expectedErr: "too many arguments",
+		},
 	}
 
 	for name, tc := range tests {

diff --git a/kustomize/commands/edit/remove/removesecret_test.go b/kustomize/commands/edit/remove/removesecret_test.go
@@ -13,9 +13,6 @@ import (
 )
 
 func TestRemoveSecret(t *testing.T) {
-	const secretName01 = "example-secret-01"
-	const secretName02 = "example-secret-02"
-
 	tests := map[string]struct {
 		input          string
 		args           []string
@@ -28,11 +25,11 @@ func TestRemoveSecret(t *testing.T) {
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 secretGenerator:
-- name: %s
+- name: test-secret-1
   files:
   - longsecret.txt
-`, secretName01),
-			args: []string{secretName01},
+`),
+			args: []string{"test-secret-1"},
 			expectedOutput: `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -43,54 +40,55 @@ kind: Kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 secretGenerator:
-- name: %s
+- name: test-secret-1
   files:
   - longsecret.txt
-- name: %s
+- name: test-secret-2
   files:
   - longsecret.txt
-`, secretName01, secretName02),
-			args: []string{
-				fmt.Sprintf("%s,%s", secretName01, secretName02),
-			},
+`),
+			args: []string{"test-secret-1,test-secret-2"},
 			expectedOutput: `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 `,
 		},
-		"fails when single secret name is specified and doesn't exist": {
+		"removes a secret successfully when single secret name is specified, it exists, but is not the only secret present": {
 			input: fmt.Sprintf(`
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 secretGenerator:
-- name: %s
+- name: test-secret-1
+  namespace: test-ns
   files:
   - longsecret.txt
-`, secretName01),
-			args:        []string{"foo"},
-			wantErr:     true,
-			expectedErr: "no specified secret(s) were found",
-		},
-		"fails when no secret name is specified": {
-			args:        []string{},
-			wantErr:     true,
-			expectedErr: "at least one secret name must be specified",
-		},
-		"fails when too many secret names are specified": {
-			args:        []string{"test1", "test2"},
-			wantErr:     true,
-			expectedErr: "too many arguments",
+- name: test-secret-2
+  namespace: default
+  literals:
+  - test-key=test-secret
+`),
+			args:    []string{"test-secret-1", "--namespace=test-ns"},
+			wantErr: false,
+			expectedOutput: `
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+secretGenerator:
+- literals:
+  - test-key=test-secret
+  name: test-secret-2
+  namespace: default
+`,
 		},
 		"succeeds when one secret name exists and one doesn't exist": {
 			input: fmt.Sprintf(`
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 secretGenerator:
-- name: %s
+- name: test-secret-1
   files:
   - application.properties
-`, secretName01),
-			args: []string{fmt.Sprintf("%s,%s", secretName01, "foo")},
+`),
+			args: []string{"test-secret-1,test-secret-2"},
 			expectedOutput: `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -145,6 +143,58 @@ kind: Kustomization
 			wantErr: false,
 			args:    []string{"test-secret", "--namespace=default"},
 		},
+		"fails when single secret name is specified and doesn't exist": {
+			input: fmt.Sprintf(`
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+secretGenerator:
+- name: test-secret-1
+  files:
+  - longsecret.txt
+`),
+			args:        []string{"foo"},
+			wantErr:     true,
+			expectedErr: "no specified secret(s) were found",
+		},
+		"fails when single secret name is specified and doesn't exist in the specified namespace": {
+			input: fmt.Sprintf(`
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+secretGenerator:
+- name: test-secret-1
+  namespace: test-ns
+  files:
+  - longsecret.txt
+`),
+			args:        []string{"test-secret-1"},
+			wantErr:     true,
+			expectedErr: "no specified secret(s) were found",
+		},
+
+		"fails when single secret name is specified and doesn't exist in the specified namespace, and neither namespace is the default one": {
+			input: fmt.Sprintf(`
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+secretGenerator:
+- name: test-secret-1
+  namespace: test-ns
+  files:
+  - longsecret.txt
+`),
+			args:        []string{"test-secret-1", "--namespace=other-ns"},
+			wantErr:     true,
+			expectedErr: "no specified secret(s) were found",
+		},
+		"fails when no secret name is specified": {
+			args:        []string{},
+			wantErr:     true,
+			expectedErr: "at least one secret name must be specified",
+		},
+		"fails when too many secret names are specified": {
+			args:        []string{"test1", "test2"},
+			wantErr:     true,
+			expectedErr: "too many arguments",
+		},
 	}
 
 	for name, tc := range tests {