feat(Auto ECR): Added Option to Auto Create ECR Repos During Deployment

samcli/commands/deploy/command.py

@@ -26,6 +26,7 @@
 from samcli.lib.utils import osutils
 from samcli.lib.bootstrap.bootstrap import manage_stack
 from samcli.lib.utils.version_checker import check_newer_version
+from samcli.lib.bootstrap.companion_stack.companion_stack_manager import sync_ecr_stack
 
 SHORT_HELP = "Deploy an AWS SAM application."
 
@@ -158,6 +159,14 @@
     "If you do not provide a --s3-bucket value, the managed bucket will be used. "
     "Do not use --s3-guided parameter with this option.",
 )
+@click.option(
+    "--resolve-image-repos",
+    required=False,
+    is_flag=True,
+    help="Automatically create and delete ECR repositories for image-based functions in non-guided deployments. "
+    "A companion stack containing ECR repos for each function will be deployed along with the template stack. "
+    "Automatically created image repositories will be deleted if the corresponding functions are removed.",
+)
 @metadata_override_option
 @notification_arns_override_option
 @tags_override_option
@@ -196,6 +205,7 @@ def cli(
     confirm_changeset,
     signing_profiles,
     resolve_s3,
+    resolve_image_repos,
     config_file,
     config_env,
 ):
@@ -230,6 +240,7 @@ def cli(
         resolve_s3,
         config_file,
         config_env,
+        resolve_image_repos,
     )  # pragma: no cover
 
 
@@ -260,6 +271,7 @@ def do_cli(
     resolve_s3,
     config_file,
     config_env,
+    resolve_image_repos,
 ):
     """
     Implementation of the ``cli`` method
@@ -289,13 +301,21 @@ def do_cli(
             config_file=config_file,
         )
         guided_context.run()
-    elif resolve_s3 and bool(s3_bucket):
-        raise DeployResolveS3AndS3SetError()
-    elif resolve_s3:
-        s3_bucket = manage_stack(profile=profile, region=region)
-        click.echo(f"\n\t\tManaged S3 bucket: {s3_bucket}")
-        click.echo("\t\tA different default S3 bucket can be set in samconfig.toml")
-        click.echo("\t\tOr by specifying --s3-bucket explicitly.")
+    else:
+        if resolve_s3:
+            if bool(s3_bucket):
+                raise DeployResolveS3AndS3SetError()
+            s3_bucket = manage_stack(profile=profile, region=region)
+            click.echo(f"\n\t\tManaged S3 bucket: {s3_bucket}")
+            click.echo("\t\tA different default S3 bucket can be set in samconfig.toml")
+            click.echo("\t\tOr by specifying --s3-bucket explicitly.")
+
+        # TODO Refactor resolve-s3 and resolve-image-repos into one place
+        # after we figure out how to enable resolve-images-repos in package
+        if resolve_image_repos:
+            image_repositories = sync_ecr_stack(
+                template_file, stack_name, region, s3_bucket, s3_prefix, image_repositories
+            )
 
     with osutils.tempfile_platform_independent() as output_template_file:
 

samcli/commands/deploy/guided_config.py

@@ -102,7 +102,10 @@ def _save_parameter_overrides(self, cmd_names, config_env, parameter_overrides,
                 samconfig.put(cmd_names, self.section, "parameter_overrides", " ".join(_params), env=config_env)
 
     def _save_image_repositories(self, cmd_names, config_env, samconfig, image_repositories):
-        if image_repositories:
+        # Check for None only as empty dict should be saved to config
+        # This can happen in an edge case where all companion stack repos are deleted and
+        # the config needs to be updated.
+        if image_repositories is not None:
             _image_repositories = [f"{key}={value}" for key, value in image_repositories.items()]
             samconfig.put(cmd_names, self.section, "image_repositories", _image_repositories, env=config_env)