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

CloudFront updates (Aug 9, 2016) #540

Merged
merged 3 commits into from
Aug 11, 2016
Merged

CloudFront updates (Aug 9, 2016) #540

merged 3 commits into from
Aug 11, 2016

Conversation

philtay
Copy link
Contributor

@philtay philtay commented Aug 10, 2016

@@ -111,6 +120,7 @@ class Restrictions(AWSProperty):

class ViewerCertificate(AWSProperty):
props = {
'AcmCertificateArn': (basestring, False),
Copy link
Contributor

Choose a reason for hiding this comment

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

It would be nice to have a test that checks that only one of AcmCertificateArn, CloudFrontDefaultCertificate, or IamCertificateId is used.

@markpeek
Copy link
Member

@philtay let me know if you want to add the suggested check or whether I should merge as-is.

@philtay
Copy link
Contributor Author

philtay commented Aug 11, 2016

@markpeek I think it should be merged as-is. In some modules (e.g. ec2.py and waf.py) the conditional attributes have the Python comment # Conditional. Do you want me to add the comment?

@markpeek markpeek merged commit 473a737 into cloudtools:master Aug 11, 2016
@markpeek
Copy link
Member

Thanks! Looks fine as-is.

amosshapira pushed a commit to amosshapira/troposphere that referenced this pull request Oct 24, 2016
* Add OriginSSLProtocols to CustomOrigin property

* Add OriginCustomHeader property

* Add AcmCertificateArn to ViewerCertificate
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants