Skip to content

Commit

Permalink
r/aws_sesv2_email_identity_policy: Reduce visibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ewbankkit
ewbankkit committed Sep 11, 2024
1 parent 717517d commit 5fb45e5
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 90 deletions.
20 changes: 10 additions & 10 deletions internal/service/sesv2/configuration_set_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func dataSourceConfigurationSet() *schema.Resource {
}

const (
DSNameConfigurationSet = "Configuration Set Data Source"
dsNameConfigurationSet = "Configuration Set Data Source"
)

func dataSourceConfigurationSetRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand All @@ -151,7 +151,7 @@ func dataSourceConfigurationSetRead(ctx context.Context, d *schema.ResourceData,

out, err := findConfigurationSetByID(ctx, conn, name)
if err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionReading, DSNameConfigurationSet, name, err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionReading, dsNameConfigurationSet, name, err)
}

d.SetId(aws.ToString(out.ConfigurationSetName))
Expand All @@ -161,61 +161,61 @@ func dataSourceConfigurationSetRead(ctx context.Context, d *schema.ResourceData,

if out.DeliveryOptions != nil {
if err := d.Set("delivery_options", []interface{}{flattenDeliveryOptions(out.DeliveryOptions)}); err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, DSNameConfigurationSet, d.Id(), err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, dsNameConfigurationSet, d.Id(), err)
}
} else {
d.Set("delivery_options", nil)
}

if out.ReputationOptions != nil {
if err := d.Set("reputation_options", []interface{}{flattenReputationOptions(out.ReputationOptions)}); err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, DSNameConfigurationSet, d.Id(), err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, dsNameConfigurationSet, d.Id(), err)
}
} else {
d.Set("reputation_options", nil)
}

if out.SendingOptions != nil {
if err := d.Set("sending_options", []interface{}{flattenSendingOptions(out.SendingOptions)}); err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, DSNameConfigurationSet, d.Id(), err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, dsNameConfigurationSet, d.Id(), err)
}
} else {
d.Set("sending_options", nil)
}

if out.SuppressionOptions != nil {
if err := d.Set("suppression_options", []interface{}{flattenSuppressionOptions(out.SuppressionOptions)}); err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, DSNameConfigurationSet, d.Id(), err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, dsNameConfigurationSet, d.Id(), err)
}
} else {
d.Set("suppression_options", nil)
}

if out.TrackingOptions != nil {
if err := d.Set("tracking_options", []interface{}{flattenTrackingOptions(out.TrackingOptions)}); err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, DSNameConfigurationSet, d.Id(), err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, dsNameConfigurationSet, d.Id(), err)
}
} else {
d.Set("tracking_options", nil)
}

if out.VdmOptions != nil {
if err := d.Set("vdm_options", []interface{}{flattenVDMOptions(out.VdmOptions)}); err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, DSNameConfigurationSet, d.Id(), err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, dsNameConfigurationSet, d.Id(), err)
}
} else {
d.Set("vdm_options", nil)
}

tags, err := listTags(ctx, conn, d.Get(names.AttrARN).(string))
if err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionReading, DSNameConfigurationSet, d.Id(), err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionReading, dsNameConfigurationSet, d.Id(), err)
}

ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig

if err := d.Set(names.AttrTags, tags.IgnoreAWS().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, DSNameConfigurationSet, d.Id(), err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, dsNameConfigurationSet, d.Id(), err)
}

return diags
Expand Down
127 changes: 69 additions & 58 deletions internal/service/sesv2/email_identity_policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
"github.com/hashicorp/terraform-provider-aws/internal/create"
"github.com/hashicorp/terraform-provider-aws/internal/errs"
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
"github.com/hashicorp/terraform-provider-aws/internal/verify"
Expand Down Expand Up @@ -66,7 +67,7 @@ func resourceEmailIdentityPolicy() *schema.Resource {
}

const (
ResNameEmailIdentityPolicy = "Email Identity Policy"
resNameEmailIdentityPolicy = "Email Identity Policy"
)

func resourceEmailIdentityPolicyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand All @@ -75,11 +76,11 @@ func resourceEmailIdentityPolicyCreate(ctx context.Context, d *schema.ResourceDa

email_identity := d.Get("email_identity").(string)
policy_name := d.Get("policy_name").(string)
emailIdentityPolicyID := FormatEmailIdentityPolicyID(email_identity, policy_name)
emailIdentityPolicyID := emailIdentityPolicyCreateResourceID(email_identity, policy_name)

policy, err := structure.NormalizeJsonString(d.Get(names.AttrPolicy).(string))
if err != nil {
return sdkdiag.AppendErrorf(diags, "policy (%s) is invalid JSON: %s", d.Get(names.AttrPolicy).(string), err)
return sdkdiag.AppendFromErr(diags, err)
}

in := &sesv2.CreateEmailIdentityPolicyInput{
Expand All @@ -90,11 +91,11 @@ func resourceEmailIdentityPolicyCreate(ctx context.Context, d *schema.ResourceDa

out, err := conn.CreateEmailIdentityPolicy(ctx, in)
if err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionCreating, ResNameEmailIdentityPolicy, emailIdentityPolicyID, err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionCreating, resNameEmailIdentityPolicy, emailIdentityPolicyID, err)
}

if out == nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionCreating, ResNameEmailIdentityPolicy, emailIdentityPolicyID, errors.New("empty output"))
return create.AppendDiagError(diags, names.SESV2, create.ErrActionCreating, resNameEmailIdentityPolicy, emailIdentityPolicyID, errors.New("empty output"))
}

d.SetId(emailIdentityPolicyID)
Expand All @@ -106,12 +107,12 @@ func resourceEmailIdentityPolicyRead(ctx context.Context, d *schema.ResourceData
var diags diag.Diagnostics
conn := meta.(*conns.AWSClient).SESV2Client(ctx)

emailIdentity, policyName, err := ParseEmailIdentityPolicyID(d.Id())
emailIdentity, policyName, err := emailIdentityPolicyParseResourceID(d.Id())
if err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionReading, ResNameEmailIdentityPolicy, d.Id(), err)
return sdkdiag.AppendFromErr(diags, err)
}

policy, err := FindEmailIdentityPolicyByID(ctx, conn, d.Id())
out, err := findEmailIdentityPolicyByTwoPartKey(ctx, conn, emailIdentity, policyName)

if !d.IsNewResource() && tfresource.NotFound(err) {
log.Printf("[WARN] SESV2 EmailIdentityPolicy (%s) not found, removing from state", d.Id())
Expand All @@ -120,17 +121,17 @@ func resourceEmailIdentityPolicyRead(ctx context.Context, d *schema.ResourceData
}

if err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionReading, ResNameEmailIdentityPolicy, d.Id(), err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionReading, resNameEmailIdentityPolicy, d.Id(), err)
}

policy, err = verify.SecondJSONUnlessEquivalent(d.Get(names.AttrPolicy).(string), policy)
policy, err := verify.SecondJSONUnlessEquivalent(d.Get(names.AttrPolicy).(string), aws.ToString(out))
if err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, ResNameEmailIdentityPolicy, d.Id(), err)
return sdkdiag.AppendFromErr(diags, err)
}

policy, err = structure.NormalizeJsonString(policy)
if err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionSetting, ResNameEmailIdentityPolicy, d.Id(), err)
return sdkdiag.AppendFromErr(diags, err)
}

