New Resource: aws_ses_identity_notification

aws/provider.go

@@ -488,6 +488,7 @@ func Provider() terraform.ResourceProvider {
 			"aws_ses_receipt_rule_set":                     resourceAwsSesReceiptRuleSet(),
 			"aws_ses_configuration_set":                    resourceAwsSesConfigurationSet(),
 			"aws_ses_event_destination":                    resourceAwsSesEventDestination(),
+			"aws_ses_identity_notification_topic":          resourceAwsSesNotificationTopic(),
 			"aws_ses_template":                             resourceAwsSesTemplate(),
 			"aws_s3_bucket":                                resourceAwsS3Bucket(),
 			"aws_s3_bucket_policy":                         resourceAwsS3BucketPolicy(),

aws/resource_aws_ses_identity_notification_topic.go

@@ -0,0 +1,136 @@
+package aws
+
+import (
+	"fmt"
+	"log"
+	"strings"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ses"
+	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/helper/validation"
+)
+
+func resourceAwsSesNotificationTopic() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAwsSesNotificationTopicSet,
+		Read:   resourceAwsSesNotificationTopicRead,
+		Update: resourceAwsSesNotificationTopicSet,
+		Delete: resourceAwsSesNotificationTopicDelete,
+
+		Schema: map[string]*schema.Schema{
+			"topic_arn": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validateArn,
+			},
+
+			"notification_type": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+				ValidateFunc: validation.StringInSlice([]string{
+					ses.NotificationTypeBounce,
+					ses.NotificationTypeComplaint,
+					ses.NotificationTypeDelivery,
+				}, false),
+			},
+
+			"identity": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validation.NoZeroValues,
+			},
+		},
+	}
+}
+
+func resourceAwsSesNotificationTopicSet(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sesConn
+	notification := d.Get("notification_type").(string)
+	identity := d.Get("identity").(string)
+
+	setOpts := &ses.SetIdentityNotificationTopicInput{
+		Identity:         aws.String(identity),
+		NotificationType: aws.String(notification),
+	}
+
+	if v, ok := d.GetOk("topic_arn"); ok && v.(string) != "" {
+		setOpts.SnsTopic = aws.String(v.(string))
+	}
+
+	d.SetId(fmt.Sprintf("%s|%s", identity, notification))
+
+	log.Printf("[DEBUG] Setting SES Identity Notification Topic: %#v", setOpts)
+
+	if _, err := conn.SetIdentityNotificationTopic(setOpts); err != nil {
+		return fmt.Errorf("Error setting SES Identity Notification Topic: %s", err)
+	}
+
+	return resourceAwsSesNotificationTopicRead(d, meta)
+}
+
+func resourceAwsSesNotificationTopicRead(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sesConn
+
+	identity, notificationType, err := decodeSesIdentityNotificationTopicId(d.Id())
+	if err != nil {
+		return err
+	}
+
+	getOpts := &ses.GetIdentityNotificationAttributesInput{
+		Identities: []*string{aws.String(identity)},
+	}
+
+	log.Printf("[DEBUG] Reading SES Identity Notification Topic Attributes: %#v", getOpts)
+
+	response, err := conn.GetIdentityNotificationAttributes(getOpts)
+
+	if err != nil {
+		return fmt.Errorf("Error reading SES Identity Notification Topic: %s", err)
+	}
+
+	notificationAttributes := response.NotificationAttributes[identity]
+	switch notificationType {
+	case ses.NotificationTypeBounce:
+		d.Set("topic_arn", notificationAttributes.BounceTopic)
+	case ses.NotificationTypeComplaint:
+		d.Set("topic_arn", notificationAttributes.ComplaintTopic)
+	case ses.NotificationTypeDelivery:
+		d.Set("topic_arn", notificationAttributes.DeliveryTopic)
+	}
+
+	return nil
+}
+
+func resourceAwsSesNotificationTopicDelete(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).sesConn
+
+	identity, notificationType, err := decodeSesIdentityNotificationTopicId(d.Id())
+	if err != nil {
+		return err
+	}
+
+	setOpts := &ses.SetIdentityNotificationTopicInput{
+		Identity:         aws.String(identity),
+		NotificationType: aws.String(notificationType),
+		SnsTopic:         nil,
+	}
+
+	log.Printf("[DEBUG] Deleting SES Identity Notification Topic: %#v", setOpts)
+
+	if _, err := conn.SetIdentityNotificationTopic(setOpts); err != nil {
+		return fmt.Errorf("Error deleting SES Identity Notification Topic: %s", err)
+	}
+
+	return resourceAwsSesNotificationTopicRead(d, meta)
+}
+
+func decodeSesIdentityNotificationTopicId(id string) (string, string, error) {
+	parts := strings.Split(id, "|")
+	if len(parts) != 2 {
+		return "", "", fmt.Errorf("Unexpected format of ID (%q), expected IDENTITY|TYPE", id)
+	}
+	return parts[0], parts[1], nil
+}

aws/resource_aws_ses_identity_notification_topic_test.go

