Fix secret type nil bug and add test case #182

kbst · Jun 2, 2022 · 8274dfe · 8274dfe
1 parent 7826652
commit 8274dfe
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/kustomize/resource_kustomization.go b/kustomize/resource_kustomization.go
@@ -91,6 +91,7 @@ func kustomizationResourceCreate(d *schema.ResourceData, m interface{}) error {
 	// wait for service account to exist
 	// https://github.com/kubernetes/kubernetes/issues/109401
 	if (u.GetKind() == "Secret") &&
+		(u.UnstructuredContent()["type"] != nil) &&
 		(u.UnstructuredContent()["type"].(string) == string(k8scorev1.SecretTypeServiceAccountToken)) {
 
 		annotations := u.GetAnnotations()

diff --git a/kustomize/resource_kustomization_test.go b/kustomize/resource_kustomization_test.go
@@ -674,8 +674,9 @@ func TestAccResourceKustomization_secretSAToken(t *testing.T) {
 				Config: testAccResourceKustomizationConfig_secretSAToken("test_kustomizations/secret_service_account_token"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet("kustomization_resource.ns", "id"),
-					resource.TestCheckResourceAttrSet("kustomization_resource.sec", "id"),
-					testAccCheckManifestAnnotation("kustomization_resource.sec", "kubernetes.io/service-account.name", "test-sa"),
+					resource.TestCheckResourceAttrSet("kustomization_resource.sec_sa_token", "id"),
+					testAccCheckManifestAnnotation("kustomization_resource.sec_sa_token", "kubernetes.io/service-account.name", "test-sa"),
+					resource.TestCheckResourceAttrSet("kustomization_resource.sec_default", "id"),
 					resource.TestCheckResourceAttrSet("kustomization_resource.sa", "id"),
 				),
 			},
@@ -689,10 +690,14 @@ resource "kustomization_resource" "ns" {
 	manifest = data.kustomization_build.test.manifests["_/Namespace/_/test-secret-sa-token"]
 }
 
-resource "kustomization_resource" "sec" {
+resource "kustomization_resource" "sec_sa_token" {
 	manifest = data.kustomization_build.test.manifests["_/Secret/test-secret-sa-token/test-sa-token"]
 }
 
+resource "kustomization_resource" "sec_default" {
+	manifest = data.kustomization_build.test.manifests["_/Secret/test-secret-sa-token/test"]
+}
+
 resource "time_sleep" "garbage_collection" {
 	create_duration = "5s"
 }

diff --git a/kustomize/test_kustomizations/secret_service_account_token/Kustomization b/kustomize/test_kustomizations/secret_service_account_token/Kustomization
@@ -5,5 +5,6 @@ namespace: test-secret-sa-token
 
 resources:
 - namespace.yaml
-- secret.yaml
+- secret_default.yaml
+- secret_sa_token.yaml
 - service_account.yaml
diff --git a/kustomize/test_kustomizations/secret_service_account_token/secret_default.yaml b/kustomize/test_kustomizations/secret_service_account_token/secret_default.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: test
+  namespace: test-secret-sa-token
diff --git a/.../secret_service_account_token/secret.yaml → ...ervice_account_token/secret_sa_token.yaml b/.../secret_service_account_token/secret.yaml → ...ervice_account_token/secret_sa_token.yaml