Remove labels custom_diff functions when converting yaml files (Googl…

…eCloudPlatform#10998)
hao-nan-li · Jun 20, 2024 · 90c9bfa · 90c9bfa
1 parent 4d6a60e
commit 90c9bfa
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/mmv1/products/compute/go_Disk.yaml b/mmv1/products/compute/go_Disk.yaml
@@ -72,7 +72,6 @@ custom_code:
 custom_diff:
   - 'customdiff.ForceNewIfChange("size", IsDiskShrinkage)'
   - 'hyperDiskIopsUpdateDiffSupress'
-  - 'tpgresource.SetLabelsDiff'
 examples:
   - name: 'disk_basic'
     primary_resource_id: 'default'

diff --git a/mmv1/products/compute/go_Firewall.yaml b/mmv1/products/compute/go_Firewall.yaml
@@ -161,6 +161,7 @@ properties:
     description: |
       An optional description of this resource. Provide this property when
       you create the resource.
+    send_empty_value: true
   - name: 'destinationRanges'
     type: Array
     description: |

diff --git a/mmv1/products/compute/go_ForwardingRule.yaml b/mmv1/products/compute/go_ForwardingRule.yaml
@@ -50,7 +50,6 @@ custom_code:
   post_create: 'templates/terraform/post_create/go/labels.tmpl'
 custom_diff:
   - 'forwardingRuleCustomizeDiff'
-  - 'tpgresource.SetLabelsDiff'
 legacy_long_form_project: true
 examples:
   - name: 'internal_http_lb_with_mig_backend'

diff --git a/mmv1/products/compute/go_RegionDisk.yaml b/mmv1/products/compute/go_RegionDisk.yaml
@@ -70,7 +70,6 @@ custom_code:
 custom_diff:
   - 'customdiff.ForceNewIfChange("size", IsDiskShrinkage)'
   - 'hyperDiskIopsUpdateDiffSupress'
-  - 'tpgresource.SetLabelsDiff'
 examples:
   - name: 'region_disk_basic'
     primary_resource_id: 'regiondisk'

diff --git a/mmv1/products/datafusion/go_Instance.yaml b/mmv1/products/datafusion/go_Instance.yaml
@@ -305,6 +305,7 @@ properties:
       If accelerators are enabled it is possible a permadiff will be created with the Options field.
       Users will need to either manually update their state file to include these diffed options, or include the field in a [lifecycle ignore changes block](https://developer.hashicorp.com/terraform/language/meta-arguments/lifecycle#ignore_changes).
     item_type:
+      type: NestedObject
       properties:
         - name: 'acceleratorType'
           type: Enum
@@ -323,4 +324,3 @@ properties:
           enum_values:
             - 'ENABLED'
             - 'DISABLED'
-      type: NestedObject
diff --git a/mmv1/templates/terraform/yaml_conversion.erb b/mmv1/templates/terraform/yaml_conversion.erb
@@ -398,9 +398,14 @@ custom_code:
   test_check_destroy: '<%= object.convert_go_file( object.custom_code.test_check_destroy )%>'
 <%    end -%>
 <%  end -%>
-<%  unless object.custom_diff.empty? || (object.custom_diff.size == 1 && object.custom_diff.include?("tpgresource.SetLabelsDiff")) -%>
+<% 
+custom_diff = object.custom_diff.reject {
+  |cdiff| cdiff == "tpgresource.SetLabelsDiff" || cdiff == "tpgresource.SetMetadataLabelsDiff" || cdiff == "tpgresource.SetAnnotationsDiff" || cdiff == "tpgresource.SetMetadataAnnotationsDiff"
+}
+-%>
+<%  unless custom_diff.empty? -%>
 custom_diff:
-<%    object.custom_diff.each do |cdiff| -%>
+<%    custom_diff.each do |cdiff| -%>
   - '<%= cdiff %>'
 <%    end -%>
 <%  end -%>