Revert "Add Update Connector Support for VPC Access Connectors (#8205)…

…" (#8456) (#5957) This reverts commit 85ff1c21e6aaff26aafa56c47d0af03ae6aa3726. Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jul 27, 2023 · 8c5e668 · 8c5e668
1 parent 3faf150
commit 8c5e668
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 194 deletions.
diff --git a/.changelog/8456.txt b/.changelog/8456.txt
@@ -0,0 +1,6 @@
+```release-note:bug
+vpcaccess: reverted new behaviour introduced by resource `google_vpc_access_connector` in `4.75.0`. `min_throughput` and `max_throughput` fields lost their default value, and customers could not make deployment due to that change.
+```
+```release-note:note
+vpcaccess: reverted the ability to update the number of instances for resource `google_vpc_access_connector`
+```
diff --git a/google-beta/data_source_vpc_access_connector_test.go b/google-beta/data_source_vpc_access_connector_test.go
@@ -42,8 +42,6 @@ resource "google_vpc_access_connector" "connector" {
   ip_cidr_range = "10.8.0.0/28"
   network       = "default"
   region        = "us-central1"
-  min_instances = 2
-  max_instances = 3
 }
 
 data "google_vpc_access_connector" "connector" {

diff --git a/google-beta/resource_app_engine_standard_app_version_test.go b/google-beta/resource_app_engine_standard_app_version_test.go
@@ -179,8 +179,6 @@ resource "google_vpc_access_connector" "bar" {
   region = "us-central1"
   ip_cidr_range = "10.8.0.0/28"
   network = "default"
-  min_instances = 3
-  max_instances = 10
 }
 
 resource "google_app_engine_standard_app_version" "foo" {

diff --git a/google-beta/resource_cloudfunctions_function_test.go b/google-beta/resource_cloudfunctions_function_test.go
@@ -1010,8 +1010,6 @@ resource "google_vpc_access_connector" "%s" {
   region        = "us-central1"
   ip_cidr_range = "%s"
   network       = google_compute_network.vpc.name
-  min_instances = 3
-  max_instances = 10
 }
 
 resource "google_storage_bucket" "bucket" {

diff --git a/google-beta/resource_vpc_access_connector_generated_test.go b/google-beta/resource_vpc_access_connector_generated_test.go
@@ -59,10 +59,8 @@ func testAccVPCAccessConnector_vpcAccessConnectorExample(context map[string]inte
 	return acctest.Nprintf(`
 resource "google_vpc_access_connector" "connector" {
   name          = "tf-test-vpc-con%{random_suffix}"
-  ip_cidr_range = "10.18.0.0/28"
+  ip_cidr_range = "10.8.0.0/28"
   network       = "default"
-  min_instances  = 2
-  max_instances  = 3
 }
 `, context)
 }
@@ -100,8 +98,6 @@ resource "google_vpc_access_connector" "connector" {
     name = google_compute_subnetwork.custom_test.name
   }
   machine_type = "e2-standard-4"
-  min_instances = 2
-  max_instances = 3
 }
 
 resource "google_compute_subnetwork" "custom_test" {

diff --git a/google-beta/resource_vpc_access_connector_test.go b/google-beta/resource_vpc_access_connector_test.go
@@ -33,38 +33,6 @@ func TestAccVPCAccessConnector_vpcAccessConnectorThroughput(t *testing.T) {
 	})
 }
 
-func TestAccVPCAccessConnector_vpcAccessConnectorMachineAndInstancesChanged(t *testing.T) {
-	t.Parallel()
-
-	context := map[string]interface{}{
-		"random_suffix": RandString(t, 10),
-	}
-
-	VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckVPCAccessConnectorDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccVPCAccessConnector_vpcAccessConnectorThroughput(context),
-			},
-			{
-				ResourceName:      "google_vpc_access_connector.connector",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			{
-				Config: testAccVPCAccessConnector_vpcAccessConnectorMachineAndInstancesChanged(context),
-			},
-			{
-				ResourceName:      "google_vpc_access_connector.connector",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
 func testAccVPCAccessConnector_vpcAccessConnectorThroughput(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_vpc_access_connector" "connector" {
@@ -91,30 +59,3 @@ resource "google_compute_network" "custom_test" {
 }
 `, context)
 }
-
-func testAccVPCAccessConnector_vpcAccessConnectorMachineAndInstancesChanged(context map[string]interface{}) string {
-	return Nprintf(`
-resource "google_vpc_access_connector" "connector" {
-  name          = "tf-test-vpc-con%{random_suffix}"
-  subnet {
-    name = google_compute_subnetwork.custom_test.name
-  }
-  machine_type  = "e2-micro"
-  min_instances = 3
-  max_instances = 5
-  region        = "us-central1"
-}
-
-resource "google_compute_subnetwork" "custom_test" {
-  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" {
-  name                    = "tf-test-vpc-con%{random_suffix}"
-  auto_create_subnetworks = false
-}
-`, context)
-}
diff --git a/google-beta/services/vpcaccess/resource_vpc_access_connector.go b/google-beta/services/vpcaccess/resource_vpc_access_connector.go
@@ -18,31 +18,22 @@
 package vpcaccess
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"reflect"
-	"strings"
 	"time"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
 	"github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource"
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
 )
 
-// Are the number of min/max instances reduced?
-func AreInstancesReduced(_ context.Context, old, new, _ interface{}) bool {
-	return new.(int) < old.(int)
-}
-
 func ResourceVPCAccessConnector() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceVPCAccessConnectorCreate,
 		Read:   resourceVPCAccessConnectorRead,
-		Update: resourceVPCAccessConnectorUpdate,
 		Delete: resourceVPCAccessConnectorDelete,
 
 		Importer: &schema.ResourceImporter{
@@ -51,14 +42,9 @@ func ResourceVPCAccessConnector() *schema.Resource {
 
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(20 * time.Minute),
-			Update: schema.DefaultTimeout(20 * time.Minute),
 			Delete: schema.DefaultTimeout(20 * time.Minute),
 		},
 
-		CustomizeDiff: customdiff.All(
-			customdiff.ForceNewIfChange("min_instances", AreInstancesReduced),
-			customdiff.ForceNewIfChange("max_instances", AreInstancesReduced)),
-
 		Schema: map[string]*schema.Schema{
 			"name": {
 				Type:        schema.TypeString,
@@ -76,36 +62,39 @@ func ResourceVPCAccessConnector() *schema.Resource {
 			"machine_type": {
 				Type:        schema.TypeString,
 				Optional:    true,
+				ForceNew:    true,
 				Description: `Machine type of VM Instance underlying connector. Default is e2-micro`,
 				Default:     "e2-micro",
 			},
 			"max_instances": {
 				Type:        schema.TypeInt,
 				Computed:    true,
 				Optional:    true,
+				ForceNew:    true,
 				Description: `Maximum value of instances in autoscaling group underlying the connector.`,
 			},
 			"max_throughput": {
 				Type:         schema.TypeInt,
-				Computed:     true,
 				Optional:     true,
 				ForceNew:     true,
-				ValidateFunc: validation.IntBetween(300, 1000),
-				Description:  `Maximum throughput of the connector in Mbps, must be greater than 'min_throughput'. Default is 1000.`,
+				ValidateFunc: validation.IntBetween(200, 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,
 				Computed:    true,
 				Optional:    true,
+				ForceNew:    true,
 				Description: `Minimum value of instances in autoscaling group underlying the connector.`,
 			},
 			"min_throughput": {
 				Type:         schema.TypeInt,
-				Computed:     true,
 				Optional:     true,
 				ForceNew:     true,
-				ValidateFunc: validation.IntBetween(200, 900),
+				ValidateFunc: validation.IntBetween(200, 1000),
 				Description:  `Minimum throughput of the connector in Mbps. Default and min is 200.`,
+				Default:      200,
 			},
 			"network": {
 				Type:             schema.TypeString,
@@ -416,104 +405,6 @@ func resourceVPCAccessConnectorRead(d *schema.ResourceData, meta interface{}) er
 	return nil
 }
 
-func resourceVPCAccessConnectorUpdate(d *schema.ResourceData, meta interface{}) error {
-	config := meta.(*transport_tpg.Config)
-	userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)
-	if err != nil {
-		return err
-	}
-
-	billingProject := ""
-
-	project, err := tpgresource.GetProject(d, config)
-	if err != nil {
-		return fmt.Errorf("Error fetching project for Connector: %s", err)
-	}
-	billingProject = project
-
-	obj := make(map[string]interface{})
-	machineTypeProp, err := expandVPCAccessConnectorMachineType(d.Get("machine_type"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("machine_type"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, machineTypeProp)) {
-		obj["machineType"] = machineTypeProp
-	}
-	minInstancesProp, err := expandVPCAccessConnectorMinInstances(d.Get("min_instances"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("min_instances"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, minInstancesProp)) {
-		obj["minInstances"] = minInstancesProp
-	}
-	maxInstancesProp, err := expandVPCAccessConnectorMaxInstances(d.Get("max_instances"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("max_instances"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, maxInstancesProp)) {
-		obj["maxInstances"] = maxInstancesProp
-	}
-
-	obj, err = resourceVPCAccessConnectorEncoder(d, meta, obj)
-	if err != nil {
-		return err
-	}
-
-	url, err := tpgresource.ReplaceVars(d, config, "{{VPCAccessBasePath}}projects/{{project}}/locations/{{region}}/connectors/{{name}}")
-	if err != nil {
-		return err
-	}
-
-	log.Printf("[DEBUG] Updating Connector %q: %#v", d.Id(), obj)
-	updateMask := []string{}
-
-	if d.HasChange("machine_type") {
-		updateMask = append(updateMask, "machineType")
-	}
-
-	if d.HasChange("min_instances") {
-		updateMask = append(updateMask, "minInstances")
-	}
-
-	if d.HasChange("max_instances") {
-		updateMask = append(updateMask, "maxInstances")
-	}
-	// updateMask is a URL parameter but not present in the schema, so ReplaceVars
-	// won't set it
-	url, err = transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})
-	if err != nil {
-		return err
-	}
-
-	// err == nil indicates that the billing_project value was found
-	if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
-		billingProject = bp
-	}
-
-	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "PATCH",
-		Project:   billingProject,
-		RawURL:    url,
-		UserAgent: userAgent,
-		Body:      obj,
-		Timeout:   d.Timeout(schema.TimeoutUpdate),
-	})
-
-	if err != nil {
-		return fmt.Errorf("Error updating Connector %q: %s", d.Id(), err)
-	} else {
-		log.Printf("[DEBUG] Finished updating Connector %q: %#v", d.Id(), res)
-	}
-
-	err = VPCAccessOperationWaitTime(
-		config, res, project, "Updating Connector", userAgent,
-		d.Timeout(schema.TimeoutUpdate))
-
-	if err != nil {
-		return err
-	}
-
-	return resourceVPCAccessConnectorRead(d, meta)
-}
-
 func resourceVPCAccessConnectorDelete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*transport_tpg.Config)
 	userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)

diff --git a/website/docs/r/vpc_access_connector.html.markdown b/website/docs/r/vpc_access_connector.html.markdown
@@ -39,10 +39,8 @@ To get more information about Connector, see:
 ```hcl
 resource "google_vpc_access_connector" "connector" {
   name          = "vpc-con"
-  ip_cidr_range = "10.18.0.0/28"
+  ip_cidr_range = "10.8.0.0/28"
   network       = "default"
-  min_instances  = 2
-  max_instances  = 3
 }
 ```
 <div class = "oics-button" style="float: right; margin: 0 0 -15px">
@@ -60,8 +58,6 @@ resource "google_vpc_access_connector" "connector" {
     name = google_compute_subnetwork.custom_test.name
   }
   machine_type = "e2-standard-4"
-  min_instances = 2
-  max_instances = 3
 }
 
 resource "google_compute_subnetwork" "custom_test" {
@@ -116,7 +112,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)
@@ -164,7 +160,6 @@ This resource provides the following
 [Timeouts](https://developer.hashicorp.com/terraform/plugin/sdkv2/resources/retries-and-customizable-timeouts) configuration options:
 
 - `create` - Default is 20 minutes.
-- `update` - Default is 20 minutes.
 - `delete` - Default is 20 minutes.
 
 ## Import