Merge pull request #1865 from justincampbell/s3-region-zone

providers/aws: Add hosted_zone_id and region to attributes

builtin/providers/aws/hosted_zones.go

@@ -0,0 +1,23 @@
+package aws
+
+// This list is copied from
+// http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_website_region_endpoints
+// It currently cannot be generated from the API json.
+var hostedZoneIDsMap = map[string]string{
+	"us-east-1":      "Z3AQBSTGFYJSTF",
+	"us-west-2":      "Z3BJ6K6RIION7M",
+	"us-west-1":      "Z2F56UZL2M1ACD",
+	"eu-west-1":      "Z1BKCTXD74EZPE",
+	"central-1":      "Z21DNDUVLTQW6Q",
+	"ap-southeast-1": "Z3O0J2DXBE1FTB",
+	"ap-southeast-2": "Z1WCIGYICN2BYD",
+	"ap-northeast-1": "Z2M4EHUR26P7ZW",
+	"sa-east-1":      "Z7KQH4QJS55SO",
+	"us-gov-west-1":  "Z31GFT0UA1I2HV",
+}
+
+// Returns the hosted zone ID for an S3 website endpoint region. This can be
+// used as input to the aws_route53_record resource's zone_id argument.
+func HostedZoneIDForRegion(region string) string {
+	return hostedZoneIDsMap[region]
+}

builtin/providers/aws/hosted_zones_test.go

@@ -0,0 +1,19 @@
+package aws
+
+import (
+	"testing"
+)
+
+func TestHostedZoneIDForRegion(t *testing.T) {
+	if r := HostedZoneIDForRegion("us-east-1"); r != "Z3AQBSTGFYJSTF" {
+		t.Fatalf("bad: %s", r)
+	}
+	if r := HostedZoneIDForRegion("ap-southeast-2"); r != "Z1WCIGYICN2BYD" {
+		t.Fatalf("bad: %s", r)
+	}
+
+	// Bad input should be empty string
+	if r := HostedZoneIDForRegion("not-a-region"); r != "" {
+		t.Fatalf("bad: %s", r)
+	}
+}

builtin/providers/aws/resource_aws_s3_bucket.go

@@ -49,6 +49,18 @@ func resourceAwsS3Bucket() *schema.Resource {
 				},
 			},
 
+			"hosted_zone_id": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+
+			"region": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+
 			"website_endpoint": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
@@ -143,7 +155,31 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error {
 		return err
 	}
 
-	// Add website_endpoint as an output
+	// Add the region as an attribute
+	location, err := s3conn.GetBucketLocation(
+		&s3.GetBucketLocationInput{
+			Bucket: aws.String(d.Id()),
+		},
+	)
+	if err != nil {
+		return err
+	}
+	var region string
+	if location.LocationConstraint != nil {
+		region = *location.LocationConstraint
+	}
+	region = normalizeRegion(region)
+	if err := d.Set("region", region); err != nil {
+		return err
+	}
+
+	// Add the hosted zone ID for this bucket's region as an attribute
+	hostedZoneID := HostedZoneIDForRegion(region)
+	if err := d.Set("hosted_zone_id", hostedZoneID); err != nil {
+		return err
+	}
+
+	// Add website_endpoint as an attribute
 	endpoint, err := websiteEndpoint(s3conn, d)
 	if err != nil {
 		return err
@@ -260,13 +296,20 @@ func websiteEndpoint(s3conn *s3.S3, d *schema.ResourceData) (string, error) {
 		region = *location.LocationConstraint
 	}
 
+	return WebsiteEndpointUrl(bucket, region), nil
+}
+
+func WebsiteEndpointUrl(bucket string, region string) string {
+	region = normalizeRegion(region)
+	return fmt.Sprintf("%s.s3-website-%s.amazonaws.com", bucket, region)
+}
+
+func normalizeRegion(region string) string {
 	// Default to us-east-1 if the bucket doesn't have a region:
 	// http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETlocation.html
 	if region == "" {
 		region = "us-east-1"
 	}
 
-	endpoint := fmt.Sprintf("%s.s3-website-%s.amazonaws.com", bucket, region)
-
-	return endpoint, nil
+	return region
 }

builtin/providers/aws/resource_aws_s3_bucket_test.go

@@ -23,6 +23,10 @@ func TestAccAWSS3Bucket_basic(t *testing.T) {
 				Config: testAccAWSS3BucketConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSS3BucketExists("aws_s3_bucket.bucket"),
+					resource.TestCheckResourceAttr(
+						"aws_s3_bucket.bucket", "hosted_zone_id", HostedZoneIDForRegion("us-west-2")),
+					resource.TestCheckResourceAttr(
+						"aws_s3_bucket.bucket", "region", "us-west-2"),
 					resource.TestCheckResourceAttr(
 						"aws_s3_bucket.bucket", "website_endpoint", ""),
 				),

builtin/providers/aws/website_endpoint_url_test.go

@@ -0,0 +1,17 @@
+package aws
+
+import "testing"
+
+func TestWebsiteEndpointUrl_withoutRegion(t *testing.T) {
+	u := WebsiteEndpointUrl("buck.et", "")
+	if u != "buck.et.s3-website-us-east-1.amazonaws.com" {
+		t.Fatalf("bad: %s", u)
+	}
+}
+
+func TestWebsiteEndpointUrl_withRegion(t *testing.T) {
+	u := WebsiteEndpointUrl("buck.et", "us-west-1")
+	if u != "buck.et.s3-website-us-west-1.amazonaws.com" {
+		t.Fatalf("bad: %s", u)
+	}
+}

website/source/docs/providers/aws/r/s3_bucket.html.markdown

@@ -59,4 +59,6 @@ The website object supports the following:
 The following attributes are exported:
 
 * `id` - The name of the bucket.
+* `hosted_zone_id` - The [Route 53 Hosted Zone ID](http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_website_region_endpoints) for this bucket's region.
+* `region` - The AWS region this bucket resides in.
 * `website_endpoint` - The website endpoint, if the bucket is configured with a website. If not, this will be an empty string.