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.

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

Allow suppressed_reasons to be an empty list in order to disable the suppression list for a configuration set #29671

Merged
merged 8 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/29671.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_sesv2_configuration_set: Allow `suppression_options.suppressed_reasons` to be an empty list (`[]`) in order to disable the suppression list
```
42 changes: 28 additions & 14 deletions internal/service/sesv2/configuration_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/aws/aws-sdk-go-v2/aws/arn"
"github.com/aws/aws-sdk-go-v2/service/sesv2"
"github.com/aws/aws-sdk-go-v2/service/sesv2/types"
"github.com/hashicorp/go-cty/cty"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand Down Expand Up @@ -112,7 +113,6 @@ func ResourceConfigurationSet() *schema.Resource {
"suppressed_reasons": {
Type: schema.TypeList,
Optional: true,
MinItems: 1,
Elem: &schema.Schema{
Type: schema.TypeString,
ValidateDiagFunc: enum.Validate[types.SuppressionListReason](),
Expand Down Expand Up @@ -187,36 +187,46 @@ func resourceConfigurationSetCreate(ctx context.Context, d *schema.ResourceData,
var diags diag.Diagnostics
conn := meta.(*conns.AWSClient).SESV2Client(ctx)

in := &sesv2.CreateConfigurationSetInput{
input := &sesv2.CreateConfigurationSetInput{
ConfigurationSetName: aws.String(d.Get("configuration_set_name").(string)),
Tags: getTagsIn(ctx),
}

if v, ok := d.GetOk("delivery_options"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
in.DeliveryOptions = expandDeliveryOptions(v.([]interface{})[0].(map[string]interface{}))
input.DeliveryOptions = expandDeliveryOptions(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("reputation_options"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
in.ReputationOptions = expandReputationOptions(v.([]interface{})[0].(map[string]interface{}))
input.ReputationOptions = expandReputationOptions(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("sending_options"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
in.SendingOptions = expandSendingOptions(v.([]interface{})[0].(map[string]interface{}))
input.SendingOptions = expandSendingOptions(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("suppression_options"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
in.SuppressionOptions = expandSuppressionOptions(v.([]interface{})[0].(map[string]interface{}))
if v, ok := d.GetRawConfig().AsValueMap()["suppression_options"]; ok && v.LengthInt() > 0 {
if v, ok := v.Index(cty.NumberIntVal(0)).AsValueMap()["suppressed_reasons"]; ok && !v.IsNull() {
tfMap := map[string]interface{}{
"suppressed_reasons": []interface{}{},
}

for _, v := range v.AsValueSlice() {
tfMap["suppressed_reasons"] = append(tfMap["suppressed_reasons"].([]interface{}), v.AsString())
}

input.SuppressionOptions = expandSuppressionOptions(tfMap)
}
}

if v, ok := d.GetOk("tracking_options"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
in.TrackingOptions = expandTrackingOptions(v.([]interface{})[0].(map[string]interface{}))
input.TrackingOptions = expandTrackingOptions(v.([]interface{})[0].(map[string]interface{}))
}

if v, ok := d.GetOk("vdm_options"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil {
in.VdmOptions = expandVDMOptions(v.([]interface{})[0].(map[string]interface{}))
input.VdmOptions = expandVDMOptions(v.([]interface{})[0].(map[string]interface{}))
}

out, err := conn.CreateConfigurationSet(ctx, in)
out, err := conn.CreateConfigurationSet(ctx, input)
if err != nil {
return create.AppendDiagError(diags, names.SESV2, create.ErrActionCreating, ResNameConfigurationSet, d.Get("configuration_set_name").(string), err)
}
Expand Down Expand Up @@ -648,13 +658,17 @@ func expandSuppressionOptions(tfMap map[string]interface{}) *types.SuppressionOp
return nil
}

a := &types.SuppressionOptions{}
apiObject := &types.SuppressionOptions{}

if v, ok := tfMap["suppressed_reasons"].([]interface{}); ok && len(v) > 0 {
a.SuppressedReasons = expandSuppressedReasons(v)
if v, ok := tfMap["suppressed_reasons"].([]interface{}); ok {
if len(v) > 0 {
apiObject.SuppressedReasons = expandSuppressedReasons(v)
} else {
apiObject.SuppressedReasons = make([]types.SuppressionListReason, 0)
}
}

return a
return apiObject
}

func expandSuppressedReasons(tfList []interface{}) []types.SuppressionListReason {
Expand Down
39 changes: 39 additions & 0 deletions internal/service/sesv2/configuration_set_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,34 @@ func TestAccSESV2ConfigurationSet_suppressedReasons(t *testing.T) {
})
}

func TestAccSESV2ConfigurationSet_suppressedReasonsEmpty(t *testing.T) {
ctx := acctest.Context(t)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_sesv2_configuration_set.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(ctx, t) },
ErrorCheck: acctest.ErrorCheck(t, names.SESV2ServiceID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
CheckDestroy: testAccCheckConfigurationSetDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccConfigurationSetConfig_suppressedReasonsEmpty(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckConfigurationSetExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "suppression_options.#", acctest.Ct1),
resource.TestCheckResourceAttr(resourceName, "suppression_options.0.suppressed_reasons.#", acctest.Ct0),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func TestAccSESV2ConfigurationSet_engagementMetrics(t *testing.T) {
ctx := acctest.Context(t)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
Expand Down Expand Up @@ -339,6 +367,17 @@ func TestAccSESV2ConfigurationSet_tags(t *testing.T) {
})
}

func testAccConfigurationSetConfig_suppressedReasonsEmpty(rName string) string {
return fmt.Sprintf(`
resource "aws_sesv2_configuration_set" "test" {
configuration_set_name = %[1]q
suppression_options {
suppressed_reasons = []
}
}
`, rName)
}

func testAccCheckConfigurationSetDestroy(ctx context.Context) resource.TestCheckFunc {
return func(s *terraform.State) error {
conn := acctest.Provider.Meta().(*conns.AWSClient).SESV2Client(ctx)
Expand Down
Loading