Skip to content

compute: resolve permadiff for display_name in google_compute_organization_security_policy #15325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

compute: resolve permadiff for display_name in google_compute_organization_security_policy #15325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
153850a
fix: resolve permadiff for org security policy
ramonvermeulen Oct 7, 2025
ad11a88
fix: use `ignore_read` instead of `diff_suppress_func`
ramonvermeulen Oct 13, 2025
4e739ad
Revert "fix: use `ignore_read` instead of `diff_suppress_func`"
ramonvermeulen Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mmv1/products/compute/OrganizationSecurityPolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
post_create: 'templates/terraform/post_create/org_security_policy.go.tmpl'
post_delete: 'templates/terraform/post_delete/org_security_policy.go.tmpl'
post_update: 'templates/terraform/post_update/org_security_policy.go.tmpl'
# TODO: Remove once b/154369201 is closed.

Check warning on line 40 in mmv1/products/compute/OrganizationSecurityPolicy.yaml

View workflow job for this annotation

GitHub Actions / lint-yaml 

40:5 [comments-indentation] comment not indented like content
test_check_destroy: 'templates/terraform/custom_check_destroy/skip_delete_during_test.go.tmpl'
examples:
- name: 'organization_security_policy_basic'
Expand All @@ -61,6 +61,7 @@
User-provided name of the organization security policy. The name should be unique in the organization in which the security policy is created. This should only be used when SecurityPolicyType is FIREWALL.
min_version: 'beta'
immutable: true
diff_suppress_func: 'tpgresource.EmptyStringOrNilDiffSuppress'
- name: 'description'
type: String
description: |
Expand Down
5 changes: 5 additions & 0 deletions mmv1/third_party/terraform/tpgresource/common_diff_suppress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ func EmptyOrFalseSuppressBoolean(k, old, new string, d *schema.ResourceData) boo
return (o == nil && !n.(bool))
}

func EmptyStringOrNilDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
o, n := d.GetChange(k)
return (o == nil || o == "") && (n != nil && n != "")
}

func CaseDiffSuppress(_, old, new string, _ *schema.ResourceData) bool {
return strings.ToUpper(old) == strings.ToUpper(new)
}
Expand Down
Loading