Patch update (#6000) (#4278)

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/6000.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+cloudfunctions: fixed an issue where `google_cloudfunctions2_function` would not update
+```

google-beta/resource_cloudfunction2_function_test.go

@@ -29,7 +29,16 @@ func TestAccCloudFunctions2Function_update(t *testing.T) {
 				ImportStateVerifyIgnore: []string{"location", "build_config.0.source.0.storage_source.0.object", "build_config.0.source.0.storage_source.0.bucket"},
 			},
 			{
-				Config: testAccCloudFunctions2Function_updated(context),
+				Config: testAccCloudFunctions2Function_test_update(context),
+			},
+			{
+				ResourceName:            "google_cloudfunctions2_function.terraform-test2",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"location", "build_config.0.source.0.storage_source.0.object", "build_config.0.source.0.storage_source.0.bucket"},
+			},
+			{
+				Config: testAccCloudFunctions2Function_test_redeploy(context),
 			},
 			{
 				ResourceName:            "google_cloudfunctions2_function.terraform-test2",
@@ -83,7 +92,49 @@ resource "google_cloudfunctions2_function" "terraform-test2" {
 `, context)
 }
 
-func testAccCloudFunctions2Function_updated(context map[string]interface{}) string {
+func testAccCloudFunctions2Function_test_update(context map[string]interface{}) string {
+	return Nprintf(`
+resource "google_storage_bucket" "bucket" {
+  provider = google-beta
+  name     = "tf-test-cloudfunctions2-function-bucket%{random_suffix}"
+  location = "US"
+  uniform_bucket_level_access = true
+}
+ 
+resource "google_storage_bucket_object" "object" {
+  provider = google-beta
+  name   = "function-source.zip"
+  bucket = google_storage_bucket.bucket.name
+  source = "%{zip_path}"
+}
+ 
+resource "google_cloudfunctions2_function" "terraform-test2" {
+  provider = google-beta
+  name = "tf-test-test-function%{random_suffix}"
+  location = "us-central1"
+  description = "an updated function"
+ 
+  build_config {
+    runtime = "nodejs12"
+    entry_point = "helloHttp"
+    source {
+      storage_source {
+        bucket = google_storage_bucket.bucket.name
+        object = google_storage_bucket_object.object.name
+      }
+    }
+  }
+ 
+  service_config {
+    max_instance_count  = 1
+    available_memory    = "1536Mi"
+    timeout_seconds     = 30
+  }
+}
+`, context)
+}
+
+func testAccCloudFunctions2Function_test_redeploy(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_storage_bucket" "bucket" {
   provider = google-beta

google-beta/resource_cloudfunctions2_function.go

@@ -549,12 +549,6 @@ func resourceCloudfunctions2functionUpdate(d *schema.ResourceData, meta interfac
 	billingProject = project
 
 	obj := make(map[string]interface{})
-	nameProp, err := expandCloudfunctions2functionName(d.Get("name"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("name"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, nameProp)) {
-		obj["name"] = nameProp
-	}
 	descriptionProp, err := expandCloudfunctions2functionDescription(d.Get("description"), d, config)
 	if err != nil {
 		return err
@@ -594,10 +588,6 @@ func resourceCloudfunctions2functionUpdate(d *schema.ResourceData, meta interfac
 	log.Printf("[DEBUG] Updating function %q: %#v", d.Id(), obj)
 	updateMask := []string{}
 
-	if d.HasChange("name") {
-		updateMask = append(updateMask, "name")
-	}
-
 	if d.HasChange("description") {
 		updateMask = append(updateMask, "description")
 	}
@@ -629,7 +619,7 @@ func resourceCloudfunctions2functionUpdate(d *schema.ResourceData, meta interfac
 		billingProject = bp
 	}
 
-	res, err := sendRequestWithTimeout(config, "PUT", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
+	res, err := sendRequestWithTimeout(config, "PATCH", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
 
 	if err != nil {
 		return fmt.Errorf("Error updating function %q: %s", d.Id(), err)