From 13951f3313aa9cc710039ea44ab0c8d874860633 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Wed, 19 Oct 2022 19:57:05 +0000 Subject: [PATCH] google_vpc_access_connector missing GA args (#6718) Signed-off-by: Modular Magician --- .changelog/6718.txt | 3 +++ ...esource_vpc_access_connector_generated_test.go | 5 +---- google-beta/resource_vpc_access_connector_test.go | 5 +---- website/docs/r/vpc_access_connector.html.markdown | 15 ++++++--------- 4 files changed, 11 insertions(+), 17 deletions(-) create mode 100644 .changelog/6718.txt diff --git a/.changelog/6718.txt b/.changelog/6718.txt new file mode 100644 index 0000000000..8117906275 --- /dev/null +++ b/.changelog/6718.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +vpcaccess - promoted `machine_type`, `min_instances`, `max_instances`, and `subnet` in `google_vpc_access_connector` to GA +``` diff --git a/google-beta/resource_vpc_access_connector_generated_test.go b/google-beta/resource_vpc_access_connector_generated_test.go index 96062a9dd0..cb440e8b4b 100644 --- a/google-beta/resource_vpc_access_connector_generated_test.go +++ b/google-beta/resource_vpc_access_connector_generated_test.go @@ -67,7 +67,7 @@ func TestAccVPCAccessConnector_vpcAccessConnectorSharedVPCExample(t *testing.T) vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, + Providers: testAccProviders, CheckDestroy: testAccCheckVPCAccessConnectorDestroyProducer(t), Steps: []resource.TestStep{ { @@ -86,7 +86,6 @@ func TestAccVPCAccessConnector_vpcAccessConnectorSharedVPCExample(t *testing.T) func testAccVPCAccessConnector_vpcAccessConnectorSharedVPCExample(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 @@ -95,7 +94,6 @@ 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" @@ -103,7 +101,6 @@ resource "google_compute_subnetwork" "custom_test" { } resource "google_compute_network" "custom_test" { - provider = google-beta name = "tf-test-vpc-con%{random_suffix}" auto_create_subnetworks = false } diff --git a/google-beta/resource_vpc_access_connector_test.go b/google-beta/resource_vpc_access_connector_test.go index fc705cfaa8..938b5f792f 100644 --- a/google-beta/resource_vpc_access_connector_test.go +++ b/google-beta/resource_vpc_access_connector_test.go @@ -15,7 +15,7 @@ func TestAccVPCAccessConnector_vpcAccessConnectorThroughput(t *testing.T) { vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, + Providers: testAccProviders, CheckDestroy: testAccCheckVPCAccessConnectorDestroyProducer(t), Steps: []resource.TestStep{ { @@ -33,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 @@ -45,7 +44,6 @@ 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" @@ -53,7 +51,6 @@ resource "google_compute_subnetwork" "custom_test" { } resource "google_compute_network" "custom_test" { - provider = google-beta name = "tf-test-vpc-con%{random_suffix}" auto_create_subnetworks = false } diff --git a/website/docs/r/vpc_access_connector.html.markdown b/website/docs/r/vpc_access_connector.html.markdown index da97840ae6..fd0f1e578e 100644 --- a/website/docs/r/vpc_access_connector.html.markdown +++ b/website/docs/r/vpc_access_connector.html.markdown @@ -54,7 +54,6 @@ resource "google_vpc_access_connector" "connector" { ```hcl resource "google_vpc_access_connector" "connector" { - provider = google-beta name = "vpc-con" subnet { name = google_compute_subnetwork.custom_test.name @@ -63,7 +62,6 @@ resource "google_vpc_access_connector" "connector" { } resource "google_compute_subnetwork" "custom_test" { - provider = google-beta name = "vpc-con" ip_cidr_range = "10.2.0.0/28" region = "us-central1" @@ -71,7 +69,6 @@ resource "google_compute_subnetwork" "custom_test" { } resource "google_compute_network" "custom_test" { - provider = google-beta name = "vpc-con" auto_create_subnetworks = false } @@ -99,7 +96,7 @@ The following arguments are supported: The range of internal addresses that follows RFC 4632 notation. Example: `10.132.0.0/28`. * `machine_type` - - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) + (Optional) Machine type of VM Instance underlying connector. Default is e2-micro * `min_throughput` - @@ -107,11 +104,11 @@ The following arguments are supported: Minimum throughput of the connector in Mbps. Default and min is 200. * `min_instances` - - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) + (Optional) Minimum value of instances in autoscaling group underlying the connector. * `max_instances` - - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) + (Optional) Maximum value of instances in autoscaling group underlying the connector. * `max_throughput` - @@ -119,7 +116,7 @@ The following arguments are supported: Maximum throughput of the connector in Mbps, must be greater than `min_throughput`. Default is 300. * `subnet` - - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) + (Optional) The subnet in which to house the connector Structure is [documented below](#nested_subnet). @@ -134,12 +131,12 @@ The following arguments are supported: The `subnet` block supports: * `name` - - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) + (Optional) Subnet name (relative, not fully qualified). E.g. if the full subnet selfLink is https://compute.googleapis.com/compute/v1/projects/{project}/regions/{region}/subnetworks/{subnetName} the correct input for this field would be {subnetName}" * `project_id` - - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) + (Optional) 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. ## Attributes Reference