Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

organizations/policy: Fix erroneous content diffs #22260

Closed
wants to merge 2 commits into from
Closed

organizations/policy: Fix erroneous content diffs #22260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f171f61
organizations/policy: Fix erroneous content diffs
YakDriver Dec 16, 2021
cd961c5
Add changelog
YakDriver Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/22260.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_organizations_policy: Fix erroneous diffs in `content` when no changes made or policies are equivalent
```
33 changes: 28 additions & 5 deletions internal/service/organizations/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
Expand All @@ -37,8 +38,12 @@ func ResourcePolicy() *schema.Resource {
"content": {
Type: schema.TypeString,
Required: true,
DiffSuppressFunc: verify.SuppressEquivalentPolicyDiffs,
ValidateFunc: validation.StringIsJSON,
DiffSuppressFunc: verify.SuppressEquivalentPolicyDiffs,
StateFunc: func(v interface{}) string {
json, _ := structure.NormalizeJsonString(v)
return json
},
},
"description": {
Type: schema.TypeString,
Expand Down Expand Up @@ -70,8 +75,14 @@ func resourcePolicyCreate(ctx context.Context, d *schema.ResourceData, meta inte

name := d.Get("name").(string)

policy, err := structure.NormalizeJsonString(d.Get("content").(string))

if err != nil {
return diag.Errorf("policy content (%s) is invalid JSON: %s", d.Get("content").(string), err)
}

input := &organizations.CreatePolicyInput{
Content: aws.String(d.Get("content").(string)),
Content: aws.String(policy),
Description: aws.String(d.Get("description").(string)),
Name: aws.String(name),
Type: aws.String(d.Get("type").(string)),
Expand All @@ -80,7 +91,6 @@ func resourcePolicyCreate(ctx context.Context, d *schema.ResourceData, meta inte

log.Printf("[DEBUG] Creating Organizations Policy (%s): %v", name, input)

var err error
var resp *organizations.CreatePolicyOutput
err = resource.Retry(4*time.Minute, func() *resource.RetryError {
resp, err = conn.CreatePolicy(input)
Expand Down Expand Up @@ -136,11 +146,18 @@ func resourcePolicyRead(ctx context.Context, d *schema.ResourceData, meta interf
}

d.Set("arn", resp.Policy.PolicySummary.Arn)
d.Set("content", resp.Policy.Content)
d.Set("description", resp.Policy.PolicySummary.Description)
d.Set("name", resp.Policy.PolicySummary.Name)
d.Set("type", resp.Policy.PolicySummary.Type)

policyToSet, err := verify.PolicyToSet(d.Get("content").(string), aws.StringValue(resp.Policy.Content))

if err != nil {
return diag.FromErr(err)
}

d.Set("content", policyToSet)

if aws.BoolValue(resp.Policy.PolicySummary.AwsManaged) {
return diag.Diagnostics{
diag.Diagnostic{
Expand Down Expand Up @@ -178,7 +195,13 @@ func resourcePolicyUpdate(ctx context.Context, d *schema.ResourceData, meta inte
}

if d.HasChange("content") {
input.Content = aws.String(d.Get("content").(string))
policy, err := structure.NormalizeJsonString(d.Get("content").(string))

if err != nil {
return diag.Errorf("policy content (%s) is invalid JSON: %s", d.Get("content").(string), err)
}

input.Content = aws.String(policy)
}

if d.HasChange("description") {
Expand Down