r/ses_configuration_set - add reputation and sending options

.changelog/17608.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_ses_configuration_set: Adds `reputation_metrics_enabled` and `sending_enabled` arguments and `last_fresh_start` attribute
+```

aws/resource_aws_ses_configuration_set.go

@@ -3,6 +3,7 @@ package aws
 import (
 	"fmt"
 	"log"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/arn"
@@ -41,6 +42,20 @@ func resourceAwsSesConfigurationSet() *schema.Resource {
 					},
 				},
 			},
+			"last_fresh_start": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"reputation_metrics_enabled": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
+			"sending_enabled": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  true,
+			},
 			"name": {
 				Type:         schema.TypeString,
 				Required:     true,
@@ -81,15 +96,41 @@ func resourceAwsSesConfigurationSetCreate(d *schema.ResourceData, meta interface
 		}
 	}
 
+	if v := d.Get("reputation_metrics_enabled"); v.(bool) {
+		input := &ses.UpdateConfigurationSetReputationMetricsEnabledInput{
+			ConfigurationSetName: aws.String(configurationSetName),
+			Enabled:              aws.Bool(v.(bool)),
+		}
+
+		_, err := conn.UpdateConfigurationSetReputationMetricsEnabled(input)
+		if err != nil {
+			return fmt.Errorf("error adding SES configuration set (%s) reputation metrics enabled: %w", configurationSetName, err)
+		}
+	}
+
+	if v := d.Get("sending_enabled"); !v.(bool) {
+		input := &ses.UpdateConfigurationSetSendingEnabledInput{
+			ConfigurationSetName: aws.String(configurationSetName),
+			Enabled:              aws.Bool(v.(bool)),
+		}
+
+		_, err := conn.UpdateConfigurationSetSendingEnabled(input)
+		if err != nil {
+			return fmt.Errorf("error adding SES configuration set (%s) sending enabled: %w", configurationSetName, err)
+		}
+	}
+
 	return resourceAwsSesConfigurationSetRead(d, meta)
 }
 
 func resourceAwsSesConfigurationSetRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).sesconn
 
 	configSetInput := &ses.DescribeConfigurationSetInput{
-		ConfigurationSetName:           aws.String(d.Id()),
-		ConfigurationSetAttributeNames: aws.StringSlice([]string{ses.ConfigurationSetAttributeDeliveryOptions}),
+		ConfigurationSetName: aws.String(d.Id()),
+		ConfigurationSetAttributeNames: aws.StringSlice([]string{
+			ses.ConfigurationSetAttributeDeliveryOptions,
+			ses.ConfigurationSetAttributeReputationOptions}),
 	}
 
 	response, err := conn.DescribeConfigurationSet(configSetInput)
@@ -109,6 +150,13 @@ func resourceAwsSesConfigurationSetRead(d *schema.ResourceData, meta interface{}
 
 	d.Set("name", aws.StringValue(response.ConfigurationSet.Name))
 
+	repOpts := response.ReputationOptions
+	if repOpts != nil {
+		d.Set("reputation_metrics_enabled", repOpts.ReputationMetricsEnabled)
+		d.Set("sending_enabled", repOpts.SendingEnabled)
+		d.Set("last_fresh_start", aws.TimeValue(repOpts.LastFreshStart).Format(time.RFC3339))
+	}
+
 	arn := arn.ARN{
 		Partition: meta.(*AWSClient).partition,
 		Service:   ses.ServiceName,
@@ -136,18 +184,48 @@ func resourceAwsSesConfigurationSetUpdate(d *schema.ResourceData, meta interface
 		}
 	}
 
+	if d.HasChange("reputation_metrics_enabled") {
+		input := &ses.UpdateConfigurationSetReputationMetricsEnabledInput{
+			ConfigurationSetName: aws.String(d.Id()),
+			Enabled:              aws.Bool(d.Get("reputation_metrics_enabled").(bool)),
+		}
+
+		_, err := conn.UpdateConfigurationSetReputationMetricsEnabled(input)
+		if err != nil {
+			return fmt.Errorf("error updating SES configuration set (%s) reputation metrics enabled: %w", d.Id(), err)
+		}
+	}
+
+	if d.HasChange("sending_enabled") {
+		input := &ses.UpdateConfigurationSetSendingEnabledInput{
+			ConfigurationSetName: aws.String(d.Id()),
+			Enabled:              aws.Bool(d.Get("sending_enabled").(bool)),
+		}
+
+		_, err := conn.UpdateConfigurationSetSendingEnabled(input)
+		if err != nil {
+			return fmt.Errorf("error updating SES configuration set (%s) reputation metrics enabled: %w", d.Id(), err)
+		}
+	}
+
 	return resourceAwsSesConfigurationSetRead(d, meta)
 }
 
 func resourceAwsSesConfigurationSetDelete(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).sesconn
 
 	log.Printf("[DEBUG] SES Delete Configuration Rule Set: %s", d.Id())
-	_, err := conn.DeleteConfigurationSet(&ses.DeleteConfigurationSetInput{
+	input := &ses.DeleteConfigurationSetInput{
 		ConfigurationSetName: aws.String(d.Id()),
-	})
+	}
 
-	return err
+	if _, err := conn.DeleteConfigurationSet(input); err != nil {
+		if !isAWSErr(err, ses.ErrCodeConfigurationSetDoesNotExistException, "") {
+			return fmt.Errorf("error deleting SES Configuration Set (%s): %w", d.Id(), err)
+		}
+	}
+
+	return nil
 }
 
 func expandSesConfigurationSetDeliveryOptions(l []interface{}) *ses.DeliveryOptions {

aws/resource_aws_ses_configuration_set_test.go

@@ -87,6 +87,9 @@ func TestAccAWSSESConfigurationSet_basic(t *testing.T) {
 					testAccCheckResourceAttrRegionalARN(resourceName, "arn", ses.ServiceName, fmt.Sprintf("configuration-set/%s", rName)),
 					resource.TestCheckResourceAttr(resourceName, "name", rName),
 					resource.TestCheckResourceAttr(resourceName, "delivery_options.#", "0"),
+					resource.TestCheckResourceAttr(resourceName, "sending_enabled", "true"),
+					resource.TestCheckResourceAttr(resourceName, "reputation_metrics_enabled", "false"),
+					resource.TestCheckResourceAttrSet(resourceName, "last_fresh_start"),
 				),
 			},
 			{
@@ -98,6 +101,95 @@ func TestAccAWSSESConfigurationSet_basic(t *testing.T) {
 	})
 }
 
+func TestAccAWSSESConfigurationSet_sendingEnabled(t *testing.T) {
+	rName := acctest.RandomWithPrefix("tf-acc-test")
+	resourceName := "aws_ses_configuration_set.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+			testAccPreCheckAWSSES(t)
+		},
+		ErrorCheck:   testAccErrorCheck(t, ses.EndpointsID),
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckSESConfigurationSetDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSSESConfigurationSetSendingConfig(rName, false),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsSESConfigurationSetExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "sending_enabled", "false"),
+					resource.TestCheckResourceAttrSet(resourceName, "last_fresh_start"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccAWSSESConfigurationSetSendingConfig(rName, true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsSESConfigurationSetExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "sending_enabled", "true"),
+					resource.TestCheckResourceAttrSet(resourceName, "last_fresh_start"),
+				),
+			},
+			{
+				Config: testAccAWSSESConfigurationSetSendingConfig(rName, false),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsSESConfigurationSetExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "sending_enabled", "false"),
+					resource.TestCheckResourceAttrSet(resourceName, "last_fresh_start"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccAWSSESConfigurationSet_reputationMetricsEnabled(t *testing.T) {
+	rName := acctest.RandomWithPrefix("tf-acc-test")
+	resourceName := "aws_ses_configuration_set.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+			testAccPreCheckAWSSES(t)
+		},
+		ErrorCheck:   testAccErrorCheck(t, ses.EndpointsID),
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckSESConfigurationSetDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSSESConfigurationSetReputationMetricsConfig(rName, false),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsSESConfigurationSetExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "reputation_metrics_enabled", "false"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccAWSSESConfigurationSetReputationMetricsConfig(rName, true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsSESConfigurationSetExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "reputation_metrics_enabled", "true"),
+				),
+			},
+			{
+				Config: testAccAWSSESConfigurationSetReputationMetricsConfig(rName, false),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsSESConfigurationSetExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "reputation_metrics_enabled", "false"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccAWSSESConfigurationSet_deliveryOptions(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_ses_configuration_set.test"
@@ -347,6 +439,24 @@ resource "aws_ses_configuration_set" "test" {
 `, rName)
 }
 
