google_vpc_access_connector missing GA args (#6718)

GoogleCloudPlatform · Oct 19, 2022 · a07f43d · a07f43d
1 parent 26e01ae
commit a07f43d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 21 deletions.
diff --git a/mmv1/products/vpcaccess/api.yaml b/mmv1/products/vpcaccess/api.yaml
@@ -99,7 +99,6 @@ objects:
         description: |
           Machine type of VM Instance underlying connector. Default is e2-micro
         default_value: e2-micro
-        min_version: beta
       - !ruby/object:Api::Type::Integer
         name: minThroughput
         description: |
@@ -109,12 +108,10 @@ objects:
         name: minInstances
         description: |
           Minimum value of instances in autoscaling group underlying the connector.
-        min_version: beta
       - !ruby/object:Api::Type::Integer
         name: maxInstances
         description: |
           Maximum value of instances in autoscaling group underlying the connector.
-        min_version: beta
       - !ruby/object:Api::Type::Integer
         name: maxThroughput
         # The API documentation says this will default to 200, but when I tried that I got an error that the minimum
@@ -131,7 +128,6 @@ objects:
       - !ruby/object:Api::Type::NestedObject
         name: 'subnet'
         input: true
-        min_version: beta
         description: |
           The subnet in which to house the connector
         properties:
@@ -144,10 +140,8 @@ objects:
               - network
               - subnet.0.name
             input: true
-            min_version: beta
           - !ruby/object:Api::Type::String
             name: 'projectId'
             description: |
               Project in which the subnet exists. If not set, this project is assumed to be the project for which the connector create request was issued.
             input: true
-            min_version: beta
diff --git a/mmv1/products/vpcaccess/terraform.yaml b/mmv1/products/vpcaccess/terraform.yaml
@@ -24,7 +24,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       - !ruby/object:Provider::Terraform::Examples
         name: "vpc_access_connector_shared_vpc"
         primary_resource_id: "connector"
-        min_version: beta
         vars:
           name: "vpc-con"
     custom_code: !ruby/object:Provider::Terraform::CustomCode

diff --git a/mmv1/templates/terraform/examples/vpc_access_connector_shared_vpc.tf.erb b/mmv1/templates/terraform/examples/vpc_access_connector_shared_vpc.tf.erb
@@ -1,5 +1,4 @@
 resource "google_vpc_access_connector" "connector" {
-  provider      = google-beta
   name          = "<%= ctx[:vars]['name'] %>"
   subnet {
     name = google_compute_subnetwork.custom_test.name
@@ -8,15 +7,13 @@ resource "google_vpc_access_connector" "connector" {
 }
 
 resource "google_compute_subnetwork" "custom_test" {
-  provider      = google-beta
   name          = "<%= ctx[:vars]['name'] %>"
   ip_cidr_range = "10.2.0.0/28"
   region        = "us-central1"
   network       = google_compute_network.custom_test.id
 }
 
 resource "google_compute_network" "custom_test" {
-  provider                = google-beta
   name                    = "<%= ctx[:vars]['name'] %>"
   auto_create_subnetworks = false
 }
diff --git a/...resource_vpc_access_connector_test.go.erb → ...sts/resource_vpc_access_connector_test.go b/...resource_vpc_access_connector_test.go.erb → ...sts/resource_vpc_access_connector_test.go
@@ -1,6 +1,4 @@
-<% autogen_exception -%>
 package google
-<% unless version == 'ga' -%>
 
 import (
 	"testing"
@@ -17,16 +15,16 @@ func TestAccVPCAccessConnector_vpcAccessConnectorThroughput(t *testing.T) {
 
 	vcrTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProvidersOiCS,
+		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckVPCAccessConnectorDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccVPCAccessConnector_vpcAccessConnectorThroughput(context),
 			},
 			{
-				ResourceName:            "google_vpc_access_connector.connector",
-				ImportState:             true,
-				ImportStateVerify:       true,
+				ResourceName:      "google_vpc_access_connector.connector",
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})
@@ -35,7 +33,6 @@ func TestAccVPCAccessConnector_vpcAccessConnectorThroughput(t *testing.T) {
 func testAccVPCAccessConnector_vpcAccessConnectorThroughput(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_vpc_access_connector" "connector" {
-  provider      = google-beta
   name          = "tf-test-vpc-con%{random_suffix}"
   subnet {
     name = google_compute_subnetwork.custom_test.name
@@ -47,19 +44,15 @@ resource "google_vpc_access_connector" "connector" {
 }
 
 resource "google_compute_subnetwork" "custom_test" {
-  provider      = google-beta
   name          = "tf-test-vpc-con%{random_suffix}"
   ip_cidr_range = "10.2.0.0/28"
   region        = "us-central1"
   network       = google_compute_network.custom_test.id
 }
 
 resource "google_compute_network" "custom_test" {
-  provider                = google-beta
   name                    = "tf-test-vpc-con%{random_suffix}"
   auto_create_subnetworks = false
 }
 `, context)
 }
-
-<% end -%>