fixed default for max_throughput (#4823) (#3294)

* fixed default for max_throughput * updated a test Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jun 2, 2021 · 492da84 · 492da84
1 parent fbb7844
commit 492da84
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 5 deletions.
diff --git a/.changelog/4823.txt b/.changelog/4823.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+vpcaccess: fixed permadiff when `max_throughput` is not set on `google_vpc_access_connector`
+```
diff --git a/google-beta/resource_dataproc_cluster_test.go b/google-beta/resource_dataproc_cluster_test.go
@@ -13,9 +13,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"google.golang.org/api/googleapi"
-
 	dataproc "google.golang.org/api/dataproc/v1beta2"
+	"google.golang.org/api/googleapi"
 )
 
 func TestDataprocExtractInitTimeout(t *testing.T) {

diff --git a/google-beta/resource_vpc_access_connector.go b/google-beta/resource_vpc_access_connector.go
@@ -73,8 +73,8 @@ func resourceVPCAccessConnector() *schema.Resource {
 				Optional:     true,
 				ForceNew:     true,
 				ValidateFunc: validation.IntBetween(200, 1000),
-				Description:  `Maximum throughput of the connector in Mbps, must be greater than 'min_throughput'. Default is 1000.`,
-				Default:      1000,
+				Description:  `Maximum throughput of the connector in Mbps, must be greater than 'min_throughput'. Default is 300.`,
+				Default:      300,
 			},
 			"min_instances": {
 				Type:        schema.TypeInt,

diff --git a/google-beta/resource_vpc_access_connector_test.go b/google-beta/resource_vpc_access_connector_test.go
@@ -0,0 +1,61 @@
+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)
+}
diff --git a/website/docs/r/vpc_access_connector.html.markdown b/website/docs/r/vpc_access_connector.html.markdown
@@ -118,7 +118,7 @@ The following arguments are supported:
 
 * `max_throughput` -
   (Optional)
-  Maximum throughput of the connector in Mbps, must be greater than `min_throughput`. Default is 1000.
+  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))