Skip to content

fix(integ): Fix Invalid image tag errors #3163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wchengru merged 1 commit into from
Aug 11, 2021
Merged

fix(integ): Fix Invalid image tag errors #3163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/integration/deploy/test_deploy_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def setUpClass(cls):
# setup some images locally by pulling them.
for repo, tag in cls.local_images:
cls.docker_client.api.pull(repository=repo, tag=tag)
cls.docker_client.api.tag(f"{repo}:{tag}", "emulation-python3.8", tag="latest")

# setup signing profile arn & name
cls.signing_profile_name = os.environ.get("AWS_SIGNING_PROFILE_NAME")
cls.signing_profile_version_arn = os.environ.get("AWS_SIGNING_PROFILE_VERSION_ARN")
Expand Down
11 changes: 5 additions & 6 deletions tests/integration/package/test_package_command_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ def setUpClass(cls):
# setup some images locally by pulling them.
for repo, tag in cls.local_images:
cls.docker_client.api.pull(repository=repo, tag=tag)
cls.docker_client.api.tag(f"{repo}:{tag}", "emulation-python3.8", tag="latest")
cls.docker_client.api.tag(f"{repo}:{tag}", "emulation-python3.8-2", tag="latest")

super(TestPackageImage, cls).setUpClass()

def setUp(self):
Expand Down Expand Up @@ -200,14 +203,10 @@ def test_package_with_deep_nested_template_image(self):
raise
process_stderr = stderr.strip().decode("utf-8")

# there are in total 3 function images and 2 child template file to upload
# verify both child templates are uploaded
uploads = re.findall(r"\.template", process_stderr)
self.assertEqual(len(uploads), 2)

# verify all function images are pushed
images = [
("public.ecr.aws/sam/emulation-python3.8", "latest"),
("emulation-python3.8", "latest"),
("emulation-python3.8-2", "latest"),
]
for image, tag in images:
# check string like this:
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/testdata/package/aws-lambda-function-image-and-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Resources:
Type: AWS::Lambda::Function
Properties:
PackageType: Image
Code: public.ecr.aws/sam/emulation-python3.8:latest
Code: "emulation-python3.8:latest"
Role:
Fn::GetAtt:
- "LambdaExecutionRole"
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/testdata/package/aws-lambda-function-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Resources:
Type: AWS::Lambda::Function
Properties:
PackageType: Image
Code: public.ecr.aws/sam/emulation-python3.8:latest
Code: emulation-python3.8:latest
Role:
Fn::GetAtt:
- "LambdaExecutionRole"
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/testdata/package/aws-serverless-function-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Resources:
Type: AWS::Serverless::Function
Properties:
PackageType: Image
ImageUri: public.ecr.aws/sam/emulation-python3.8:latest
ImageUri: emulation-python3.8:latest
Events:
HelloWorld:
Type: Api
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/testdata/package/deep-nested-image/ChildStackX/ChildStackY/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Resources:
Type: AWS::Serverless::Function
Properties:
PackageType: Image
ImageUri: public.ecr.aws/sam/emulation-python3.8:latest
ImageUri: emulation-python3.8:latest
2 changes: 1 addition & 1 deletion tests/integration/testdata/package/deep-nested-image/ChildStackX/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Resources:
Type: AWS::Serverless::Function
Properties:
PackageType: Image
ImageUri: public.ecr.aws/sam/emulation-python3.8:latest
ImageUri: emulation-python3.8-2:latest

ChildStackY:
Type: AWS::Serverless::Application
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/testdata/package/deep-nested-image/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Resources:
Type: AWS::Serverless::Function
Properties:
PackageType: Image
ImageUri: public.ecr.aws/sam/emulation-python3.8:latest
ImageUri: emulation-python3.8:latest

ChildStackX:
Type: AWS::Serverless::Application
Expand Down