Refactor - new resource: aws_cloudfront_distribution

 * Includes a complete re-write of the old aws_cloudfront_web_distribution
   resource to bring it to feature parity with API and CloudFormation.
 * Also includes the aws_cloudfront_origin_access_identity resource to generate
   origin access identities for use with S3.

builtin/providers/aws/resource_aws_cloudfront_distribution_test.go

@@ -0,0 +1,392 @@
+package aws
+
+import (
+ "fmt"
+ "math/rand"
+ "testing"
+ "time"
+
+ "github.com/aws/aws-sdk-go/aws"
+ "github.com/aws/aws-sdk-go/service/cloudfront"
+ "github.com/hashicorp/terraform/helper/resource"
+ "github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccAWSCloudFrontDistribution_S3Origin(t *testing.T) {
+ resource.Test(t, resource.TestCase{
+ PreCheck: func() { testAccPreCheck(t) },
+ Providers: testAccProviders,
+ CheckDestroy: testAccCheckCloudFrontDistributionDestroy,
+ Steps: []resource.TestStep{
+ resource.TestStep{
+ Config: testAccAWSCloudFrontDistributionS3Config,
+ Check: resource.ComposeTestCheckFunc(
+ testAccCheckCloudFrontDistributionExistence(
+ "aws_cloudfront_distribution.s3_distribution",
+ ),
+ ),
+ },
+ },
+ })
+}
+
+func TestAccAWSCloudFrontDistribution_customOrigin(t *testing.T) {
+ resource.Test(t, resource.TestCase{
+ PreCheck: func() { testAccPreCheck(t) },
+ Providers: testAccProviders,
+ CheckDestroy: testAccCheckCloudFrontDistributionDestroy,
+ Steps: []resource.TestStep{
+ resource.TestStep{
+ Config: testAccAWSCloudFrontDistributionCustomConfig,
+ Check: resource.ComposeTestCheckFunc(
+ testAccCheckCloudFrontDistributionExistence(
+ "aws_cloudfront_distribution.custom_distribution",
+ ),
+ ),
+ },
+ },
+ })
+}
+
+func TestAccAWSCloudFrontDistribution_multiOrigin(t *testing.T) {
+ resource.Test(t, resource.TestCase{
+ PreCheck: func() { testAccPreCheck(t) },
+ Providers: testAccProviders,
+ CheckDestroy: testAccCheckCloudFrontDistributionDestroy,
+ Steps: []resource.TestStep{
+ resource.TestStep{
+ Config: testAccAWSCloudFrontDistributionMultiOriginConfig,
+ Check: resource.ComposeTestCheckFunc(
+ testAccCheckCloudFrontDistributionExistence(
+ "aws_cloudfront_distribution.multi_origin_distribution",
+ ),
+ ),
+ },
+ },
+ })
+}
+
+func TestAccAWSCloudFrontDistribution_noLoggingConfig(t *testing.T) {
+ resource.Test(t, resource.TestCase{
+ PreCheck: func() { testAccPreCheck(t) },
+ Providers: testAccProviders,
+ CheckDestroy: testAccCheckCloudFrontDistributionDestroy,
+ Steps: []resource.TestStep{
+ resource.TestStep{
+ Config: testAccAWSCloudFrontDistributionNoLoggingConfig,
+ Check: resource.ComposeTestCheckFunc(
+ testAccCheckCloudFrontDistributionExistence(
+ "aws_cloudfront_distribution.no_logging_config",
+ ),
+ ),
+ },
+ },
+ })
+}
+
+func testAccCheckCloudFrontDistributionDestroy(s *terraform.State) error {
+ for k, rs := range s.RootModule().Resources {
+ if rs.Type != "aws_cloudfront_distribution" {
+ continue
+ }
+ dist, _ := testAccAuxCloudFrontGetDistributionConfig(s, k)
+
+ if *dist.DistributionConfig.Enabled != false {
+ return fmt.Errorf("CloudFront distribution should be disabled")
+ }
+ }
+ return nil
+}
+
+func testAccCheckCloudFrontDistributionExistence(cloudFrontResource string) resource.TestCheckFunc {
+ return func(s *terraform.State) error {
+ _, err := testAccAuxCloudFrontGetDistributionConfig(s, cloudFrontResource)
+
+ return err
+ }
+}
+
+func testAccAuxCloudFrontGetDistributionConfig(s *terraform.State, cloudFrontResource string) (*cloudfront.Distribution, error) {
+ cf, ok := s.RootModule().Resources[cloudFrontResource]
+ if !ok {
+ return nil, fmt.Errorf("Not found: %s", cloudFrontResource)
+ }
+
+ if cf.Primary.ID == "" {
+ return nil, fmt.Errorf("No Id is set")
+ }
+
+ cloudfrontconn := testAccProvider.Meta().(*AWSClient).cloudfrontconn
+
+ req := &cloudfront.GetDistributionInput{
+ Id: aws.String(cf.Primary.ID),
+ }
+
+ res, err := cloudfrontconn.GetDistribution(req)
+ if err != nil {
+ return nil, fmt.Errorf("Error retrieving CloudFront distribution: %s", err)
+ }
+
+ return res.Distribution, nil
+}
+
+var testAccAWSCloudFrontDistributionS3Config = fmt.Sprintf(`
+variable rand_id {
+ default = %d
+}
+
+resource "aws_s3_bucket" "s3_bucket" {
+ bucket = "mybucket.${var.rand_id}.s3.amazonaws.com"
+ acl = "public-read"
+}
+
+resource "aws_cloudfront_distribution" "s3_distribution" {
+ origin {
+ domain_name = "${aws_s3_bucket.s3_bucket.id}"
+ origin_id = "myS3Origin"
+ s3_origin_config {}
+ }
+ enabled = true
+ comment = "Some comment"
+ default_root_object = "index.html"
+ logging_config {
+ include_cookies = false
+ bucket = "mylogs.${var.rand_id}.s3.amazonaws.com"
+ prefix = "myprefix"
+ }
+ aliases = [ "mysite.${var.rand_id}.example.com", "yoursite.${var.rand_id}.example.com" ]
+ default_cache_behavior {
+ allowed_methods = [ "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT" ]
+ cached_methods = [ "GET", "HEAD" ]
+ target_origin_id = "myS3Origin"
+ forwarded_values {
+ query_string = false
+ cookies {
+ forward = "none"
+ }
+ }
+ viewer_protocol_policy = "allow-all"
+ min_ttl = 0
+ default_ttl = 3600
+ max_ttl = 86400
+ }
+ price_class = "PriceClass_200"
+ restrictions {
+ geo_restriction {
+ restriction_type = "whitelist"
+ locations = [ "US", "CA", "GB", "DE" ]
+ }
+ }
+ viewer_certificate {
+ cloudfront_default_certificate = true
+ }
+ retain_on_delete = true
+}
+`, rand.New(rand.NewSource(time.Now().UnixNano())).Int())
+
+var testAccAWSCloudFrontDistributionCustomConfig = fmt.Sprintf(`
+variable rand_id {
+ default = %d
+}
+
+resource "aws_cloudfront_distribution" "custom_distribution" {
+ origin {
+ domain_name = "www.example.com"
+ origin_id = "myCustomOrigin"
+ custom_origin_config {
+ http_port = 80
+ https_port = 443
+ origin_protocol_policy = "http-only"
+ origin_ssl_protocols = [ "SSLv3", "TLSv1" ]
+ }
+ }
+ enabled = true
+ comment = "Some comment"
+ default_root_object = "index.html"
+ logging_config {
+ include_cookies = false
+ bucket = "mylogs.${var.rand_id}.s3.amazonaws.com"
+ prefix = "myprefix"
+ }
+ aliases = [ "mysite.${var.rand_id}.example.com", "*.yoursite.${var.rand_id}.example.com" ]
+ default_cache_behavior {
+ allowed_methods = [ "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT" ]
+ cached_methods = [ "GET", "HEAD" ]
+ target_origin_id = "myCustomOrigin"
+ smooth_streaming = false
+ forwarded_values {
+ query_string = false
+ cookies {
+ forward = "all"
+ }
+ }
+ viewer_protocol_policy = "allow-all"
+ min_ttl = 0
+ default_ttl = 3600
+ max_ttl = 86400
+ }
+ price_class = "PriceClass_200"
+ restrictions {
+ geo_restriction {
+ restriction_type = "whitelist"
+ locations = [ "US", "CA", "GB", "DE" ]
+ }
+ }
+ viewer_certificate {
+ cloudfront_default_certificate = true
+ }
+ retain_on_delete = true
+}
+`, rand.New(rand.NewSource(time.Now().UnixNano())).Int())
+
+var testAccAWSCloudFrontDistributionMultiOriginConfig = fmt.Sprintf(`
+variable rand_id {
+ default = %d
+}
+
+resource "aws_s3_bucket" "s3_bucket" {
+ bucket = "mybucket.${var.rand_id}.s3.amazonaws.com"
+ acl = "public-read"
+}
+
+resource "aws_cloudfront_distribution" "multi_origin_distribution" {
+ origin {
+ domain_name = "${aws_s3_bucket.s3_bucket.id}"
+ origin_id = "myS3Origin"
+ s3_origin_config {}
+ }
+ origin {
+ domain_name = "www.example.com"
+ origin_id = "myCustomOrigin"
+ custom_origin_config {
+ http_port = 80
+ https_port = 443
+ origin_protocol_policy = "http-only"
+ origin_ssl_protocols = [ "SSLv3", "TLSv1" ]
+ }
+ }
+ enabled = true
+ comment = "Some comment"
+ default_root_object = "index.html"
+ logging_config {
+ include_cookies = false
+ bucket = "mylogs.${var.rand_id}.s3.amazonaws.com"
+ prefix = "myprefix"
+ }
+ aliases = [ "mysite.${var.rand_id}.example.com", "*.yoursite.${var.rand_id}.example.com" ]
+ default_cache_behavior {
+ allowed_methods = [ "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT" ]
+ cached_methods = [ "GET", "HEAD" ]
+ target_origin_id = "myS3Origin"
+ smooth_streaming = true
+ forwarded_values {
+ query_string = false
+ cookies {
+ forward = "all"
+ }
+ }
+ min_ttl = 100
+ default_ttl = 100
+ max_ttl = 100
+ viewer_protocol_policy = "allow-all"
+ }
+ cache_behavior {
+ allowed_methods = [ "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT" ]
+ cached_methods = [ "GET", "HEAD" ]
+ target_origin_id = "myS3Origin"
+ forwarded_values {
+ query_string = true
+ cookies {
+ forward = "none"
+ }
+ }
+ min_ttl = 50
+ default_ttl = 50
+ max_ttl = 50
+ viewer_protocol_policy = "allow-all"
+ path_pattern = "images1/*.jpg"
+ }
+ cache_behavior {
+ allowed_methods = [ "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT" ]
+ cached_methods = [ "GET", "HEAD" ]
+ target_origin_id = "myCustomOrigin"
+ forwarded_values {
+ query_string = true
+ cookies {
+ forward = "none"
+ }
+ }
+ min_ttl = 50
+ default_ttl = 50
+ max_ttl = 50
+ viewer_protocol_policy = "allow-all"
+ path_pattern = "images2/*.jpg"
+ }
+ price_class = "PriceClass_All"
+ custom_error_response {
+ error_code = 404
+ response_page_path = "/error-pages/404.html"
+ response_code = 200
+ error_caching_min_ttl = 30
+ }
+ restrictions {
+ geo_restriction {
+ restriction_type = "none"
+ }
+ }
+ viewer_certificate {
+ cloudfront_default_certificate = true
+ }
+ retain_on_delete = true
+}
+`, rand.New(rand.NewSource(time.Now().UnixNano())).Int())
+
+var testAccAWSCloudFrontDistributionNoLoggingConfig = fmt.Sprintf(`
+variable rand_id {
+ default = %d
+}
+
+resource "aws_cloudfront_distribution" "no_logging_config" {
+ origin {
+ domain_name = "www.example.com"
+ origin_id = "myCustomOrigin"
+ custom_origin_config {
+ http_port = 80
+ https_port = 443
+ origin_protocol_policy = "http-only"
+ origin_ssl_protocols = [ "SSLv3", "TLSv1" ]
+ }
+ }
+ enabled = true
+ comment = "Some comment"
+ default_root_object = "index.html"
+ aliases = [ "mysite.${var.rand_id}.example.com", "*.yoursite.${var.rand_id}.example.com" ]
+ default_cache_behavior {
+ allowed_methods = [ "DELETE", "GET", "HEAD", "OPTIONS", "PATCH", "POST", "PUT" ]
+ cached_methods = [ "GET", "HEAD" ]
+ target_origin_id = "myCustomOrigin"
+ smooth_streaming = false
+ forwarded_values {
+ query_string = false
+ cookies {
+ forward = "all"
+ }
+ }
+ viewer_protocol_policy = "allow-all"
+ min_ttl = 0
+ default_ttl = 3600
+ max_ttl = 86400
+ }
+ price_class = "PriceClass_200"
+ restrictions {
+ geo_restriction {
+ restriction_type = "whitelist"
+ locations = [ "US", "CA", "GB", "DE" ]
+ }
+ }
+ viewer_certificate {
+ cloudfront_default_certificate = true
+ }
+ retain_on_delete = true
+}
+`, rand.New(rand.NewSource(time.Now().UnixNano())).Int())