Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resource/aws_cloudfront_distribution: Import into ordered_cache_behavior instead of deprecated cache_behavior #5586

Merged

Conversation

bflad
Copy link
Contributor

@bflad bflad commented Aug 17, 2018

Fixes: #5580
Fixes: #4773

Previously:

--- FAIL: TestAccAWSCloudFrontDistribution_orderedCacheBehavior (739.56s)
	testing.go:527: Step 1 error: ImportStateVerify attributes not equivalent. Difference is shown below. Top is actual, bottom is expected.

		(map[string]string) (len=59) {
		 (string) (len=16) "cache_behavior.#": (string) (len=1) "2",
...
		 (string) (len=48) "cache_behavior.1203603591.viewer_protocol_policy": (string) (len=9) "allow-all"
		}

		(map[string]string) (len=59) {
		 (string) (len=24) "ordered_cache_behavior.#": (string) (len=1) "2",
...
		 (string) (len=47) "ordered_cache_behavior.1.viewer_protocol_policy": (string) (len=9) "allow-all"
		}

Changes proposed in this pull request:

  • Use d.GetOk() against the old attribute during read instead of the new attribute, which defaults imports to the new attribute

Output from acceptance testing:

--- PASS: TestAccAWSCloudFrontDistribution_orderedCacheBehavior (820.16s)

…ior instead of deprecated cache_behavior

Previously:

--- FAIL: TestAccAWSCloudFrontDistribution_orderedCacheBehavior (739.56s)
	testing.go:527: Step 1 error: ImportStateVerify attributes not equivalent. Difference is shown below. Top is actual, bottom is expected.

		(map[string]string) (len=59) {
		 (string) (len=16) "cache_behavior.#": (string) (len=1) "2",
...
		 (string) (len=48) "cache_behavior.1203603591.viewer_protocol_policy": (string) (len=9) "allow-all"
		}

		(map[string]string) (len=59) {
		 (string) (len=24) "ordered_cache_behavior.#": (string) (len=1) "2",
...
		 (string) (len=47) "ordered_cache_behavior.1.viewer_protocol_policy": (string) (len=9) "allow-all"
		}

Now:

--- PASS: TestAccAWSCloudFrontDistribution_orderedCacheBehavior (820.16s)
@bflad bflad added bug Addresses a defect in current functionality. service/cloudfront Issues and PRs that pertain to the cloudfront service. labels Aug 17, 2018
@bflad bflad requested a review from a team August 17, 2018 05:12
@ghost ghost added the size/S Managed by automation to categorize the size of a PR. label Aug 17, 2018
Copy link
Contributor

@tombuildsstuff tombuildsstuff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@bflad bflad added this to the v1.33.0 milestone Aug 20, 2018
@bflad bflad merged commit f3dfbdf into master Aug 20, 2018
@bflad bflad deleted the b-aws_cloudfront_distribution-ordered_cache_behavior-import branch August 20, 2018 14:57
bflad added a commit that referenced this pull request Aug 20, 2018
@bflad
Copy link
Contributor Author

bflad commented Aug 22, 2018

This has been released in version 1.33.0 of the AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

@ghost
Copy link

ghost commented Apr 3, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked and limited conversation to collaborators Apr 3, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Addresses a defect in current functionality. service/cloudfront Issues and PRs that pertain to the cloudfront service. size/S Managed by automation to categorize the size of a PR.
Projects
None yet
2 participants