Merge branch 'feat/terraform-v2-api' of https://github.com/aws/aws-sa…

…m-cli into feat/terraform-v2-api

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

@@ -75,7 +75,7 @@ jobs:
       - uses: actions/setup-python@v4 # used for make update-reproducible-reqs below
         with:
           python-version: |
-            3.7
+            3.8
             3.11
 
       - name: Update aws-sam-translator & commit
@@ -132,7 +132,7 @@ jobs:
       - uses: actions/setup-python@v4 # used for make update-reproducible-reqs below
         with:
           python-version: |
-            3.7
+            3.8
             3.11
 
       - name: Upgrade aws_lambda_builders & commit

.github/workflows/build.yml

@@ -57,17 +57,9 @@ jobs:
           - "3.11"
     steps:
     - uses: actions/checkout@v3
-    # @melasmar
-    # TODO: Revert back to use 3.7 to all operating systems after the regression issue in Python
-    # https://github.com/actions/setup-python/issues/682 in github action got resolved
     - uses: actions/setup-python@v4
-      if: matrix.os != 'macos-latest' || ( matrix.os == 'macos-latest' && matrix.python != '3.7' )
       with:
         python-version: ${{ matrix.python }}
-    - uses: actions/setup-python@v4
-      if: matrix.os == 'macos-latest' && matrix.python == '3.7'
-      with:
-        python-version: "3.7.16"
     - run: test -f "./.github/ISSUE_TEMPLATE/Bug_report.md"  # prevent Bug_report.md from being renamed or deleted
     - run: make init
     - run: make pr

Makefile

@@ -65,7 +65,7 @@ update-reproducible-linux-reqs:
 	venv-update-reproducible-linux/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-linux.txt
 
 update-reproducible-mac-reqs:
-	python3.7 -m venv venv-update-reproducible-mac
+	python3.8 -m venv venv-update-reproducible-mac
 	venv-update-reproducible-mac/bin/pip install --upgrade pip-tools pip
 	venv-update-reproducible-mac/bin/pip install -r requirements/base.txt
 	venv-update-reproducible-mac/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-mac.txt

appveyor-windows.yml

@@ -134,7 +134,14 @@ install:
   # Echo final Path
   - "echo %PATH%"
 
-  - "IF DEFINED BY_CANARY ECHO Logging in Public ECR && aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws"
+  # use amazon-ecr-credential-helper
+  - choco install amazon-ecr-credential-helper
+  - ps: "
+    $docker_config = Get-Content $env:HOME/.docker/config.json -raw | ConvertFrom-Json;
+    $docker_config.credsStore = 'ecr-login';
+    $docker_config | ConvertTo-Json | set-content $env:HOME/.docker/config.json;
+  "
+  - ps: "get-content $env:HOME/.docker/config.json"
 
   # claim some disk space before starting the tests
   - "docker system prune -a -f"

installer/pyinstaller/build-linux.sh

@@ -26,7 +26,7 @@ else
     is_nightly="false"
 fi
 
-set -eu
+set -eux
 
 yum install -y zlib-devel libffi-devel bzip2-devel
 
