Add website_domain for S3 buckets.

hashicorp · Jun 3, 2015 · 49d962d · 49d962d
1 parent f1439e6
commit 49d962d
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/builtin/providers/aws/resource_aws_route53_record_test.go b/builtin/providers/aws/resource_aws_route53_record_test.go
@@ -155,6 +155,22 @@ func TestAccRoute53Record_alias(t *testing.T) {
 	})
 }
 
+func TestAccRoute53Record_s3_alias(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckRoute53RecordDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccRoute53S3AliasRecord,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckRoute53RecordExists("aws_route53_record.alias"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccRoute53Record_weighted_alias(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -449,6 +465,32 @@ resource "aws_route53_record" "alias" {
 }
 `
 
+const testAccRoute53S3AliasRecord = `
+resource "aws_route53_zone" "main" {
+  name = "notexample.com"
+}
+
+resource "aws_s3_bucket" "website" {
+  bucket = "website.notexample.com"
+	acl = "public-read"
+	website {
+		index_document = index.html
+	}
+}
+
+resource "aws_route53_record" "alias" {
+  zone_id = "${aws_route53_zone.main.zone_id}"
+  name = "www"
+  type = "A"
+
+  alias {
+    zone_id = "${aws_route53_zone.main.zone_id}"
+    name = "${aws_s3_bucket.website.website_domain}"
+    evaluate_target_health = true
+  }
+}
+`
+
 const testAccRoute53WeightedElbAliasRecord = `
 resource "aws_route53_zone" "main" {
   name = "notexample.com"

diff --git a/builtin/providers/aws/resource_aws_s3_bucket.go b/builtin/providers/aws/resource_aws_s3_bucket.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
 
@@ -84,6 +85,12 @@ func resourceAwsS3Bucket() *schema.Resource {
 				Computed: true,
 			},
 
+			"website_domain": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+
 			"tags": tagsSchema(),
 
 			"force_destroy": &schema.Schema{
@@ -244,6 +251,9 @@ func resourceAwsS3BucketRead(d *schema.ResourceData, meta interface{}) error {
 	if err := d.Set("website_endpoint", endpoint); err != nil {
 		return err
 	}
+	if err := d.Set("website_domain", strings.TrimPrefix(endpoint, fmt.Sprintf("%s.", d.Id()))); err != nil {
+		return err
+	}
 
 	tagSet, err := getTagSetS3(s3conn, d.Id())
 	if err != nil {