Merge pull request #28800 from hashicorp/b-efs-file-system-policy

efs/file_system_policy: Improve diff handling
hashicorp · Jan 10, 2023 · 08c1744 · 08c1744
2 parents 86bf014 + 4de5312
commit 08c1744
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.changelog/28800.txt 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`
+```
diff --git 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
+				},
 			},
 		},
 	}