From 182ae5ef282be3da34d405180b72262a9deb9d85 Mon Sep 17 00:00:00 2001
From: Mohamed ElAsmar <melasmar@amazon.com>
Date: Wed, 26 Jul 2023 17:37:04 -0700
Subject: [PATCH 1/3] fix: update the error message in the integration testing
---
samcli/lib/cli_validation/image_repository_validation.py | 2 +-
tests/integration/package/test_package_command_image.py | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/samcli/lib/cli_validation/image_repository_validation.py b/samcli/lib/cli_validation/image_repository_validation.py
index 8d26ff558e..4db42bc499 100644
--- a/samcli/lib/cli_validation/image_repository_validation.py
+++ b/samcli/lib/cli_validation/image_repository_validation.py
@@ -89,7 +89,7 @@ def wrapped(*args, **kwargs):
exception=click.BadOptionUsage(
option_name="--image-repositories",
ctx=ctx,
- message=f"Missing option {available_options}",
+ message=f"Missing option(s) {available_options}",
),
),
Validator(
diff --git a/tests/integration/package/test_package_command_image.py b/tests/integration/package/test_package_command_image.py
index 5aac7e59c5..a9e4438ccc 100644
--- a/tests/integration/package/test_package_command_image.py
+++ b/tests/integration/package/test_package_command_image.py
@@ -61,8 +61,7 @@ def test_package_template_without_image_repository(self, template_file):
process.kill()
raise
process_stderr = stderr.strip()
-
- self.assertIn("Error: Missing option '--image-repository'", process_stderr.decode("utf-8"))
+ self.assertIn("Error: Missing option(s) '--image-repositories', '--image-repository'", process_stderr.decode("utf-8"))
self.assertEqual(2, process.returncode)
@parameterized.expand(
@@ -189,7 +188,7 @@ def test_package_template_and_s3_bucket(self, template_file):
process_stderr = stderr.strip()
self.assertEqual(2, process.returncode)
- self.assertIn("Error: Missing option '--image-repository'", process_stderr.decode("utf-8"))
+ self.assertIn("Error: Missing option(s) '--image-repositories', '--image-repository'", process_stderr.decode("utf-8"))
@parameterized.expand(["aws-serverless-application-image.yaml"])
def test_package_template_with_image_function_in_nested_application(self, template_file):
From 9bee09c23cc15aea9bf8a1f66a8c1625644cb28f Mon Sep 17 00:00:00 2001
From: Mohamed ElAsmar <melasmar@amazon.com>
Date: Wed, 26 Jul 2023 17:51:20 -0700
Subject: [PATCH 2/3] run make format
---
tests/integration/package/test_package_command_image.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/integration/package/test_package_command_image.py b/tests/integration/package/test_package_command_image.py
index a9e4438ccc..dc028e7cc6 100644
--- a/tests/integration/package/test_package_command_image.py
+++ b/tests/integration/package/test_package_command_image.py
@@ -61,7 +61,9 @@ def test_package_template_without_image_repository(self, template_file):
process.kill()
raise
process_stderr = stderr.strip()
- self.assertIn("Error: Missing option(s) '--image-repositories', '--image-repository'", process_stderr.decode("utf-8"))
+ self.assertIn(
+ "Error: Missing option(s) '--image-repositories', '--image-repository'", process_stderr.decode("utf-8")
+ )
self.assertEqual(2, process.returncode)
@parameterized.expand(
@@ -188,7 +190,9 @@ def test_package_template_and_s3_bucket(self, template_file):
process_stderr = stderr.strip()
self.assertEqual(2, process.returncode)
- self.assertIn("Error: Missing option(s) '--image-repositories', '--image-repository'", process_stderr.decode("utf-8"))
+ self.assertIn(
+ "Error: Missing option(s) '--image-repositories', '--image-repository'", process_stderr.decode("utf-8")
+ )
@parameterized.expand(["aws-serverless-application-image.yaml"])
def test_package_template_with_image_function_in_nested_application(self, template_file):
From 563e0f95904967e71fcf743c8cded132d6cbeacc Mon Sep 17 00:00:00 2001
From: Mohamed ElAsmar <melasmar@amazon.com>
Date: Wed, 26 Jul 2023 17:53:34 -0700
Subject: [PATCH 3/3] fix unit testing
---
samcli/lib/cli_validation/image_repository_validation.py | 2 +-
tests/integration/package/test_package_command_image.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/samcli/lib/cli_validation/image_repository_validation.py b/samcli/lib/cli_validation/image_repository_validation.py
index 4db42bc499..8d26ff558e 100644
--- a/samcli/lib/cli_validation/image_repository_validation.py
+++ b/samcli/lib/cli_validation/image_repository_validation.py
@@ -89,7 +89,7 @@ def wrapped(*args, **kwargs):
exception=click.BadOptionUsage(
option_name="--image-repositories",
ctx=ctx,
- message=f"Missing option(s) {available_options}",
+ message=f"Missing option {available_options}",
),
),
Validator(
diff --git a/tests/integration/package/test_package_command_image.py b/tests/integration/package/test_package_command_image.py
index dc028e7cc6..8c5b36649d 100644
--- a/tests/integration/package/test_package_command_image.py
+++ b/tests/integration/package/test_package_command_image.py
@@ -62,7 +62,7 @@ def test_package_template_without_image_repository(self, template_file):
raise
process_stderr = stderr.strip()
self.assertIn(
- "Error: Missing option(s) '--image-repositories', '--image-repository'", process_stderr.decode("utf-8")
+ "Error: Missing option '--image-repositories', '--image-repository'", process_stderr.decode("utf-8")
)
self.assertEqual(2, process.returncode)
@@ -191,7 +191,7 @@ def test_package_template_and_s3_bucket(self, template_file):
self.assertEqual(2, process.returncode)
self.assertIn(
- "Error: Missing option(s) '--image-repositories', '--image-repository'", process_stderr.decode("utf-8")
+ "Error: Missing option '--image-repositories', '--image-repository'", process_stderr.decode("utf-8")
)
@parameterized.expand(["aws-serverless-application-image.yaml"])