Merge pull request #5586 from terraform-providers/b-aws_cloudfront_di…

…stribution-ordered_cache_behavior-import resource/aws_cloudfront_distribution: Import into ordered_cache_behavior instead of deprecated cache_behavior
hashicorp · Aug 20, 2018 · f3dfbdf · f3dfbdf
2 parents 294c533 + 4e56e0c
commit f3dfbdf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/aws/cloudfront_distribution_configuration_structure.go b/aws/cloudfront_distribution_configuration_structure.go
@@ -144,10 +144,10 @@ func flattenDistributionConfig(d *schema.ResourceData, distributionConfig *cloud
  }
  }
  if distributionConfig.CacheBehaviors != nil {
- if _, ok := d.GetOk("ordered_cache_behavior"); ok {
- err = d.Set("ordered_cache_behavior", flattenCacheBehaviors(distributionConfig.CacheBehaviors))
- } else {
+ if _, ok := d.GetOk("cache_behavior"); ok {
  err = d.Set("cache_behavior", flattenCacheBehaviorsDeprecated(distributionConfig.CacheBehaviors))
+ } else {
+ err = d.Set("ordered_cache_behavior", flattenCacheBehaviors(distributionConfig.CacheBehaviors))
  }
 
  if err != nil {

diff --git a/aws/resource_aws_cloudfront_distribution_test.go b/aws/resource_aws_cloudfront_distribution_test.go
@@ -219,6 +219,11 @@ func TestAccAWSCloudFrontDistribution_orderedCacheBehavior(t *testing.T) {
  resource.TestCheckResourceAttr(resourceName, "ordered_cache_behavior.1.path_pattern", "images2/*.jpg"),
  ),
  },
+ {
+ ResourceName: resourceName,
+ ImportState: true,
+ ImportStateVerify: true,
+ },
  },
  })
 }