@@ -83,6 +83,7 @@ cp -r ./venv/lib/python*/site-packages/* ./output/python-libraries
 
 echo "Installing PyInstaller"
 ./venv/bin/pip install -r src/requirements/pyinstaller-build.txt
+./venv/bin/pip check
 
 echo "Building Binary"
 cd src

installer/pyinstaller/build-mac.sh

@@ -45,7 +45,7 @@ else
     is_nightly="false"
 fi
 
-set -eu
+set -eux
 
 echo "Making Folders"
 mkdir -p .build/src
@@ -93,6 +93,7 @@ cp -r ./venv/lib/python*/site-packages/* ./output/python-libraries
 
 echo "Installing PyInstaller"
 ./venv/bin/pip install -r src/requirements/pyinstaller-build.txt
+./venv/bin/pip check
 
 # Building the binary using pyinstaller
 echo "Building Binary"

pytest.ini

@@ -6,3 +6,7 @@ filterwarnings =
     error
     ignore::DeprecationWarning:docker
     default::ResourceWarning
+;   The following deprecation warnings are treated as failures unless we explicitly tell pytest not to
+;   Remove once we no longer support python3.7
+    ignore::boto3.exceptions.PythonDeprecationWarning
+

requirements/base.txt

@@ -1,13 +1,14 @@
 chevron~=0.12
-click~=8.0
+# 8.1.4 of Click has an issue with the typing breaking the linter - https://github.com/pallets/click/issues/2558
+click~=8.0,!=8.1.4
 Flask<2.3
 #Need to add latest lambda changes which will return invoke mode details
 boto3>=1.26.109,==1.*
 jmespath~=1.0.1
 ruamel_yaml~=0.17.32
 PyYAML>=5.4.1,==5.*
 cookiecutter~=2.1.1
-aws-sam-translator==1.70.0
+aws-sam-translator==1.71.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=6.1.0
 dateparser~=1.1
@@ -18,6 +19,8 @@ tomlkit==0.11.8
 watchdog==2.1.2
 rich~=13.3.3
 pyopenssl~=23.2.0
+# Pin to <4.18 to until SAM-T no longer uses RefResolver
+jsonschema<4.18
 
 # Needed for supporting Protocol in Python 3.7, Protocol class became public with python3.8
 typing_extensions~=4.4.0

requirements/reproducible-linux.txt

@@ -19,9 +19,9 @@ aws-lambda-builders==1.34.0 \
     --hash=sha256:0790f7e9b7ee7286b96fbcf49450c5be0341bb7cb852ca7d74beae190139eb48 \
     --hash=sha256:20456a942a417407b42ecf8ab7fce6a47306fd063051e7cb09d02d1be24d5cf3
     # via aws-sam-cli (setup.py)
-aws-sam-translator==1.70.0 \
-    --hash=sha256:753288eda07b057e5350773b7617076962b59404d49cd05e2259ac96a7694436 \
-    --hash=sha256:a2df321607d29791893707ef2ded9e79be00dbb71ac430696f6e6d7d0b0301a5
+aws-sam-translator==1.71.0 \
+    --hash=sha256:17fb87c8137d8d49e7a978396b2b3b279211819dee44618415aab1e99c2cb659 \
+    --hash=sha256:a3ea80aeb116d7978b26ac916d2a5a24d012b742bf28262b17769c4b886e8fba
     # via
     #   aws-sam-cli (setup.py)
     #   cfn-lint
@@ -212,26 +212,26 @@ cookiecutter==2.1.1 \
     --hash=sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022 \
     --hash=sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5
     # via aws-sam-cli (setup.py)
-cryptography==41.0.0 \
-    --hash=sha256:0ddaee209d1cf1f180f1efa338a68c4621154de0afaef92b89486f5f96047c55 \
-    --hash=sha256:14754bcdae909d66ff24b7b5f166d69340ccc6cb15731670435efd5719294895 \
-    --hash=sha256:344c6de9f8bda3c425b3a41b319522ba3208551b70c2ae00099c205f0d9fd3be \
-    --hash=sha256:34d405ea69a8b34566ba3dfb0521379b210ea5d560fafedf9f800a9a94a41928 \
-    --hash=sha256:3680248309d340fda9611498a5319b0193a8dbdb73586a1acf8109d06f25b92d \
-    --hash=sha256:3c5ef25d060c80d6d9f7f9892e1d41bb1c79b78ce74805b8cb4aa373cb7d5ec8 \
-    --hash=sha256:4ab14d567f7bbe7f1cdff1c53d5324ed4d3fc8bd17c481b395db224fb405c237 \
-    --hash=sha256:5c1f7293c31ebc72163a9a0df246f890d65f66b4a40d9ec80081969ba8c78cc9 \
-    --hash=sha256:6b71f64beeea341c9b4f963b48ee3b62d62d57ba93eb120e1196b31dc1025e78 \
-    --hash=sha256:7d92f0248d38faa411d17f4107fc0bce0c42cae0b0ba5415505df72d751bf62d \
-    --hash=sha256:8362565b3835ceacf4dc8f3b56471a2289cf51ac80946f9087e66dc283a810e0 \
-    --hash=sha256:84a165379cb9d411d58ed739e4af3396e544eac190805a54ba2e0322feb55c46 \
-    --hash=sha256:88ff107f211ea696455ea8d911389f6d2b276aabf3231bf72c8853d22db755c5 \
-    --hash=sha256:9f65e842cb02550fac96536edb1d17f24c0a338fd84eaf582be25926e993dde4 \
-    --hash=sha256:a4fc68d1c5b951cfb72dfd54702afdbbf0fb7acdc9b7dc4301bbf2225a27714d \
-    --hash=sha256:b7f2f5c525a642cecad24ee8670443ba27ac1fab81bba4cc24c7b6b41f2d0c75 \
-    --hash=sha256:b846d59a8d5a9ba87e2c3d757ca019fa576793e8758174d3868aecb88d6fc8eb \
-    --hash=sha256:bf8fc66012ca857d62f6a347007e166ed59c0bc150cefa49f28376ebe7d992a2 \
-    --hash=sha256:f5d0bf9b252f30a31664b6f64432b4730bb7038339bd18b1fafe129cfc2be9be
+cryptography==41.0.1 \
+    --hash=sha256:059e348f9a3c1950937e1b5d7ba1f8e968508ab181e75fc32b879452f08356db \
+    --hash=sha256:1a5472d40c8f8e91ff7a3d8ac6dfa363d8e3138b961529c996f3e2df0c7a411a \
+    --hash=sha256:1a8e6c2de6fbbcc5e14fd27fb24414507cb3333198ea9ab1258d916f00bc3039 \
+    --hash=sha256:1fee5aacc7367487b4e22484d3c7e547992ed726d14864ee33c0176ae43b0d7c \
+    --hash=sha256:5d092fdfedaec4cbbffbf98cddc915ba145313a6fdaab83c6e67f4e6c218e6f3 \
+    --hash=sha256:5f0ff6e18d13a3de56f609dd1fd11470918f770c6bd5d00d632076c727d35485 \
+    --hash=sha256:7bfc55a5eae8b86a287747053140ba221afc65eb06207bedf6e019b8934b477c \
+    --hash=sha256:7fa01527046ca5facdf973eef2535a27fec4cb651e4daec4d043ef63f6ecd4ca \
+    --hash=sha256:8dde71c4169ec5ccc1087bb7521d54251c016f126f922ab2dfe6649170a3b8c5 \
+    --hash=sha256:8f4ab7021127a9b4323537300a2acfb450124b2def3756f64dc3a3d2160ee4b5 \
+    --hash=sha256:948224d76c4b6457349d47c0c98657557f429b4e93057cf5a2f71d603e2fc3a3 \
+    --hash=sha256:9a6c7a3c87d595608a39980ebaa04d5a37f94024c9f24eb7d10262b92f739ddb \
+    --hash=sha256:b46e37db3cc267b4dea1f56da7346c9727e1209aa98487179ee8ebed09d21e43 \
+    --hash=sha256:b4ceb5324b998ce2003bc17d519080b4ec8d5b7b70794cbd2836101406a9be31 \
+    --hash=sha256:cb33ccf15e89f7ed89b235cff9d49e2e62c6c981a6061c9c8bb47ed7951190bc \
+    --hash=sha256:d198820aba55660b4d74f7b5fd1f17db3aa5eb3e6893b0a41b75e84e4f9e0e4b \
+    --hash=sha256:d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006 \
+    --hash=sha256:eb8163f5e549a22888c18b0d53d6bb62a20510060a22fd5a995ec8a05268df8a \
+    --hash=sha256:f73bff05db2a3e5974a6fd248af2566134d8981fd7ab012e5dd4ddb1d9a70699
     # via pyopenssl
 dateparser==1.1.8 \
     --hash=sha256:070b29b5bbf4b1ec2cd51c96ea040dc68a614de703910a91ad1abba18f9f379f \
@@ -291,6 +291,7 @@ jsonschema==4.17.3 \
     --hash=sha256:0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d \
     --hash=sha256:a870ad254da1a8ca84b6a2905cac29d265f805acc57af304784962a2aa6508f6
     # via
+    #   aws-sam-cli (setup.py)
     #   aws-sam-translator
     #   cfn-lint
 junit-xml==1.9 \