Promote Server Tls Policy to V1 (GoogleCloudPlatform#11538)

Co-authored-by: Stephen Lewis (Burrows) <[email protected]>
iyabchen · Sep 14, 2024 · f88c600 · f88c600
1 parent 08e8686
commit f88c600
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 22 deletions.
diff --git a/mmv1/products/networksecurity/ServerTlsPolicy.yaml b/mmv1/products/networksecurity/ServerTlsPolicy.yaml
@@ -15,7 +15,6 @@
 name: 'ServerTlsPolicy'
 base_url: 'projects/{{project}}/locations/{{location}}/serverTlsPolicies'
 create_url: 'projects/{{project}}/locations/{{location}}/serverTlsPolicies?serverTlsPolicyId={{name}}'
-min_version: beta
 update_verb: :PATCH
 update_mask: true
 description: |
@@ -47,26 +46,21 @@ import_format:
   ['projects/{{project}}/locations/{{location}}/serverTlsPolicies/{{name}}']
 examples:
   - !ruby/object:Provider::Terraform::Examples
-    min_version: beta
     name: 'network_security_server_tls_policy_basic'
-    skip_vcr: true
     primary_resource_id: 'default'
     vars:
       resource_name: 'my-server-tls-policy'
   - !ruby/object:Provider::Terraform::Examples
-    min_version: beta
     name: 'network_security_server_tls_policy_advanced'
     primary_resource_id: 'default'
     vars:
       resource_name: 'my-server-tls-policy'
   - !ruby/object:Provider::Terraform::Examples
-    min_version: beta
     name: 'network_security_server_tls_policy_server_cert'
     primary_resource_id: 'default'
     vars:
       resource_name: 'my-server-tls-policy'
   - !ruby/object:Provider::Terraform::Examples
-    min_version: beta
     name: 'network_security_server_tls_policy_mtls'
     primary_resource_id: 'default'
     vars:

diff --git a/mmv1/templates/terraform/examples/network_security_server_tls_policy_advanced.tf.erb b/mmv1/templates/terraform/examples/network_security_server_tls_policy_advanced.tf.erb
@@ -1,5 +1,4 @@
 resource "google_network_security_server_tls_policy" "<%= ctx[:primary_resource_id] %>" {
-  provider               = google-beta
   name                   = "<%= ctx[:vars]['resource_name'] %>"
   labels                 = {
     foo = "bar"

diff --git a/mmv1/templates/terraform/examples/network_security_server_tls_policy_basic.tf.erb b/mmv1/templates/terraform/examples/network_security_server_tls_policy_basic.tf.erb
@@ -1,5 +1,4 @@
 resource "google_network_security_server_tls_policy" "<%= ctx[:primary_resource_id] %>" {
-  provider               = google-beta
   name                   = "<%= ctx[:vars]['resource_name'] %>"
   labels                 = {
     foo = "bar"
@@ -17,16 +16,6 @@ resource "google_network_security_server_tls_policy" "<%= ctx[:primary_resource_
         target_uri = "unix:mypath"
       }
     }
-    client_validation_ca {
-      grpc_endpoint {
-        target_uri = "unix:abc/mypath"
-      }
-    }
-    client_validation_ca {
-      certificate_provider_instance {
-        plugin_instance = "google_cloud_private_spiffe"
-      }
-    }
   }
 }
 
diff --git a/mmv1/templates/terraform/examples/network_security_server_tls_policy_mtls.tf.erb b/mmv1/templates/terraform/examples/network_security_server_tls_policy_mtls.tf.erb
@@ -1,9 +1,7 @@
 data "google_project" "project" {
-  provider = google-beta
 }
 
 resource "google_network_security_server_tls_policy" "<%= ctx[:primary_resource_id] %>" {
-  provider = google-beta
   name     = "<%= ctx[:vars]['resource_name'] %>"
 
   description = "my description"
@@ -21,7 +19,6 @@ resource "google_network_security_server_tls_policy" "<%= ctx[:primary_resource_
 }
 
 resource "google_certificate_manager_trust_config" "default" {
-  provider    = google-beta
   name        = "<%= ctx[:vars]['trust_config_name'] %>"
   description = "sample trust config description"
   location    = "global"

diff --git a/mmv1/templates/terraform/examples/network_security_server_tls_policy_server_cert.tf.erb b/mmv1/templates/terraform/examples/network_security_server_tls_policy_server_cert.tf.erb
@@ -1,5 +1,4 @@
 resource "google_network_security_server_tls_policy" "<%= ctx[:primary_resource_id] %>" {
-  provider               = google-beta
   name                   = "<%= ctx[:vars]['resource_name'] %>"
   labels                 = {
     foo = "bar"