Merge develop commits into feat/sam_delete

appveyor.yml

@@ -9,26 +9,26 @@ environment:
 
   matrix:
 
-    - PYTHON_HOME: "C:\\Python36-x64"
-      PYTHON_VERSION: '3.6'
-      PYTHON_ARCH: '64'
-      NOSE_PARAMETERIZED_NO_WARN: 1
-      INSTALL_PY_37_PIP: 1
-      INSTALL_PY_38_PIP: 1
-      AWS_S3: 'AWS_S3_36'
-      AWS_ECR: 'AWS_ECR_36'
-      APPVEYOR_CONSOLE_DISABLE_PTY: true
-
-    - PYTHON_HOME: "C:\\Python37-x64"
-      PYTHON_VERSION: '3.7'
-      PYTHON_ARCH: '64'
-      RUN_SMOKE: 1
-      NOSE_PARAMETERIZED_NO_WARN: 1
-      INSTALL_PY_36_PIP: 1
-      INSTALL_PY_38_PIP: 1
-      AWS_S3: 'AWS_S3_37'
-      AWS_ECR: 'AWS_ECR_37'
-      APPVEYOR_CONSOLE_DISABLE_PTY: true
+    # - PYTHON_HOME: "C:\\Python36-x64"
+    #   PYTHON_VERSION: '3.6'
+    #   PYTHON_ARCH: '64'
+    #   NOSE_PARAMETERIZED_NO_WARN: 1
+    #   INSTALL_PY_37_PIP: 1
+    #   INSTALL_PY_38_PIP: 1
+    #   AWS_S3: 'AWS_S3_36'
+    #   AWS_ECR: 'AWS_ECR_36'
+    #   APPVEYOR_CONSOLE_DISABLE_PTY: true
+
+    # - PYTHON_HOME: "C:\\Python37-x64"
+    #   PYTHON_VERSION: '3.7'
+    #   PYTHON_ARCH: '64'
+    #   RUN_SMOKE: 1
+    #   NOSE_PARAMETERIZED_NO_WARN: 1
+    #   INSTALL_PY_36_PIP: 1
+    #   INSTALL_PY_38_PIP: 1
+    #   AWS_S3: 'AWS_S3_37'
+    #   AWS_ECR: 'AWS_ECR_37'
+    #   APPVEYOR_CONSOLE_DISABLE_PTY: true
 
     - PYTHON_HOME: "C:\\Python38-x64"
       PYTHON_VERSION: '3.8'

installer/pyinstaller/hook-samcli.py

@@ -13,6 +13,9 @@
     "samcli.commands.deploy",
     "samcli.commands.logs",
     "samcli.commands.publish",
+    "samcli.commands.pipeline.pipeline",
+    "samcli.commands.pipeline.init",
+    "samcli.commands.pipeline.bootstrap",
     # default hidden import 'pkg_resources.py2_warn' is added
     # since pyInstaller 4.0.
     "pkg_resources.py2_warn",

mypy.ini

@@ -59,6 +59,6 @@ ignore_missing_imports=True
 ignore_missing_imports=True
 
 # progressive add typechecks and these modules already complete the process, let's keep them clean
-[mypy-samcli.commands.build,samcli.lib.build.*,samcli.commands.local.cli_common.invoke_context,samcli.commands.local.lib.local_lambda,samcli.lib.providers.*,samcli.lib.utils.git_repo.py]
+[mypy-samcli.commands.build,samcli.lib.build.*,samcli.commands.local.cli_common.invoke_context,samcli.commands.local.lib.local_lambda,samcli.lib.providers.*,samcli.lib.utils.git_repo.py,samcli.lib.cookiecutter.*,samcli.lib.pipeline.*,samcli.commands.pipeline.*]
 disallow_untyped_defs=True
 disallow_incomplete_defs=True

requirements/base.txt

@@ -6,12 +6,12 @@ boto3~=1.14
 jmespath~=0.10.0
 PyYAML~=5.3
 cookiecutter~=1.7.2
-aws-sam-translator==1.36.0
+aws-sam-translator==1.38.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=4.2.0
 dateparser~=0.7
 requests==2.25.1
 serverlessrepo==0.1.10
-aws_lambda_builders==1.4.0
+aws_lambda_builders==1.5.0
 tomlkit==0.7.2
 watchdog==2.1.2

requirements/reproducible-linux.txt

@@ -12,15 +12,15 @@ attrs==20.3.0 \
     --hash=sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6 \
     --hash=sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700
     # via jsonschema
