Merge from aws/aws-sam-cli/develop

.github/labeler.yml

@@ -1,75 +1,109 @@
 area/package:
-- samcli/commands/package/*
-- samcli/commands/package/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/package/*
+      - samcli/commands/package/**/*
 
 area/local/invoke:
-- samcli/commands/local/invoke/*
-- samcli/commands/local/invoke/**/*
-- samcli/local/*
-- samcli/local/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/local/invoke/*
+      - samcli/commands/local/invoke/**/*
+      - samcli/local/*
+      - samcli/local/**/*
 
 area/pipeline:
-- samcli/commands/pipeline/*
-- samcli/commands/pipeline/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/pipeline/*
+      - samcli/commands/pipeline/**/*
 
 area/deploy:
-- samcli/commands/deploy/*
-- samcli/commands/deploy/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/deploy/*
+      - samcli/commands/deploy/**/*
 
 area/local/start-api:
-- samcli/commands/local/start-api/*
-- samcli/commands/local/start-api/**/*
-- samcli/local/*
-- samcli/local/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/local/start-api/*
+      - samcli/commands/local/start-api/**/*
+      - samcli/local/*
+      - samcli/local/**/*
 
 area/local/start-invoke:
-- samcli/commands/local/start-invoke/*
-- samcli/commands/local/start-invoke/**/*
-- samcli/local/*
-- samcli/local/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/local/start-invoke/*
+      - samcli/commands/local/start-invoke/**/*
+      - samcli/local/*
+      - samcli/local/**/*
 
 area/local/generate-event:
-- samcli/commands/local/generate-event/*
-- samcli/commands/local/generate-event/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/local/generate-event/*
+      - samcli/commands/local/generate-event/**/*
 
 area/init:
-- samcli/commands/init/*
-- samcli/commands/init/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/init/*
+      - samcli/commands/init/**/*
 
 area/delete:
-- samcli/commands/delete/*
-- samcli/commands/delete/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/delete/*
+      - samcli/commands/delete/**/*
 
 area/integration-tests:
-- test/integration/*
-- test/integration/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - test/integration/*
+      - test/integration/**/*
 
 area/publish:
-- samcli/commands/publish/*
-- samcli/commands/publish/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/publish/*
+      - samcli/commands/publish/**/*
 
 area/sync:
-- samcli/commands/sync/*
-- samcli/commands/sync/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/sync/*
+      - samcli/commands/sync/**/*
 
 area/validate:
-- samcli/commands/validate/*
-- samcli/commands/validate/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/validate/*
+      - samcli/commands/validate/**/*
 
 area/build:
-- samcli/commands/build/*
-- samcli/commands/build/**/*
-- samcli/lib/build/*
-- samcli/lib/build/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/build/*
+      - samcli/commands/build/**/*
+      - samcli/lib/build/*
+      - samcli/lib/build/**/*
 
 area/logs:
-- samcli/commands/logs/*
-- samcli/commands/logs/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/logs/*
+      - samcli/commands/logs/**/*
 
 area/traces:
-- samcli/commands/traces/*
-- samcli/commands/traces/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - samcli/commands/traces/*
+      - samcli/commands/traces/**/*
 
 area/schema:
-- schema/*
-- schema/**/*
+  - changed-files:
+    - any-glob-to-any-file:
+      - schema/*
+      - schema/**/*

.github/workflows/build.yml

@@ -60,7 +60,7 @@ jobs:
           - "3.11"
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python }}
     - run: test -f "./.github/ISSUE_TEMPLATE/Bug_report.md"  # prevent Bug_report.md from being renamed or deleted
@@ -76,13 +76,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         name: Install Python 3.11
         with:
           python-version: 3.11
       - run: make init
       - run: |
-          diff <( cat schema/samcli.json ) <( python schema/make_schema.py; cat schema/samcli.json ) && exit 0 # exit if schema is unchanged
+          diff <( cat schema/samcli.json ) <( python -m schema.make_schema && cat schema/samcli.json ) && \
+            echo "No changes found." && \
+            exit 0 # exit if schema is unchanged
           echo "The generated schema differs from that in the PR. Please run 'make schema'."
           exit 1
         name: Generate and compare the schema
