Merge pull request #28865 from hashicorp/b-sagemaker-policy-diffs

sagemaker/model_package_group_policy: Improve policy diffs
hashicorp · Jan 12, 2023 · 35bbf81 · 35bbf81
2 parents 0e6ca06 + 502f7ee
commit 35bbf81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.changelog/28865.txt b/.changelog/28865.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_sagemaker_model_package_group_policy: Improve refresh to avoid unnecessary diffs in `resource_policy`
+```
diff --git a/internal/service/sagemaker/model_package_group_policy.go b/internal/service/sagemaker/model_package_group_policy.go
@@ -32,10 +32,11 @@ func ResourceModelPackageGroupPolicy() *schema.Resource {
 				ForceNew: true,
 			},
 			"resource_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
@@ -49,7 +50,6 @@ func resourceModelPackageGroupPolicyPut(d *schema.ResourceData, meta interface{}
 	conn := meta.(*conns.AWSClient).SageMakerConn()
 
 	policy, err := structure.NormalizeJsonString(d.Get("resource_policy").(string))
-
 	if err != nil {
 		return fmt.Errorf("policy (%s) is invalid JSON: %w", d.Get("resource_policy").(string), err)
 	}
@@ -87,7 +87,6 @@ func resourceModelPackageGroupPolicyRead(d *schema.ResourceData, meta interface{
 	d.Set("model_package_group_name", d.Id())
 
 	policyToSet, err := verify.PolicyToSet(d.Get("resource_policy").(string), aws.StringValue(mpg.ResourcePolicy))
-
 	if err != nil {
 		return err
 	}