New Resource: aws_media_store_container

aws/config.go

@@ -58,6 +58,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/kms"
 	"github.com/aws/aws-sdk-go/service/lambda"
 	"github.com/aws/aws-sdk-go/service/lightsail"
+	"github.com/aws/aws-sdk-go/service/mediastore"
 	"github.com/aws/aws-sdk-go/service/mq"
 	"github.com/aws/aws-sdk-go/service/opsworks"
 	"github.com/aws/aws-sdk-go/service/rds"
@@ -188,6 +189,7 @@ type AWSClient struct {
 	batchconn             *batch.Batch
 	athenaconn            *athena.Athena
 	dxconn                *directconnect.DirectConnect
+	mediastoreconn        *mediastore.MediaStore
 }
 
 func (c *AWSClient) S3() *s3.S3 {
@@ -426,6 +428,7 @@ func (c *Config) Client() (interface{}, error) {
 	client.batchconn = batch.New(sess)
 	client.athenaconn = athena.New(sess)
 	client.dxconn = directconnect.New(sess)
+	client.mediastoreconn = mediastore.New(sess)
 
 	// Workaround for https://github.com/aws/aws-sdk-go/issues/1376
 	client.kinesisconn.Handlers.Retry.PushBack(func(r *request.Request) {

aws/provider.go

@@ -400,6 +400,7 @@ func Provider() terraform.ResourceProvider {
 			"aws_main_route_table_association":             resourceAwsMainRouteTableAssociation(),
 			"aws_mq_broker":                                resourceAwsMqBroker(),
 			"aws_mq_configuration":                         resourceAwsMqConfiguration(),
+			"aws_media_store_container":                    resourceAwsMediaStoreContainer(),
 			"aws_nat_gateway":                              resourceAwsNatGateway(),
 			"aws_network_acl":                              resourceAwsNetworkAcl(),
 			"aws_default_network_acl":                      resourceAwsDefaultNetworkAcl(),

aws/resource_aws_media_store_container.go

@@ -0,0 +1,149 @@
+package aws
+
+import (
+	"fmt"
+	"regexp"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/service/mediastore"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func resourceAwsMediaStoreContainer() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAwsMediaStoreContainerCreate,
+		Read:   resourceAwsMediaStoreContainerRead,
+		Update: resourceAwsMediaStoreContainerUpdate,
+		Delete: resourceAwsMediaStoreContainerDelete,
+
+		Schema: map[string]*schema.Schema{
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+				ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
+					value := v.(string)
+					if !regexp.MustCompile("^\\w+$").MatchString(value) {
+						errors = append(errors, fmt.Errorf("%q must match \\w+", k))
+					}
+					return
+				},
+			},
+			"policy": {
+				Type:             schema.TypeString,
+				Optional:         true,
+				ValidateFunc:     validateIAMPolicyJson,
+				DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs,
+			},
+			"arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"endpoint": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func resourceAwsMediaStoreContainerCreate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).mediastoreconn
+
+	input := &mediastore.CreateContainerInput{
+		ContainerName: aws.String(d.Get("name").(string)),
+	}
+
+	_, err := conn.CreateContainer(input)
+	if err != nil {
+		return err
+	}
+	stateConf := &resource.StateChangeConf{
+		Pending:    []string{mediastore.ContainerStatusCreating},
+		Target:     []string{mediastore.ContainerStatusActive},
+		Refresh:    mediaStoreContainerRefreshStatusFunc(conn, d.Get("name").(string)),
+		Timeout:    10 * time.Minute,
+		Delay:      10 * time.Second,
+		MinTimeout: 3 * time.Second,
+	}
+
+	_, err = stateConf.WaitForState()
+	if err != nil {
+		return fmt.Errorf("[WARN] Error waiting for MediaStore Container status to be \"ACTIVE\": %s", err)
+	}
+
+	d.SetId(d.Get("name").(string))
+	return resourceAwsMediaStoreContainerUpdate(d, meta)
+}
+
+func resourceAwsMediaStoreContainerRead(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).mediastoreconn
+
+	input := &mediastore.DescribeContainerInput{
+		ContainerName: aws.String(d.Id()),
+	}
+	resp, err := conn.DescribeContainer(input)
+	if err != nil {
+		return err
+	}
+	d.Set("arn", resp.Container.ARN)
+	d.Set("endpoint", resp.Container.Endpoint)
+	return nil
+}
+
+func resourceAwsMediaStoreContainerUpdate(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).mediastoreconn
+
+	if !d.HasChange("policy") {
+		return resourceAwsMediaStoreContainerRead(d, meta)
+	}
+
+	input := &mediastore.PutContainerPolicyInput{
+		ContainerName: aws.String(d.Id()),
+		Policy:        aws.String(d.Get("policy").(string)),
+	}
+	_, err := conn.PutContainerPolicy(input)
+	if err != nil {
+		return err
+	}
+
+	return resourceAwsMediaStoreContainerRead(d, meta)
+}
+
+func resourceAwsMediaStoreContainerDelete(d *schema.ResourceData, meta interface{}) error {
+	conn := meta.(*AWSClient).mediastoreconn
+
+	input := &mediastore.DeleteContainerInput{
+		ContainerName: aws.String(d.Id()),
+	}
+	_, err := conn.DeleteContainer(input)
+	if err != nil {
+		if ecrerr, ok := err.(awserr.Error); ok {
+			switch ecrerr.Code() {
+			case mediastore.ErrCodeContainerNotFoundException:
+				d.SetId("")
+				return nil
+			}
+		}
+		return err
+	}
+
+	d.SetId("")
+	return nil
+}
+
+func mediaStoreContainerRefreshStatusFunc(conn *mediastore.MediaStore, cn string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		input := &mediastore.DescribeContainerInput{
+			ContainerName: aws.String(cn),
+		}
+		resp, err := conn.DescribeContainer(input)
+		if err != nil {
+			return nil, "failed", err
+		}
+		return resp, *resp.Container.Status, nil
+	}
+}

aws/resource_aws_media_store_container_test.go

@@ -0,0 +1,109 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/service/mediastore"
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccAwsMediaStoreContainer_basic(t *testing.T) {
+	rName := acctest.RandString(5)
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAwsMediaStoreContainerDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccMediaStoreContainerConfig(rName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsMediaStoreContainerExists("aws_media_store_container.test"),
+				),
+			},
+			{
+				Config: testAccMediaStoreContainerConfig_Update(rName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsMediaStoreContainerExists("aws_media_store_container.test"),
+					resource.TestCheckResourceAttrSet("aws_media_store_container.test", "policy"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckAwsMediaStoreContainerDestroy(s *terraform.State) error {
+	conn := testAccProvider.Meta().(*AWSClient).mediastoreconn
+
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "aws_media_store_container" {
+			continue
+		}
+
+		input := &mediastore.DescribeContainerInput{
+			ContainerName: aws.String(rs.Primary.ID),
+		}
+
+		resp, err := conn.DescribeContainer(input)
+		if err != nil {
+			if ecrerr, ok := err.(awserr.Error); ok {
+				switch ecrerr.Code() {
+				case mediastore.ErrCodeContainerNotFoundException:
+					return nil
+				}
+			}
+			return err
+		}
+
+		if *resp.Container.Status != mediastore.ContainerStatusDeleting {
+			return fmt.Errorf("Media Store Container (%s) not deleted", rs.Primary.ID)
+		}
+	}
+	return nil
+}
+
+func testAccCheckAwsMediaStoreContainerExists(name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		_, ok := s.RootModule().Resources[name]
+		if !ok {
+			return fmt.Errorf("Not found: %s", name)
+		}
+
+		return nil
+	}
+}
+
+func testAccMediaStoreContainerConfig(rName string) string {
+	return fmt.Sprintf(`
+resource "aws_media_store_container" "test" {
+  name = "tf_mediastore_%s"
+}`, rName)
+}
+
+func testAccMediaStoreContainerConfig_Update(rName string) string {
+	return fmt.Sprintf(`
+data "aws_caller_identity" "test" {}
+
+resource "aws_media_store_container" "test" {
+  name = "tf_mediastore_%s"
+	policy = <<POLICY
+{
+  "Version": "2012-10-17",
+  "Statement": [{
+    "Sid": "MediaStoreFullAccess",
+    "Action": [ "mediastore:*" ],
+    "Principal": {"AWS" : "*"},
+    "Effect": "Allow",
+    "Resource": "arn:aws:mediastore:us-west-2:${data.aws_caller_identity.test.account_id}:container/tf_mediastore_%s/*",
+    "Condition": {
+      "Bool": { "aws:SecureTransport": "true" }
+    }
+  }]
+}
+POLICY
+}`, rName, rName)
+}

website/aws.erb

@@ -1118,6 +1118,18 @@
                         <li<%= sidebar_current("docs-aws-resource-mq-configuration") %>>
                             <a href="/docs/providers/aws/r/mq_configuration.html">aws_mq_configuration</a>
                         </li>
+
+                    </ul>
+                </li>
+
+                <li<%= sidebar_current("docs-aws-resource-media-store") %>>
+                    <a href="#">MediaStore Resources</a>
+                    <ul class="nav nav-visible">
+
+                        <li<%= sidebar_current("docs-aws-resource-media-store-container") %>>
+                          <a href="/docs/providers/aws/r/media_store_container.html">aws_media_store_container</a>
+                        </li>
+
                     </ul>
                 </li>
 

website/docs/r/media_store_container.html.markdown

@@ -0,0 +1,33 @@
+---
+layout: "aws"
+page_title: "AWS: aws_media_store_container"
+sidebar_current: "docs-aws-resource-media-store-container"
+description: |-
+  Provides a MediaStore Container.
+---
+
+# aws_media_store_container
+
+Provides a MediaStore Container.
+
+## Example Usage
+
+```hcl
+resource "aws_media_store_container" "example" {
+  name = "example"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name` - (Required) The name of the container. Must atisfy regular expression pattern: `\w+`
+* `policy` - (Optional) The policy of the container.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `arn` - The ARN of the container.
+* `endpoint` - The DNS endpoint of the container.