d.Set("email_identity", emailIdentity)
Expand All @@ -144,21 +145,25 @@ func resourceEmailIdentityPolicyUpdate(ctx context.Context, d *schema.ResourceDa
var diags diag.Diagnostics
conn := meta.(*conns.AWSClient).SESV2Client(ctx)

emailIdentity, policyName, err := emailIdentityPolicyParseResourceID(d.Id())
if err != nil {
return sdkdiag.AppendFromErr(diags, err)
}

policy, err := structure.NormalizeJsonString(d.Get(names.AttrPolicy).(string))
if err != nil {
return sdkdiag.AppendErrorf(diags, "policy (%s) is invalid JSON: %s", d.Get(names.AttrPolicy).(string), err)
return sdkdiag.AppendFromErr(diags, err)
}

in := &sesv2.UpdateEmailIdentityPolicyInput{
EmailIdentity: aws.String(d.Get("email_identity").(string)),
EmailIdentity: aws.String(emailIdentity),
Policy: aws.String(policy),
PolicyName: aws.String(d.Get("policy_name").(string)),
PolicyName: aws.String(policyName),
}

log.Printf("[DEBUG] Updating SESV2 EmailIdentityPolicy (%s): %#v", d.Id(), in)
_, err = conn.UpdateEmailIdentityPolicy(ctx, in)
if err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionUpdating, ResNameEmailIdentityPolicy, d.Id(), err)
return create.AppendDiagError(diags, names.SESV2, create.ErrActionUpdating, resNameEmailIdentityPolicy, d.Id(), err)
}

return append(diags, resourceEmailIdentityPolicyRead(ctx, d, meta)...)
Expand All @@ -168,75 +173,81 @@ func resourceEmailIdentityPolicyDelete(ctx context.Context, d *schema.ResourceDa
var diags diag.Diagnostics
conn := meta.(*conns.AWSClient).SESV2Client(ctx)

log.Printf("[INFO] Deleting SESV2 EmailIdentityPolicy %s", d.Id())

emailIdentity, policyName, err := ParseEmailIdentityPolicyID(d.Id())
emailIdentity, policyName, err := emailIdentityPolicyParseResourceID(d.Id())
if err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionReading, ResNameEmailIdentityPolicy, d.Id(), err)
return sdkdiag.AppendFromErr(diags, err)
}

log.Printf("[INFO] Deleting SESV2 EmailIdentityPolicy: %s", d.Id())
_, err = conn.DeleteEmailIdentityPolicy(ctx, &sesv2.DeleteEmailIdentityPolicyInput{
EmailIdentity: aws.String(emailIdentity),
PolicyName: aws.String(policyName),
})

if err != nil {
var nfe *types.NotFoundException
if errors.As(err, &nfe) {
return diags
}
if errs.IsA[*types.NotFoundException](err) {
return diags
}

return create.AppendDiagError(diags, names.SESV2, create.ErrActionDeleting, ResNameEmailIdentityPolicy, d.Id(), err)
if err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionDeleting, resNameEmailIdentityPolicy, d.Id(), err)
}

return diags
}

