2544 terraform s3 policy

builtin/providers/aws/provider.go

@@ -119,6 +119,7 @@ func Provider() terraform.ResourceProvider {
 			"aws_route_table_association":      resourceAwsRouteTableAssociation(),
 			"aws_route_table":                  resourceAwsRouteTable(),
 			"aws_s3_bucket":                    resourceAwsS3Bucket(),
+			"aws_s3_bucket_policy":             resourceAwsS3BucketPolicy(),
 			"aws_security_group":               resourceAwsSecurityGroup(),
 			"aws_security_group_rule":          resourceAwsSecurityGroupRule(),
 			"aws_subnet":                       resourceAwsSubnet(),

builtin/providers/aws/resource_aws_s3_bucket_policy.go

@@ -0,0 +1,100 @@
+package aws
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/hashicorp/terraform/helper/schema"
+
+	"github.com/awslabs/aws-sdk-go/aws"
+	"github.com/awslabs/aws-sdk-go/aws/awsutil"
+	"github.com/awslabs/aws-sdk-go/service/s3"
+)
+
+func resourceAwsS3BucketPolicy() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceAwsS3BucketPolicyPut,
+		Update: resourceAwsS3BucketPolicyPut,
+		Read:   resourceAwsS3BucketPolicyRead,
+		Delete: resourceAwsS3BucketPolicyDelete,
+
+		Schema: map[string]*schema.Schema{
+			"bucket": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"policy": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"name": &schema.Schema{
+				Type:     schema.TypeString,
+				Required: true,
+			},
+		},
+	}
+}
+
+func resourceAwsS3BucketPolicyPut(d *schema.ResourceData, meta interface{}) error {
+
+	s3conn := meta.(*AWSClient).s3conn
+	bucket := d.Get("bucket").(string)
+	policy := d.Get("policy").(string)
+	name := d.Get("name").(string)
+
+	resp, err := s3conn.PutBucketPolicy(
+		&s3.PutBucketPolicyInput{
+			Bucket: aws.String(bucket),
+			Policy: aws.String(policy),
+		})
+
+	log.Printf("[DEBUG] S3 bucket policy set (response): %s", awsutil.StringValue(resp))
+
+	if err != nil {
+		return fmt.Errorf("Error adding policy to S3 bucket: %s", err)
+	}
+
+	d.SetId(fmt.Sprintf("%s:%s", bucket, name))
+	return nil
+}
+
+func resourceAwsS3BucketPolicyRead(d *schema.ResourceData, meta interface{}) error {
+
+	s3conn := meta.(*AWSClient).s3conn
+	bucket := d.Get("bucket").(string)
+
+	resp, err := s3conn.GetBucketPolicy(
+		&s3.GetBucketPolicyInput{
+			Bucket: aws.String(bucket),
+		},
+	)
+
+	if resp != nil {
+		if resp.Policy != nil {
+			d.Set("policy", resp.Policy)
+		}
+	}
+
+	if err != nil {
+		return fmt.Errorf("Error getting policy for S3 bucket (%s): %s", bucket, err)
+	}
+	return nil
+}
+
+func resourceAwsS3BucketPolicyDelete(d *schema.ResourceData, meta interface{}) error {
+
+	s3conn := meta.(*AWSClient).s3conn
+	bucket := d.Get("bucket").(string)
+
+	_, err := s3conn.DeleteBucketPolicy(
+		&s3.DeleteBucketPolicyInput{
+			Bucket: aws.String(bucket),
+		},
+	)
+
+	if err != nil {
+		return fmt.Errorf("Error deleting policy for S3 bucket (%s): %s", bucket, err)
+	}
+
+	return nil
+}