+func testAccAWSSESConfigurationSetSendingConfig(rName string, enabled bool) string {
+	return fmt.Sprintf(`
+resource "aws_ses_configuration_set" "test" {
+  name            = %[1]q
+  sending_enabled = %[2]t
+}
+`, rName, enabled)
+}
+
+func testAccAWSSESConfigurationSetReputationMetricsConfig(rName string, enabled bool) string {
+	return fmt.Sprintf(`
+resource "aws_ses_configuration_set" "test" {
+  name                       = %[1]q
+  reputation_metrics_enabled = %[2]t
+}
+`, rName, enabled)
+}
+
 func testAccAWSSESConfigurationSetDeliveryOptionsConfig(rName, tlsPolicy string) string {
 	return fmt.Sprintf(`
 resource "aws_ses_configuration_set" "test" {

website/docs/r/ses_configuration_set.html.markdown

@@ -39,6 +39,8 @@ The following argument is required:
 The following argument is optional:
 
 * `delivery_options` - (Optional) Configuration block. Detailed below.
+* `reputation_metrics_enabled` - (Optional) Whether or not Amazon SES publishes reputation metrics for the configuration set, such as bounce and complaint rates, to Amazon CloudWatch. The default value is `false`.
+* `sending_enabled` - (Optional) Whether email sending is enabled or disabled for the configuration set. The default value is `true`.
 
 ### delivery_options
 
@@ -50,6 +52,7 @@ In addition to all arguments above, the following attributes are exported:
 
 * `arn` - SES configuration set ARN.
 * `id` - SES configuration set name.
+* `last_fresh_start` - The date and time at which the reputation metrics for the configuration set were last reset. Resetting these metrics is known as a fresh start.
 
 ## Import