acceptance tests, gofmt, and md update

hashicorp · Mar 16, 2019 · c3a70fa · c3a70fa
1 parent bdf9ec3
commit c3a70fa
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 39 deletions.
diff --git a/aws/cloudfront_distribution_configuration_structure.go b/aws/cloudfront_distribution_configuration_structure.go
@@ -701,19 +701,6 @@ func flattenOriginGroupMembers(ogm *cloudfront.OriginGroupMembers) []interface{}
 	return s
 }
 
-func expandOriginGroupMember(m map[string]interface{}) *cloudfront.OriginGroupMember {
-	return &cloudfront.OriginGroupMember{
-		OriginId: aws.String(m["origin_id"].(string)),
-	}
-}
-
-func flattenOriginGroupMember(ogms *cloudfront.OriginGroupMember) map[string]interface{} {
-	m := map[string]interface{}{
-		"origin_id": *ogms.OriginId,
-	}
-	return m
-}
-
 // Assemble the hash for the aws_cloudfront_distribution origin
 // TypeSet attribute.
 func originHash(v interface{}) int {

diff --git a/aws/resource_aws_cloudfront_distribution.go b/aws/resource_aws_cloudfront_distribution.go
@@ -493,7 +493,6 @@ func resourceAwsCloudFrontDistribution() *schema.Resource {
 							Type:     schema.TypeList,
 							Required: true,
 							MaxItems: 1,
-							Set:      failoverCriteriaHash,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"status_codes": {

diff --git a/aws/resource_aws_cloudfront_distribution_test.go b/aws/resource_aws_cloudfront_distribution_test.go
@@ -753,16 +753,16 @@ func TestAccAWSCloudFrontDistribution_OriginGroups(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCloudFrontDistributionExists(resourceName, &distribution),
 					resource.TestCheckResourceAttr(resourceName, "origin_group.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "origin_group.3694416691.origin_id", "groupS3"),
-					resource.TestCheckResourceAttr(resourceName, "origin_group.3694416691.failover_criteria.409426305.status_codes.#", "4"),
-					resource.TestCheckResourceAttr(resourceName, "origin_group.3694416691.failover_criteria.409426305.status_codes.0", "403"),
-					resource.TestCheckResourceAttr(resourceName, "origin_group.3694416691.failover_criteria.409426305.status_codes.1", "404"),
-					resource.TestCheckResourceAttr(resourceName, "origin_group.3694416691.failover_criteria.409426305.status_codes.2", "500"),
-					resource.TestCheckResourceAttr(resourceName, "origin_group.3694416691.failover_criteria.409426305.status_codes.3", "502"),
-					resource.TestCheckResourceAttr(resourceName, "origin_group.3694416691.members.1751759501.ordered_origin_group_member.#", "2"),
-					resource.TestCheckResourceAttr(resourceName, "origin_group.3694416691.members.1751759501.ordered_origin_group_member.0.origin_id", "primaryS3"),
-					resource.TestCheckResourceAttr(resourceName, "origin_group.3694416691.members.1751759501.ordered_origin_group_member.1.origin_id", "failoverS3"),
-					resource.TestCheckResourceAttr(resourceName, "default_cache_behavior.2496375652.target_origin_id", "groupS3"),
+					resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.origin_id", "groupS3"),
+					resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.0.status_codes.#", "4"),
+					resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.0.status_codes.1057413486", "403"),
+					resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.0.status_codes.1883721641", "404"),
+					resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.0.status_codes.2661388106", "502"),
+					resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.failover_criteria.0.status_codes.2895637960", "500"),
+					resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.member.#", "2"),
+					resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.member.0.origin_id", "primaryS3"),
+					resource.TestCheckResourceAttr(resourceName, "origin_group.1789175660.member.1.origin_id", "failoverS3"),
 				),
 			},
 		},
@@ -1482,13 +1482,11 @@ resource "aws_cloudfront_distribution" "failover_distribution" {
     failover_criteria {
       status_codes = [403, 404, 500, 502]
     }
-    members {
-      ordered_origin_group_member {
-        origin_id = "primaryS3"
-      }
-      ordered_origin_group_member {
-        origin_id = "failoverS3"
-      }
+    member {
+      origin_id = "primaryS3"
+    }
+    member {
+      origin_id = "failoverS3"
     }
   }
   enabled = true

diff --git a/website/docs/r/cloudfront_distribution.html.markdown b/website/docs/r/cloudfront_distribution.html.markdown
@@ -151,16 +151,15 @@ resource "aws_cloudfront_distribution" "s3_distribution" {
     origin_id = "groupS3"
 
     failover_criteria {
-      status_codes = [403, 404, 500, 502, 503, 504]
+      status_codes = [403, 404, 500, 502]
     }
 
-    members {
-      ordered_origin_group_member {
-        origin_id = "primaryS3"
-      }
-      ordered_origin_group_member {
-        origin_id = "failoverS3"
-      }
+    member {
+      origin_id = "primaryS3"
+    }
+    
+    member {
+      origin_id = "failoverS3"
     }
   }