Merge branch 'rossd/cloudfront_import' of https://github.com/dropbox/terraform into dropbox-rossd/cloudfront_import

builtin/providers/aws/cloudfront_distribution_configuration_structure.go

@@ -11,6 +11,7 @@ import (
 	"bytes"
 	"fmt"
 	"reflect"
+	"sort"
 	"strconv"
 	"time"
 
@@ -25,6 +26,14 @@ import (
 // is used to set the zone_id attribute.
 const cloudFrontRoute53ZoneID = "Z2FDTNDATAQYW2"
 
+// Define Sort interface for []*string so we can ensure the order of
+// geo_restrictions.locations
+type StringPtrSlice []*string
+
+func (p StringPtrSlice) Len() int           { return len(p) }
+func (p StringPtrSlice) Less(i, j int) bool { return *p[i] < *p[j] }
+func (p StringPtrSlice) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
+
 // Assemble the *cloudfront.DistributionConfig variable. Calls out to various
 // expander functions to convert attributes and sub-attributes to the various
 // complex structures which are necessary to properly build the
@@ -873,6 +882,7 @@ func expandGeoRestriction(m map[string]interface{}) *cloudfront.GeoRestriction {
 	if v, ok := m["locations"]; ok {
 		gr.Quantity = aws.Int64(int64(len(v.([]interface{}))))
 		gr.Items = expandStringList(v.([]interface{}))
+		sort.Sort(StringPtrSlice(gr.Items))
 	} else {
 		gr.Quantity = aws.Int64(0)
 	}
@@ -884,6 +894,7 @@ func flattenGeoRestriction(gr *cloudfront.GeoRestriction) map[string]interface{}
 
 	m["restriction_type"] = *gr.RestrictionType
 	if gr.Items != nil {
+		sort.Sort(StringPtrSlice(gr.Items))
 		m["locations"] = flattenStringList(gr.Items)
 	}
 	return m

builtin/providers/aws/import_aws_cloudfront_distribution.go

@@ -0,0 +1,28 @@
+package aws
+
+import (
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/cloudfront"
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func resourceAwsCloudFrontDistributionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	conn := meta.(*AWSClient).cloudfrontconn
+	id := d.Id()
+	resp, err := conn.GetDistributionConfig(&cloudfront.GetDistributionConfigInput{
+		Id: aws.String(id),
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	distConfig := resp.DistributionConfig
+	results := make([]*schema.ResourceData, 1)
+	err = flattenDistributionConfig(d, distConfig)
+	if err != nil {
+		return nil, err
+	}
+	results[0] = d
+	return results, nil
+}

builtin/providers/aws/import_aws_cloudfront_distribution_test.go

@@ -0,0 +1,30 @@
+package aws
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccCloudFrontDistribution_importBasic(t *testing.T) {
+	resourceName := "aws_cloudfront_distribution.s3_distribution"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckCloudFrontDistributionDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccAWSCloudFrontDistributionS3Config,
+			},
+			resource.TestStep{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+				// Ignore retain_on_delete since it doesn't come from the AWS
+				// API.
+				ImportStateVerifyIgnore: []string{"retain_on_delete"},
+			},
+		},
+	})
+}

builtin/providers/aws/resource_aws_cloudfront_distribution.go

@@ -16,6 +16,9 @@ func resourceAwsCloudFrontDistribution() *schema.Resource {
 		Read:   resourceAwsCloudFrontDistributionRead,
 		Update: resourceAwsCloudFrontDistributionUpdate,
 		Delete: resourceAwsCloudFrontDistributionDelete,
+		Importer: &schema.ResourceImporter{
+			State: resourceAwsCloudFrontDistributionImport,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"aliases": &schema.Schema{