-aws-lambda-builders==1.4.0 \
-    --hash=sha256:3f885433bb71bae653b520e3cf4c31fe5f5b977cb770d42c631af155cd60fd2b \
-    --hash=sha256:5d4e4ecb3d3290f0eec1f62b7b0d9d6b91160ae71447d95899eede392d05f75f \
-    --hash=sha256:d32f79cf67b189a7598793f69797f284b2eb9a9fada562175b1e854187f95aed
+aws-lambda-builders==1.5.0 \
+    --hash=sha256:0167b40da88c679e21341852faf59fae2aafe36c22a560de2e4aa75c7b9dd846 \
+    --hash=sha256:6fd7fddd50b7bbbb8668c44c638d685123a698bf1a866da2f34b440bca9958ad \
+    --hash=sha256:c9f2259656353f98e70c49ed52b6ea8891d1f6853c2b1a9ac891772768d1697e
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.36.0 \
-    --hash=sha256:4195ae8196f04803e7f0384a2b5ccd8c2b06ce0d8dc408aa1f1ce96c23bcf39d \
-    --hash=sha256:f7d51b661fe1f5613a882f4733d1c92eff4dac36a076eafd18031d209b178695 \
-    --hash=sha256:fa1b990d9329d19052e7b91cf0b19371ed9d31a529054b616005884cd662b584
+aws-sam-translator==1.38.0 \
+    --hash=sha256:0ecadda9cf5ab2318f57f1253181a2151e4c53cd35d21717a923c075a5a65cb6 \
+    --hash=sha256:dc6b816bb5cfd9709299f9b263fc0cf5ae60aca4166d1c90413ece651f1556bb \
+    --hash=sha256:ee7c7c5e44ec67202622ca877140545496527ffcc45da3beeda966f007443a88
     # via aws-sam-cli (setup.py)
 binaryornot==0.4.4 \
     --hash=sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061 \

samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.24.1"
+__version__ = "1.27.1"

samcli/cli/command.py

@@ -22,6 +22,7 @@
     "samcli.commands.delete",
     "samcli.commands.logs",
     "samcli.commands.publish",
+    "samcli.commands.pipeline.pipeline",
     # We intentionally do not expose the `bootstrap` command for now. We might open it up later
     # "samcli.commands.bootstrap",
 ]

samcli/cli/context.py

@@ -4,7 +4,7 @@
 
 import logging
 import uuid
-from typing import Optional, cast
+from typing import Optional, cast, List
 
 import boto3
 import botocore
@@ -186,7 +186,7 @@ def _refresh_session(self):
             raise CredentialsError(str(ex)) from ex
 
 
-def get_cmd_names(cmd_name, ctx):
+def get_cmd_names(cmd_name, ctx) -> List[str]:
     """
     Given the click core context, return a list representing all the subcommands passed to the CLI
 

samcli/commands/_utils/template.py

@@ -9,16 +9,16 @@
 import yaml
 from botocore.utils import set_value_from_jmespath
 
-from samcli.commands.exceptions import UserException
-from samcli.lib.utils.packagetype import ZIP
-from samcli.yamlhelper import yaml_parse, yaml_dump
 from samcli.commands._utils.resources import (
     METADATA_WITH_LOCAL_PATHS,
     RESOURCES_WITH_LOCAL_PATHS,
     AWS_SERVERLESS_FUNCTION,
     AWS_LAMBDA_FUNCTION,
     get_packageable_resource_paths,
 )
+from samcli.commands.exceptions import UserException
+from samcli.lib.utils.packagetype import ZIP
+from samcli.yamlhelper import yaml_parse, yaml_dump
 
 
 class TemplateNotFoundException(UserException):

samcli/commands/deploy/guided_context.py

@@ -6,7 +6,6 @@
 from typing import Dict, Any, List
 
 import click
-from botocore.session import get_session
 from click import confirm
 from click import prompt
 from click.types import FuncParamType
@@ -36,6 +35,7 @@
 from samcli.lib.providers.sam_function_provider import SamFunctionProvider
 from samcli.lib.providers.sam_stack_provider import SamLocalStackProvider
 from samcli.lib.utils.colors import Colored
+from samcli.lib.utils.defaults import get_default_aws_region
 from samcli.lib.utils.packagetype import IMAGE
 
 LOG = logging.getLogger(__name__)
@@ -110,7 +110,7 @@ def guided_prompts(self, parameter_override_keys):
             The keys of parameters to override, for each key, customers will be asked to provide a value
         """
         default_stack_name = self.stack_name or "sam-app"
-        default_region = self.region or get_session().get_config_variable("region") or "us-east-1"
+        default_region = self.region or get_default_aws_region()
         default_capabilities = self.capabilities[0] or ("CAPABILITY_IAM",)
         default_config_env = self.config_env or DEFAULT_ENV
         default_config_file = self.config_file or DEFAULT_CONFIG_FILE_NAME

samcli/commands/exceptions.py

@@ -59,3 +59,22 @@ class ContainersInitializationException(UserException):
     """
     Exception class when SAM is not able to initialize any of the lambda functions containers
     """
+
+
+class PipelineTemplateCloneException(UserException):
+    """
+    Exception class when unable to download pipeline templates from a Git repository during `sam pipeline init`
+    """
+
+
+class AppPipelineTemplateManifestException(UserException):
+    """
+    Exception class when SAM is not able to parse the "manifest.yaml" file located in the SAM pipeline templates
+    Git repo: "github.com/aws/aws-sam-cli-pipeline-init-templates.git
+    """
+
+
+class AppPipelineTemplateMetadataException(UserException):
+    """
+    Exception class when SAM is not able to parse the "metadata.json" file located in the SAM pipeline templates
+    """