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

provider/aws: Allow empty S3 config in Cloudfront Origin #6487

Merged
merged 2 commits into from
May 5, 2016

Conversation

catsby
Copy link
Contributor

@catsby catsby commented May 4, 2016

If both custom and s3 origin are missing, add an empty s3 origin... one or the other must be specified, but the S3 origin can be "empty". Fixes #6422

@catsby
Copy link
Contributor Author

catsby commented May 4, 2016

Waiting on acc tests (which take some time) to complete, will update when they do!

@catsby catsby changed the title provider/aws: Allow empty S3 config in Cloudfront Origin [WIP] provider/aws: Allow empty S3 config in Cloudfront Origin May 4, 2016
@phinze
Copy link
Contributor

phinze commented May 5, 2016

Code LGTM 👍

@catsby
Copy link
Contributor Author

catsby commented May 5, 2016

Tests pass

==> Checking that code complies with gofmt requirements...
/Users/clint/Projects/Go/bin/stringer
go generate $(go list ./... | grep -v /vendor/)
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSCloudFrontDistribution_ -timeout 120m
=== RUN   TestAccAWSCloudFrontDistribution_S3Origin
--- PASS: TestAccAWSCloudFrontDistribution_S3Origin (21.72s)
=== RUN   TestAccAWSCloudFrontDistribution_customOrigin
--- PASS: TestAccAWSCloudFrontDistribution_customOrigin (9.36s)
=== RUN   TestAccAWSCloudFrontDistribution_multiOrigin
--- PASS: TestAccAWSCloudFrontDistribution_multiOrigin (19.68s)
=== RUN   TestAccAWSCloudFrontDistribution_noOptionalItemsConfig
--- PASS: TestAccAWSCloudFrontDistribution_noOptionalItemsConfig (8.15s)
=== RUN   TestAccAWSCloudFrontDistribution_noCustomErrorResponseConfig
--- PASS: TestAccAWSCloudFrontDistribution_noCustomErrorResponseConfig (7.03s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    65.963s

@catsby catsby changed the title [WIP] provider/aws: Allow empty S3 config in Cloudfront Origin provider/aws: Allow empty S3 config in Cloudfront Origin May 5, 2016
@catsby catsby merged commit c588924 into master May 5, 2016
@catsby catsby deleted the b-aws-cloudfront-s3-update branch May 5, 2016 15:49
bigkraig pushed a commit to ticketmaster/terraform that referenced this pull request May 5, 2016
)

* provider/aws: Allow empty S3 config in Cloudfront Origin
cristicalin pushed a commit to cristicalin/terraform that referenced this pull request May 24, 2016
)

* provider/aws: Allow empty S3 config in Cloudfront Origin
@ghost
Copy link

ghost commented Apr 26, 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 have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@ghost ghost locked and limited conversation to collaborators Apr 26, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

s3_origin_config is a required field for aws_cloudfront_distribution
2 participants