Merge from aws/aws-sam-cli/develop

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-<!-- Make sure we don't have an existing Issue that reports the bug you are seeing (both open and closed). -->
+<!-- Make sure we don't have an existing Issue for the feature you are requesting (both open and closed). -->
 
 ### Describe your idea/feature/enhancement
 

.github/workflows/automated-updates-to-sam-cli.yml

@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout App Templates
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: aws/aws-sam-cli-app-templates
           path: aws-sam-cli-app-templates
 
       - name: Checkout SAM CLI
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: aws/aws-sam-cli
           path: aws-sam-cli
@@ -59,15 +59,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout SAM
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: aws/serverless-application-model
           path: serverless-application-model
           ref: main
           fetch-depth: 0
 
       - name: Checkout SAM CLI
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: aws/aws-sam-cli
           path: aws-sam-cli
@@ -110,15 +110,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Lambda Builders
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: aws/aws-lambda-builders
           path: aws-lambda-builders
           ref: main
           fetch-depth: 0
 
       - name: Checkout SAM CLI
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: aws/aws-sam-cli
           path: aws-sam-cli

.github/workflows/build.yml

@@ -58,7 +58,7 @@ jobs:
           - "3.9"
           - "3.11"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
@@ -74,7 +74,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         name: Install Python 3.11
         with:
@@ -129,7 +129,7 @@ jobs:
           #- "validate"
           - "docs"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           # set last version as the one in matrix to make it default
@@ -207,7 +207,7 @@ jobs:
           - "3.9"
           - "3.11"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
@@ -222,13 +222,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       SAM_CLI_DEV: "1"
+      CI: true
     strategy:
       matrix:
         os:
           - ubuntu-latest
           - windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           # These are the versions of Python that correspond to the supported Lambda runtimes

.github/workflows/codeql.yml

@@ -42,7 +42,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/update-reproducibles.yml

@@ -26,7 +26,7 @@ jobs:
       max-parallel: 1
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
       - uses: actions/setup-python@v4

.github/workflows/validate_pyinstaller.yml

@@ -17,6 +17,9 @@ jobs:
     strategy:
       fail-fast: false
     steps:
+      # we need to keep checkout as v3 otherwise it doesn't work with manylinux image above
+      # due to glibc requirement from github actions 
+      # see example failure: https://github.com/aws/aws-sam-cli/actions/runs/6102715182/job/16561754862?pr=5887
       - uses: actions/checkout@v3
       - name: Set up Go
         uses: actions/setup-go@v4
@@ -45,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: "3.7"

installer/pyinstaller/hook-samcli.py

@@ -13,6 +13,9 @@
     )[0]
     + hooks.collect_all("jschema_to_python", include_py_files=False)[0]
     + hooks.collect_all("cfnlint", include_py_files=True)[0]
+    # cookiecutter 2.2.3 added the version in a file called VERSION.txt which needs to be added
+    # for sam init to run cookiecutter using pyinstaller https://github.com/cookiecutter/cookiecutter/releases/tag/2.2.3
+    + hooks.collect_all("cookiecutter", include_py_files=False)[0]
     # Collect ONLY data files.
     + hooks.collect_data_files("samcli")
     + hooks.collect_data_files("samtranslator")

requirements/base.txt

@@ -1,21 +1,20 @@
 chevron~=0.12
 click~=8.1
 Flask<2.4
-#Need to add latest lambda changes which will return invoke mode details
-boto3>=1.26.109,==1.*
+boto3>=1.26.109,<2
 jmespath~=1.0.1
 ruamel_yaml~=0.17.32
 PyYAML~=6.0,>=6.0.1
-cookiecutter~=2.1.1
-aws-sam-translator==1.73.0
+cookiecutter~=2.3.0
+aws-sam-translator==1.75.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=6.1.0
 dateparser~=1.1
 requests~=2.31.0
-aws_lambda_builders==1.37.0
+aws_lambda_builders==1.38.0
 tomlkit==0.12.1
 watchdog==3.0.0
-rich~=13.5.2
+rich~=13.5.3
 pyopenssl~=23.2.0
 # Pin to <4.18 to until SAM-T no longer uses RefResolver
 jsonschema<4.20
@@ -29,7 +28,7 @@ regex!=2021.10.8
 tzlocal==5.0.1
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=0.79.7
+cfn-lint~=0.80.3
 
 # Type checking boto3 objects
-boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray]==1.28.38
+boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray]==1.28.55

requirements/dev.txt

@@ -1,18 +1,20 @@
 -r pre-dev.txt
 
-coverage==7.2.7
+coverage==7.2.7; python_version < "3.8"
+coverage==7.3.1; python_version >= "3.8"
 pytest-cov==4.1.0
 
 
 # type checking and related stubs
 # mypy adds new rules in new minor versions, which could cause our PR check to fail
 # here we fix its version and upgrade it manually in the future
-mypy==1.4.1
+mypy==1.4.1; python_version < "3.8"
+mypy==1.5.1; python_version >= "3.8"
 types-pywin32==306.0.0.4
 types-PyYAML==6.0.12.11
 types-chevron==0.14.2.5
 types-psutil==5.9.5.16
-types-setuptools==68.1.0.0
+types-setuptools==68.2.0.0
 types-Pygments==2.16.0.0 
 types-colorama==0.4.15.12
 types-dateparser==1.1.4.10
@@ -23,7 +25,7 @@ types-requests==2.31.0.2
 types-urllib3==1.26.25.14
 
 # Test requirements
-pytest~=7.4.0
+pytest~=7.4.2
 parameterized==0.9.0
 pytest-xdist==3.3.1
 pytest-forked==1.6.0
@@ -32,8 +34,10 @@ pytest-rerunfailures==12.0
 # NOTE (hawflau): DO NOT upgrade pytest-metadata and pytest-json-report unless pytest-json-report addresses https://github.com/numirias/pytest-json-report/issues/89
 pytest-metadata==2.0.4
 pytest-json-report==1.5.0
-filelock==3.12.2
+filelock==3.12.2; python_version < "3.8"
+filelock==3.12.4; python_version >= "3.8"
 
 # formatter
-black==22.6.0
+black==22.6.0; python_version < "3.8"
+black==23.9.1; python_version >= "3.8"
 psutil==5.9.5

requirements/pre-dev.txt

@@ -1 +1 @@
-ruff==0.0.285
+ruff==0.0.291

requirements/pyinstaller-build.txt

@@ -1,3 +1,3 @@
 # Executable binary builder requirements
-setuptools==68.1.2
+setuptools==68.2.2
 pyinstaller==5.13.2