func FindEmailIdentityPolicyByID(ctx context.Context, conn *sesv2.Client, id string) (string, error) {
emailIdentity, policyName, err := ParseEmailIdentityPolicyID(id)
if err != nil {
return "", err
const emailIdentityPolicyResourceIDSeparator = "|"

func emailIdentityPolicyCreateResourceID(emailIdentity, policyName string) string {
parts := []string{emailIdentity, policyName}
id := strings.Join(parts, emailIdentityPolicyResourceIDSeparator)

return id
}

func emailIdentityPolicyParseResourceID(id string) (string, string, error) {
parts := strings.Split(id, emailIdentityPolicyResourceIDSeparator)

if len(parts) != 2 || parts[0] == "" || parts[1] == "" {
return "", "", fmt.Errorf("unexpected format of ID (%[1]s), expected EMAIL_IDENTITY%[2]sPOLICY_NAME", id, emailIdentityPolicyResourceIDSeparator)
}

in := &sesv2.GetEmailIdentityPoliciesInput{
return parts[0], parts[1], nil
}

func findEmailIdentityPolicyByTwoPartKey(ctx context.Context, conn *sesv2.Client, emailIdentity, policyName string) (*string, error) {
input := &sesv2.GetEmailIdentityPoliciesInput{
EmailIdentity: aws.String(emailIdentity),
}
output, err := findEmailIdentityPolicies(ctx, conn, input)

out, err := conn.GetEmailIdentityPolicies(ctx, in)
if err != nil {
var nfe *types.NotFoundException
if errors.As(err, &nfe) {
return "", &retry.NotFoundError{
LastError: err,
LastRequest: in,
}
}

return "", err
return nil, err
}

if out == nil {
return "", tfresource.NewEmptyResultError(in)
if output, ok := output[policyName]; ok {
return aws.String(output), nil
}

for name, policy := range out.Policies {
if policyName == name {
return policy, nil
return nil, tfresource.NewEmptyResultError(input)
}

func findEmailIdentityPolicies(ctx context.Context, conn *sesv2.Client, input *sesv2.GetEmailIdentityPoliciesInput) (map[string]string, error) {
output, err := conn.GetEmailIdentityPolicies(ctx, input)

if errs.IsA[*types.NotFoundException](err) {
return nil, &retry.NotFoundError{
LastError: err,
LastRequest: input,
}
}

return "", &retry.NotFoundError{}
}

func FormatEmailIdentityPolicyID(emailIdentity, policyName string) string {
return fmt.Sprintf("%s|%s", emailIdentity, policyName)
}
if err != nil {
return nil, err
}

func ParseEmailIdentityPolicyID(id string) (string, string, error) {
idParts := strings.Split(id, "|")
if len(idParts) != 2 {
return "", "", errors.New("please make sure the ID is in the form EMAIL_IDENTITY|POLICY_NAME")
if output == nil || output.Policies == nil {
return nil, tfresource.NewEmptyResultError(input)
}

return idParts[0], idParts[1], nil
return output.Policies, nil
}
34 changes: 12 additions & 22 deletions internal/service/sesv2/email_identity_policy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,16 @@ package sesv2_test

import (
"context"
"errors"
"fmt"
"testing"

"github.com/aws/aws-sdk-go-v2/service/sesv2/types"
sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-plugin-testing/terraform"
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
"github.com/hashicorp/terraform-provider-aws/internal/create"
tfsesv2 "github.com/hashicorp/terraform-provider-aws/internal/service/sesv2"
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
"github.com/hashicorp/terraform-provider-aws/names"
)

Expand Down Expand Up @@ -83,43 +81,35 @@ func testAccCheckEmailIdentityPolicyDestroy(ctx context.Context) resource.TestCh
continue
}

_, err := tfsesv2.FindEmailIdentityPolicyByID(ctx, conn, rs.Primary.ID)
_, err := tfsesv2.FindEmailIdentityPolicyByTwoPartKey(ctx, conn, rs.Primary.Attributes["email_identity"], rs.Primary.Attributes["policy_name"])

if tfresource.NotFound(err) {
continue
}

if err != nil {
var nfe *types.NotFoundException
if errors.As(err, &nfe) {
return nil
}
return err
}

return create.Error(names.SESV2, create.ErrActionCheckingDestroyed, tfsesv2.ResNameEmailIdentityPolicy, rs.Primary.ID, errors.New("not destroyed"))
return fmt.Errorf("SESv2 Email Identity Policy %s still exists", rs.Primary.ID)
}

return nil
}
}

func testAccCheckEmailIdentityPolicyExists(ctx context.Context, name string) resource.TestCheckFunc {
func testAccCheckEmailIdentityPolicyExists(ctx context.Context, n string) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[name]
rs, ok := s.RootModule().Resources[n]
if !ok {
return create.Error(names.SESV2, create.ErrActionCheckingExistence, tfsesv2.ResNameEmailIdentityPolicy, name, errors.New("not found"))
}

if rs.Primary.ID == "" {
return create.Error(names.SESV2, create.ErrActionCheckingExistence, tfsesv2.ResNameEmailIdentityPolicy, name, errors.New("not set"))
return fmt.Errorf("Not found: %s", n)
}

conn := acctest.Provider.Meta().(*conns.AWSClient).SESV2Client(ctx)

_, err := tfsesv2.FindEmailIdentityPolicyByID(ctx, conn, rs.Primary.ID)

if err != nil {
return create.Error(names.SESV2, create.ErrActionCheckingExistence, tfsesv2.ResNameEmailIdentityPolicy, rs.Primary.ID, err)
}
_, err := tfsesv2.FindEmailIdentityPolicyByTwoPartKey(ctx, conn, rs.Primary.Attributes["email_identity"], rs.Primary.Attributes["policy_name"])

return nil
return err
}
}

Expand Down
Loading

0 comments on commit 5fb45e5

Please sign in to comment.