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

fix cloudformation arn account id (#4995)

Browse Source
This commit is contained in:
Panagiotis Irakleous 2022-04-02 18:07:40 +01:00 committed by GitHub
parent 213c6f4222
commit 3718cde444
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/cloudformation/utils.py
View File

@ -7,7 +7,7 @@ import string
from moto.core import ACCOUNT_ID from moto.core import ACCOUNT_ID
def generate_stack_id(stack_name, region="us-east-1", account="123456789"): def generate_stack_id(stack_name, region="us-east-1", account=ACCOUNT_ID):
random_id = uuid.uuid4() random_id = uuid.uuid4()
return "arn:aws:cloudformation:{}:{}:stack/{}/{}".format( return "arn:aws:cloudformation:{}:{}:stack/{}/{}".format(
region, account, stack_name, random_id region, account, stack_name, random_id
@ -16,8 +16,8 @@ def generate_stack_id(stack_name, region="us-east-1", account="123456789"):
def generate_changeset_id(changeset_name, region_name): def generate_changeset_id(changeset_name, region_name):
random_id = uuid.uuid4() random_id = uuid.uuid4()
return "arn:aws:cloudformation:{0}:123456789:changeSet/{1}/{2}".format( return "arn:aws:cloudformation:{0}:{1}:changeSet/{2}/{3}".format(
region_name, changeset_name, random_id region_name, ACCOUNT_ID, changeset_name, random_id
) )

12
tests/test_cloudformation/test_cloudformation_stack_crud_boto3.py
View File

@ -1073,10 +1073,10 @@ def test_creating_stacks_across_regions():
list(west2_cf.stacks.all()).should.have.length_of(1) list(west2_cf.stacks.all()).should.have.length_of(1)
list(west1_cf.stacks.all())[0].stack_id.should.contain( list(west1_cf.stacks.all())[0].stack_id.should.contain(
"arn:aws:cloudformation:us-west-1:123456789:stack/test_stack/" "arn:aws:cloudformation:us-west-1:{}:stack/test_stack/".format(ACCOUNT_ID)
) )
list(west2_cf.stacks.all())[0].stack_id.should.contain( list(west2_cf.stacks.all())[0].stack_id.should.contain(
"arn:aws:cloudformation:us-west-2:123456789:stack/test_stack/" "arn:aws:cloudformation:us-west-2:{}:stack/test_stack/".format(ACCOUNT_ID)
) )
@ -1379,11 +1379,11 @@ def test_create_change_set_from_s3_url():
Tags=[{"Key": "tag-key", "Value": "tag-value"}], Tags=[{"Key": "tag-key", "Value": "tag-value"}],
) )
assert ( assert (
"arn:aws:cloudformation:us-west-1:123456789:changeSet/NewChangeSet/" "arn:aws:cloudformation:us-west-1:{}:changeSet/NewChangeSet/".format(ACCOUNT_ID)
in response["Id"] in response["Id"]
) )
assert ( assert (
"arn:aws:cloudformation:us-west-1:123456789:stack/NewStack" "arn:aws:cloudformation:us-west-1:{}:stack/NewStack".format(ACCOUNT_ID)
in response["StackId"] in response["StackId"]
) )
@ -1857,7 +1857,9 @@ def test_update_stack_when_rolled_back():
err = ex.value.response["Error"] err = ex.value.response["Error"]
err.should.have.key("Code").being.equal("ValidationError") err.should.have.key("Code").being.equal("ValidationError")
err.should.have.key("Message").match( err.should.have.key("Message").match(
r"Stack:arn:aws:cloudformation:us-east-1:123456789:stack/test_stack/[a-z0-9-]+ is in ROLLBACK_COMPLETE state and can not be updated." r"Stack:arn:aws:cloudformation:us-east-1:{}:stack/test_stack/[a-z0-9-]+ is in ROLLBACK_COMPLETE state and can not be updated.".format(
ACCOUNT_ID
)
) )