Merge pull request #28796 from hashicorp/b-codebuild-repository-permi…

…ssions-policy codebuild/repository_permissions_policy: Improve policy diffs
hashicorp · Jan 10, 2023 · da13362 · da13362
2 parents e4e8e63 + 67376a9
commit da13362
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.changelog/28796.txt b/.changelog/28796.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_codebuild_resource_policy: Improve refresh to avoid unnecessary diffs in `policy`
+```
diff --git a/internal/service/codebuild/resource_policy.go b/internal/service/codebuild/resource_policy.go
@@ -28,10 +28,15 @@ func ResourceResourcePolicy() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"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
+				},
 			},
 			"resource_arn": {
 				Type:         schema.TypeString,