From 78d443950ffedd6ab485222df67c4c88578215a9 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 10 Jan 2023 11:23:59 -0500 Subject: [PATCH 1/2] efs/file_system_policy: Improve diff handling --- internal/service/efs/file_system_policy.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/internal/service/efs/file_system_policy.go b/internal/service/efs/file_system_policy.go index 69e699ba488d..72aa1073bfb9 100644 --- a/internal/service/efs/file_system_policy.go +++ b/internal/service/efs/file_system_policy.go @@ -37,10 +37,15 @@ func ResourceFileSystemPolicy() *schema.Resource { ForceNew: true, }, "policy": { - Type: schema.TypeString, - Required: true, - ValidateFunc: validation.StringIsJSON, - DiffSuppressFunc: verify.SuppressEquivalentPolicyDiffs, + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringIsJSON, + DiffSuppressFunc: verify.SuppressEquivalentPolicyDiffs, + DiffSuppressOnRefresh: true, + StateFunc: func(v interface{}) string { + json, _ := structure.NormalizeJsonString(v) + return json + }, }, }, } From 4de531255c42f57df0d3c9b0e5003638d06abff0 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Tue, 10 Jan 2023 11:25:38 -0500 Subject: [PATCH 2/2] Add changelog --- .changelog/28800.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/28800.txt diff --git a/.changelog/28800.txt b/.changelog/28800.txt new file mode 100644 index 000000000000..6fd31b01aa35 --- /dev/null +++ b/.changelog/28800.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_efs_file_system_policy: Improve refresh to avoid unnecessary diffs in `policy` +``` \ No newline at end of file