From 6116eb696bf95be5546d7f28792422c49bafad41 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 10 Jan 2023 10:16:22 -0500 Subject: [PATCH 1/2] cloudsearch/domain_service_access_policy: Improve diff handling of policy --- .../service/cloudsearch/domain_service_access_policy.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/service/cloudsearch/domain_service_access_policy.go b/internal/service/cloudsearch/domain_service_access_policy.go index 5fd218b7b335..f330ec63ffbd 100644 --- a/internal/service/cloudsearch/domain_service_access_policy.go +++ b/internal/service/cloudsearch/domain_service_access_policy.go @@ -34,10 +34,11 @@ func ResourceDomainServiceAccessPolicy() *schema.Resource { Schema: map[string]*schema.Schema{ "access_policy": { - Type: schema.TypeString, - Required: true, - DiffSuppressFunc: verify.SuppressEquivalentPolicyDiffs, - ValidateFunc: validation.StringIsJSON, + Type: schema.TypeString, + Required: true, + DiffSuppressFunc: verify.SuppressEquivalentPolicyDiffs, + DiffSuppressOnRefresh: true, + ValidateFunc: validation.StringIsJSON, StateFunc: func(v interface{}) string { json, _ := structure.NormalizeJsonString(v) return json From d9fa34d7369293c795c792cd3bc5510a720a5383 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 10 Jan 2023 10:18:29 -0500 Subject: [PATCH 2/2] Add changelog --- .changelog/28792.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/28792.txt diff --git a/.changelog/28792.txt b/.changelog/28792.txt new file mode 100644 index 000000000000..9195e3adcb24 --- /dev/null +++ b/.changelog/28792.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_cloudsearch_domain_service_access_policy: Improve refresh to avoid unnecessary diffs in `access_policy` +```