@@ -0,0 +1,129 @@
+package aws
+
+import (
+	"fmt"
+	"log"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ses"
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccAwsSESIdentityNotificationTopic_basic(t *testing.T) {
+	domain := fmt.Sprintf(
+		"%s.terraformtesting.com",
+		acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
+	topicName := fmt.Sprintf("test-topic-%d", acctest.RandInt())
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAwsSESIdentityNotificationTopicDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: fmt.Sprintf(testAccAwsSESIdentityNotificationTopicConfig_basic, domain),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsSESIdentityNotificationTopicExists("aws_ses_identity_notification_topic.test"),
+				),
+			},
+			resource.TestStep{
+				Config: fmt.Sprintf(testAccAwsSESIdentityNotificationTopicConfig_update, domain, topicName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsSESIdentityNotificationTopicExists("aws_ses_identity_notification_topic.test"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckAwsSESIdentityNotificationTopicDestroy(s *terraform.State) error {
+	conn := testAccProvider.Meta().(*AWSClient).sesConn
+
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "aws_ses_identity_notification_topic" {
+			continue
+		}
+
+		identity := rs.Primary.Attributes["identity"]
+		params := &ses.GetIdentityNotificationAttributesInput{
+			Identities: []*string{aws.String(identity)},
+		}
+
+		log.Printf("[DEBUG] Testing SES Identity Notification Topic Destroy: %#v", params)
+
+		response, err := conn.GetIdentityNotificationAttributes(params)
+		if err != nil {
+			return err
+		}
+
+		if response.NotificationAttributes[identity] != nil {
+			return fmt.Errorf("SES Identity Notification Topic %s still exists. Failing!", identity)
+		}
+	}
+
+	return nil
+}
+
+func testAccCheckAwsSESIdentityNotificationTopicExists(n string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("SES Identity Notification Topic not found: %s", n)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("SES Identity Notification Topic identity not set")
+		}
+
+		identity := rs.Primary.Attributes["identity"]
+		conn := testAccProvider.Meta().(*AWSClient).sesConn
+
+		params := &ses.GetIdentityNotificationAttributesInput{
+			Identities: []*string{aws.String(identity)},
+		}
+
+		log.Printf("[DEBUG] Testing SES Identity Notification Topic Exists: %#v", params)
+
+		response, err := conn.GetIdentityNotificationAttributes(params)
+		if err != nil {
+			return err
+		}
+
+		if response.NotificationAttributes[identity] == nil {
+			return fmt.Errorf("SES Identity Notification Topic %s not found in AWS", identity)
+		}
+
+		return nil
+	}
+}
+
+const testAccAwsSESIdentityNotificationTopicConfig_basic = `
+resource "aws_ses_identity_notification_topic" "test" {
+	identity = "${aws_ses_domain_identity.test.arn}"
+	notification_type = "Complaint"
+}
+
+resource "aws_ses_domain_identity" "test" {
+  domain = "%s"
+}
+`
+const testAccAwsSESIdentityNotificationTopicConfig_update = `
+resource "aws_ses_identity_notification_topic" "test" {
+	topic_arn = "${aws_sns_topic.test.arn}"
+	identity = "${aws_ses_domain_identity.test.arn}"
+	notification_type = "Complaint"
+}
+
+resource "aws_ses_domain_identity" "test" {
+  domain = "%s"
+}
+
+resource "aws_sns_topic" "test" {
+  name = "%s"
+}
+`

website/aws.erb

@@ -1677,6 +1677,10 @@
                             <a href="/docs/providers/aws/r/ses_event_destination.html">aws_ses_event_destination</a>
                         </li>
 
+                        <li<%= sidebar_current("docs-aws-resource-ses-identity-notification-topic") %>>
+                            <a href="/docs/providers/aws/r/ses_identity_notification_topic.html">aws_ses_identity_notification_topic</a>
+                        </li>
+
                         <li<%= sidebar_current("docs-aws-resource-ses-template") %>>
                             <a href="/docs/providers/aws/r/ses_template.html">aws_ses_template</a>
                         </li>

website/docs/r/ses_identity_notification_topic.markdown

@@ -0,0 +1,29 @@
+---
+layout: "aws"
+page_title: "AWS: aws_ses_identity_notification_topic"
+sidebar_current: "docs-aws-resource-ses-identity-notification-topic"
+description: |-
+  Setting AWS SES Identity Notification Topic
+---
+
+# ses_identity_notification_topic
+
+Resource for managing SES Identity Notification Topics
+
+## Example Usage
+
+```hcl
+resource "aws_ses_identity_notification_topic" "test" {
+  topic_arn			= "${aws_sns_topic.example.arn}"
+  notification_type = "Bounce"
+  identity 			= "${aws_ses_domain_identity.example.domain}"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `topic_arn` - (Optional) The Amazon Resource Name (ARN) of the Amazon SNS topic. Can be set to "" (an empty string) to disable publishing.
+* `notification_type` - (Required) The type of notifications that will be published to the specified Amazon SNS topic. Valid Values: *Bounce*, *Complaint* or *Delivery*.
+* `identity` - (Required) The identity for which the Amazon SNS topic will be set. You can specify an identity by using its name or by using its Amazon Resource Name (ARN).