From 6d8d29c9834d2117464654fe6205b0db64b2da3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 09:04:46 -0700 Subject: [PATCH 01/32] chore(deps-dev): bump the pytest group in /requirements with 1 update (#6825) Bumps the pytest group in /requirements with 1 update: [pytest-rerunfailures](https://github.com/pytest-dev/pytest-rerunfailures). Updates `pytest-rerunfailures` from 13.0 to 14.0 - [Changelog](https://github.com/pytest-dev/pytest-rerunfailures/blob/master/CHANGES.rst) - [Commits](https://github.com/pytest-dev/pytest-rerunfailures/compare/13.0...14.0) --- updated-dependencies: - dependency-name: pytest-rerunfailures dependency-type: direct:development update-type: version-update:semver-major dependency-group: pytest ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index e257d5481a..5e94146384 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -29,7 +29,7 @@ parameterized==0.9.0 pytest-xdist==3.5.0 pytest-forked==1.6.0 pytest-timeout==2.3.1 -pytest-rerunfailures==13.0 +pytest-rerunfailures==14.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==3.1.1 # NOTE (lucashuy): `pytest-json-report` was updated to `pytest-json-report-wip` as the original repository does not seem to be maintained anymore, if `-wip` is updated, validate the changes From 193cdbefc648e39890cb84f68c31a05e728795b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 16:05:52 +0000 Subject: [PATCH 02/32] chore(deps): bump referencing from 0.33.0 to 0.34.0 in /requirements (#6848) Bumps [referencing](https://github.com/python-jsonschema/referencing) from 0.33.0 to 0.34.0. - [Release notes](https://github.com/python-jsonschema/referencing/releases) - [Changelog](https://github.com/python-jsonschema/referencing/blob/main/docs/changes.rst) - [Commits](https://github.com/python-jsonschema/referencing/compare/v0.33.0...v0.34.0) --- updated-dependencies: - dependency-name: referencing dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/reproducible-linux.txt | 6 +++--- requirements/reproducible-mac.txt | 6 +++--- requirements/reproducible-win.txt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index 19647b5da8..2929fc10f1 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -632,9 +632,9 @@ pyyaml==6.0.1 \ # aws-sam-cli (setup.py) # cfn-lint # cookiecutter -referencing==0.33.0 \ - --hash=sha256:39240f2ecc770258f28b642dd47fd74bc8b02484de54e1882b74b35ebd779bd5 \ - --hash=sha256:c775fedf74bc0f9189c2a3be1c12fd03e8c23f4d371dce795df44e06c5b412f7 +referencing==0.34.0 \ + --hash=sha256:5773bd84ef41799a5a8ca72dc34590c041eb01bf9aa02632b4a973fb0181a844 \ + --hash=sha256:d53ae300ceddd3169f1ffa9caf2cb7b769e92657e4fafb23d34b93679116dfd4 # via # jsonschema # jsonschema-specifications diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 92d8e41c00..adedabbc72 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -664,9 +664,9 @@ pyyaml==6.0.1 \ # aws-sam-cli (setup.py) # cfn-lint # cookiecutter -referencing==0.33.0 \ - --hash=sha256:39240f2ecc770258f28b642dd47fd74bc8b02484de54e1882b74b35ebd779bd5 \ - --hash=sha256:c775fedf74bc0f9189c2a3be1c12fd03e8c23f4d371dce795df44e06c5b412f7 +referencing==0.34.0 \ + --hash=sha256:5773bd84ef41799a5a8ca72dc34590c041eb01bf9aa02632b4a973fb0181a844 \ + --hash=sha256:d53ae300ceddd3169f1ffa9caf2cb7b769e92657e4fafb23d34b93679116dfd4 # via # jsonschema # jsonschema-specifications diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index 358639ed53..163dd88f5d 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -652,9 +652,9 @@ pyyaml==6.0.1 \ # aws-sam-cli (setup.py) # cfn-lint # cookiecutter -referencing==0.33.0 \ - --hash=sha256:39240f2ecc770258f28b642dd47fd74bc8b02484de54e1882b74b35ebd779bd5 \ - --hash=sha256:c775fedf74bc0f9189c2a3be1c12fd03e8c23f4d371dce795df44e06c5b412f7 +referencing==0.34.0 \ + --hash=sha256:5773bd84ef41799a5a8ca72dc34590c041eb01bf9aa02632b4a973fb0181a844 \ + --hash=sha256:d53ae300ceddd3169f1ffa9caf2cb7b769e92657e4fafb23d34b93679116dfd4 # via # jsonschema # jsonschema-specifications From 29ef40adc8a102be9f2ccbeecb2f4f8e9d8ebd89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 16:06:06 +0000 Subject: [PATCH 03/32] chore(deps): bump s3transfer from 0.10.0 to 0.10.1 in /requirements (#6839) Bumps [s3transfer](https://github.com/boto/s3transfer) from 0.10.0 to 0.10.1. - [Changelog](https://github.com/boto/s3transfer/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/s3transfer/compare/0.10.0...0.10.1) --- updated-dependencies: - dependency-name: s3transfer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/reproducible-linux.txt | 6 +++--- requirements/reproducible-mac.txt | 6 +++--- requirements/reproducible-win.txt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index 2929fc10f1..ca1af8826b 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -908,9 +908,9 @@ ruamel-yaml-clib==0.2.8 \ --hash=sha256:f481f16baec5290e45aebdc2a5168ebc6d35189ae6fea7a58787613a25f6e875 \ --hash=sha256:fff3573c2db359f091e1589c3d7c5fc2f86f5bdb6f24252c2d8e539d4e45f412 # via ruamel-yaml -s3transfer==0.10.0 \ - --hash=sha256:3cdb40f5cfa6966e812209d0994f2a4709b561c88e90cf00c2696d2df4e56b2e \ - --hash=sha256:d0c8bbf672d5eebbe4e57945e23b972d963f07d82f661cabf678a5c88831595b +s3transfer==0.10.1 \ + --hash=sha256:5683916b4c724f799e600f41dd9e10a9ff19871bf87623cc8f491cb4f5fa0a19 \ + --hash=sha256:ceb252b11bcf87080fb7850a224fb6e05c8a776bab8f2b64b7f25b969464839d # via boto3 sarif-om==1.0.4 \ --hash=sha256:539ef47a662329b1c8502388ad92457425e95dc0aaaf995fe46f4984c4771911 \ diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index adedabbc72..9571e3d9db 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -940,9 +940,9 @@ ruamel-yaml-clib==0.2.8 \ --hash=sha256:f481f16baec5290e45aebdc2a5168ebc6d35189ae6fea7a58787613a25f6e875 \ --hash=sha256:fff3573c2db359f091e1589c3d7c5fc2f86f5bdb6f24252c2d8e539d4e45f412 # via ruamel-yaml -s3transfer==0.10.0 \ - --hash=sha256:3cdb40f5cfa6966e812209d0994f2a4709b561c88e90cf00c2696d2df4e56b2e \ - --hash=sha256:d0c8bbf672d5eebbe4e57945e23b972d963f07d82f661cabf678a5c88831595b +s3transfer==0.10.1 \ + --hash=sha256:5683916b4c724f799e600f41dd9e10a9ff19871bf87623cc8f491cb4f5fa0a19 \ + --hash=sha256:ceb252b11bcf87080fb7850a224fb6e05c8a776bab8f2b64b7f25b969464839d # via boto3 sarif-om==1.0.4 \ --hash=sha256:539ef47a662329b1c8502388ad92457425e95dc0aaaf995fe46f4984c4771911 \ diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index 163dd88f5d..dbcbc37790 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -928,9 +928,9 @@ ruamel-yaml-clib==0.2.8 \ --hash=sha256:f481f16baec5290e45aebdc2a5168ebc6d35189ae6fea7a58787613a25f6e875 \ --hash=sha256:fff3573c2db359f091e1589c3d7c5fc2f86f5bdb6f24252c2d8e539d4e45f412 # via ruamel-yaml -s3transfer==0.10.0 \ - --hash=sha256:3cdb40f5cfa6966e812209d0994f2a4709b561c88e90cf00c2696d2df4e56b2e \ - --hash=sha256:d0c8bbf672d5eebbe4e57945e23b972d963f07d82f661cabf678a5c88831595b +s3transfer==0.10.1 \ + --hash=sha256:5683916b4c724f799e600f41dd9e10a9ff19871bf87623cc8f491cb4f5fa0a19 \ + --hash=sha256:ceb252b11bcf87080fb7850a224fb6e05c8a776bab8f2b64b7f25b969464839d # via boto3 sarif-om==1.0.4 \ --hash=sha256:539ef47a662329b1c8502388ad92457425e95dc0aaaf995fe46f4984c4771911 \ From 790fd1f4d16e4c0815925db145e47924b3c6fb92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 16:06:21 +0000 Subject: [PATCH 04/32] chore(deps-dev): bump coverage from 7.4.3 to 7.4.4 in /requirements (#6838) Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.4.3 to 7.4.4. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.4.3...7.4.4) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 5e94146384..e8976ec094 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,6 +1,6 @@ -r pre-dev.txt -coverage==7.4.3 +coverage==7.4.4 pytest-cov==4.1.0 From 196b9c0dea36329fcf72b249823e09ff71db39d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 16:06:32 +0000 Subject: [PATCH 05/32] chore(deps): bump zipp from 3.17.0 to 3.18.1 in /requirements (#6837) Bumps [zipp](https://github.com/jaraco/zipp) from 3.17.0 to 3.18.1. - [Release notes](https://github.com/jaraco/zipp/releases) - [Changelog](https://github.com/jaraco/zipp/blob/main/NEWS.rst) - [Commits](https://github.com/jaraco/zipp/compare/v3.17.0...v3.18.1) --- updated-dependencies: - dependency-name: zipp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lucas <12496191+lucashuy@users.noreply.github.com> --- requirements/reproducible-mac.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 9571e3d9db..6a0a767d24 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -1056,9 +1056,9 @@ wheel==0.43.0 \ --hash=sha256:465ef92c69fa5c5da2d1cf8ac40559a8c940886afcef87dcf14b9470862f1d85 \ --hash=sha256:55c570405f142630c6b9f72fe09d9b67cf1477fcf543ae5b8dcb1f5b7377da81 # via aws-lambda-builders -zipp==3.17.0 \ - --hash=sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31 \ - --hash=sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0 +zipp==3.18.1 \ + --hash=sha256:206f5a15f2af3dbaee80769fb7dc6f249695e940acca08dfb2a4769fe61e538b \ + --hash=sha256:2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715 # via # importlib-metadata # importlib-resources From ae4a276e05651f201621be77f8a4039529a4c998 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 16:06:44 +0000 Subject: [PATCH 06/32] chore(deps): bump pydantic from 2.6.3 to 2.6.4 in /requirements (#6827) Bumps [pydantic](https://github.com/pydantic/pydantic) from 2.6.3 to 2.6.4. - [Release notes](https://github.com/pydantic/pydantic/releases) - [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md) - [Commits](https://github.com/pydantic/pydantic/compare/v2.6.3...v2.6.4) --- updated-dependencies: - dependency-name: pydantic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/reproducible-linux.txt | 6 +++--- requirements/reproducible-mac.txt | 6 +++--- requirements/reproducible-win.txt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index ca1af8826b..c6f9933e22 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -479,9 +479,9 @@ pycparser==2.21 \ --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 # via cffi -pydantic==2.6.3 \ - --hash=sha256:72c6034df47f46ccdf81869fddb81aade68056003900a8724a4f160700016a2a \ - --hash=sha256:e07805c4c7f5c6826e33a1d4c9d47950d7eaf34868e2690f8594d2e30241f11f +pydantic==2.6.4 \ + --hash=sha256:b1704e0847db01817624a6b86766967f552dd9dbf3afba4004409f908dcc84e6 \ + --hash=sha256:cc46fce86607580867bdc3361ad462bab9c222ef042d3da86f2fb333e1d916c5 # via aws-sam-translator pydantic-core==2.16.3 \ --hash=sha256:00ee1c97b5364b84cb0bd82e9bbf645d5e2871fb8c58059d158412fee2d33d8a \ diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 6a0a767d24..8445f0ae64 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -511,9 +511,9 @@ pycparser==2.21 \ --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 # via cffi -pydantic==2.6.3 \ - --hash=sha256:72c6034df47f46ccdf81869fddb81aade68056003900a8724a4f160700016a2a \ - --hash=sha256:e07805c4c7f5c6826e33a1d4c9d47950d7eaf34868e2690f8594d2e30241f11f +pydantic==2.6.4 \ + --hash=sha256:b1704e0847db01817624a6b86766967f552dd9dbf3afba4004409f908dcc84e6 \ + --hash=sha256:cc46fce86607580867bdc3361ad462bab9c222ef042d3da86f2fb333e1d916c5 # via aws-sam-translator pydantic-core==2.16.3 \ --hash=sha256:00ee1c97b5364b84cb0bd82e9bbf645d5e2871fb8c58059d158412fee2d33d8a \ diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index dbcbc37790..7342178924 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -483,9 +483,9 @@ pycparser==2.21 \ --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 # via cffi -pydantic==2.6.3 \ - --hash=sha256:72c6034df47f46ccdf81869fddb81aade68056003900a8724a4f160700016a2a \ - --hash=sha256:e07805c4c7f5c6826e33a1d4c9d47950d7eaf34868e2690f8594d2e30241f11f +pydantic==2.6.4 \ + --hash=sha256:b1704e0847db01817624a6b86766967f552dd9dbf3afba4004409f908dcc84e6 \ + --hash=sha256:cc46fce86607580867bdc3361ad462bab9c222ef042d3da86f2fb333e1d916c5 # via aws-sam-translator pydantic-core==2.16.3 \ --hash=sha256:00ee1c97b5364b84cb0bd82e9bbf645d5e2871fb8c58059d158412fee2d33d8a \ From f4e63679a985c0d89f7888c11bf69d30801bf209 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 16:06:56 +0000 Subject: [PATCH 07/32] chore(deps): bump setuptools from 69.1.1 to 69.2.0 in /requirements (#6826) Bumps [setuptools](https://github.com/pypa/setuptools) from 69.1.1 to 69.2.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v69.1.1...v69.2.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/pyinstaller-build.txt | 2 +- requirements/reproducible-linux.txt | 6 +++--- requirements/reproducible-mac.txt | 6 +++--- requirements/reproducible-win.txt | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements/pyinstaller-build.txt b/requirements/pyinstaller-build.txt index 3263bdcbf5..0863e1a330 100644 --- a/requirements/pyinstaller-build.txt +++ b/requirements/pyinstaller-build.txt @@ -1,3 +1,3 @@ # Executable binary builder requirements -setuptools==69.1.1 +setuptools==69.2.0 pyinstaller==6.5.0 diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index c6f9933e22..91a679436d 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -1023,7 +1023,7 @@ wheel==0.43.0 \ # via aws-lambda-builders # The following packages are considered to be unsafe in a requirements file: -setuptools==69.1.1 \ - --hash=sha256:02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56 \ - --hash=sha256:5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8 +setuptools==69.2.0 \ + --hash=sha256:0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e \ + --hash=sha256:c21c49fb1042386df081cb5d86759792ab89efca84cf114889191cd09aacc80c # via aws-lambda-builders diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 8445f0ae64..6ef6129102 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -1064,7 +1064,7 @@ zipp==3.18.1 \ # importlib-resources # The following packages are considered to be unsafe in a requirements file: -setuptools==69.1.1 \ - --hash=sha256:02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56 \ - --hash=sha256:5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8 +setuptools==69.2.0 \ + --hash=sha256:0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e \ + --hash=sha256:c21c49fb1042386df081cb5d86759792ab89efca84cf114889191cd09aacc80c # via aws-lambda-builders diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index 7342178924..7879c6037f 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -1047,7 +1047,7 @@ wheel==0.43.0 \ # via aws-lambda-builders # The following packages are considered to be unsafe in a requirements file: -setuptools==69.1.1 \ - --hash=sha256:02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56 \ - --hash=sha256:5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8 +setuptools==69.2.0 \ + --hash=sha256:0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e \ + --hash=sha256:c21c49fb1042386df081cb5d86759792ab89efca84cf114889191cd09aacc80c # via aws-lambda-builders From e3e4ddd9cc02f488bc40e4bdd7f196f2a8099bf1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 16:08:41 +0000 Subject: [PATCH 08/32] chore(deps): bump the types group in /requirements with 5 updates (#6854) Bumps the types group in /requirements with 5 updates: | Package | From | To | | --- | --- | --- | | [types-pywin32](https://github.com/python/typeshed) | `306.0.0.20240313` | `306.0.0.20240319` | | [types-psutil](https://github.com/python/typeshed) | `5.9.5.20240311` | `5.9.5.20240316` | | [types-setuptools](https://github.com/python/typeshed) | `69.1.0.20240310` | `69.2.0.20240317` | | [types-docutils](https://github.com/python/typeshed) | `0.20.0.20240311` | `0.20.0.20240317` | | [types-python-dateutil](https://github.com/python/typeshed) | `2.8.19.20240311` | `2.9.0.20240316` | Updates `types-pywin32` from 306.0.0.20240313 to 306.0.0.20240319 - [Commits](https://github.com/python/typeshed/commits) Updates `types-psutil` from 5.9.5.20240311 to 5.9.5.20240316 - [Commits](https://github.com/python/typeshed/commits) Updates `types-setuptools` from 69.1.0.20240310 to 69.2.0.20240317 - [Commits](https://github.com/python/typeshed/commits) Updates `types-docutils` from 0.20.0.20240311 to 0.20.0.20240317 - [Commits](https://github.com/python/typeshed/commits) Updates `types-python-dateutil` from 2.8.19.20240311 to 2.9.0.20240316 - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-pywin32 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: types - dependency-name: types-psutil dependency-type: direct:development update-type: version-update:semver-patch dependency-group: types - dependency-name: types-setuptools dependency-type: direct:development update-type: version-update:semver-minor dependency-group: types - dependency-name: types-docutils dependency-type: direct:development update-type: version-update:semver-patch dependency-group: types - dependency-name: types-python-dateutil dependency-type: direct:production update-type: version-update:semver-minor dependency-group: types ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/dev.txt | 8 ++++---- requirements/reproducible-linux.txt | 6 +++--- requirements/reproducible-mac.txt | 6 +++--- requirements/reproducible-win.txt | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index e8976ec094..cab1b19dc2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,15 +8,15 @@ pytest-cov==4.1.0 # 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.9.0 -types-pywin32==306.0.0.20240313 +types-pywin32==306.0.0.20240319 types-PyYAML==6.0.12.20240311 types-chevron==0.14.2.20240310 -types-psutil==5.9.5.20240311 -types-setuptools==69.1.0.20240310 +types-psutil==5.9.5.20240316 +types-setuptools==69.2.0.20240317 types-Pygments==2.17.0.20240310 types-colorama==0.4.15.20240311 types-dateparser==1.1.4.20240106 -types-docutils==0.20.0.20240311 +types-docutils==0.20.0.20240317 types-jsonschema==4.21.0.20240311 types-pyOpenSSL==24.0.0.20240311 # as of types-requests>=2.31.0.7, this now requires `urllib3>2`, pin we are able to upgrade diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index 91a679436d..462e284765 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -938,9 +938,9 @@ types-awscrt==0.20.5 \ --hash=sha256:61811bbf4de95248939f9276a434be93d2b95f6ccfe8aa94e56999e9778cfcc2 \ --hash=sha256:79d5bfb01f64701b6cf442e89a37d9c4dc6dbb79a46f2f611739b2418d30ecfd # via botocore-stubs -types-python-dateutil==2.8.19.20240311 \ - --hash=sha256:51178227bbd4cbec35dc9adffbf59d832f20e09842d7dcb8c73b169b8780b7cb \ - --hash=sha256:ef813da0809aca76472ca88807addbeea98b19339aebe56159ae2f4b4f70857a +types-python-dateutil==2.9.0.20240316 \ + --hash=sha256:5d2f2e240b86905e40944dd787db6da9263f0deabef1076ddaed797351ec0202 \ + --hash=sha256:6b8cb66d960771ce5ff974e9dd45e38facb81718cc1e208b10b1baccbfdbee3b # via arrow types-s3transfer==0.10.0 \ --hash=sha256:35e4998c25df7f8985ad69dedc8e4860e8af3b43b7615e940d53c00d413bdc69 \ diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 6ef6129102..cfeb39a134 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -970,9 +970,9 @@ types-awscrt==0.20.5 \ --hash=sha256:61811bbf4de95248939f9276a434be93d2b95f6ccfe8aa94e56999e9778cfcc2 \ --hash=sha256:79d5bfb01f64701b6cf442e89a37d9c4dc6dbb79a46f2f611739b2418d30ecfd # via botocore-stubs -types-python-dateutil==2.8.19.20240311 \ - --hash=sha256:51178227bbd4cbec35dc9adffbf59d832f20e09842d7dcb8c73b169b8780b7cb \ - --hash=sha256:ef813da0809aca76472ca88807addbeea98b19339aebe56159ae2f4b4f70857a +types-python-dateutil==2.9.0.20240316 \ + --hash=sha256:5d2f2e240b86905e40944dd787db6da9263f0deabef1076ddaed797351ec0202 \ + --hash=sha256:6b8cb66d960771ce5ff974e9dd45e38facb81718cc1e208b10b1baccbfdbee3b # via arrow types-s3transfer==0.10.0 \ --hash=sha256:35e4998c25df7f8985ad69dedc8e4860e8af3b43b7615e940d53c00d413bdc69 \ diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index 7879c6037f..b712994c06 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -958,9 +958,9 @@ types-awscrt==0.20.5 \ --hash=sha256:61811bbf4de95248939f9276a434be93d2b95f6ccfe8aa94e56999e9778cfcc2 \ --hash=sha256:79d5bfb01f64701b6cf442e89a37d9c4dc6dbb79a46f2f611739b2418d30ecfd # via botocore-stubs -types-python-dateutil==2.8.19.20240311 \ - --hash=sha256:51178227bbd4cbec35dc9adffbf59d832f20e09842d7dcb8c73b169b8780b7cb \ - --hash=sha256:ef813da0809aca76472ca88807addbeea98b19339aebe56159ae2f4b4f70857a +types-python-dateutil==2.9.0.20240316 \ + --hash=sha256:5d2f2e240b86905e40944dd787db6da9263f0deabef1076ddaed797351ec0202 \ + --hash=sha256:6b8cb66d960771ce5ff974e9dd45e38facb81718cc1e208b10b1baccbfdbee3b # via arrow types-s3transfer==0.10.0 \ --hash=sha256:35e4998c25df7f8985ad69dedc8e4860e8af3b43b7615e940d53c00d413bdc69 \ From 1a0461ccead2a571fce19aec66a7d0ce90924752 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 16:09:23 +0000 Subject: [PATCH 09/32] chore(deps): bump importlib-resources in /requirements (#6857) Bumps [importlib-resources](https://github.com/python/importlib_resources) from 6.3.0 to 6.3.2. - [Release notes](https://github.com/python/importlib_resources/releases) - [Changelog](https://github.com/python/importlib_resources/blob/main/NEWS.rst) - [Commits](https://github.com/python/importlib_resources/compare/v6.3.0...v6.3.2) --- updated-dependencies: - dependency-name: importlib-resources dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/reproducible-mac.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index cfeb39a134..686afd5108 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -303,9 +303,9 @@ importlib-metadata==7.0.2 \ --hash=sha256:198f568f3230878cb1b44fbd7975f87906c22336dba2e4a7f05278c281fbd792 \ --hash=sha256:f4bc4c0c070c490abf4ce96d715f68e95923320370efb66143df00199bb6c100 # via flask -importlib-resources==6.3.0 \ - --hash=sha256:166072a97e86917a9025876f34286f549b9caf1d10b35a1b372bffa1600c6569 \ - --hash=sha256:783407aa1cd05550e3aa123e8f7cfaebee35ffa9cb0242919e2d1e4172222705 +importlib-resources==6.3.2 \ + --hash=sha256:963eb79649252b0160c1afcfe5a1d3fe3ad66edd0a8b114beacffb70c0674223 \ + --hash=sha256:f41f4098b16cd140a97d256137cfd943d958219007990b2afb00439fc623f580 # via # jsonschema # jsonschema-specifications From b78c4d6bdecd18b8dbc724da265bca28212f12ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 19:20:01 +0000 Subject: [PATCH 10/32] feat: updating app templates repo hash with (fc148913bec2d15f8e1afc3de1f904264282392a) (#6859) Co-authored-by: GitHub Action Co-authored-by: Mehmet Nuri Deveci <5735811+mndeveci@users.noreply.github.com> Co-authored-by: Daniel Mil <84205762+mildaniel@users.noreply.github.com> --- samcli/runtime_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samcli/runtime_config.json b/samcli/runtime_config.json index 4cdb10d532..0e6720522e 100644 --- a/samcli/runtime_config.json +++ b/samcli/runtime_config.json @@ -1,3 +1,3 @@ { - "app_template_repo_commit": "a29a1c93b76b951f3073e479d7c126a96e18ecac" + "app_template_repo_commit": "fc148913bec2d15f8e1afc3de1f904264282392a" } From 73366c1ff1cf1b5dee7acb89a501dc251eff6d35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 12:59:25 -0700 Subject: [PATCH 11/32] chore(deps-dev): bump black from 24.2.0 to 24.3.0 in /requirements (#6860) Bumps [black](https://github.com/psf/black) from 24.2.0 to 24.3.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/24.2.0...24.3.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index cab1b19dc2..9d19d38cc5 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -37,5 +37,5 @@ pytest-json-report-wip==1.5.1 filelock==3.13.1 # formatter -black==24.2.0 +black==24.3.0 psutil==5.9.8 From 0c7ba1f1c4ae66bc2fb078184902031c8dfe4e73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 20:24:31 +0000 Subject: [PATCH 12/32] chore(deps): bump the boto group in /requirements with 7 updates (#6862) Bumps the boto group in /requirements with 7 updates: | Package | From | To | | --- | --- | --- | | [boto3](https://github.com/boto/boto3) | `1.34.61` | `1.34.67` | | [boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]](https://github.com/youtype/mypy_boto3_builder) | `1.34.61` | `1.34.67` | | [botocore](https://github.com/boto/botocore) | `1.34.61` | `1.34.67` | | [botocore-stubs](https://github.com/youtype/botocore-stubs) | `1.34.61` | `1.34.66` | | [mypy-boto3-cloudformation](https://github.com/youtype/mypy_boto3_builder) | `1.34.61` | `1.34.66` | | [mypy-boto3-s3](https://github.com/youtype/mypy_boto3_builder) | `1.34.14` | `1.34.65` | | [mypy-boto3-secretsmanager](https://github.com/youtype/mypy_boto3_builder) | `1.34.43` | `1.34.63` | Updates `boto3` from 1.34.61 to 1.34.67 - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.34.61...1.34.67) Updates `boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]` from 1.34.61 to 1.34.67 - [Release notes](https://github.com/youtype/mypy_boto3_builder/releases) - [Commits](https://github.com/youtype/mypy_boto3_builder/commits) Updates `botocore` from 1.34.61 to 1.34.67 - [Changelog](https://github.com/boto/botocore/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/botocore/compare/1.34.61...1.34.67) Updates `botocore-stubs` from 1.34.61 to 1.34.66 - [Release notes](https://github.com/youtype/botocore-stubs/releases) - [Commits](https://github.com/youtype/botocore-stubs/commits) Updates `mypy-boto3-cloudformation` from 1.34.61 to 1.34.66 - [Release notes](https://github.com/youtype/mypy_boto3_builder/releases) - [Commits](https://github.com/youtype/mypy_boto3_builder/commits) Updates `mypy-boto3-s3` from 1.34.14 to 1.34.65 - [Release notes](https://github.com/youtype/mypy_boto3_builder/releases) - [Commits](https://github.com/youtype/mypy_boto3_builder/commits) Updates `mypy-boto3-secretsmanager` from 1.34.43 to 1.34.63 - [Release notes](https://github.com/youtype/mypy_boto3_builder/releases) - [Commits](https://github.com/youtype/mypy_boto3_builder/commits) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray] dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: botocore dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: botocore-stubs dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: mypy-boto3-cloudformation dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: mypy-boto3-s3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: mypy-boto3-secretsmanager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/base.txt | 2 +- requirements/reproducible-linux.txt | 42 ++++++++++++++--------------- requirements/reproducible-mac.txt | 42 ++++++++++++++--------------- requirements/reproducible-win.txt | 42 ++++++++++++++--------------- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index cb7ff7b3e3..011828a99a 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -31,4 +31,4 @@ tzlocal==5.2 cfn-lint~=0.86.0 # Type checking boto3 objects -boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.61 +boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.67 diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index 462e284765..8c5cf9845d 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -38,25 +38,25 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.61 \ - --hash=sha256:4b40bf2c8494647c9e88c180537dc9fc0c1047a9fffbb1e5b0da6596f1e59b7b \ - --hash=sha256:992e994c7e481a5d3259c699574882b79d631a46f7c369bea350b7ccb0651317 +boto3==1.34.67 \ + --hash=sha256:473febdf2606cf36f14c470dc3ff1b986efac15f69e37eb0fd728d42749065dd \ + --hash=sha256:950161d438ae1bf31374f04175e5f2624a5de8109674ff80f4de5d962313072a # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.61 \ - --hash=sha256:24badf32e31472d4f8326a6e759762bcf902f97e1241611f4167da1530ff6d0f \ - --hash=sha256:2e1c47bfe00a3401c92fa77ee4560bda6152cc3457f2ac00e4a349c8a853c776 +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.67 \ + --hash=sha256:0a528ac7802070a7f9552482b9f8909f7333c6a348ab685ed14407f3bda42be4 \ + --hash=sha256:dcdfcc6961d33761028160158d7fc86f87b8aa66fe69adafd0f803b2cec1bccc # via aws-sam-cli (setup.py) -botocore==1.34.61 \ - --hash=sha256:079f3288d38f97fd5656c25c44a94bea0e7090b938abfdeea463eaadb210c4a0 \ - --hash=sha256:72df4af7e4e6392552c882d48c74e4be9bf7be4cd8d829711b312fbae13d7034 +botocore==1.34.67 \ + --hash=sha256:56002d7c046ec134811dd079469692ab82919c9840ea4e1c1c373a1d228e37ae \ + --hash=sha256:fc094c055a6ac151820a4d8e28f7b30d03e02695ce180527520a5e219b14e8a1 # via # boto3 # s3transfer -botocore-stubs==1.34.61 \ - --hash=sha256:c8ece27ae6d6204a823a2a6df47128d6f9e1c4e63252e1e11d86f635e98b4159 \ - --hash=sha256:f2b44cf7eb7c8f2c0f674792ab516a4a187fe2561524d21b89f76309e1812738 +botocore-stubs==1.34.66 \ + --hash=sha256:530ea7d66022ec6aa0ba0c5200a2aede5d30b839c632d00962f0cf4f806c6a51 \ + --hash=sha256:a5aa1240c3c8ccc62d43916395943896afa81399dc5d4203127cc0ffba20f999 # via boto3-stubs certifi==2024.2.2 \ --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ @@ -409,9 +409,9 @@ mypy-boto3-apigateway==1.34.56 \ --hash=sha256:3695503bd9388b3067c1dc1dc4ec1486dcec450dbf1e9889f451120e333b92da \ --hash=sha256:5ab15db30d730198384d6445d50cc1fec98361b85366dd092b10e9b9f4a1a2cb # via boto3-stubs -mypy-boto3-cloudformation==1.34.61 \ - --hash=sha256:33ca97567ceeb691c176d91133d7fd8bcccd63782a17fbd58bf59cc2fbfc3945 \ - --hash=sha256:7d3e3c7a08273723ff70f5e85ef9b7f3acd629f9aeca1032c6bb541b039e9b47 +mypy-boto3-cloudformation==1.34.66 \ + --hash=sha256:295ddb878f3f4b61489b83bd4bad949382deb8a478ff5ae66c22ca3ffbabbe95 \ + --hash=sha256:e0080e4ba0cd464479f3ee285faddd863e40147e8f331b78445aef210afc91ed # via boto3-stubs mypy-boto3-ecr==1.34.0 \ --hash=sha256:3346c02c22b16068c9acc67d990e32060bf7cdaea5f3d43c50e44308fbbc3439 \ @@ -429,17 +429,17 @@ mypy-boto3-lambda==1.34.58 \ --hash=sha256:6ab1b9611ff396e9310ad77f02994a6e03d40c8a0eea51085e355b4fd2a0cbc9 \ --hash=sha256:903822c74bd1b34748eb2d72eab0f132fbc3b392c8041aa8fe4d9552a44b0c65 # via boto3-stubs -mypy-boto3-s3==1.34.14 \ - --hash=sha256:71c39ab0623cdb442d225b71c1783f6a513cff4c4a13505a2efbb2e3aff2e965 \ - --hash=sha256:f9669ecd182d5bf3532f5f2dcc5e5237776afe157ad5a0b37b26d6bec5fcc432 +mypy-boto3-s3==1.34.65 \ + --hash=sha256:2aecfbe1c00654bc21f839068218d60123366954bf43a708baa50f9543e3f205 \ + --hash=sha256:2fcdf412ce2924b2f0b34db59abf06a9c0bbe4cd3361f14f0d2c1e211c0f7ddd # via boto3-stubs mypy-boto3-schemas==1.34.0 \ --hash=sha256:28c016609dcffc606bd8425ee92894c46e943ab77033e1ae46481f00c39b7f75 \ --hash=sha256:3b25a71944192b0980c3bb5132deb7c06ee9b88580ed63f257fad97cf3bf2927 # via boto3-stubs -mypy-boto3-secretsmanager==1.34.43 \ - --hash=sha256:64e9df58f71072f0a912ecaca626683f4536da078caa204ac07928c4b1481b8b \ - --hash=sha256:abbf560775c2fe0dc383b7f70c16a1bf753d9b3ffc0caa5e35447e685783a68b +mypy-boto3-secretsmanager==1.34.63 \ + --hash=sha256:3ed3587f9b5a5eb4e8c81edeeaa0b4a9118d8f07cfc4915c137f8edc315028ab \ + --hash=sha256:a193373d718f747d53878b5cc7fef2e9b8fde3892e4788ac690fd2b16a35564c # via boto3-stubs mypy-boto3-signer==1.34.0 \ --hash=sha256:c11ed943ccd38ee54fc0ca90ed347ef770d695df49535eab96dd97fb3dbdc592 \ diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 686afd5108..aad652bd3b 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -56,25 +56,25 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.61 \ - --hash=sha256:4b40bf2c8494647c9e88c180537dc9fc0c1047a9fffbb1e5b0da6596f1e59b7b \ - --hash=sha256:992e994c7e481a5d3259c699574882b79d631a46f7c369bea350b7ccb0651317 +boto3==1.34.67 \ + --hash=sha256:473febdf2606cf36f14c470dc3ff1b986efac15f69e37eb0fd728d42749065dd \ + --hash=sha256:950161d438ae1bf31374f04175e5f2624a5de8109674ff80f4de5d962313072a # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.61 \ - --hash=sha256:24badf32e31472d4f8326a6e759762bcf902f97e1241611f4167da1530ff6d0f \ - --hash=sha256:2e1c47bfe00a3401c92fa77ee4560bda6152cc3457f2ac00e4a349c8a853c776 +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.67 \ + --hash=sha256:0a528ac7802070a7f9552482b9f8909f7333c6a348ab685ed14407f3bda42be4 \ + --hash=sha256:dcdfcc6961d33761028160158d7fc86f87b8aa66fe69adafd0f803b2cec1bccc # via aws-sam-cli (setup.py) -botocore==1.34.61 \ - --hash=sha256:079f3288d38f97fd5656c25c44a94bea0e7090b938abfdeea463eaadb210c4a0 \ - --hash=sha256:72df4af7e4e6392552c882d48c74e4be9bf7be4cd8d829711b312fbae13d7034 +botocore==1.34.67 \ + --hash=sha256:56002d7c046ec134811dd079469692ab82919c9840ea4e1c1c373a1d228e37ae \ + --hash=sha256:fc094c055a6ac151820a4d8e28f7b30d03e02695ce180527520a5e219b14e8a1 # via # boto3 # s3transfer -botocore-stubs==1.34.61 \ - --hash=sha256:c8ece27ae6d6204a823a2a6df47128d6f9e1c4e63252e1e11d86f635e98b4159 \ - --hash=sha256:f2b44cf7eb7c8f2c0f674792ab516a4a187fe2561524d21b89f76309e1812738 +botocore-stubs==1.34.66 \ + --hash=sha256:530ea7d66022ec6aa0ba0c5200a2aede5d30b839c632d00962f0cf4f806c6a51 \ + --hash=sha256:a5aa1240c3c8ccc62d43916395943896afa81399dc5d4203127cc0ffba20f999 # via boto3-stubs certifi==2024.2.2 \ --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ @@ -437,9 +437,9 @@ mypy-boto3-apigateway==1.34.56 \ --hash=sha256:3695503bd9388b3067c1dc1dc4ec1486dcec450dbf1e9889f451120e333b92da \ --hash=sha256:5ab15db30d730198384d6445d50cc1fec98361b85366dd092b10e9b9f4a1a2cb # via boto3-stubs -mypy-boto3-cloudformation==1.34.61 \ - --hash=sha256:33ca97567ceeb691c176d91133d7fd8bcccd63782a17fbd58bf59cc2fbfc3945 \ - --hash=sha256:7d3e3c7a08273723ff70f5e85ef9b7f3acd629f9aeca1032c6bb541b039e9b47 +mypy-boto3-cloudformation==1.34.66 \ + --hash=sha256:295ddb878f3f4b61489b83bd4bad949382deb8a478ff5ae66c22ca3ffbabbe95 \ + --hash=sha256:e0080e4ba0cd464479f3ee285faddd863e40147e8f331b78445aef210afc91ed # via boto3-stubs mypy-boto3-ecr==1.34.0 \ --hash=sha256:3346c02c22b16068c9acc67d990e32060bf7cdaea5f3d43c50e44308fbbc3439 \ @@ -457,17 +457,17 @@ mypy-boto3-lambda==1.34.58 \ --hash=sha256:6ab1b9611ff396e9310ad77f02994a6e03d40c8a0eea51085e355b4fd2a0cbc9 \ --hash=sha256:903822c74bd1b34748eb2d72eab0f132fbc3b392c8041aa8fe4d9552a44b0c65 # via boto3-stubs -mypy-boto3-s3==1.34.14 \ - --hash=sha256:71c39ab0623cdb442d225b71c1783f6a513cff4c4a13505a2efbb2e3aff2e965 \ - --hash=sha256:f9669ecd182d5bf3532f5f2dcc5e5237776afe157ad5a0b37b26d6bec5fcc432 +mypy-boto3-s3==1.34.65 \ + --hash=sha256:2aecfbe1c00654bc21f839068218d60123366954bf43a708baa50f9543e3f205 \ + --hash=sha256:2fcdf412ce2924b2f0b34db59abf06a9c0bbe4cd3361f14f0d2c1e211c0f7ddd # via boto3-stubs mypy-boto3-schemas==1.34.0 \ --hash=sha256:28c016609dcffc606bd8425ee92894c46e943ab77033e1ae46481f00c39b7f75 \ --hash=sha256:3b25a71944192b0980c3bb5132deb7c06ee9b88580ed63f257fad97cf3bf2927 # via boto3-stubs -mypy-boto3-secretsmanager==1.34.43 \ - --hash=sha256:64e9df58f71072f0a912ecaca626683f4536da078caa204ac07928c4b1481b8b \ - --hash=sha256:abbf560775c2fe0dc383b7f70c16a1bf753d9b3ffc0caa5e35447e685783a68b +mypy-boto3-secretsmanager==1.34.63 \ + --hash=sha256:3ed3587f9b5a5eb4e8c81edeeaa0b4a9118d8f07cfc4915c137f8edc315028ab \ + --hash=sha256:a193373d718f747d53878b5cc7fef2e9b8fde3892e4788ac690fd2b16a35564c # via boto3-stubs mypy-boto3-signer==1.34.0 \ --hash=sha256:c11ed943ccd38ee54fc0ca90ed347ef770d695df49535eab96dd97fb3dbdc592 \ diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index b712994c06..50e904ee87 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -38,25 +38,25 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.61 \ - --hash=sha256:4b40bf2c8494647c9e88c180537dc9fc0c1047a9fffbb1e5b0da6596f1e59b7b \ - --hash=sha256:992e994c7e481a5d3259c699574882b79d631a46f7c369bea350b7ccb0651317 +boto3==1.34.67 \ + --hash=sha256:473febdf2606cf36f14c470dc3ff1b986efac15f69e37eb0fd728d42749065dd \ + --hash=sha256:950161d438ae1bf31374f04175e5f2624a5de8109674ff80f4de5d962313072a # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.61 \ - --hash=sha256:24badf32e31472d4f8326a6e759762bcf902f97e1241611f4167da1530ff6d0f \ - --hash=sha256:2e1c47bfe00a3401c92fa77ee4560bda6152cc3457f2ac00e4a349c8a853c776 +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.67 \ + --hash=sha256:0a528ac7802070a7f9552482b9f8909f7333c6a348ab685ed14407f3bda42be4 \ + --hash=sha256:dcdfcc6961d33761028160158d7fc86f87b8aa66fe69adafd0f803b2cec1bccc # via aws-sam-cli (setup.py) -botocore==1.34.61 \ - --hash=sha256:079f3288d38f97fd5656c25c44a94bea0e7090b938abfdeea463eaadb210c4a0 \ - --hash=sha256:72df4af7e4e6392552c882d48c74e4be9bf7be4cd8d829711b312fbae13d7034 +botocore==1.34.67 \ + --hash=sha256:56002d7c046ec134811dd079469692ab82919c9840ea4e1c1c373a1d228e37ae \ + --hash=sha256:fc094c055a6ac151820a4d8e28f7b30d03e02695ce180527520a5e219b14e8a1 # via # boto3 # s3transfer -botocore-stubs==1.34.61 \ - --hash=sha256:c8ece27ae6d6204a823a2a6df47128d6f9e1c4e63252e1e11d86f635e98b4159 \ - --hash=sha256:f2b44cf7eb7c8f2c0f674792ab516a4a187fe2561524d21b89f76309e1812738 +botocore-stubs==1.34.66 \ + --hash=sha256:530ea7d66022ec6aa0ba0c5200a2aede5d30b839c632d00962f0cf4f806c6a51 \ + --hash=sha256:a5aa1240c3c8ccc62d43916395943896afa81399dc5d4203127cc0ffba20f999 # via boto3-stubs certifi==2024.2.2 \ --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ @@ -413,9 +413,9 @@ mypy-boto3-apigateway==1.34.56 \ --hash=sha256:3695503bd9388b3067c1dc1dc4ec1486dcec450dbf1e9889f451120e333b92da \ --hash=sha256:5ab15db30d730198384d6445d50cc1fec98361b85366dd092b10e9b9f4a1a2cb # via boto3-stubs -mypy-boto3-cloudformation==1.34.61 \ - --hash=sha256:33ca97567ceeb691c176d91133d7fd8bcccd63782a17fbd58bf59cc2fbfc3945 \ - --hash=sha256:7d3e3c7a08273723ff70f5e85ef9b7f3acd629f9aeca1032c6bb541b039e9b47 +mypy-boto3-cloudformation==1.34.66 \ + --hash=sha256:295ddb878f3f4b61489b83bd4bad949382deb8a478ff5ae66c22ca3ffbabbe95 \ + --hash=sha256:e0080e4ba0cd464479f3ee285faddd863e40147e8f331b78445aef210afc91ed # via boto3-stubs mypy-boto3-ecr==1.34.0 \ --hash=sha256:3346c02c22b16068c9acc67d990e32060bf7cdaea5f3d43c50e44308fbbc3439 \ @@ -433,17 +433,17 @@ mypy-boto3-lambda==1.34.58 \ --hash=sha256:6ab1b9611ff396e9310ad77f02994a6e03d40c8a0eea51085e355b4fd2a0cbc9 \ --hash=sha256:903822c74bd1b34748eb2d72eab0f132fbc3b392c8041aa8fe4d9552a44b0c65 # via boto3-stubs -mypy-boto3-s3==1.34.14 \ - --hash=sha256:71c39ab0623cdb442d225b71c1783f6a513cff4c4a13505a2efbb2e3aff2e965 \ - --hash=sha256:f9669ecd182d5bf3532f5f2dcc5e5237776afe157ad5a0b37b26d6bec5fcc432 +mypy-boto3-s3==1.34.65 \ + --hash=sha256:2aecfbe1c00654bc21f839068218d60123366954bf43a708baa50f9543e3f205 \ + --hash=sha256:2fcdf412ce2924b2f0b34db59abf06a9c0bbe4cd3361f14f0d2c1e211c0f7ddd # via boto3-stubs mypy-boto3-schemas==1.34.0 \ --hash=sha256:28c016609dcffc606bd8425ee92894c46e943ab77033e1ae46481f00c39b7f75 \ --hash=sha256:3b25a71944192b0980c3bb5132deb7c06ee9b88580ed63f257fad97cf3bf2927 # via boto3-stubs -mypy-boto3-secretsmanager==1.34.43 \ - --hash=sha256:64e9df58f71072f0a912ecaca626683f4536da078caa204ac07928c4b1481b8b \ - --hash=sha256:abbf560775c2fe0dc383b7f70c16a1bf753d9b3ffc0caa5e35447e685783a68b +mypy-boto3-secretsmanager==1.34.63 \ + --hash=sha256:3ed3587f9b5a5eb4e8c81edeeaa0b4a9118d8f07cfc4915c137f8edc315028ab \ + --hash=sha256:a193373d718f747d53878b5cc7fef2e9b8fde3892e4788ac690fd2b16a35564c # via boto3-stubs mypy-boto3-signer==1.34.0 \ --hash=sha256:c11ed943ccd38ee54fc0ca90ed347ef770d695df49535eab96dd97fb3dbdc592 \ From 0307f10811541c4aea55a0d5c0c7593ae7545f19 Mon Sep 17 00:00:00 2001 From: sidhujus <105385029+sidhujus@users.noreply.github.com> Date: Thu, 21 Mar 2024 10:09:35 -0700 Subject: [PATCH 13/32] fix: use parameter overrides in package context (#6831) * use parameter overrides in package context * add unit tests --- samcli/commands/deploy/command.py | 11 +-- samcli/commands/package/package_context.py | 3 + tests/unit/commands/deploy/test_command.py | 92 ++++++++++++++++++++++ 3 files changed, 101 insertions(+), 5 deletions(-) diff --git a/samcli/commands/deploy/command.py b/samcli/commands/deploy/command.py index 09a30ce553..1ec7f8f6d0 100644 --- a/samcli/commands/deploy/command.py +++ b/samcli/commands/deploy/command.py @@ -310,6 +310,10 @@ def do_cli( ) with osutils.tempfile_platform_independent() as output_template_file: + if guided: + context_param_overrides = sanitize_parameter_overrides(guided_context.guided_parameter_overrides) + else: + context_param_overrides = parameter_overrides with PackageContext( template_file=template_file, s3_bucket=guided_context.guided_s3_bucket if guided else s3_bucket, @@ -326,6 +330,7 @@ def do_cli( region=guided_context.guided_region if guided else region, profile=profile, signing_profiles=guided_context.signing_profiles if guided else signing_profiles, + parameter_overrides=context_param_overrides, ) as package_context: package_context.run() @@ -348,11 +353,7 @@ def do_cli( no_progressbar=no_progressbar, s3_prefix=guided_context.guided_s3_prefix if guided else s3_prefix, kms_key_id=kms_key_id, - parameter_overrides=( - sanitize_parameter_overrides(guided_context.guided_parameter_overrides) - if guided - else parameter_overrides - ), + parameter_overrides=context_param_overrides, capabilities=guided_context.guided_capabilities if guided else capabilities, no_execute_changeset=no_execute_changeset, role_arn=role_arn, diff --git a/samcli/commands/package/package_context.py b/samcli/commands/package/package_context.py index aaeb6635b5..d658cb2197 100644 --- a/samcli/commands/package/package_context.py +++ b/samcli/commands/package/package_context.py @@ -70,6 +70,7 @@ def __init__( metadata, region, profile, + parameter_overrides=None, on_deploy=False, signing_profiles=None, ): @@ -89,6 +90,7 @@ def __init__( self.on_deploy = on_deploy self.code_signer = None self.signing_profiles = signing_profiles + self.parameter_overrides = parameter_overrides self._global_parameter_overrides = {IntrinsicsSymbolTable.AWS_REGION: region} if region else {} def __enter__(self): @@ -104,6 +106,7 @@ def run(self): stacks, _ = SamLocalStackProvider.get_stacks( self.template_file, global_parameter_overrides=self._global_parameter_overrides, + parameter_overrides=self.parameter_overrides, ) self._warn_preview_runtime(stacks) self.image_repositories = self.image_repositories if self.image_repositories is not None else {} diff --git a/tests/unit/commands/deploy/test_command.py b/tests/unit/commands/deploy/test_command.py index 9f6a59d8e3..3ff809a177 100644 --- a/tests/unit/commands/deploy/test_command.py +++ b/tests/unit/commands/deploy/test_command.py @@ -1129,3 +1129,95 @@ def test_all_args_resolve_image_repos( context_mock.run.assert_called_with() self.assertEqual(context_mock.run.call_count, 1) + + @patch("os.environ", {**os.environ, "SAM_CLI_POLL_DELAY": 10}) # type: ignore + @patch("samcli.commands.package.command.click") + @patch("samcli.commands.package.package_context.PackageContext") + @patch("samcli.commands.deploy.command.click") + @patch("samcli.commands.deploy.deploy_context.DeployContext") + def test_passing_parameter_overrides_to_context( + self, mock_deploy_context, mock_deploy_click, mock_package_context, mock_package_click + ): + context_mock = Mock() + mock_deploy_context.return_value.__enter__.return_value = context_mock + + do_cli( + template_file=self.template_file, + stack_name=self.stack_name, + s3_bucket=self.s3_bucket, + image_repository=self.image_repository, + image_repositories=None, + force_upload=self.force_upload, + no_progressbar=self.no_progressbar, + s3_prefix=self.s3_prefix, + kms_key_id=self.kms_key_id, + parameter_overrides=self.parameter_overrides, + capabilities=self.capabilities, + no_execute_changeset=self.no_execute_changeset, + role_arn=self.role_arn, + notification_arns=self.notification_arns, + fail_on_empty_changeset=self.fail_on_empty_changset, + tags=self.tags, + region=self.region, + profile=self.profile, + use_json=self.use_json, + metadata=self.metadata, + guided=self.guided, + confirm_changeset=self.confirm_changeset, + signing_profiles=self.signing_profiles, + resolve_s3=self.resolve_s3, + config_env=self.config_env, + config_file=self.config_file, + resolve_image_repos=self.resolve_image_repos, + disable_rollback=self.disable_rollback, + on_failure=self.on_failure, + ) + + mock_deploy_context.assert_called_with( + template_file=ANY, + stack_name=self.stack_name, + s3_bucket=self.s3_bucket, + image_repository=self.image_repository, + image_repositories=None, + force_upload=self.force_upload, + no_progressbar=self.no_progressbar, + s3_prefix=self.s3_prefix, + kms_key_id=self.kms_key_id, + parameter_overrides=self.parameter_overrides, + capabilities=self.capabilities, + no_execute_changeset=self.no_execute_changeset, + role_arn=self.role_arn, + notification_arns=self.notification_arns, + fail_on_empty_changeset=self.fail_on_empty_changset, + tags=self.tags, + region=self.region, + profile=self.profile, + confirm_changeset=self.confirm_changeset, + signing_profiles=self.signing_profiles, + use_changeset=self.use_changeset, + disable_rollback=self.disable_rollback, + poll_delay=os.getenv("SAM_CLI_POLL_DELAY"), + on_failure=self.on_failure, + ) + + mock_package_context.assert_called_with( + template_file=ANY, + s3_bucket=self.s3_bucket, + s3_prefix=self.s3_prefix, + image_repository=self.image_repository, + image_repositories=None, + output_template_file=ANY, + kms_key_id=self.kms_key_id, + use_json=self.use_json, + force_upload=self.force_upload, + no_progressbar=self.no_progressbar, + metadata=self.metadata, + on_deploy=True, + region=self.region, + profile=self.profile, + signing_profiles=self.signing_profiles, + parameter_overrides=self.parameter_overrides, + ) + + context_mock.run.assert_called_with() + self.assertEqual(context_mock.run.call_count, 1) From 3169d2e267d727588e9ec7e5ff64fd0e5169f50c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:19:42 -0700 Subject: [PATCH 14/32] chore(deps): bump the boto group in /requirements with 4 updates (#6872) Bumps the boto group in /requirements with 4 updates: [boto3](https://github.com/boto/boto3), [boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]](https://github.com/youtype/mypy_boto3_builder), [botocore](https://github.com/boto/botocore) and [botocore-stubs](https://github.com/youtype/botocore-stubs). Updates `boto3` from 1.34.67 to 1.34.68 - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.34.67...1.34.68) Updates `boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]` from 1.34.67 to 1.34.68 - [Release notes](https://github.com/youtype/mypy_boto3_builder/releases) - [Commits](https://github.com/youtype/mypy_boto3_builder/commits) Updates `botocore` from 1.34.67 to 1.34.68 - [Changelog](https://github.com/boto/botocore/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/botocore/compare/1.34.67...1.34.68) Updates `botocore-stubs` from 1.34.66 to 1.34.68 - [Release notes](https://github.com/youtype/botocore-stubs/releases) - [Commits](https://github.com/youtype/botocore-stubs/commits) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray] dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: botocore dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: botocore-stubs dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/base.txt | 2 +- requirements/reproducible-linux.txt | 24 ++++++++++++------------ requirements/reproducible-mac.txt | 24 ++++++++++++------------ requirements/reproducible-win.txt | 24 ++++++++++++------------ 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 011828a99a..e107a715ff 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -31,4 +31,4 @@ tzlocal==5.2 cfn-lint~=0.86.0 # Type checking boto3 objects -boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.67 +boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.68 diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index 8c5cf9845d..dada254614 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -38,25 +38,25 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.67 \ - --hash=sha256:473febdf2606cf36f14c470dc3ff1b986efac15f69e37eb0fd728d42749065dd \ - --hash=sha256:950161d438ae1bf31374f04175e5f2624a5de8109674ff80f4de5d962313072a +boto3==1.34.68 \ + --hash=sha256:00a7cff4887e8a46c8b2ce438f33d5f87cf7812f303227adc0266f28338af6d5 \ + --hash=sha256:14f1e23b3f83ec365628a6ef849f1038b4c7338c4fabff159007c711b8147efc # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.67 \ - --hash=sha256:0a528ac7802070a7f9552482b9f8909f7333c6a348ab685ed14407f3bda42be4 \ - --hash=sha256:dcdfcc6961d33761028160158d7fc86f87b8aa66fe69adafd0f803b2cec1bccc +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.68 \ + --hash=sha256:69c99b2ab3edf424d888e2ccd66aa6ae27ea19cdee6f7ea60f1d39ee9c2b7426 \ + --hash=sha256:a0a31790a959e29abb8f11b4b5f15f393a8c703ed191f9c7faad85d6bf6e072d # via aws-sam-cli (setup.py) -botocore==1.34.67 \ - --hash=sha256:56002d7c046ec134811dd079469692ab82919c9840ea4e1c1c373a1d228e37ae \ - --hash=sha256:fc094c055a6ac151820a4d8e28f7b30d03e02695ce180527520a5e219b14e8a1 +botocore==1.34.68 \ + --hash=sha256:3ad0ec67f78beecc039c3c31c93a83181e30b6f789261bdbb9f5c8e8dc551812 \ + --hash=sha256:e7ae9d69cc3e7b31d926e6a1a9ae673ba02da263e35cf12ff2bae35a21755cc6 # via # boto3 # s3transfer -botocore-stubs==1.34.66 \ - --hash=sha256:530ea7d66022ec6aa0ba0c5200a2aede5d30b839c632d00962f0cf4f806c6a51 \ - --hash=sha256:a5aa1240c3c8ccc62d43916395943896afa81399dc5d4203127cc0ffba20f999 +botocore-stubs==1.34.68 \ + --hash=sha256:8a1366ab41b49c1ce0445e1dec813f24c699ecd37a935d7b2bf3aaa72cf52883 \ + --hash=sha256:f631c5b64a720bb586f95ba05704c10bb2f928296882b644cfa294fb35b50dd6 # via boto3-stubs certifi==2024.2.2 \ --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index aad652bd3b..ce234b53a3 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -56,25 +56,25 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.67 \ - --hash=sha256:473febdf2606cf36f14c470dc3ff1b986efac15f69e37eb0fd728d42749065dd \ - --hash=sha256:950161d438ae1bf31374f04175e5f2624a5de8109674ff80f4de5d962313072a +boto3==1.34.68 \ + --hash=sha256:00a7cff4887e8a46c8b2ce438f33d5f87cf7812f303227adc0266f28338af6d5 \ + --hash=sha256:14f1e23b3f83ec365628a6ef849f1038b4c7338c4fabff159007c711b8147efc # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.67 \ - --hash=sha256:0a528ac7802070a7f9552482b9f8909f7333c6a348ab685ed14407f3bda42be4 \ - --hash=sha256:dcdfcc6961d33761028160158d7fc86f87b8aa66fe69adafd0f803b2cec1bccc +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.68 \ + --hash=sha256:69c99b2ab3edf424d888e2ccd66aa6ae27ea19cdee6f7ea60f1d39ee9c2b7426 \ + --hash=sha256:a0a31790a959e29abb8f11b4b5f15f393a8c703ed191f9c7faad85d6bf6e072d # via aws-sam-cli (setup.py) -botocore==1.34.67 \ - --hash=sha256:56002d7c046ec134811dd079469692ab82919c9840ea4e1c1c373a1d228e37ae \ - --hash=sha256:fc094c055a6ac151820a4d8e28f7b30d03e02695ce180527520a5e219b14e8a1 +botocore==1.34.68 \ + --hash=sha256:3ad0ec67f78beecc039c3c31c93a83181e30b6f789261bdbb9f5c8e8dc551812 \ + --hash=sha256:e7ae9d69cc3e7b31d926e6a1a9ae673ba02da263e35cf12ff2bae35a21755cc6 # via # boto3 # s3transfer -botocore-stubs==1.34.66 \ - --hash=sha256:530ea7d66022ec6aa0ba0c5200a2aede5d30b839c632d00962f0cf4f806c6a51 \ - --hash=sha256:a5aa1240c3c8ccc62d43916395943896afa81399dc5d4203127cc0ffba20f999 +botocore-stubs==1.34.68 \ + --hash=sha256:8a1366ab41b49c1ce0445e1dec813f24c699ecd37a935d7b2bf3aaa72cf52883 \ + --hash=sha256:f631c5b64a720bb586f95ba05704c10bb2f928296882b644cfa294fb35b50dd6 # via boto3-stubs certifi==2024.2.2 \ --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index 50e904ee87..1e86efbd86 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -38,25 +38,25 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.67 \ - --hash=sha256:473febdf2606cf36f14c470dc3ff1b986efac15f69e37eb0fd728d42749065dd \ - --hash=sha256:950161d438ae1bf31374f04175e5f2624a5de8109674ff80f4de5d962313072a +boto3==1.34.68 \ + --hash=sha256:00a7cff4887e8a46c8b2ce438f33d5f87cf7812f303227adc0266f28338af6d5 \ + --hash=sha256:14f1e23b3f83ec365628a6ef849f1038b4c7338c4fabff159007c711b8147efc # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.67 \ - --hash=sha256:0a528ac7802070a7f9552482b9f8909f7333c6a348ab685ed14407f3bda42be4 \ - --hash=sha256:dcdfcc6961d33761028160158d7fc86f87b8aa66fe69adafd0f803b2cec1bccc +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.68 \ + --hash=sha256:69c99b2ab3edf424d888e2ccd66aa6ae27ea19cdee6f7ea60f1d39ee9c2b7426 \ + --hash=sha256:a0a31790a959e29abb8f11b4b5f15f393a8c703ed191f9c7faad85d6bf6e072d # via aws-sam-cli (setup.py) -botocore==1.34.67 \ - --hash=sha256:56002d7c046ec134811dd079469692ab82919c9840ea4e1c1c373a1d228e37ae \ - --hash=sha256:fc094c055a6ac151820a4d8e28f7b30d03e02695ce180527520a5e219b14e8a1 +botocore==1.34.68 \ + --hash=sha256:3ad0ec67f78beecc039c3c31c93a83181e30b6f789261bdbb9f5c8e8dc551812 \ + --hash=sha256:e7ae9d69cc3e7b31d926e6a1a9ae673ba02da263e35cf12ff2bae35a21755cc6 # via # boto3 # s3transfer -botocore-stubs==1.34.66 \ - --hash=sha256:530ea7d66022ec6aa0ba0c5200a2aede5d30b839c632d00962f0cf4f806c6a51 \ - --hash=sha256:a5aa1240c3c8ccc62d43916395943896afa81399dc5d4203127cc0ffba20f999 +botocore-stubs==1.34.68 \ + --hash=sha256:8a1366ab41b49c1ce0445e1dec813f24c699ecd37a935d7b2bf3aaa72cf52883 \ + --hash=sha256:f631c5b64a720bb586f95ba05704c10bb2f928296882b644cfa294fb35b50dd6 # via boto3-stubs certifi==2024.2.2 \ --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ From 05ec248c834670e4a16038f503589f380b8c90b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:19:50 -0700 Subject: [PATCH 15/32] chore(deps): bump importlib-resources in /requirements (#6869) Bumps [importlib-resources](https://github.com/python/importlib_resources) from 6.3.2 to 6.4.0. - [Release notes](https://github.com/python/importlib_resources/releases) - [Changelog](https://github.com/python/importlib_resources/blob/main/NEWS.rst) - [Commits](https://github.com/python/importlib_resources/compare/v6.3.2...v6.4.0) --- updated-dependencies: - dependency-name: importlib-resources dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/reproducible-mac.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index ce234b53a3..aa756061e5 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -303,9 +303,9 @@ importlib-metadata==7.0.2 \ --hash=sha256:198f568f3230878cb1b44fbd7975f87906c22336dba2e4a7f05278c281fbd792 \ --hash=sha256:f4bc4c0c070c490abf4ce96d715f68e95923320370efb66143df00199bb6c100 # via flask -importlib-resources==6.3.2 \ - --hash=sha256:963eb79649252b0160c1afcfe5a1d3fe3ad66edd0a8b114beacffb70c0674223 \ - --hash=sha256:f41f4098b16cd140a97d256137cfd943d958219007990b2afb00439fc623f580 +importlib-resources==6.4.0 \ + --hash=sha256:50d10f043df931902d4194ea07ec57960f66a80449ff867bfe782b4c486ba78c \ + --hash=sha256:cdb2b453b8046ca4e3798eb1d84f3cce1446a0e8e7b5ef4efb600f19fc398145 # via # jsonschema # jsonschema-specifications From 1ba164c10939716e09741eccf92bca09ae218956 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 18:19:58 +0000 Subject: [PATCH 16/32] chore(deps): bump importlib-metadata in /requirements (#6864) Bumps [importlib-metadata](https://github.com/python/importlib_metadata) from 7.0.2 to 7.1.0. - [Release notes](https://github.com/python/importlib_metadata/releases) - [Changelog](https://github.com/python/importlib_metadata/blob/main/NEWS.rst) - [Commits](https://github.com/python/importlib_metadata/compare/v7.0.2...v7.1.0) --- updated-dependencies: - dependency-name: importlib-metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/reproducible-mac.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index aa756061e5..9dfebe4804 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -299,9 +299,9 @@ idna==3.6 \ --hash=sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca \ --hash=sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f # via requests -importlib-metadata==7.0.2 \ - --hash=sha256:198f568f3230878cb1b44fbd7975f87906c22336dba2e4a7f05278c281fbd792 \ - --hash=sha256:f4bc4c0c070c490abf4ce96d715f68e95923320370efb66143df00199bb6c100 +importlib-metadata==7.1.0 \ + --hash=sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570 \ + --hash=sha256:b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2 # via flask importlib-resources==6.4.0 \ --hash=sha256:50d10f043df931902d4194ea07ec57960f66a80449ff867bfe782b4c486ba78c \ From afb388b0e1dc22722664b61a1fbc61a856624809 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 18:20:06 +0000 Subject: [PATCH 17/32] chore(deps): bump cfn-lint from 0.86.0 to 0.86.1 in /requirements (#6866) Bumps [cfn-lint](https://github.com/aws-cloudformation/cfn-python-lint) from 0.86.0 to 0.86.1. - [Release notes](https://github.com/aws-cloudformation/cfn-python-lint/releases) - [Changelog](https://github.com/aws-cloudformation/cfn-lint/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-cloudformation/cfn-python-lint/compare/v0.86.0...v0.86.1) --- updated-dependencies: - dependency-name: cfn-lint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/base.txt | 2 +- requirements/reproducible-linux.txt | 6 +++--- requirements/reproducible-mac.txt | 6 +++--- requirements/reproducible-win.txt | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index e107a715ff..378bbb6def 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -28,7 +28,7 @@ regex!=2021.10.8 tzlocal==5.2 #Adding cfn-lint dependency for SAM validate -cfn-lint~=0.86.0 +cfn-lint~=0.86.1 # Type checking boto3 objects boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.68 diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index dada254614..3a3479d378 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -116,9 +116,9 @@ cffi==1.16.0 \ --hash=sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956 \ --hash=sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357 # via cryptography -cfn-lint==0.86.0 \ - --hash=sha256:70cefa0ab91e35698cd8c03a2f99a367d71d848da5a62123192552937652d542 \ - --hash=sha256:7216e9c10dd27af73821d0ae79b17406cd89f5dfbc25feb5d2ba756eb6e9a651 +cfn-lint==0.86.1 \ + --hash=sha256:e599b23f1e3745c11585008fc1d186665dded2fb0ded3cc05e30e7d7b0830082 \ + --hash=sha256:ed41e596d807fea2de74dbbfc0cb8b48f8787572c50e3b58cce05382a5af3a64 # via aws-sam-cli (setup.py) chardet==5.2.0 \ --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \ diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 9dfebe4804..8b52bcda57 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -134,9 +134,9 @@ cffi==1.16.0 \ --hash=sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956 \ --hash=sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357 # via cryptography -cfn-lint==0.86.0 \ - --hash=sha256:70cefa0ab91e35698cd8c03a2f99a367d71d848da5a62123192552937652d542 \ - --hash=sha256:7216e9c10dd27af73821d0ae79b17406cd89f5dfbc25feb5d2ba756eb6e9a651 +cfn-lint==0.86.1 \ + --hash=sha256:e599b23f1e3745c11585008fc1d186665dded2fb0ded3cc05e30e7d7b0830082 \ + --hash=sha256:ed41e596d807fea2de74dbbfc0cb8b48f8787572c50e3b58cce05382a5af3a64 # via aws-sam-cli (setup.py) chardet==5.2.0 \ --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \ diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index 1e86efbd86..b672d69573 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -116,9 +116,9 @@ cffi==1.16.0 \ --hash=sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956 \ --hash=sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357 # via cryptography -cfn-lint==0.86.0 \ - --hash=sha256:70cefa0ab91e35698cd8c03a2f99a367d71d848da5a62123192552937652d542 \ - --hash=sha256:7216e9c10dd27af73821d0ae79b17406cd89f5dfbc25feb5d2ba756eb6e9a651 +cfn-lint==0.86.1 \ + --hash=sha256:e599b23f1e3745c11585008fc1d186665dded2fb0ded3cc05e30e7d7b0830082 \ + --hash=sha256:ed41e596d807fea2de74dbbfc0cb8b48f8787572c50e3b58cce05382a5af3a64 # via aws-sam-cli (setup.py) chardet==5.2.0 \ --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \ From b715434d6fe7147790e3eac4c2c35eae7930aadc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 18:23:59 +0000 Subject: [PATCH 18/32] chore(deps-dev): bump ruff from 0.3.2 to 0.3.4 in /requirements (#6870) Bumps [ruff](https://github.com/astral-sh/ruff) from 0.3.2 to 0.3.4. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.3.2...v0.3.4) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/pre-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/pre-dev.txt b/requirements/pre-dev.txt index 92cf633071..e43c0da306 100644 --- a/requirements/pre-dev.txt +++ b/requirements/pre-dev.txt @@ -1 +1 @@ -ruff==0.3.2 +ruff==0.3.4 From 9a1ff4ae76a32935e4d512b902568e3bca53fbde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 09:12:05 -0700 Subject: [PATCH 19/32] chore(deps-dev): bump the pytest group in /requirements with 1 update (#6876) Bumps the pytest group in /requirements with 1 update: [pytest-cov](https://github.com/pytest-dev/pytest-cov). Updates `pytest-cov` from 4.1.0 to 5.0.0 - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-cov/compare/v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: pytest-cov dependency-type: direct:development update-type: version-update:semver-major dependency-group: pytest ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 9d19d38cc5..b70f8865a2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,7 +1,7 @@ -r pre-dev.txt coverage==7.4.4 -pytest-cov==4.1.0 +pytest-cov==5.0.0 # type checking and related stubs From 1855f6f3e3c57be457176fd31562a8d6a4001c8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 09:12:18 -0700 Subject: [PATCH 20/32] chore(deps): bump the boto group in /requirements with 4 updates (#6875) Bumps the boto group in /requirements with 4 updates: [boto3](https://github.com/boto/boto3), [boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]](https://github.com/youtype/mypy_boto3_builder), [botocore](https://github.com/boto/botocore) and [botocore-stubs](https://github.com/youtype/botocore-stubs). Updates `boto3` from 1.34.68 to 1.34.69 - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.34.68...1.34.69) Updates `boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]` from 1.34.68 to 1.34.69 - [Release notes](https://github.com/youtype/mypy_boto3_builder/releases) - [Commits](https://github.com/youtype/mypy_boto3_builder/commits) Updates `botocore` from 1.34.68 to 1.34.69 - [Changelog](https://github.com/boto/botocore/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/botocore/compare/1.34.68...1.34.69) Updates `botocore-stubs` from 1.34.68 to 1.34.69 - [Release notes](https://github.com/youtype/botocore-stubs/releases) - [Commits](https://github.com/youtype/botocore-stubs/commits) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray] dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: botocore dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: botocore-stubs dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/base.txt | 2 +- requirements/reproducible-linux.txt | 24 ++++++++++++------------ requirements/reproducible-mac.txt | 24 ++++++++++++------------ requirements/reproducible-win.txt | 24 ++++++++++++------------ 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 378bbb6def..3d726198b9 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -31,4 +31,4 @@ tzlocal==5.2 cfn-lint~=0.86.1 # Type checking boto3 objects -boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.68 +boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.69 diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index 3a3479d378..50282fae6c 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -38,25 +38,25 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.68 \ - --hash=sha256:00a7cff4887e8a46c8b2ce438f33d5f87cf7812f303227adc0266f28338af6d5 \ - --hash=sha256:14f1e23b3f83ec365628a6ef849f1038b4c7338c4fabff159007c711b8147efc +boto3==1.34.69 \ + --hash=sha256:2e25ef6bd325217c2da329829478be063155897d8d3b29f31f7f23ab548519b1 \ + --hash=sha256:898a5fed26b1351352703421d1a8b886ef2a74be6c97d5ecc92432ae01fda203 # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.68 \ - --hash=sha256:69c99b2ab3edf424d888e2ccd66aa6ae27ea19cdee6f7ea60f1d39ee9c2b7426 \ - --hash=sha256:a0a31790a959e29abb8f11b4b5f15f393a8c703ed191f9c7faad85d6bf6e072d +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.69 \ + --hash=sha256:804984bfdc3651762894b961892db9d455b1da6d92c904b14d9dd0f3bf8d06be \ + --hash=sha256:93fb4f8640cd01a70e9d3c94395c67fb6197f5e6623d2f39f18357b5b9adbdfc # via aws-sam-cli (setup.py) -botocore==1.34.68 \ - --hash=sha256:3ad0ec67f78beecc039c3c31c93a83181e30b6f789261bdbb9f5c8e8dc551812 \ - --hash=sha256:e7ae9d69cc3e7b31d926e6a1a9ae673ba02da263e35cf12ff2bae35a21755cc6 +botocore==1.34.69 \ + --hash=sha256:d1ab2bff3c2fd51719c2021d9fa2f30fbb9ed0a308f69e9a774ac92c8091380a \ + --hash=sha256:d3802d076d4d507bf506f9845a6970ce43adc3d819dd57c2791f5c19ed6e5950 # via # boto3 # s3transfer -botocore-stubs==1.34.68 \ - --hash=sha256:8a1366ab41b49c1ce0445e1dec813f24c699ecd37a935d7b2bf3aaa72cf52883 \ - --hash=sha256:f631c5b64a720bb586f95ba05704c10bb2f928296882b644cfa294fb35b50dd6 +botocore-stubs==1.34.69 \ + --hash=sha256:0c3835c775db1387246c1ba8063b197604462fba8603d9b36b5dc60297197b2f \ + --hash=sha256:463248fd1d6e7b68a0c57bdd758d04c6bd0c5c2c3bfa81afdf9d64f0930b59bc # via boto3-stubs certifi==2024.2.2 \ --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 8b52bcda57..eedd5bb9dc 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -56,25 +56,25 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.68 \ - --hash=sha256:00a7cff4887e8a46c8b2ce438f33d5f87cf7812f303227adc0266f28338af6d5 \ - --hash=sha256:14f1e23b3f83ec365628a6ef849f1038b4c7338c4fabff159007c711b8147efc +boto3==1.34.69 \ + --hash=sha256:2e25ef6bd325217c2da329829478be063155897d8d3b29f31f7f23ab548519b1 \ + --hash=sha256:898a5fed26b1351352703421d1a8b886ef2a74be6c97d5ecc92432ae01fda203 # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.68 \ - --hash=sha256:69c99b2ab3edf424d888e2ccd66aa6ae27ea19cdee6f7ea60f1d39ee9c2b7426 \ - --hash=sha256:a0a31790a959e29abb8f11b4b5f15f393a8c703ed191f9c7faad85d6bf6e072d +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.69 \ + --hash=sha256:804984bfdc3651762894b961892db9d455b1da6d92c904b14d9dd0f3bf8d06be \ + --hash=sha256:93fb4f8640cd01a70e9d3c94395c67fb6197f5e6623d2f39f18357b5b9adbdfc # via aws-sam-cli (setup.py) -botocore==1.34.68 \ - --hash=sha256:3ad0ec67f78beecc039c3c31c93a83181e30b6f789261bdbb9f5c8e8dc551812 \ - --hash=sha256:e7ae9d69cc3e7b31d926e6a1a9ae673ba02da263e35cf12ff2bae35a21755cc6 +botocore==1.34.69 \ + --hash=sha256:d1ab2bff3c2fd51719c2021d9fa2f30fbb9ed0a308f69e9a774ac92c8091380a \ + --hash=sha256:d3802d076d4d507bf506f9845a6970ce43adc3d819dd57c2791f5c19ed6e5950 # via # boto3 # s3transfer -botocore-stubs==1.34.68 \ - --hash=sha256:8a1366ab41b49c1ce0445e1dec813f24c699ecd37a935d7b2bf3aaa72cf52883 \ - --hash=sha256:f631c5b64a720bb586f95ba05704c10bb2f928296882b644cfa294fb35b50dd6 +botocore-stubs==1.34.69 \ + --hash=sha256:0c3835c775db1387246c1ba8063b197604462fba8603d9b36b5dc60297197b2f \ + --hash=sha256:463248fd1d6e7b68a0c57bdd758d04c6bd0c5c2c3bfa81afdf9d64f0930b59bc # via boto3-stubs certifi==2024.2.2 \ --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index b672d69573..225d95fa82 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -38,25 +38,25 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.68 \ - --hash=sha256:00a7cff4887e8a46c8b2ce438f33d5f87cf7812f303227adc0266f28338af6d5 \ - --hash=sha256:14f1e23b3f83ec365628a6ef849f1038b4c7338c4fabff159007c711b8147efc +boto3==1.34.69 \ + --hash=sha256:2e25ef6bd325217c2da329829478be063155897d8d3b29f31f7f23ab548519b1 \ + --hash=sha256:898a5fed26b1351352703421d1a8b886ef2a74be6c97d5ecc92432ae01fda203 # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.68 \ - --hash=sha256:69c99b2ab3edf424d888e2ccd66aa6ae27ea19cdee6f7ea60f1d39ee9c2b7426 \ - --hash=sha256:a0a31790a959e29abb8f11b4b5f15f393a8c703ed191f9c7faad85d6bf6e072d +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.69 \ + --hash=sha256:804984bfdc3651762894b961892db9d455b1da6d92c904b14d9dd0f3bf8d06be \ + --hash=sha256:93fb4f8640cd01a70e9d3c94395c67fb6197f5e6623d2f39f18357b5b9adbdfc # via aws-sam-cli (setup.py) -botocore==1.34.68 \ - --hash=sha256:3ad0ec67f78beecc039c3c31c93a83181e30b6f789261bdbb9f5c8e8dc551812 \ - --hash=sha256:e7ae9d69cc3e7b31d926e6a1a9ae673ba02da263e35cf12ff2bae35a21755cc6 +botocore==1.34.69 \ + --hash=sha256:d1ab2bff3c2fd51719c2021d9fa2f30fbb9ed0a308f69e9a774ac92c8091380a \ + --hash=sha256:d3802d076d4d507bf506f9845a6970ce43adc3d819dd57c2791f5c19ed6e5950 # via # boto3 # s3transfer -botocore-stubs==1.34.68 \ - --hash=sha256:8a1366ab41b49c1ce0445e1dec813f24c699ecd37a935d7b2bf3aaa72cf52883 \ - --hash=sha256:f631c5b64a720bb586f95ba05704c10bb2f928296882b644cfa294fb35b50dd6 +botocore-stubs==1.34.69 \ + --hash=sha256:0c3835c775db1387246c1ba8063b197604462fba8603d9b36b5dc60297197b2f \ + --hash=sha256:463248fd1d6e7b68a0c57bdd758d04c6bd0c5c2c3bfa81afdf9d64f0930b59bc # via boto3-stubs certifi==2024.2.2 \ --hash=sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f \ From 0f6fc458b0018aa588195b9fd280e1649bfae7aa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 09:55:27 -0700 Subject: [PATCH 21/32] feat: updating app templates repo hash with (c415e56700aa164fa2a83700c7c417ba4468fa17) (#6874) Co-authored-by: GitHub Action --- samcli/runtime_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samcli/runtime_config.json b/samcli/runtime_config.json index 0e6720522e..3a9194cc40 100644 --- a/samcli/runtime_config.json +++ b/samcli/runtime_config.json @@ -1,3 +1,3 @@ { - "app_template_repo_commit": "fc148913bec2d15f8e1afc3de1f904264282392a" + "app_template_repo_commit": "c415e56700aa164fa2a83700c7c417ba4468fa17" } From 9ecb3b12aa1f91bb9c87720616e0961ac9ced0cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olle=20Br=C3=B6ms?= Date: Tue, 26 Mar 2024 17:11:45 +0100 Subject: [PATCH 22/32] fix: wrong cast of !Ref when using CommaDelimitedList (#6768) * fix: wrong cast of !Ref when using CommaDelimitedList * Add unit tests, keep supporting using an array * Format files --------- Co-authored-by: Daniel Mil Co-authored-by: Haresh Nasit <84355507+hnnasit@users.noreply.github.com> --- .../intrinsic_resolver/intrinsics_symbol_table.py | 12 ++++++++++++ .../test_intrinsics_symbol_table.py | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/samcli/lib/intrinsic_resolver/intrinsics_symbol_table.py b/samcli/lib/intrinsic_resolver/intrinsics_symbol_table.py index feefb46c03..4788ba9c97 100644 --- a/samcli/lib/intrinsic_resolver/intrinsics_symbol_table.py +++ b/samcli/lib/intrinsic_resolver/intrinsics_symbol_table.py @@ -82,6 +82,8 @@ class IntrinsicsSymbolTable: CFN_RESOURCE_PROPERTIES = "Properties" CFN_LAMBDA_FUNCTION_NAME = "FunctionName" + COMMA_DELIMITED_LIST = "CommaDelimitedList" + def __init__( self, template=None, logical_id_translator=None, default_type_resolver=None, common_attribute_resolver=None ): @@ -324,6 +326,16 @@ def get_translation(self, logical_id, resource_attributes=IntrinsicResolver.REF) if any(isinstance(logical_id_item, object_type) for object_type in [str, list, bool, int]): if resource_attributes not in (IntrinsicResolver.REF, ""): return None + parameter_info = self._parameters.get(logical_id) + if ( + parameter_info + and parameter_info.get(IntrinsicsSymbolTable.CFN_RESOURCE_TYPE) + == IntrinsicsSymbolTable.COMMA_DELIMITED_LIST + and isinstance(logical_id_item, str) + ): + # If the reference is a comma-delimited list represented as a string, + # return the reference as a list of items instead + return [item.strip() for item in logical_id_item.split(",")] return logical_id_item return logical_id_item.get(resource_attributes) diff --git a/tests/unit/lib/intrinsic_resolver/test_intrinsics_symbol_table.py b/tests/unit/lib/intrinsic_resolver/test_intrinsics_symbol_table.py index 278241e10d..236697aaa1 100644 --- a/tests/unit/lib/intrinsic_resolver/test_intrinsics_symbol_table.py +++ b/tests/unit/lib/intrinsic_resolver/test_intrinsics_symbol_table.py @@ -2,6 +2,8 @@ from unittest.mock import patch +from parameterized import parameterized + from samcli.lib.intrinsic_resolver.invalid_intrinsic_exception import InvalidSymbolException from samcli.lib.intrinsic_resolver.intrinsic_property_resolver import IntrinsicResolver from samcli.lib.intrinsic_resolver.intrinsics_symbol_table import IntrinsicsSymbolTable @@ -103,6 +105,18 @@ def test_unknown_symbol_translation(self): res = symbol_resolver.get_translation("UNKNOWN MAP") self.assertEqual(res, None) + @parameterized.expand([(["my-origin.com", "my-second-origin.com"],), ("my-origin.com, my-second-origin.com",)]) + def test_comma_delimited_list(self, logical_id_translator_target): + template = { + "Parameters": {"Test": {"Default": "my-origin.com,my-second-origin.com", "Type": "CommaDelimitedList"}}, + } + + symbol_resolver = IntrinsicsSymbolTable( + template=template, logical_id_translator={"Test": logical_id_translator_target} + ) + res = symbol_resolver.get_translation("Test") + self.assertEqual(res, ["my-origin.com", "my-second-origin.com"]) + def test_basic_symbol_translation(self): symbol_resolver = IntrinsicsSymbolTable(template={}, logical_id_translator={"item": "test"}) res = symbol_resolver.get_translation("item") From eb556c872284d583f389b356074bad3850a4683e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 22:55:54 -0700 Subject: [PATCH 23/32] chore(deps-dev): bump filelock from 3.13.1 to 3.13.3 in /requirements (#6880) Bumps [filelock](https://github.com/tox-dev/py-filelock) from 3.13.1 to 3.13.3. - [Release notes](https://github.com/tox-dev/py-filelock/releases) - [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst) - [Commits](https://github.com/tox-dev/py-filelock/compare/3.13.1...3.13.3) --- updated-dependencies: - dependency-name: filelock dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lucas <12496191+lucashuy@users.noreply.github.com> --- requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index b70f8865a2..7778b7977e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -34,7 +34,7 @@ pytest-rerunfailures==14.0 pytest-metadata==3.1.1 # NOTE (lucashuy): `pytest-json-report` was updated to `pytest-json-report-wip` as the original repository does not seem to be maintained anymore, if `-wip` is updated, validate the changes pytest-json-report-wip==1.5.1 -filelock==3.13.1 +filelock==3.13.3 # formatter black==24.3.0 From 0446045c4f11ba82a165022c67c7488982094217 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 11:47:23 -0700 Subject: [PATCH 24/32] chore(deps): bump the boto group in /requirements with 3 updates (#6882) Bumps the boto group in /requirements with 3 updates: [boto3](https://github.com/boto/boto3), [boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]](https://github.com/youtype/mypy_boto3_builder) and [botocore](https://github.com/boto/botocore). Updates `boto3` from 1.34.69 to 1.34.71 - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.34.69...1.34.71) Updates `boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]` from 1.34.69 to 1.34.71 - [Release notes](https://github.com/youtype/mypy_boto3_builder/releases) - [Commits](https://github.com/youtype/mypy_boto3_builder/commits) Updates `botocore` from 1.34.69 to 1.34.71 - [Changelog](https://github.com/boto/botocore/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/botocore/compare/1.34.69...1.34.71) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray] dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: botocore dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/base.txt | 2 +- requirements/reproducible-linux.txt | 18 +++++++++--------- requirements/reproducible-mac.txt | 18 +++++++++--------- requirements/reproducible-win.txt | 18 +++++++++--------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 3d726198b9..3331979045 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -31,4 +31,4 @@ tzlocal==5.2 cfn-lint~=0.86.1 # Type checking boto3 objects -boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.69 +boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.71 diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index 50282fae6c..979b56c5be 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -38,19 +38,19 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.69 \ - --hash=sha256:2e25ef6bd325217c2da329829478be063155897d8d3b29f31f7f23ab548519b1 \ - --hash=sha256:898a5fed26b1351352703421d1a8b886ef2a74be6c97d5ecc92432ae01fda203 +boto3==1.34.71 \ + --hash=sha256:7ce8c9a50af2f8a159a0dd86b40011d8dfdaba35005a118e51cd3ac72dc630f1 \ + --hash=sha256:d786e7fbe3c4152866199786468a625dc77b9f27294cd7ad4f63cd2e0c927287 # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.69 \ - --hash=sha256:804984bfdc3651762894b961892db9d455b1da6d92c904b14d9dd0f3bf8d06be \ - --hash=sha256:93fb4f8640cd01a70e9d3c94395c67fb6197f5e6623d2f39f18357b5b9adbdfc +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.71 \ + --hash=sha256:1be579780a39a75394db0c413594aec380afde86dbc7eb5eb086a97a25d3c995 \ + --hash=sha256:c9959c48ee1b53e9d19e424898caacf365aaee34cee4c70f40692e2b47bc8099 # via aws-sam-cli (setup.py) -botocore==1.34.69 \ - --hash=sha256:d1ab2bff3c2fd51719c2021d9fa2f30fbb9ed0a308f69e9a774ac92c8091380a \ - --hash=sha256:d3802d076d4d507bf506f9845a6970ce43adc3d819dd57c2791f5c19ed6e5950 +botocore==1.34.71 \ + --hash=sha256:3bc9e23aee73fe6f097823d61f79a8877790436038101a83fa96c7593e8109f8 \ + --hash=sha256:c58f9ed71af2ea53d24146187130541222d7de8c27eb87d23f15457e7b83d88b # via # boto3 # s3transfer diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index eedd5bb9dc..345fe30373 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -56,19 +56,19 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.69 \ - --hash=sha256:2e25ef6bd325217c2da329829478be063155897d8d3b29f31f7f23ab548519b1 \ - --hash=sha256:898a5fed26b1351352703421d1a8b886ef2a74be6c97d5ecc92432ae01fda203 +boto3==1.34.71 \ + --hash=sha256:7ce8c9a50af2f8a159a0dd86b40011d8dfdaba35005a118e51cd3ac72dc630f1 \ + --hash=sha256:d786e7fbe3c4152866199786468a625dc77b9f27294cd7ad4f63cd2e0c927287 # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.69 \ - --hash=sha256:804984bfdc3651762894b961892db9d455b1da6d92c904b14d9dd0f3bf8d06be \ - --hash=sha256:93fb4f8640cd01a70e9d3c94395c67fb6197f5e6623d2f39f18357b5b9adbdfc +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.71 \ + --hash=sha256:1be579780a39a75394db0c413594aec380afde86dbc7eb5eb086a97a25d3c995 \ + --hash=sha256:c9959c48ee1b53e9d19e424898caacf365aaee34cee4c70f40692e2b47bc8099 # via aws-sam-cli (setup.py) -botocore==1.34.69 \ - --hash=sha256:d1ab2bff3c2fd51719c2021d9fa2f30fbb9ed0a308f69e9a774ac92c8091380a \ - --hash=sha256:d3802d076d4d507bf506f9845a6970ce43adc3d819dd57c2791f5c19ed6e5950 +botocore==1.34.71 \ + --hash=sha256:3bc9e23aee73fe6f097823d61f79a8877790436038101a83fa96c7593e8109f8 \ + --hash=sha256:c58f9ed71af2ea53d24146187130541222d7de8c27eb87d23f15457e7b83d88b # via # boto3 # s3transfer diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index 225d95fa82..46c70c9808 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -38,19 +38,19 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.69 \ - --hash=sha256:2e25ef6bd325217c2da329829478be063155897d8d3b29f31f7f23ab548519b1 \ - --hash=sha256:898a5fed26b1351352703421d1a8b886ef2a74be6c97d5ecc92432ae01fda203 +boto3==1.34.71 \ + --hash=sha256:7ce8c9a50af2f8a159a0dd86b40011d8dfdaba35005a118e51cd3ac72dc630f1 \ + --hash=sha256:d786e7fbe3c4152866199786468a625dc77b9f27294cd7ad4f63cd2e0c927287 # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.69 \ - --hash=sha256:804984bfdc3651762894b961892db9d455b1da6d92c904b14d9dd0f3bf8d06be \ - --hash=sha256:93fb4f8640cd01a70e9d3c94395c67fb6197f5e6623d2f39f18357b5b9adbdfc +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.71 \ + --hash=sha256:1be579780a39a75394db0c413594aec380afde86dbc7eb5eb086a97a25d3c995 \ + --hash=sha256:c9959c48ee1b53e9d19e424898caacf365aaee34cee4c70f40692e2b47bc8099 # via aws-sam-cli (setup.py) -botocore==1.34.69 \ - --hash=sha256:d1ab2bff3c2fd51719c2021d9fa2f30fbb9ed0a308f69e9a774ac92c8091380a \ - --hash=sha256:d3802d076d4d507bf506f9845a6970ce43adc3d819dd57c2791f5c19ed6e5950 +botocore==1.34.71 \ + --hash=sha256:3bc9e23aee73fe6f097823d61f79a8877790436038101a83fa96c7593e8109f8 \ + --hash=sha256:c58f9ed71af2ea53d24146187130541222d7de8c27eb87d23f15457e7b83d88b # via # boto3 # s3transfer From d34da6490404b575de22aedd3d56dda50ba68049 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 12:40:40 -0700 Subject: [PATCH 25/32] chore(deps): bump pycparser from 2.21 to 2.22 in /requirements (#6891) Bumps [pycparser](https://github.com/eliben/pycparser) from 2.21 to 2.22. - [Release notes](https://github.com/eliben/pycparser/releases) - [Changelog](https://github.com/eliben/pycparser/blob/main/CHANGES) - [Commits](https://github.com/eliben/pycparser/compare/release_v2.21...release_v2.22) --- updated-dependencies: - dependency-name: pycparser dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/reproducible-linux.txt | 6 +++--- requirements/reproducible-mac.txt | 6 +++--- requirements/reproducible-win.txt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index 979b56c5be..ca95b884b3 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -475,9 +475,9 @@ pbr==6.0.0 \ # via # jschema-to-python # sarif-om -pycparser==2.21 \ - --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ - --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 +pycparser==2.22 \ + --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \ + --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc # via cffi pydantic==2.6.4 \ --hash=sha256:b1704e0847db01817624a6b86766967f552dd9dbf3afba4004409f908dcc84e6 \ diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 345fe30373..5376c26860 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -507,9 +507,9 @@ pkgutil-resolve-name==1.3.10 \ --hash=sha256:357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174 \ --hash=sha256:ca27cc078d25c5ad71a9de0a7a330146c4e014c2462d9af19c6b828280649c5e # via jsonschema -pycparser==2.21 \ - --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ - --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 +pycparser==2.22 \ + --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \ + --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc # via cffi pydantic==2.6.4 \ --hash=sha256:b1704e0847db01817624a6b86766967f552dd9dbf3afba4004409f908dcc84e6 \ diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index 46c70c9808..1a283ab9d0 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -479,9 +479,9 @@ pbr==6.0.0 \ # via # jschema-to-python # sarif-om -pycparser==2.21 \ - --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ - --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 +pycparser==2.22 \ + --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \ + --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc # via cffi pydantic==2.6.4 \ --hash=sha256:b1704e0847db01817624a6b86766967f552dd9dbf3afba4004409f908dcc84e6 \ From b13c8778f2a68c1fdca80607f0e9ca02a3e5d761 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 12:40:57 -0700 Subject: [PATCH 26/32] chore(deps-dev): bump the types group in /requirements with 4 updates (#6890) Bumps the types group in /requirements with 4 updates: [types-pywin32](https://github.com/python/typeshed), [types-dateparser](https://github.com/python/typeshed), [types-docutils](https://github.com/python/typeshed) and [types-jsonschema](https://github.com/python/typeshed). Updates `types-pywin32` from 306.0.0.20240319 to 306.0.0.20240331 - [Commits](https://github.com/python/typeshed/commits) Updates `types-dateparser` from 1.1.4.20240106 to 1.1.4.20240331 - [Commits](https://github.com/python/typeshed/commits) Updates `types-docutils` from 0.20.0.20240317 to 0.20.0.20240331 - [Commits](https://github.com/python/typeshed/commits) Updates `types-jsonschema` from 4.21.0.20240311 to 4.21.0.20240331 - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-pywin32 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: types - dependency-name: types-dateparser dependency-type: direct:development update-type: version-update:semver-patch dependency-group: types - dependency-name: types-docutils dependency-type: direct:development update-type: version-update:semver-patch dependency-group: types - dependency-name: types-jsonschema dependency-type: direct:development update-type: version-update:semver-patch dependency-group: types ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/dev.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 7778b7977e..b581ccc02f 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,16 +8,16 @@ pytest-cov==5.0.0 # 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.9.0 -types-pywin32==306.0.0.20240319 +types-pywin32==306.0.0.20240331 types-PyYAML==6.0.12.20240311 types-chevron==0.14.2.20240310 types-psutil==5.9.5.20240316 types-setuptools==69.2.0.20240317 types-Pygments==2.17.0.20240310 types-colorama==0.4.15.20240311 -types-dateparser==1.1.4.20240106 -types-docutils==0.20.0.20240317 -types-jsonschema==4.21.0.20240311 +types-dateparser==1.1.4.20240331 +types-docutils==0.20.0.20240331 +types-jsonschema==4.21.0.20240331 types-pyOpenSSL==24.0.0.20240311 # as of types-requests>=2.31.0.7, this now requires `urllib3>2`, pin we are able to upgrade types-requests==2.31.0.6 From 0aab4087f7e9bc15a18f14be4891ad14012dc1bb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 16:20:36 -0700 Subject: [PATCH 27/32] chore: update aws_lambda_builders to 1.48.0 (#6893) * chore: update aws_lambda_builders to 1.48.0 * Update reproducibles: update-reproducible-linux-reqs * Update reproducibles: update-reproducible-mac-reqs * Update reproducibles: update-reproducible-win-reqs --------- Co-authored-by: GitHub Action Co-authored-by: Wing Fung Lau <4760060+hawflau@users.noreply.github.com> --- requirements/base.txt | 2 +- requirements/reproducible-linux.txt | 6 +++--- requirements/reproducible-mac.txt | 6 +++--- requirements/reproducible-win.txt | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 3331979045..18cc5f16c6 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -11,7 +11,7 @@ aws-sam-translator==1.86.0 docker~=7.0.0 dateparser~=1.2 requests~=2.31.0 -aws_lambda_builders==1.47.0 +aws_lambda_builders==1.48.0 tomlkit==0.12.4 watchdog==4.0.0 rich~=13.7.1 diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index ca95b884b3..31ef8a8b3a 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -20,9 +20,9 @@ attrs==23.2.0 \ # jsonschema # referencing # sarif-om -aws-lambda-builders==1.47.0 \ - --hash=sha256:e35466c7faa603f9bd30c851be1a8e6076b93876e56ab59ff78dca5b244bdddf \ - --hash=sha256:f30175975ae60f6fe301a6ca1e3e7b5ca53c7685da9a3bccc9e720a7f5168e5e +aws-lambda-builders==1.48.0 \ + --hash=sha256:01a2f41a49c118066a05428a924f08b65112565b155e43beb980517a6d295ae4 \ + --hash=sha256:683155f44f373aa72eba0ea74dd324d688881de65984e9ca391ca1ec10aee6ed # via aws-sam-cli (setup.py) aws-sam-translator==1.86.0 \ --hash=sha256:97a44e5ac8b0d141c31f4ed35c57aa94429a0e6cef7fe989831c9a1c40455473 \ diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 5376c26860..1dec9010b7 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -20,9 +20,9 @@ attrs==23.2.0 \ # jsonschema # referencing # sarif-om -aws-lambda-builders==1.47.0 \ - --hash=sha256:e35466c7faa603f9bd30c851be1a8e6076b93876e56ab59ff78dca5b244bdddf \ - --hash=sha256:f30175975ae60f6fe301a6ca1e3e7b5ca53c7685da9a3bccc9e720a7f5168e5e +aws-lambda-builders==1.48.0 \ + --hash=sha256:01a2f41a49c118066a05428a924f08b65112565b155e43beb980517a6d295ae4 \ + --hash=sha256:683155f44f373aa72eba0ea74dd324d688881de65984e9ca391ca1ec10aee6ed # via aws-sam-cli (setup.py) aws-sam-translator==1.86.0 \ --hash=sha256:97a44e5ac8b0d141c31f4ed35c57aa94429a0e6cef7fe989831c9a1c40455473 \ diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index 1a283ab9d0..bbf524f4fd 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -20,9 +20,9 @@ attrs==23.2.0 \ # jsonschema # referencing # sarif-om -aws-lambda-builders==1.47.0 \ - --hash=sha256:e35466c7faa603f9bd30c851be1a8e6076b93876e56ab59ff78dca5b244bdddf \ - --hash=sha256:f30175975ae60f6fe301a6ca1e3e7b5ca53c7685da9a3bccc9e720a7f5168e5e +aws-lambda-builders==1.48.0 \ + --hash=sha256:01a2f41a49c118066a05428a924f08b65112565b155e43beb980517a6d295ae4 \ + --hash=sha256:683155f44f373aa72eba0ea74dd324d688881de65984e9ca391ca1ec10aee6ed # via aws-sam-cli (setup.py) aws-sam-translator==1.86.0 \ --hash=sha256:97a44e5ac8b0d141c31f4ed35c57aa94429a0e6cef7fe989831c9a1c40455473 \ From f5b2037b6d59ac7c8bed17583b9c506e57d83fee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 17:18:26 -0700 Subject: [PATCH 28/32] chore(deps): bump the boto group in /requirements with 4 updates (#6892) Bumps the boto group in /requirements with 4 updates: [boto3](https://github.com/boto/boto3), [boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]](https://github.com/youtype/mypy_boto3_builder), [botocore](https://github.com/boto/botocore) and [mypy-boto3-secretsmanager](https://github.com/youtype/mypy_boto3_builder). Updates `boto3` from 1.34.71 to 1.34.74 - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.34.71...1.34.74) Updates `boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]` from 1.34.71 to 1.34.74 - [Release notes](https://github.com/youtype/mypy_boto3_builder/releases) - [Commits](https://github.com/youtype/mypy_boto3_builder/commits) Updates `botocore` from 1.34.71 to 1.34.74 - [Changelog](https://github.com/boto/botocore/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/botocore/compare/1.34.71...1.34.74) Updates `mypy-boto3-secretsmanager` from 1.34.63 to 1.34.72 - [Release notes](https://github.com/youtype/mypy_boto3_builder/releases) - [Commits](https://github.com/youtype/mypy_boto3_builder/commits) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray] dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: botocore dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto - dependency-name: mypy-boto3-secretsmanager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: boto ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements/base.txt | 2 +- requirements/reproducible-linux.txt | 24 ++++++++++++------------ requirements/reproducible-mac.txt | 24 ++++++++++++------------ requirements/reproducible-win.txt | 24 ++++++++++++------------ 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 18cc5f16c6..46a7d0d13b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -31,4 +31,4 @@ tzlocal==5.2 cfn-lint~=0.86.1 # Type checking boto3 objects -boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.71 +boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.74 diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt index 31ef8a8b3a..01ff9404bc 100644 --- a/requirements/reproducible-linux.txt +++ b/requirements/reproducible-linux.txt @@ -38,19 +38,19 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.71 \ - --hash=sha256:7ce8c9a50af2f8a159a0dd86b40011d8dfdaba35005a118e51cd3ac72dc630f1 \ - --hash=sha256:d786e7fbe3c4152866199786468a625dc77b9f27294cd7ad4f63cd2e0c927287 +boto3==1.34.74 \ + --hash=sha256:71f551491fb12fe07727d371d5561c5919fdf33dbc1d4251c57940d267a53a9e \ + --hash=sha256:b703e22775561a748adc4576c30424b81abd2a00d3c6fb28eec2e5cde92c1eed # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.71 \ - --hash=sha256:1be579780a39a75394db0c413594aec380afde86dbc7eb5eb086a97a25d3c995 \ - --hash=sha256:c9959c48ee1b53e9d19e424898caacf365aaee34cee4c70f40692e2b47bc8099 +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.74 \ + --hash=sha256:2efb27b39a80f41b4f73f924dd5296b64711ac9a5f5534c2bf0e1250e645261d \ + --hash=sha256:4b9ed86ba5ca8d82fec21fcd1c4900be9d4719ebc4b6c3d95c0e7707984b96da # via aws-sam-cli (setup.py) -botocore==1.34.71 \ - --hash=sha256:3bc9e23aee73fe6f097823d61f79a8877790436038101a83fa96c7593e8109f8 \ - --hash=sha256:c58f9ed71af2ea53d24146187130541222d7de8c27eb87d23f15457e7b83d88b +botocore==1.34.74 \ + --hash=sha256:32bb519bae62483893330c18a0ea4fd09d1ffa32bc573cd8559c2d9a08fb8c5c \ + --hash=sha256:5d2015b5d91d6c402c122783729ce995ed7283a746b0380957026dc2b3b75969 # via # boto3 # s3transfer @@ -437,9 +437,9 @@ mypy-boto3-schemas==1.34.0 \ --hash=sha256:28c016609dcffc606bd8425ee92894c46e943ab77033e1ae46481f00c39b7f75 \ --hash=sha256:3b25a71944192b0980c3bb5132deb7c06ee9b88580ed63f257fad97cf3bf2927 # via boto3-stubs -mypy-boto3-secretsmanager==1.34.63 \ - --hash=sha256:3ed3587f9b5a5eb4e8c81edeeaa0b4a9118d8f07cfc4915c137f8edc315028ab \ - --hash=sha256:a193373d718f747d53878b5cc7fef2e9b8fde3892e4788ac690fd2b16a35564c +mypy-boto3-secretsmanager==1.34.72 \ + --hash=sha256:c5ed74e4a56e345a6396c609d2808fbe64570f90bb76b256d65e1294eaa24c69 \ + --hash=sha256:d0733c5b53e8b5e7bda00f4b42ed84af12e36a20c848917e49c173a0422ef03c # via boto3-stubs mypy-boto3-signer==1.34.0 \ --hash=sha256:c11ed943ccd38ee54fc0ca90ed347ef770d695df49535eab96dd97fb3dbdc592 \ diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt index 1dec9010b7..d5682d39ac 100644 --- a/requirements/reproducible-mac.txt +++ b/requirements/reproducible-mac.txt @@ -56,19 +56,19 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.71 \ - --hash=sha256:7ce8c9a50af2f8a159a0dd86b40011d8dfdaba35005a118e51cd3ac72dc630f1 \ - --hash=sha256:d786e7fbe3c4152866199786468a625dc77b9f27294cd7ad4f63cd2e0c927287 +boto3==1.34.74 \ + --hash=sha256:71f551491fb12fe07727d371d5561c5919fdf33dbc1d4251c57940d267a53a9e \ + --hash=sha256:b703e22775561a748adc4576c30424b81abd2a00d3c6fb28eec2e5cde92c1eed # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.71 \ - --hash=sha256:1be579780a39a75394db0c413594aec380afde86dbc7eb5eb086a97a25d3c995 \ - --hash=sha256:c9959c48ee1b53e9d19e424898caacf365aaee34cee4c70f40692e2b47bc8099 +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.74 \ + --hash=sha256:2efb27b39a80f41b4f73f924dd5296b64711ac9a5f5534c2bf0e1250e645261d \ + --hash=sha256:4b9ed86ba5ca8d82fec21fcd1c4900be9d4719ebc4b6c3d95c0e7707984b96da # via aws-sam-cli (setup.py) -botocore==1.34.71 \ - --hash=sha256:3bc9e23aee73fe6f097823d61f79a8877790436038101a83fa96c7593e8109f8 \ - --hash=sha256:c58f9ed71af2ea53d24146187130541222d7de8c27eb87d23f15457e7b83d88b +botocore==1.34.74 \ + --hash=sha256:32bb519bae62483893330c18a0ea4fd09d1ffa32bc573cd8559c2d9a08fb8c5c \ + --hash=sha256:5d2015b5d91d6c402c122783729ce995ed7283a746b0380957026dc2b3b75969 # via # boto3 # s3transfer @@ -465,9 +465,9 @@ mypy-boto3-schemas==1.34.0 \ --hash=sha256:28c016609dcffc606bd8425ee92894c46e943ab77033e1ae46481f00c39b7f75 \ --hash=sha256:3b25a71944192b0980c3bb5132deb7c06ee9b88580ed63f257fad97cf3bf2927 # via boto3-stubs -mypy-boto3-secretsmanager==1.34.63 \ - --hash=sha256:3ed3587f9b5a5eb4e8c81edeeaa0b4a9118d8f07cfc4915c137f8edc315028ab \ - --hash=sha256:a193373d718f747d53878b5cc7fef2e9b8fde3892e4788ac690fd2b16a35564c +mypy-boto3-secretsmanager==1.34.72 \ + --hash=sha256:c5ed74e4a56e345a6396c609d2808fbe64570f90bb76b256d65e1294eaa24c69 \ + --hash=sha256:d0733c5b53e8b5e7bda00f4b42ed84af12e36a20c848917e49c173a0422ef03c # via boto3-stubs mypy-boto3-signer==1.34.0 \ --hash=sha256:c11ed943ccd38ee54fc0ca90ed347ef770d695df49535eab96dd97fb3dbdc592 \ diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt index bbf524f4fd..079ea5600d 100644 --- a/requirements/reproducible-win.txt +++ b/requirements/reproducible-win.txt @@ -38,19 +38,19 @@ blinker==1.7.0 \ --hash=sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9 \ --hash=sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182 # via flask -boto3==1.34.71 \ - --hash=sha256:7ce8c9a50af2f8a159a0dd86b40011d8dfdaba35005a118e51cd3ac72dc630f1 \ - --hash=sha256:d786e7fbe3c4152866199786468a625dc77b9f27294cd7ad4f63cd2e0c927287 +boto3==1.34.74 \ + --hash=sha256:71f551491fb12fe07727d371d5561c5919fdf33dbc1d4251c57940d267a53a9e \ + --hash=sha256:b703e22775561a748adc4576c30424b81abd2a00d3c6fb28eec2e5cde92c1eed # via # aws-sam-cli (setup.py) # aws-sam-translator -boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.71 \ - --hash=sha256:1be579780a39a75394db0c413594aec380afde86dbc7eb5eb086a97a25d3c995 \ - --hash=sha256:c9959c48ee1b53e9d19e424898caacf365aaee34cee4c70f40692e2b47bc8099 +boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.34.74 \ + --hash=sha256:2efb27b39a80f41b4f73f924dd5296b64711ac9a5f5534c2bf0e1250e645261d \ + --hash=sha256:4b9ed86ba5ca8d82fec21fcd1c4900be9d4719ebc4b6c3d95c0e7707984b96da # via aws-sam-cli (setup.py) -botocore==1.34.71 \ - --hash=sha256:3bc9e23aee73fe6f097823d61f79a8877790436038101a83fa96c7593e8109f8 \ - --hash=sha256:c58f9ed71af2ea53d24146187130541222d7de8c27eb87d23f15457e7b83d88b +botocore==1.34.74 \ + --hash=sha256:32bb519bae62483893330c18a0ea4fd09d1ffa32bc573cd8559c2d9a08fb8c5c \ + --hash=sha256:5d2015b5d91d6c402c122783729ce995ed7283a746b0380957026dc2b3b75969 # via # boto3 # s3transfer @@ -441,9 +441,9 @@ mypy-boto3-schemas==1.34.0 \ --hash=sha256:28c016609dcffc606bd8425ee92894c46e943ab77033e1ae46481f00c39b7f75 \ --hash=sha256:3b25a71944192b0980c3bb5132deb7c06ee9b88580ed63f257fad97cf3bf2927 # via boto3-stubs -mypy-boto3-secretsmanager==1.34.63 \ - --hash=sha256:3ed3587f9b5a5eb4e8c81edeeaa0b4a9118d8f07cfc4915c137f8edc315028ab \ - --hash=sha256:a193373d718f747d53878b5cc7fef2e9b8fde3892e4788ac690fd2b16a35564c +mypy-boto3-secretsmanager==1.34.72 \ + --hash=sha256:c5ed74e4a56e345a6396c609d2808fbe64570f90bb76b256d65e1294eaa24c69 \ + --hash=sha256:d0733c5b53e8b5e7bda00f4b42ed84af12e36a20c848917e49c173a0422ef03c # via boto3-stubs mypy-boto3-signer==1.34.0 \ --hash=sha256:c11ed943ccd38ee54fc0ca90ed347ef770d695df49535eab96dd97fb3dbdc592 \ From a18a7292227d28a0f497ab44177ccf9a41174ced Mon Sep 17 00:00:00 2001 From: Wing Fung Lau <4760060+hawflau@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:18:21 -0700 Subject: [PATCH 29/32] feat: add ruby3.3 support (#6878) * feat: add ruby3.3 support * update schema * install Ruby3.3 in appveyor * support preview OCI * install ruby3.3 in appveyor * update testdata * Add ruby version files * Add ruby version files * update ruby version in GHA --- .github/workflows/build.yml | 2 +- appveyor-linux-binary.yml | 5 +++-- appveyor-ubuntu.yml | 3 ++- appveyor-windows-binary.yml | 1 + appveyor-windows.yml | 1 + samcli/commands/build/command.py | 2 +- samcli/lib/build/workflow_config.py | 2 ++ samcli/lib/utils/architecture.py | 1 + samcli/local/common/runtime_template.py | 4 +++- samcli/local/docker/lambda_image.py | 13 +++++++++++-- schema/samcli.json | 12 +++++++----- tests/integration/buildcmd/test_build_cmd.py | 8 ++++---- .../testdata/buildcmd/Ruby32/.ruby-version | 1 + tests/integration/testdata/buildcmd/Ruby32/Gemfile | 2 +- .../testdata/buildcmd/Ruby33/.ruby-version | 1 + tests/integration/testdata/buildcmd/Ruby33/Gemfile | 5 +++++ tests/integration/testdata/buildcmd/Ruby33/app.rb | 9 +++++++++ .../sync/infra/after/Ruby/function/.ruby-version | 1 + .../sync/infra/after/Ruby/layer/.ruby-version | 1 + .../sync/infra/before/Ruby/function/.ruby-version | 1 + .../sync/infra/before/Ruby/layer/.ruby-version | 1 + tests/integration/validate/test_validate_command.py | 3 +++ tests/testing_utils.py | 1 + 23 files changed, 62 insertions(+), 18 deletions(-) create mode 100644 tests/integration/testdata/buildcmd/Ruby32/.ruby-version create mode 100644 tests/integration/testdata/buildcmd/Ruby33/.ruby-version create mode 100644 tests/integration/testdata/buildcmd/Ruby33/Gemfile create mode 100644 tests/integration/testdata/buildcmd/Ruby33/app.rb create mode 100644 tests/integration/testdata/sync/infra/after/Ruby/function/.ruby-version create mode 100644 tests/integration/testdata/sync/infra/after/Ruby/layer/.ruby-version create mode 100644 tests/integration/testdata/sync/infra/before/Ruby/function/.ruby-version create mode 100644 tests/integration/testdata/sync/infra/before/Ruby/layer/.ruby-version diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1db61f6423..307cd24326 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -150,7 +150,7 @@ jobs: go-version: '1.19' - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.2" + ruby-version: "3.3" - uses: actions/setup-node@v4 with: node-version: 20 diff --git a/appveyor-linux-binary.yml b/appveyor-linux-binary.yml index b4a77fb9f0..450b712d5a 100644 --- a/appveyor-linux-binary.yml +++ b/appveyor-linux-binary.yml @@ -52,8 +52,9 @@ install: - sh: "mvn --version" - sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate" - - sh: "rvm reinstall ruby-3.2.2 --with-openssl-dir=/usr/lib/x86_64-linux-gnu" # reinstall ruby3.2 to fix OpenSSL issue - - sh: "rvm use 3.2.2" + - sh: "rbenv install 3.3.0" + - sh: "rbenv global 3.3.0" + - sh: "ruby --version" - sh: "docker info" - sh: "docker version" - sh: "nvm install ${NODE_VERSION}" diff --git a/appveyor-ubuntu.yml b/appveyor-ubuntu.yml index dd82e5e2f9..6ef006f095 100644 --- a/appveyor-ubuntu.yml +++ b/appveyor-ubuntu.yml @@ -53,7 +53,8 @@ install: - sh: "mvn --version" - sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate" - - sh: "rbenv global 3.2.3" + - sh: "rbenv install 3.3.0" + - sh: "rbenv global 3.3.0" - sh: "ruby --version" - sh: "docker info" - sh: "docker version" diff --git a/appveyor-windows-binary.yml b/appveyor-windows-binary.yml index 4f1cd448bb..3d2a65b2b3 100644 --- a/appveyor-windows-binary.yml +++ b/appveyor-windows-binary.yml @@ -67,6 +67,7 @@ install: - choco upgrade gradle --version=8.4.0 - "gradle -v" - "mvn --version" + - choco install ruby --version=3.3.0.1 # Make sure the temp directory exists for Python to use. - ps: "mkdir -Force C:\\tmp" diff --git a/appveyor-windows.yml b/appveyor-windows.yml index 5f7f778c02..1d2d7c5975 100644 --- a/appveyor-windows.yml +++ b/appveyor-windows.yml @@ -66,6 +66,7 @@ install: - choco upgrade gradle --version=8.4.0 - "gradle -v" - "mvn --version" + - choco install ruby --version=3.3.0.1 # Make sure the temp directory exists for Python to use. - ps: "mkdir -Force C:\\tmp" diff --git a/samcli/commands/build/command.py b/samcli/commands/build/command.py index 7b467b65a4..89fc81842f 100644 --- a/samcli/commands/build/command.py +++ b/samcli/commands/build/command.py @@ -56,7 +56,7 @@ ------------------ 1. Python 3.8, 3.9, 3.10, 3.11, 3.12 using PIP\n 2. Nodejs 20.x, 18.x, 16.x, 14.x, 12.x using NPM\n - 3. Ruby 3.2 using Bundler\n + 3. Ruby 3.2, 3.3 using Bundler\n 4. Java 8, Java 11, Java 17, Java 21 using Gradle and Maven\n 5. Dotnet8, Dotnet6 using Dotnet CLI\n 6. Go 1.x using Go Modules (without --use-container)\n diff --git a/samcli/lib/build/workflow_config.py b/samcli/lib/build/workflow_config.py index ff6dbecb5b..3bb646ab04 100644 --- a/samcli/lib/build/workflow_config.py +++ b/samcli/lib/build/workflow_config.py @@ -97,6 +97,7 @@ def get_layer_subfolder(build_workflow: str) -> str: "nodejs18.x": "nodejs", "nodejs20.x": "nodejs", "ruby3.2": "ruby/lib", + "ruby3.3": "ruby/lib", "java11": "java", "java8.al2": "java", "java17": "java", @@ -160,6 +161,7 @@ def get_workflow_config( "nodejs18.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG), "nodejs20.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG), "ruby3.2": BasicWorkflowSelector(RUBY_BUNDLER_CONFIG), + "ruby3.3": BasicWorkflowSelector(RUBY_BUNDLER_CONFIG), "dotnet6": BasicWorkflowSelector(DOTNET_CLIPACKAGE_CONFIG), "dotnet8": BasicWorkflowSelector(DOTNET_CLIPACKAGE_CONFIG), "go1.x": BasicWorkflowSelector(GO_MOD_CONFIG), diff --git a/samcli/lib/utils/architecture.py b/samcli/lib/utils/architecture.py index 262f13a93c..2bc34ecb8f 100644 --- a/samcli/lib/utils/architecture.py +++ b/samcli/lib/utils/architecture.py @@ -24,6 +24,7 @@ "python3.11": [ARM64, X86_64], "python3.12": [ARM64, X86_64], "ruby3.2": [ARM64, X86_64], + "ruby3.3": [ARM64, X86_64], "java8.al2": [ARM64, X86_64], "java11": [ARM64, X86_64], "java17": [ARM64, X86_64], diff --git a/samcli/local/common/runtime_template.py b/samcli/local/common/runtime_template.py index ba7052c49d..ef9f28e4ac 100644 --- a/samcli/local/common/runtime_template.py +++ b/samcli/local/common/runtime_template.py @@ -24,7 +24,7 @@ ], "ruby": [ { - "runtimes": ["ruby3.2"], + "runtimes": ["ruby3.3", "ruby3.2"], "dependency_manager": "bundler", "init_location": os.path.join(_templates, "cookiecutter-aws-sam-hello-ruby"), "build": True, @@ -123,6 +123,7 @@ def get_local_lambda_images_location(mapping, runtime): "python3.9", "python3.8", # ruby runtimes in descending order + "ruby3.3", "ruby3.2", ] @@ -145,6 +146,7 @@ def get_local_lambda_images_location(mapping, runtime): "python3.10": "amazon/python3.10-base", "python3.9": "amazon/python3.9-base", "python3.8": "amazon/python3.8-base", + "ruby3.3": "amazon/ruby3.3-base", "ruby3.2": "amazon/ruby3.2-base", } diff --git a/samcli/local/docker/lambda_image.py b/samcli/local/docker/lambda_image.py index 0fd301a16e..47a5d5d6ad 100644 --- a/samcli/local/docker/lambda_image.py +++ b/samcli/local/docker/lambda_image.py @@ -31,6 +31,8 @@ RAPID_IMAGE_TAG_PREFIX = "rapid" +TEST_RUNTIMES = ["ruby3.3"] + class Runtime(Enum): nodejs16x = "nodejs16.x" @@ -42,6 +44,7 @@ class Runtime(Enum): python311 = "python3.11" python312 = "python3.12" ruby32 = "ruby3.2" + ruby33 = "ruby3.3" java8al2 = "java8.al2" java11 = "java11" java17 = "java17" @@ -64,7 +67,7 @@ def has_value(cls, value): return any(value == item.value for item in cls) @classmethod - def get_image_name_tag(cls, runtime: str, architecture: str) -> str: + def get_image_name_tag(cls, runtime: str, architecture: str, is_preview: bool = False) -> str: """ Returns the image name and tag for a particular runtime @@ -74,6 +77,8 @@ def get_image_name_tag(cls, runtime: str, architecture: str) -> str: AWS Lambda runtime architecture : str Architecture for the runtime + is_preview : bool + Flag to use preview tag Returns ------- @@ -96,6 +101,9 @@ def get_image_name_tag(cls, runtime: str, architecture: str) -> str: # nodejs20.x, go1.x, etc don't have the `.x` part. runtime_image_tag = runtime_image_tag.replace(".x", "") + if is_preview: + runtime_image_tag = f"{runtime_image_tag}-preview" + # Runtime image tags contain the architecture only if more than one is supported for that runtime if has_runtime_multi_arch_image(runtime): runtime_image_tag = f"{runtime_image_tag}-{architecture}" @@ -161,7 +169,8 @@ def build(self, runtime, packagetype, image, layers, architecture, stream=None, if packagetype == IMAGE: base_image = image elif packagetype == ZIP: - runtime_image_tag = Runtime.get_image_name_tag(runtime, architecture) + is_preview = runtime in TEST_RUNTIMES + runtime_image_tag = Runtime.get_image_name_tag(runtime, architecture, is_preview=is_preview) if self.invoke_images: base_image = self.invoke_images.get(function_name, self.invoke_images.get(None)) if not base_image: diff --git a/schema/samcli.json b/schema/samcli.json index bf1b66044a..2cc9c36b5a 100644 --- a/schema/samcli.json +++ b/schema/samcli.json @@ -23,7 +23,7 @@ "properties": { "parameters": { "title": "Parameters for the init command", - "description": "Available parameters for the init command:\n* no_interactive:\nDisable interactive prompting for init parameters. (fail if any required values are missing)\n* architecture:\nArchitectures for Lambda functions.\n\nArchitectures: ['arm64', 'x86_64']\n* location:\nTemplate location (git, mercurial, http(s), zip, path).\n* runtime:\nLambda runtime for application.\n\nRuntimes: dotnet8, dotnet6, go1.x, java21, java17, java11, java8.al2, nodejs20.x, nodejs18.x, nodejs16.x, provided, provided.al2, provided.al2023, python3.9, python3.8, python3.12, python3.11, python3.10, ruby3.2\n* package_type:\nLambda deployment package type.\n\nPackage Types: Zip, Image\n* base_image:\nLambda base image for deploying IMAGE based package type.\n\nBase images: amazon/dotnet6-base, amazon/dotnet8-base, amazon/go-provided.al2-base, amazon/go-provided.al2023-base, amazon/go1.x-base, amazon/java11-base, amazon/java17-base, amazon/java21-base, amazon/java8.al2-base, amazon/nodejs16.x-base, amazon/nodejs18.x-base, amazon/nodejs20.x-base, amazon/python3.10-base, amazon/python3.11-base, amazon/python3.12-base, amazon/python3.8-base, amazon/python3.9-base, amazon/ruby3.2-base\n* dependency_manager:\nDependency manager for Lambda runtime.\n\nDependency managers: bundler, cli-package, gradle, maven, mod, npm, pip\n* output_dir:\nDirectory to initialize AWS SAM application.\n* name:\nName of AWS SAM Application.\n* app_template:\nIdentifier of the managed application template to be used. Alternatively, run '$sam init' without options for an interactive workflow.\n* no_input:\nDisable Cookiecutter prompting and accept default values defined in the cookiecutter config.\n* extra_context:\nOverride custom parameters in the template's cookiecutter.json configuration e.g. {\"customParam1\": \"customValue1\", \"customParam2\":\"customValue2\"}\n* tracing:\nEnable AWS X-Ray tracing for application.\n* application_insights:\nEnable CloudWatch Application Insights monitoring for application.\n* structured_logging:\nEnable Structured Logging for application.\n* beta_features:\nEnable/Disable beta features.\n* debug:\nTurn on debug logging to print debug message generated by AWS SAM CLI and display timestamps.\n* save_params:\nSave the parameters provided via the command line to the configuration file.", + "description": "Available parameters for the init command:\n* no_interactive:\nDisable interactive prompting for init parameters. (fail if any required values are missing)\n* architecture:\nArchitectures for Lambda functions.\n\nArchitectures: ['arm64', 'x86_64']\n* location:\nTemplate location (git, mercurial, http(s), zip, path).\n* runtime:\nLambda runtime for application.\n\nRuntimes: dotnet8, dotnet6, go1.x, java21, java17, java11, java8.al2, nodejs20.x, nodejs18.x, nodejs16.x, provided, provided.al2, provided.al2023, python3.9, python3.8, python3.12, python3.11, python3.10, ruby3.3, ruby3.2\n* package_type:\nLambda deployment package type.\n\nPackage Types: Zip, Image\n* base_image:\nLambda base image for deploying IMAGE based package type.\n\nBase images: amazon/dotnet6-base, amazon/dotnet8-base, amazon/go-provided.al2-base, amazon/go-provided.al2023-base, amazon/go1.x-base, amazon/java11-base, amazon/java17-base, amazon/java21-base, amazon/java8.al2-base, amazon/nodejs16.x-base, amazon/nodejs18.x-base, amazon/nodejs20.x-base, amazon/python3.10-base, amazon/python3.11-base, amazon/python3.12-base, amazon/python3.8-base, amazon/python3.9-base, amazon/ruby3.2-base, amazon/ruby3.3-base\n* dependency_manager:\nDependency manager for Lambda runtime.\n\nDependency managers: bundler, cli-package, gradle, maven, mod, npm, pip\n* output_dir:\nDirectory to initialize AWS SAM application.\n* name:\nName of AWS SAM Application.\n* app_template:\nIdentifier of the managed application template to be used. Alternatively, run '$sam init' without options for an interactive workflow.\n* no_input:\nDisable Cookiecutter prompting and accept default values defined in the cookiecutter config.\n* extra_context:\nOverride custom parameters in the template's cookiecutter.json configuration e.g. {\"customParam1\": \"customValue1\", \"customParam2\":\"customValue2\"}\n* tracing:\nEnable AWS X-Ray tracing for application.\n* application_insights:\nEnable CloudWatch Application Insights monitoring for application.\n* structured_logging:\nEnable Structured Logging for application.\n* beta_features:\nEnable/Disable beta features.\n* debug:\nTurn on debug logging to print debug message generated by AWS SAM CLI and display timestamps.\n* save_params:\nSave the parameters provided via the command line to the configuration file.", "type": "object", "properties": { "no_interactive": { @@ -48,7 +48,7 @@ "runtime": { "title": "runtime", "type": "string", - "description": "Lambda runtime for application.\n\nRuntimes: dotnet8, dotnet6, go1.x, java21, java17, java11, java8.al2, nodejs20.x, nodejs18.x, nodejs16.x, provided, provided.al2, provided.al2023, python3.9, python3.8, python3.12, python3.11, python3.10, ruby3.2", + "description": "Lambda runtime for application.\n\nRuntimes: dotnet8, dotnet6, go1.x, java21, java17, java11, java8.al2, nodejs20.x, nodejs18.x, nodejs16.x, provided, provided.al2, provided.al2023, python3.9, python3.8, python3.12, python3.11, python3.10, ruby3.3, ruby3.2", "enum": [ "dotnet6", "dotnet8", @@ -68,7 +68,8 @@ "python3.12", "python3.8", "python3.9", - "ruby3.2" + "ruby3.2", + "ruby3.3" ] }, "package_type": { @@ -83,7 +84,7 @@ "base_image": { "title": "base_image", "type": "string", - "description": "Lambda base image for deploying IMAGE based package type.\n\nBase images: amazon/dotnet6-base, amazon/dotnet8-base, amazon/go-provided.al2-base, amazon/go-provided.al2023-base, amazon/go1.x-base, amazon/java11-base, amazon/java17-base, amazon/java21-base, amazon/java8.al2-base, amazon/nodejs16.x-base, amazon/nodejs18.x-base, amazon/nodejs20.x-base, amazon/python3.10-base, amazon/python3.11-base, amazon/python3.12-base, amazon/python3.8-base, amazon/python3.9-base, amazon/ruby3.2-base", + "description": "Lambda base image for deploying IMAGE based package type.\n\nBase images: amazon/dotnet6-base, amazon/dotnet8-base, amazon/go-provided.al2-base, amazon/go-provided.al2023-base, amazon/go1.x-base, amazon/java11-base, amazon/java17-base, amazon/java21-base, amazon/java8.al2-base, amazon/nodejs16.x-base, amazon/nodejs18.x-base, amazon/nodejs20.x-base, amazon/python3.10-base, amazon/python3.11-base, amazon/python3.12-base, amazon/python3.8-base, amazon/python3.9-base, amazon/ruby3.2-base, amazon/ruby3.3-base", "enum": [ "amazon/dotnet6-base", "amazon/dotnet8-base", @@ -102,7 +103,8 @@ "amazon/python3.12-base", "amazon/python3.8-base", "amazon/python3.9-base", - "amazon/ruby3.2-base" + "amazon/ruby3.2-base", + "amazon/ruby3.3-base" ] }, "dependency_manager": { diff --git a/tests/integration/buildcmd/test_build_cmd.py b/tests/integration/buildcmd/test_build_cmd.py index a5939b30c5..2362c178a7 100644 --- a/tests/integration/buildcmd/test_build_cmd.py +++ b/tests/integration/buildcmd/test_build_cmd.py @@ -813,7 +813,7 @@ def test_building_default_package_json(self, runtime, use_container, architectur class TestBuildCommand_RubyFunctions(BuildIntegRubyBase): - @parameterized.expand(["ruby3.2"]) + @parameterized.expand(["ruby3.2", "ruby3.3"]) @skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE) def test_building_ruby_in_container(self, runtime): self._test_with_default_gemfile(runtime, "use_container", "Ruby", self.test_data_path) @@ -826,12 +826,12 @@ def test_building_ruby_in_process(self, runtime): class TestBuildCommand_RubyFunctions_With_Architecture(BuildIntegRubyBase): template = "template_with_architecture.yaml" - @parameterized.expand([("ruby3.2", "Ruby32")]) + @parameterized.expand([("ruby3.2", "Ruby32"), ("ruby3.3", "Ruby33")]) @skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE) def test_building_ruby_in_container_with_specified_architecture(self, runtime, codeuri): self._test_with_default_gemfile(runtime, "use_container", codeuri, self.test_data_path, "x86_64") - @parameterized.expand([("ruby3.2", "Ruby32")]) + @parameterized.expand([("ruby3.2", "Ruby32"), ("ruby3.3", "Ruby33")]) def test_building_ruby_in_process_with_specified_architecture(self, runtime, codeuri): self._test_with_default_gemfile(runtime, False, codeuri, self.test_data_path, "x86_64") @@ -842,7 +842,7 @@ class TestBuildCommand_RubyFunctionsWithGemfileInTheRoot(BuildIntegRubyBase): This doesn't apply to containerized build, since it copies only the function folder to the container """ - @parameterized.expand([("ruby3.2")]) + @parameterized.expand([("ruby3.2"), ("ruby3.3")]) def test_building_ruby_in_process_with_root_gemfile(self, runtime): self._prepare_application_environment() self._test_with_default_gemfile(runtime, False, "RubyWithRootGemfile", self.working_dir) diff --git a/tests/integration/testdata/buildcmd/Ruby32/.ruby-version b/tests/integration/testdata/buildcmd/Ruby32/.ruby-version new file mode 100644 index 0000000000..06eda28ac7 --- /dev/null +++ b/tests/integration/testdata/buildcmd/Ruby32/.ruby-version @@ -0,0 +1 @@ +3.2.3 \ No newline at end of file diff --git a/tests/integration/testdata/buildcmd/Ruby32/Gemfile b/tests/integration/testdata/buildcmd/Ruby32/Gemfile index d3f3b71907..2b179b1ecc 100644 --- a/tests/integration/testdata/buildcmd/Ruby32/Gemfile +++ b/tests/integration/testdata/buildcmd/Ruby32/Gemfile @@ -2,4 +2,4 @@ source "https://rubygems.org" gem "aws-eventstream" -ruby '~> 3.2.0' \ No newline at end of file +ruby '~> 3.2' \ No newline at end of file diff --git a/tests/integration/testdata/buildcmd/Ruby33/.ruby-version b/tests/integration/testdata/buildcmd/Ruby33/.ruby-version new file mode 100644 index 0000000000..0fa4ae4890 --- /dev/null +++ b/tests/integration/testdata/buildcmd/Ruby33/.ruby-version @@ -0,0 +1 @@ +3.3.0 \ No newline at end of file diff --git a/tests/integration/testdata/buildcmd/Ruby33/Gemfile b/tests/integration/testdata/buildcmd/Ruby33/Gemfile new file mode 100644 index 0000000000..9ba8228382 --- /dev/null +++ b/tests/integration/testdata/buildcmd/Ruby33/Gemfile @@ -0,0 +1,5 @@ +source "https://rubygems.org" + +gem "aws-eventstream" + +ruby '~> 3.3' \ No newline at end of file diff --git a/tests/integration/testdata/buildcmd/Ruby33/app.rb b/tests/integration/testdata/buildcmd/Ruby33/app.rb new file mode 100644 index 0000000000..483b148cad --- /dev/null +++ b/tests/integration/testdata/buildcmd/Ruby33/app.rb @@ -0,0 +1,9 @@ +require 'json' + +def lambda_handler(event:, context:) + "Hello World" +end + +def second_lambda_handler(event:, context:) + "Hello Mars" +end \ No newline at end of file diff --git a/tests/integration/testdata/sync/infra/after/Ruby/function/.ruby-version b/tests/integration/testdata/sync/infra/after/Ruby/function/.ruby-version new file mode 100644 index 0000000000..06eda28ac7 --- /dev/null +++ b/tests/integration/testdata/sync/infra/after/Ruby/function/.ruby-version @@ -0,0 +1 @@ +3.2.3 \ No newline at end of file diff --git a/tests/integration/testdata/sync/infra/after/Ruby/layer/.ruby-version b/tests/integration/testdata/sync/infra/after/Ruby/layer/.ruby-version new file mode 100644 index 0000000000..06eda28ac7 --- /dev/null +++ b/tests/integration/testdata/sync/infra/after/Ruby/layer/.ruby-version @@ -0,0 +1 @@ +3.2.3 \ No newline at end of file diff --git a/tests/integration/testdata/sync/infra/before/Ruby/function/.ruby-version b/tests/integration/testdata/sync/infra/before/Ruby/function/.ruby-version new file mode 100644 index 0000000000..06eda28ac7 --- /dev/null +++ b/tests/integration/testdata/sync/infra/before/Ruby/function/.ruby-version @@ -0,0 +1 @@ +3.2.3 \ No newline at end of file diff --git a/tests/integration/testdata/sync/infra/before/Ruby/layer/.ruby-version b/tests/integration/testdata/sync/infra/before/Ruby/layer/.ruby-version new file mode 100644 index 0000000000..06eda28ac7 --- /dev/null +++ b/tests/integration/testdata/sync/infra/before/Ruby/layer/.ruby-version @@ -0,0 +1 @@ +3.2.3 \ No newline at end of file diff --git a/tests/integration/validate/test_validate_command.py b/tests/integration/validate/test_validate_command.py index 22a7187c5f..8ae2a7149b 100644 --- a/tests/integration/validate/test_validate_command.py +++ b/tests/integration/validate/test_validate_command.py @@ -148,7 +148,10 @@ def test_lint_supported_runtimes(self): "python3.8", "python3.9", "python3.10", + "python3.11", + "python3.12", "ruby3.2", + "ruby3.3", ] i = 0 for runtime in supported_runtimes: diff --git a/tests/testing_utils.py b/tests/testing_utils.py index efb776900b..37f04972cf 100644 --- a/tests/testing_utils.py +++ b/tests/testing_utils.py @@ -313,6 +313,7 @@ def runtime_supported_by_docker(runtime: str) -> bool: "java21", "python3.12", "dotnet8", + "ruby3.3", } min_docker_version = "20.10.10" return runtime not in al2023_based_runtimes or ( From ce67b6da5b2b38af86f09f29b08630f4f3fed385 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:03:53 +0000 Subject: [PATCH 30/32] feat: updating app templates repo hash with (ccd6c098c35880495d6dd5a1b710a20831c62791) (#6895) Co-authored-by: GitHub Action --- samcli/runtime_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samcli/runtime_config.json b/samcli/runtime_config.json index 3a9194cc40..2b1f70ca90 100644 --- a/samcli/runtime_config.json +++ b/samcli/runtime_config.json @@ -1,3 +1,3 @@ { - "app_template_repo_commit": "c415e56700aa164fa2a83700c7c417ba4468fa17" + "app_template_repo_commit": "ccd6c098c35880495d6dd5a1b710a20831c62791" } From e06c289fb588a34e231075cf74e038105f9943fa Mon Sep 17 00:00:00 2001 From: Haresh Nasit <84355507+hnnasit@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:53:25 -0700 Subject: [PATCH 31/32] chore: Skip ruby3.3 win tests as its based on al2023 (#6904) * Skip ruby3.3 win tests as its based on al2023 * Remove formatting for runtime parameter --- tests/integration/buildcmd/test_build_cmd.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/integration/buildcmd/test_build_cmd.py b/tests/integration/buildcmd/test_build_cmd.py index 2362c178a7..8d1bbe1b44 100644 --- a/tests/integration/buildcmd/test_build_cmd.py +++ b/tests/integration/buildcmd/test_build_cmd.py @@ -816,6 +816,8 @@ class TestBuildCommand_RubyFunctions(BuildIntegRubyBase): @parameterized.expand(["ruby3.2", "ruby3.3"]) @skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE) def test_building_ruby_in_container(self, runtime): + if IS_WINDOWS and not runtime_supported_by_docker(runtime): + self.skipTest(RUNTIME_NOT_SUPPORTED_BY_DOCKER_MSG) self._test_with_default_gemfile(runtime, "use_container", "Ruby", self.test_data_path) @parameterized.expand(["ruby3.2"]) @@ -829,10 +831,14 @@ class TestBuildCommand_RubyFunctions_With_Architecture(BuildIntegRubyBase): @parameterized.expand([("ruby3.2", "Ruby32"), ("ruby3.3", "Ruby33")]) @skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE) def test_building_ruby_in_container_with_specified_architecture(self, runtime, codeuri): + if IS_WINDOWS and not runtime_supported_by_docker(runtime): + self.skipTest(RUNTIME_NOT_SUPPORTED_BY_DOCKER_MSG) self._test_with_default_gemfile(runtime, "use_container", codeuri, self.test_data_path, "x86_64") @parameterized.expand([("ruby3.2", "Ruby32"), ("ruby3.3", "Ruby33")]) def test_building_ruby_in_process_with_specified_architecture(self, runtime, codeuri): + if IS_WINDOWS and not runtime_supported_by_docker(runtime): + self.skipTest(RUNTIME_NOT_SUPPORTED_BY_DOCKER_MSG) self._test_with_default_gemfile(runtime, False, codeuri, self.test_data_path, "x86_64") From c6956688113d5377fa603a455db4d3ebb4a1008f Mon Sep 17 00:00:00 2001 From: Haresh Nasit <84355507+hnnasit@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:56:03 -0700 Subject: [PATCH 32/32] chore: version bump to v1.114 (#6905) --- samcli/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samcli/__init__.py b/samcli/__init__.py index c467d927d1..fc0951554f 100644 --- a/samcli/__init__.py +++ b/samcli/__init__.py @@ -2,4 +2,4 @@ SAM CLI version """ -__version__ = "1.113.0" +__version__ = "1.114.0"