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

conflicts

Browse Source
This commit is contained in:
usmankb 2020-04-08 22:00:48 +05:30
commit 8542309fc9
3 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
moto/apigateway/models.py
View File

@ -614,8 +614,8 @@ class DomainName(BaseModel,dict):
def __init__(self, domain_name, **kwargs): def __init__(self, domain_name, **kwargs):
super(DomainName, self).__init__() super(DomainName, self).__init__()
self["domainName"] = domain_name self["domainName"] = domain_name
self["regionalDomainName"] = domain_name, self["regionalDomainName"] = domain_name
self["distributionDomainName"] = domain_name, self["distributionDomainName"] = domain_name
self["domainNameStatus"] = "AVAILABLE" self["domainNameStatus"] = "AVAILABLE"
self["domainNameStatusMessage"] = "Domain Name Available" self["domainNameStatusMessage"] = "Domain Name Available"
self["regionalHostedZoneId"] = "Z2FDTNDATAQYW2" self["regionalHostedZoneId"] = "Z2FDTNDATAQYW2"
@ -634,25 +634,15 @@ class DomainName(BaseModel,dict):
if kwargs.get("certificate_chain"): if kwargs.get("certificate_chain"):
self["certificateChain"] = kwargs.get("certificate_chain") self["certificateChain"] = kwargs.get("certificate_chain")
if kwargs.get("regional_certificate_name"): if kwargs.get("regional_certificate_name"):
self["regionalCertificateName"] = kwargs.get( self["regionalCertificateName"] = kwargs.get("regional_certificate_name")
"regional_certificate_name"
)
if kwargs.get("certificate_private_key"): if kwargs.get("certificate_private_key"):
self["certificatePrivateKey"] = kwargs.get( self["certificatePrivateKey"] = kwargs.get("certificate_private_key")
"certificate_private_key"
)
if kwargs.get("regional_certificate_arn"): if kwargs.get("regional_certificate_arn"):
self["regionalCertificateArn"] = kwargs.get( self["regionalCertificateArn"] = kwargs.get("regional_certificate_arn")
"regional_certificate_arn"
)
if kwargs.get("endpoint_configuration"): if kwargs.get("endpoint_configuration"):
self["endpointConfiguration"] = kwargs.get( self["endpointConfiguration"] = kwargs.get("endpoint_configuration")
"endpoint_configuration"
)
if kwargs.get("generate_cli_skeleton"): if kwargs.get("generate_cli_skeleton"):
self["generateCliSkeleton"] = kwargs.get( self["generateCliSkeleton"] = kwargs.get("generate_cli_skeleton")
"generate_cli_skeleton"
)
class APIGatewayBackend(BaseBackend): class APIGatewayBackend(BaseBackend):
@ -1048,16 +1038,21 @@ class APIGatewayBackend(BaseBackend):
except Exception: except Exception:
return False return False
def create_domain_name(self,domain_name, def create_domain_name(
certificate_name=None,certificate_private_key=None, self,
tags=None, certificate_arn=None, domain_name,
certificate_name=None,
tags=None,
certificate_arn=None,
certificate_body=None, certificate_body=None,
certificate_private_key=None,
certificate_chain=None, certificate_chain=None,
regional_certificate_name=None, regional_certificate_name=None,
regional_certificate_arn=None, regional_certificate_arn=None,
endpoint_configuration=None, endpoint_configuration=None,
security_policy=None, security_policy=None,
generate_cli_skeleton=None): generate_cli_skeleton=None,
):
if not domain_name: if not domain_name:
raise InvalidDomainName() raise InvalidDomainName()
@ -1072,7 +1067,8 @@ class APIGatewayBackend(BaseBackend):
regional_certificate_name=regional_certificate_name, regional_certificate_name=regional_certificate_name,
regional_certificate_arn=regional_certificate_arn, regional_certificate_arn=regional_certificate_arn,
endpoint_configuration=endpoint_configuration, endpoint_configuration=endpoint_configuration,
tags=tags, security_policy=security_policy, tags=tags,
security_policy=security_policy,
generate_cli_skeleton=generate_cli_skeleton, generate_cli_skeleton=generate_cli_skeleton,
) )

21
moto/apigateway/responses.py
View File

@ -547,7 +547,6 @@ class APIGatewayResponse(BaseResponse):
certificate_private_key = self._get_param( certificate_private_key = self._get_param(
"certificatePrivateKey" "certificatePrivateKey"
) )
certificate_chain = self._get_param("certificateChain") certificate_chain = self._get_param("certificateChain")
regional_certificate_name = self._get_param( regional_certificate_name = self._get_param(
"regionalCertificateName" "regionalCertificateName"
@ -563,12 +562,18 @@ class APIGatewayResponse(BaseResponse):
"generateCliSkeleton" "generateCliSkeleton"
) )
domain_name_resp = self.backend.create_domain_name( domain_name_resp = self.backend.create_domain_name(
domain_name, certificate_name, domain_name,
certificate_private_key,tags, certificate_arn, certificate_name,
certificate_body, certificate_chain, tags,
regional_certificate_name, regional_certificate_arn, certificate_arn,
endpoint_configuration, security_policy, certificate_body,
generate_cli_skeleton certificate_private_key,
certificate_chain,
regional_certificate_name,
regional_certificate_arn,
endpoint_configuration,
security_policy,
generate_cli_skeleton,
) )
return 200, {}, json.dumps(domain_name_resp) return 200, {}, json.dumps(domain_name_resp)
@ -592,7 +597,6 @@ class APIGatewayResponse(BaseResponse):
if domain_name is not None: if domain_name is not None:
domain_names = self.backend.get_domain_name(domain_name) domain_names = self.backend.get_domain_name(domain_name)
return 200, {}, json.dumps(domain_names) return 200, {}, json.dumps(domain_names)
except DomainNameNotFound as error: except DomainNameNotFound as error:
return ( return (
error.code, error.code,
@ -603,3 +607,4 @@ class APIGatewayResponse(BaseResponse):
) )

7
tests/test_apigateway/test_apigateway.py
View File

@ -1490,10 +1490,11 @@ def test_create_domain_names():
test_certificate_name = "test.certificate" test_certificate_name = "test.certificate"
test_certificate_private_key = "testPrivateKey" test_certificate_private_key = "testPrivateKey"
# success case with valid params # success case with valid params
response = client.create_domain_name(domainName=domain_name, response = client.create_domain_name(
domainName=domain_name,
certificateName=test_certificate_name, certificateName=test_certificate_name,
certificatePrivateKey=test_certificate_private_key) certificatePrivateKey=test_certificate_private_key,
)
response["domainName"].should.equal(domain_name) response["domainName"].should.equal(domain_name)
response["certificateName"].should.equal(test_certificate_name) response["certificateName"].should.equal(test_certificate_name)
# without domain name it should throw BadRequestException # without domain name it should throw BadRequestException