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

CF:create_distribution() - fix config with single alias (#6472)

Browse Source
This commit is contained in:
Bert Blommers 2023-07-02 10:04:05 +00:00 committed by GitHub
parent 478f878c58
commit 4f091efcce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/cloudfront/models.py
View File

@ -148,6 +148,8 @@ class DistributionConfig:
self.aliases = ((config.get("Aliases") or {}).get("Items") or {}).get( self.aliases = ((config.get("Aliases") or {}).get("Items") or {}).get(
"CNAME" "CNAME"
) or [] ) or []
if isinstance(self.aliases, str):
self.aliases = [self.aliases]
self.comment = config.get("Comment") or "" self.comment = config.get("Comment") or ""
self.default_cache_behavior = DefaultCacheBehaviour( self.default_cache_behavior = DefaultCacheBehaviour(
config["DefaultCacheBehavior"] config["DefaultCacheBehavior"]

11
tests/test_cloudfront/test_cloudfront_distributions.py
View File

@ -287,12 +287,15 @@ def test_create_distribution_with_origins():
@pytest.mark.parametrize("qs", [True, False]) @pytest.mark.parametrize("qs", [True, False])
@pytest.mark.parametrize("smooth", [True, False]) @pytest.mark.parametrize("smooth", [True, False])
@pytest.mark.parametrize("ipv6", [True, False]) @pytest.mark.parametrize("ipv6", [True, False])
def test_create_distribution_with_additional_fields(compress, qs, smooth, ipv6): @pytest.mark.parametrize("aliases", [["alias1", "alias2"], ["alias1"]])
def test_create_distribution_with_additional_fields(
compress, qs, smooth, ipv6, aliases
):
client = boto3.client("cloudfront", region_name="us-west-1") client = boto3.client("cloudfront", region_name="us-west-1")
config = scaffold.example_distribution_config("ref") config = scaffold.example_distribution_config("ref")
config["IsIPV6Enabled"] = ipv6 config["IsIPV6Enabled"] = ipv6
config["Aliases"] = {"Quantity": 2, "Items": ["alias1", "alias2"]} config["Aliases"] = {"Quantity": 2, "Items": aliases}
config["DefaultCacheBehavior"]["ForwardedValues"]["Cookies"] = { config["DefaultCacheBehavior"]["ForwardedValues"]["Cookies"] = {
"Forward": "whitelist", "Forward": "whitelist",
"WhitelistedNames": {"Quantity": 1, "Items": ["x-amz-header"]}, "WhitelistedNames": {"Quantity": 1, "Items": ["x-amz-header"]},
@ -306,9 +309,7 @@ def test_create_distribution_with_additional_fields(compress, qs, smooth, ipv6):
distribution = resp["Distribution"] distribution = resp["Distribution"]
distribution.should.have.key("DistributionConfig") distribution.should.have.key("DistributionConfig")
config = distribution["DistributionConfig"] config = distribution["DistributionConfig"]
config.should.have.key("Aliases").equals( assert config["Aliases"] == {"Items": aliases, "Quantity": len(aliases)}
{"Items": ["alias1", "alias2"], "Quantity": 2}
)
config.should.have.key("PriceClass").equals("PriceClass_100") config.should.have.key("PriceClass").equals("PriceClass_100")
config.should.have.key("IsIPV6Enabled").equals(ipv6) config.should.have.key("IsIPV6Enabled").equals(ipv6)