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

Use the specified region name when generating ARN for a requested cert.

Browse Source
This commit is contained in:
Asher Foa 2019-08-19 14:56:34 -07:00
parent c0c86be6ee
commit 66a7ace2c5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/acm/models.py
View File

@ -105,7 +105,7 @@ class CertBundle(BaseModel):
self.arn = arn self.arn = arn
@classmethod @classmethod
def generate_cert(cls, domain_name, sans=None): def generate_cert(cls, domain_name, region, sans=None):
if sans is None: if sans is None:
sans = set() sans = set()
else: else:
@ -152,7 +152,7 @@ class CertBundle(BaseModel):
encryption_algorithm=serialization.NoEncryption() encryption_algorithm=serialization.NoEncryption()
) )
return cls(cert_armored, private_key, cert_type='AMAZON_ISSUED', cert_status='PENDING_VALIDATION') return cls(cert_armored, private_key, cert_type='AMAZON_ISSUED', cert_status='PENDING_VALIDATION', region=region)
def validate_pk(self): def validate_pk(self):
try: try:
@ -355,7 +355,7 @@ class AWSCertificateManagerBackend(BaseBackend):
if arn is not None: if arn is not None:
return arn return arn
cert = CertBundle.generate_cert(domain_name, subject_alt_names) cert = CertBundle.generate_cert(domain_name, region=self.region, sans=subject_alt_names)
if idempotency_token is not None: if idempotency_token is not None:
self._set_idempotency_token_arn(idempotency_token, cert.arn) self._set_idempotency_token_arn(idempotency_token, cert.arn)
self._certificates[cert.arn] = cert self._certificates[cert.arn] = cert

1
tests/test_acm/test_acm.py
View File

@ -291,6 +291,7 @@ def test_request_certificate():
) )
resp.should.contain('CertificateArn') resp.should.contain('CertificateArn')
arn = resp['CertificateArn'] arn = resp['CertificateArn']
arn.should.match(r"arn:aws:acm:eu-central-1:\d{12}:certificate/")
resp = client.request_certificate( resp = client.request_certificate(
DomainName='google.com', DomainName='google.com',