Promote enable_confidential_storage from beta to GA

GoogleCloudPlatform · Feb 15, 2024 · f469948 · f469948
1 parent 56fb584
commit f469948
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 11 deletions.
diff --git a/mmv1/third_party/terraform/services/container/node_config.go.erb b/mmv1/third_party/terraform/services/container/node_config.go.erb
@@ -675,14 +675,12 @@ func schemaNodeConfig() *schema.Schema {
 						},
 					},
 				},
-				<% unless version == 'ga' -%>
 				"enable_confidential_storage": {
 						Type:     schema.TypeBool,
 						Optional: true,
 						ForceNew: true,
 						Description: `If enabled boot disks are configured with confidential mode.`,
 				},
-				<% end -%>
 			},
 		},
 	}
@@ -969,11 +967,9 @@ func expandNodeConfig(v interface{}) *container.NodeConfig {
 		nc.SoleTenantConfig = expandSoleTenantConfig(v)
 	}
 
-	<% unless version == 'ga' -%>
 	if v,ok := nodeConfig["enable_confidential_storage"]; ok {
 		nc.EnableConfidentialStorage = v.(bool)
 	}
-	<% end -%>
 
 	<% unless version == "ga" -%>
 	if v, ok := nodeConfig["host_maintenance_policy"]; ok {
@@ -1213,9 +1209,7 @@ func flattenNodeConfig(c *container.NodeConfig, v interface{}) []map[string]inte
 		"advanced_machine_features": flattenAdvancedMachineFeaturesConfig(c.AdvancedMachineFeatures),
 		"sole_tenant_config":        flattenSoleTenantConfig(c.SoleTenantConfig),
 		"fast_socket":               flattenFastSocket(c.FastSocket),
-	<% unless version == 'ga' -%>		
 		"enable_confidential_storage": c.EnableConfidentialStorage,
-	<% end -%>
 	})
 
 	if len(c.OauthScopes) > 0 {

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
@@ -9352,7 +9352,6 @@ func testAccContainerCluster_additional_pod_ranges_config(name string, nameCount
 	`, name, name, name, aprc)
 }
 
-<% unless version == 'ga' -%>
 func TestAccContainerCluster_withConfidentialBootDisk(t *testing.T) {
 	t.Parallel()
 
@@ -9521,7 +9520,6 @@ resource "google_container_cluster" "without_confidential_boot_disk" {
 }
 `, clusterName, npName, networkName, subnetworkName)
 }
-<% end -%>
 
 <% unless version == 'ga' -%>
 func testAccContainerCluster_withWorkloadALTSConfig(projectID, name, networkName, subnetworkName string, enable bool) string {

diff --git a/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.erb b/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.erb
@@ -4080,8 +4080,6 @@ resource "google_container_node_pool" "np" {
 }
 <% end -%>
 
-<% unless version == 'ga' -%>
-
 func TestAccContainerNodePool_withConfidentialBootDisk(t *testing.T) {
 	t.Parallel()
 
@@ -4207,4 +4205,3 @@ resource "google_container_node_pool" "without_confidential_boot_disk" {
 }
 `, cluster, networkName, subnetworkName, np)
 }
-<% end -%>