Remove the function check field_specific_update_methods

GoogleCloudPlatform · Oct 3, 2023 · d141415 · d141415
1 parent 39220d2
commit d141415
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/mmv1/api/resource.rb b/mmv1/api/resource.rb
@@ -556,14 +556,6 @@ def get_labels_field_note(title)
 Please refer to the field `effective_#{title}` for all of the #{title} present on the resource."
     end
 
-    def terraform_labels?
-      terraform_label = root_properties.select do |p|
-        p.is_a?(Api::Type::KeyValueTerraformLabels)
-      end
-
-      terraform_label.length.positive?
-    end
-
     # ====================
     # Version-related methods
     # ====================

diff --git a/mmv1/templates/terraform/post_update/cloudbuild_bitbucketserver_config.go.erb b/mmv1/templates/terraform/post_update/cloudbuild_bitbucketserver_config.go.erb
@@ -21,7 +21,7 @@ if d.HasChange("connected_repositories") {
 	for _, repo := range removeRepos {
 		obj := make(map[string]interface{})
 		obj["connectedRepository"] = repo
-		res, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config: config,
 			Method: "POST",
 			Project: billingProject,
@@ -61,7 +61,7 @@ if d.HasChange("connected_repositories") {
 			return err
 		}
 
-		res, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+		res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 			Config: config,
 			Method: "POST",
 			Project: billingProject,

diff --git a/mmv1/templates/terraform/resource.erb b/mmv1/templates/terraform/resource.erb
@@ -792,7 +792,7 @@ func resource<%= resource_name -%>Update(d *schema.ResourceData, meta interface{
       billingProject = bp
     }
 
-<%      if object.update_mask && (field_specific_update_methods(object.root_properties) || object.terraform_labels?) -%>
+<%      if object.update_mask -%>
 // if updateMask is empty we are not updating anything so skip the post
 if len(updateMask) > 0 {
 <%      end -%>
@@ -838,7 +838,7 @@ if len(updateMask) > 0 {
     }
 <%        end -%>
 <%      end -%>
-<%      if object.update_mask && (field_specific_update_methods(object.root_properties) || object.terraform_labels?) -%>
+<%      if object.update_mask -%>
   }
 <%      end -%>
 <%    end # if !object.immutable -%>