Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cloudfront - add missing fields (#4792)

Browse Source
This commit is contained in:
Bert Blommers 2022-01-25 18:24:18 -01:00 committed by GitHub
parent 05f5bbc568
commit 38ad5193d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/cloudfront/models.py
View File

@ -100,6 +100,8 @@ class Origin:
class DistributionConfig: class DistributionConfig:
def __init__(self, config): def __init__(self, config):
self.config = config self.config = config
self.aliases = config.get("Aliases", {}).get("Items", {}).get("CNAME", [])
self.comment = config.get("Comment", "")
self.default_cache_behavior = DefaultCacheBehaviour( self.default_cache_behavior = DefaultCacheBehaviour(
config["DefaultCacheBehavior"] config["DefaultCacheBehavior"]
) )
@ -145,7 +147,6 @@ class Distribution(BaseModel):
self.distribution_config = DistributionConfig(config) self.distribution_config = DistributionConfig(config)
self.active_trusted_signers = ActiveTrustedSigners() self.active_trusted_signers = ActiveTrustedSigners()
self.active_trusted_key_groups = ActiveTrustedKeyGroups() self.active_trusted_key_groups = ActiveTrustedKeyGroups()
self.aliases = []
self.origin_groups = [] self.origin_groups = []
self.alias_icp_recordals = [] self.alias_icp_recordals = []
self.last_modified_time = "2021-11-27T10:34:26.802Z" self.last_modified_time = "2021-11-27T10:34:26.802Z"

2
moto/cloudfront/responses.py
View File

@ -381,7 +381,7 @@ DIST_CONFIG_TEMPLATE = """
</Items> </Items>
{% endif %} {% endif %}
</CustomErrorResponses> </CustomErrorResponses>
<Comment>{{ CommentType }}</Comment> <Comment>{{ distribution.distribution_config.comment }}</Comment>
<Logging> <Logging>
<Enabled>{{ distribution.distribution_config.logging.enabled }}</Enabled> <Enabled>{{ distribution.distribution_config.logging.enabled }}</Enabled>
<IncludeCookies>{{ distribution.distribution_config.logging.include_cookies }}</IncludeCookies> <IncludeCookies>{{ distribution.distribution_config.logging.include_cookies }}</IncludeCookies>

19
tests/test_cloudfront/test_cloudfront_distributions.py
View File

@ -121,7 +121,9 @@ def test_create_distribution_s3_minimum():
config.should.have.key("CacheBehaviors").equals({"Quantity": 0}) config.should.have.key("CacheBehaviors").equals({"Quantity": 0})
config.should.have.key("CustomErrorResponses").equals({"Quantity": 0}) config.should.have.key("CustomErrorResponses").equals({"Quantity": 0})
config.should.have.key("Comment").equals("") config.should.have.key("Comment").equals(
"an optional comment that's not actually optional"
)
config.should.have.key("Logging") config.should.have.key("Logging")
logging = config["Logging"] logging = config["Logging"]
@ -149,6 +151,21 @@ def test_create_distribution_s3_minimum():
restriction.should.have.key("Quantity").equals(0) restriction.should.have.key("Quantity").equals(0)
@mock_cloudfront
def test_create_distribution_with_additional_fields():
client = boto3.client("cloudfront", region_name="us-west-1")
config = example_distribution_config("ref")
config["Aliases"] = {"Quantity": 2, "Items": ["alias1", "alias2"]}
resp = client.create_distribution(DistributionConfig=config)
distribution = resp["Distribution"]
distribution.should.have.key("DistributionConfig")
config = distribution["DistributionConfig"]
config.should.have.key("Aliases").equals(
{"Items": ["alias1", "alias2"], "Quantity": 2}
)
@mock_cloudfront @mock_cloudfront
def test_create_distribution_returns_etag(): def test_create_distribution_returns_etag():
client = boto3.client("cloudfront", region_name="us-east-1") client = boto3.client("cloudfront", region_name="us-east-1")