From 32bf962511d6577aaad56d35de9cf271d01a0518 Mon Sep 17 00:00:00 2001 From: Edward Sun Date: Sat, 29 May 2021 11:01:37 -0700 Subject: [PATCH 1/2] fixed default for max_throughput --- mmv1/products/vpcaccess/api.yaml | 5 +- .../resource_vpc_access_connector_test.go.erb | 69 +++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 mmv1/third_party/terraform/tests/resource_vpc_access_connector_test.go.erb diff --git a/mmv1/products/vpcaccess/api.yaml b/mmv1/products/vpcaccess/api.yaml index 49ca0fe63ac3..24e71e5faa1c 100644 --- a/mmv1/products/vpcaccess/api.yaml +++ b/mmv1/products/vpcaccess/api.yaml @@ -119,9 +119,10 @@ objects: name: maxThroughput # The API documentation says this will default to 200, but when I tried that I got an error that the minimum # throughput must be lower than the maximum. The console defaults to 1000, so I changed it to that. + # API returns 300 if it is not sent description: | - Maximum throughput of the connector in Mbps, must be greater than `min_throughput`. Default is 1000. - default_value: 1000 + Maximum throughput of the connector in Mbps, must be greater than `min_throughput`. Default is 300. + default_value: 300 - !ruby/object:Api::Type::String name: 'selfLink' description: | diff --git a/mmv1/third_party/terraform/tests/resource_vpc_access_connector_test.go.erb b/mmv1/third_party/terraform/tests/resource_vpc_access_connector_test.go.erb new file mode 100644 index 000000000000..3e5a8a74cfec --- /dev/null +++ b/mmv1/third_party/terraform/tests/resource_vpc_access_connector_test.go.erb @@ -0,0 +1,69 @@ +<% autogen_exception -%> +package google +<% unless version == 'ga' -%> + +package google + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" +) + +func TestAccVPCAccessConnector_vpcAccessConnectorThroughput(t *testing.T) { + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": randString(t, 10), + } + + vcrTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProvidersOiCS, + CheckDestroy: testAccCheckVPCAccessConnectorDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccVPCAccessConnector_vpcAccessConnectorThroughput(context), + }, + { + ResourceName: "google_vpc_access_connector.connector", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +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 + } + machine_type = "e2-standard-4" + min_instances = 2 + max_instances = 3 + region = "us-central1" +} + +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) +} + +<% else %> +// Magic Modules doesn't let us remove files - blank out beta-only common-compile files for now. +<% end -%> From fbd158ac3b862f396981f2927633a5f132af32c7 Mon Sep 17 00:00:00 2001 From: Edward Sun Date: Wed, 2 Jun 2021 04:50:42 -0700 Subject: [PATCH 2/2] updated a test --- .../terraform/tests/resource_vpc_access_connector_test.go.erb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mmv1/third_party/terraform/tests/resource_vpc_access_connector_test.go.erb b/mmv1/third_party/terraform/tests/resource_vpc_access_connector_test.go.erb index 3e5a8a74cfec..d0dc5918167d 100644 --- a/mmv1/third_party/terraform/tests/resource_vpc_access_connector_test.go.erb +++ b/mmv1/third_party/terraform/tests/resource_vpc_access_connector_test.go.erb @@ -2,8 +2,6 @@ package google <% unless version == 'ga' -%> -package google - import ( "testing" @@ -64,6 +62,4 @@ resource "google_compute_network" "custom_test" { `, context) } -<% else %> -// Magic Modules doesn't let us remove files - blank out beta-only common-compile files for now. <% end -%>