fix more tests

GoogleCloudPlatform · Sep 21, 2023 · e06b8e5 · e06b8e5
1 parent 198903c
commit e06b8e5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/mmv1/products/gkehub/Membership.yaml b/mmv1/products/gkehub/Membership.yaml
@@ -60,6 +60,11 @@ examples:
     vars:
       name: 'basic'
       cluster_name: 'basiccluster'
+      deletion_protection: 'true'
+    test_vars_overrides:
+      deletion_protection: 'false'
+    oics_vars_overrides:
+      deletion_protection: 'false'
   - !ruby/object:Provider::Terraform::Examples
     name: 'gkehub_membership_issuer'
     primary_resource_id: 'membership'

diff --git a/mmv1/third_party/terraform/services/container/data_source_google_container_cluster_test.go b/mmv1/third_party/terraform/services/container/data_source_google_container_cluster_test.go
@@ -26,6 +26,7 @@ func TestAccContainerClusterDatasource_zonal(t *testing.T) {
 							"enable_autopilot":             {},
 							"enable_tpu":                   {},
 							"pod_security_policy_config.#": {},
+							"deletion_protection":          {},
 						},
 					),
 				),
@@ -52,6 +53,7 @@ func TestAccContainerClusterDatasource_regional(t *testing.T) {
 							"enable_autopilot":             {},
 							"enable_tpu":                   {},
 							"pod_security_policy_config.#": {},
+							"deletion_protection":          {},
 						},
 					),
 				),

diff --git a/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb b/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.erb
@@ -171,6 +171,9 @@ func TestAccContainerCluster_withDeletionProtection(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"deletion_protection"},
 			},
+			{
+				Config: testAccContainerCluster_withDeletionProtection(clusterName, "true"),
+			},
 			{
 				Config: testAccContainerCluster_withDeletionProtection(clusterName, "true"),
 				Destroy:     true,
@@ -4982,7 +4985,7 @@ func TestAccContainerCluster_withPrivateEndpointSubnetwork(t *testing.T) {
 				ResourceName:				"google_container_cluster.with_private_endpoint_subnetwork",
 				ImportState:				true,
 				ImportStateVerify:			true,
-				ImportStateVerifyIgnore:	[]string{"min_master_version"},
+				ImportStateVerifyIgnore:	[]string{"min_master_version", "deletion_protection"},
 			},
 		},
 	})
@@ -5969,6 +5972,7 @@ func testAccContainerCluster_withNodePoolBasic(cluster, nodePool string) string
 resource "google_container_cluster" "with_node_pool" {
   name     = "%s"
   location = "us-central1-a"
+  deletion_protection = false
 
   node_pool {
     name               = "%s"