@@ -132,7 +134,7 @@ jobs:
           - "tests/integration/docs"
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           # set last version as the one in matrix to make it default
           python-version: |
@@ -218,7 +220,7 @@ jobs:
           - "3.11"
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
       - name: Init samdev
@@ -240,7 +242,7 @@ jobs:
           - windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           # These are the versions of Python that correspond to the supported Lambda runtimes
           python-version: |

.github/workflows/codeql.yml

@@ -46,7 +46,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -73,6 +73,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/pr-labeler.yml

@@ -9,7 +9,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
   apply-internal-external-label:

.github/workflows/update-reproducibles.yml

@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
       - run: make ${{ matrix.target }}

.github/workflows/validate_pyinstaller.yml

@@ -49,7 +49,7 @@ jobs:
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.8"
       - name: Set up Go

appveyor-linux-binary.yml

@@ -67,6 +67,10 @@ install:
   - sh: "PATH=/opt/gradle/gradle-8.4/bin:$PATH"
   - sh: "gradle --version"
 
+  # Install dotnet8 SDK
+  - sh: "sudo apt-get update"
+  - sh: "sudo apt-get install -y dotnet-sdk-8.0"
+
   # Install AWS CLI
   - sh: "virtualenv aws_cli"
   - sh: "./aws_cli/bin/python -m pip install awscli"

appveyor-ubuntu.yml

@@ -68,6 +68,10 @@ install:
   - sh: "PATH=/opt/gradle/gradle-8.4/bin:$PATH"
   - sh: "gradle --version"
 
+  # Install dotnet8 SDK
+  - sh: "sudo apt-get update"
+  - sh: "sudo apt-get install -y dotnet-sdk-8.0"
+
   # Install AWS CLI
   - sh: "virtualenv aws_cli"
   - sh: "./aws_cli/bin/python -m pip install awscli"

requirements/base.txt

@@ -1,7 +1,7 @@
 chevron~=0.12
 click~=8.1
 Flask<3.1
-boto3>=1.26.109,<2
+boto3>=1.29.2,<2
 jmespath~=1.0.1
 ruamel_yaml~=0.18.5
 PyYAML~=6.0,>=6.0.1
@@ -11,7 +11,7 @@ aws-sam-translator==1.82.0
 docker~=6.1.0
 dateparser~=1.2
 requests~=2.31.0
-aws_lambda_builders==1.43.0
+aws_lambda_builders==1.45.0
 tomlkit==0.12.3
 watchdog==3.0.0
 rich~=13.7.0
@@ -28,7 +28,7 @@ regex!=2021.10.8
 tzlocal==5.2
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=0.83.4
+cfn-lint~=0.83.5
 
 # Type checking boto3 objects
-boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.33.5
+boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.9

requirements/dev.txt

@@ -1,18 +1,18 @@
 -r pre-dev.txt
 
-coverage==7.3.2
+coverage==7.4.0
 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.7.1
-types-pywin32==306.0.0.6
+types-pywin32==306.0.0.8
 types-PyYAML==6.0.12.12
 types-chevron==0.14.2.5
 types-psutil==5.9.5.17
-types-setuptools==68.2.0.2
+types-setuptools==69.0.0.0
 types-Pygments==2.17.0.0 
 types-colorama==0.4.15.12
 types-dateparser==1.1.4.10
@@ -36,5 +36,5 @@ pytest-json-report==1.5.0
 filelock==3.13.1
 
 # formatter
-black==23.11.0
-psutil==5.9.6
+black==23.12.0
+psutil==5.9.7

requirements/pre-dev.txt

@@ -1 +1 @@
-ruff==0.1.7
+ruff==0.1.8

requirements/pyinstaller-build.txt

@@ -1,3 +1,3 @@
 # Executable binary builder requirements
 setuptools==69.0.2
-pyinstaller==6.2.0
+pyinstaller==6.3.0