Merge from aws/aws-sam-cli/develop

.github/workflows/build.yml

@@ -4,12 +4,12 @@ on:
  pull_request:
  branches:
  - develop
- - "feat/*"
+ - "feat*"
  merge_group:
  types: [ checks_requested ]
  branches:
  - develop
- - "feat/*"
+ - "feat*"
 
 jobs:
  run-workflow:

.github/workflows/pr-labeler.yml

@@ -25,7 +25,7 @@ jobs:
  'aws-sam-cli-bot',
  'jfuss', 'hoffa', 'awood45', 'aahung', 'hawflau', 'mndeveci', 'ssenchenko',
  'qingchm', 'moelasmar', 'xazhao', 'mildaniel', 'marekaiv', 'torresxb1',
- 'lucashuy', 'hnnasit', 'sriram-mv'
+ 'lucashuy', 'hnnasit', 'sriram-mv','dependabot[bot]'
  ]
  if (maintainers.includes(context.payload.sender.login)) {
  github.rest.issues.addLabels({

appveyor-iac-integration-ubuntu.yml

@@ -1,6 +1,6 @@
 version: 1.0.{build}
 image: 
- - Ubuntu
+ - Ubuntu2004
 
 environment:
  AWS_DEFAULT_REGION: us-east-1

appveyor-ubuntu.yml

@@ -1,6 +1,6 @@
 version: 1.0.{build}
 image: 
- - Ubuntu
+ - Ubuntu2004
 
 configuration:
  - BuildIntegTesting
@@ -28,39 +28,34 @@ environment:
 
  matrix:
 
- - PYTHON_HOME: "C:\\Python37-x64"
+ - PYTHON_HOME: "$HOME/venv3.7/bin"
  PYTHON_VERSION: '3.7'
  PYTHON_ARCH: '64'
- RUN_SMOKE: 1
  NOSE_PARAMETERIZED_NO_WARN: 1
  INSTALL_PY_38_PIP: 1
  INSTALL_PY_39_PIP: 1
  INSTALL_PY_310_PIP: 1
  APPVEYOR_CONSOLE_DISABLE_PTY: true
 
- - PYTHON_HOME: "C:\\Python38-x64"
+ - PYTHON_HOME: "$HOME/venv3.8/bin"
  PYTHON_VERSION: '3.8'
  PYTHON_ARCH: '64'
- RUN_SMOKE: 1
  NOSE_PARAMETERIZED_NO_WARN: 1
  INSTALL_PY_37_PIP: 1
  INSTALL_PY_39_PIP: 1
  INSTALL_PY_310_PIP: 1
  APPVEYOR_CONSOLE_DISABLE_PTY: true
 
- - PYTHON_HOME: "C:\\Python39-x64"
+ - PYTHON_HOME: "$HOME/venv3.9/bin"
  PYTHON_VERSION: '3.9'
  PYTHON_ARCH: '64'
- RUN_SMOKE: 1
  NOSE_PARAMETERIZED_NO_WARN: 1
  INSTALL_PY_37_PIP: 1
  INSTALL_PY_38_PIP: 1
  INSTALL_PY_310_PIP: 1
  APPVEYOR_CONSOLE_DISABLE_PTY: true
 
 install:
- # apt repo for python3.9 installation
- - sh: "sudo add-apt-repository ppa:deadsnakes/ppa"
  # AppVeyor's apt-get cache might be outdated, and the package could potentially be 404.
  - sh: "sudo apt-get update"
 
@@ -87,26 +82,7 @@ install:
  - sh: "./aws_cli/bin/python -m pip install awscli"
  - sh: "PATH=$(echo $PWD'/aws_cli/bin'):$PATH"
 
- - sh: "sudo apt-get -y install python3.7"
- - sh: "sudo apt-get -y install python3.8"
- - sh: "sudo apt-get -y install python3.9 python3.9-dev python3.9-venv"
- - sh: "sudo apt-get -y install python3.10 python3.10-dev python3.10-venv"
-
- - sh: "which python3.8"
- - sh: "which python3.7"
- - sh: "which python3.9"
- - sh: "which python3.10"
-
- - sh: "PATH=$PATH:/usr/bin/python3.9:/usr/bin/python3.8:/usr/bin/python3.7:/usr/bin/python3.10"
- - sh: "curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py"
- - sh: "curl https://bootstrap.pypa.io/pip/3.6/get-pip.py -o get-pip-36.py"
-
- - sh: "sudo apt-get -y install python3-distutils"
- - sh: "sudo apt-get -y install python3.9-distutils"
- - ps: "If ($env:INSTALL_PY_310_PIP) {python3.10 get-pip.py --user}"
- - ps: "If ($env:INSTALL_PY_39_PIP) {python3.9 get-pip.py --user}"
- - ps: "If ($env:INSTALL_PY_38_PIP) {python3.8 get-pip.py --user}"
- - ps: "If ($env:INSTALL_PY_37_PIP) {python3.7 get-pip.py --user}"
+ - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin"
 
  # update ca-certificates which causes failures with newest golang library
  - sh: "sudo apt-get install --reinstall ca-certificates"
@@ -202,8 +178,7 @@ for:
  - 
  matrix:
  only:
- - image: Ubuntu
- configuration: BuildIntegTesting
+ - configuration: BuildIntegTesting
 
  test_script:
  # Pre-dev Tests
@@ -220,8 +195,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: LocalZipTerraformBuildIntegTesting
+ - configuration: LocalZipTerraformBuildIntegTesting
 
  test_script:
  # Pre-dev Tests
@@ -234,8 +208,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: LocalZipTerraformBuildInContainerIntegTesting
+ - configuration: LocalZipTerraformBuildInContainerIntegTesting
 
  test_script:
  # Pre-dev Tests
@@ -248,8 +221,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: S3ZipTerraformBuildIntegTesting
+ - configuration: S3ZipTerraformBuildIntegTesting
 
  test_script:
  # Pre-dev Tests
@@ -262,8 +234,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: S3ZipTerraformBuildInContainerIntegTesting
+ - configuration: S3ZipTerraformBuildInContainerIntegTesting
 
  test_script:
  # Pre-dev Tests
@@ -276,8 +247,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: OtherTerraformBuildIntegTesting
+ - configuration: OtherTerraformBuildIntegTesting
 
  test_script:
  # Pre-dev Tests
@@ -290,8 +260,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: DeployIntegTesting
+ - configuration: DeployIntegTesting
 
  test_script:
  - "pip install -e \".[dev]\""
@@ -301,8 +270,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: PackageIntegTesting
+ - configuration: PackageIntegTesting
 
  test_script:
  - "pip install -e \".[dev]\""
@@ -312,8 +280,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: DeleteIntegTesting
+ - configuration: DeleteIntegTesting
 
  test_script:
  - "pip install -e \".[dev]\""
@@ -323,8 +290,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: SyncIntegTesting
+ - configuration: SyncIntegTesting
 
  test_script:
  - "pip install -e \".[dev]\""
@@ -334,8 +300,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: LocalIntegTesting
+ - configuration: LocalIntegTesting
 
  test_script:
  # Pre-dev Tests
@@ -349,8 +314,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: EndToEndTesting
+ - configuration: EndToEndTesting
 
  test_script:
  - "pip install -e \".[dev]\""
@@ -360,8 +324,7 @@ for:
  -
  matrix:
  only:
- - image: Ubuntu
- configuration: OtherTesting
+ - configuration: OtherTesting
 
  test_script:
  # Pre-dev Tests
@@ -378,7 +341,4 @@ for:
  - sh: "pytest tests/integration --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others.json"
  - sh: "pytest -vv tests/regression --json-report --json-report-file=TEST_REPORT-regression.json"
  - sh: "black --check setup.py tests samcli"
-
- # Smoke tests run in parallel - it runs on both Linux & Windows
- # Presence of the RUN_SMOKE envvar will run the smoke tests
- - ps: "If ($env:RUN_SMOKE) {pytest -n 4 -vv tests/smoke --json-report --json-report-file=TEST_REPORT-smoke.json}"
+ - sh: "pytest -n 4 -vv tests/smoke --json-report --json-report-file=TEST_REPORT-smoke.json"

appveyor-windows.yml

@@ -1,5 +1,5 @@
 version: 1.0.{build}
-image: Visual Studio 2019
+image: Visual Studio 2022
 build: off
 
 clone_folder: C:\source
@@ -58,10 +58,7 @@ cache:
 install:
  # setup make
  - "choco install make"
- # Install latest dotnet sdk
- - "choco install dotnet-sdk"
  # setup Java, Maven and Gradle
- - "choco install maven -y --force"
  - "choco install gradle -y --force"
  - "java -version"
  - "gradle -v"

installer/pyinstaller/hook-samcli.py

@@ -6,7 +6,10 @@
 datas = (
  # Collect data files, raw python files (if include_py_files=True) and package metadata directories.
  hooks.collect_all(
- "samcli", include_py_files=True, include_datas=["hook_packages/terraform/copy_terraform_built_artifacts.py"]
+ "samcli", include_py_files=True, include_datas=[
+ "hook_packages/terraform/copy_terraform_built_artifacts.py",
+ "local/lambdafn/zip.py",
+ ]
  )[0]
  + hooks.collect_all("jschema_to_python", include_py_files=False)[0]
  + hooks.collect_all("cfnlint", include_py_files=True)[0]

requirements/base.txt

@@ -7,22 +7,22 @@ jmespath~=0.10.0
 ruamel_yaml==0.17.21
 PyYAML>=5.4.1,==5.*
 cookiecutter~=2.1.1
-aws-sam-translator==1.62.0
+aws-sam-translator==1.64.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=4.2.0
 dateparser~=1.1
 requests==2.28.2
 serverlessrepo==0.1.10
 aws_lambda_builders==1.28.0
-tomlkit==0.11.6
+tomlkit==0.11.7
 watchdog==2.1.2
 pyopenssl==23.0.0
 
 # Needed for supporting Protocol in Python 3.7, Protocol class became public with python3.8
 typing_extensions~=4.4.0
 
-# NOTE: regex is not a direct dependency of SAM CLI, but pin to 2021.9.30 due to 2021.10.8 not working on M1 Mac - https://bitbucket.org/mrabarnett/mrab-regex/issues/399/missing-wheel-for-macosx-and-the-new-m1
-regex==2021.9.30
+# NOTE: regex is not a direct dependency of SAM CLI, exclude version 2021.10.8 due to not working on M1 Mac - https://github.com/mrabarnett/mrab-regex/issues/399
+regex!=2021.10.8
 # NOTE: tzlocal is not a direct dependency of SAM CLI, but pin to 3.0 as 4.0 break appveyor jobs
 tzlocal==3.0
 

requirements/dev.txt

@@ -9,7 +9,7 @@ pytest-cov==4.0.0
 # here we fix its version and upgrade it manually in the future
 mypy==0.790
 boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray]==1.21.21
-types-pywin32==304.0.0.1
+types-pywin32==306.0.0.0
 types-PyYAML==6.0.12
 types-chevron==0.14.2
 types-psutil==5.9.5.1
@@ -23,8 +23,8 @@ pytest-forked==1.6.0
 pytest-timeout==2.1.0
 pytest-rerunfailures==11.1.2
 pytest-json-report==1.5.0
-filelock==3.10.0
+filelock==3.10.7
 
 # formatter
 black==22.6.0
-psutil==5.9.0
+psutil==5.9.4

requirements/pyinstaller-build.txt

@@ -1,3 +1,3 @@
 # Executable binary builder requirements
 setuptools==65.5.1
-pyinstaller==5.8.0
+pyinstaller==5.9.0