Skip to content

Commit 52b721b

Browse files
aws-sam-cli-botaws-sam-cli-bot
authored
Merge from aws/aws-sam-cli/develop
2 parents 225c9f6 + d1571aa commit 52b721b

File tree

9 files changed

+168
-21
lines changed

9 files changed

+168
-21
lines changed

‎requirements/base.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
chevron~=0.12
22
click==8.1.8
33
Flask<3.2
4-
boto3>=1.29.2,<2
4+
boto3[crt]>=1.29.2,<2
55
jmespath~=1.0.1
66
ruamel_yaml~=0.18.16
77
PyYAML~=6.0
88
cookiecutter~=2.6.0
9-
aws-sam-translator==1.102.0
9+
aws-sam-translator==1.103.0
1010
#docker minor version updates can include breaking changes. Auto update micro version only.
1111
docker~=7.1.0
1212
dateparser~=1.2

‎requirements/reproducible-linux.txt‎

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,54 @@ aws-lambda-builders==1.60.0 \
2222
--hash=sha256:518b668130e550a4c88968432fba344a36aa965cca89bf8a30456f991053ae0e \
2323
--hash=sha256:c61d49dd80ee00a484bea3754ff55fd45e6ec5cd3c56169a6eb8767882187dbd
2424
# via aws-sam-cli (setup.py)
25-
aws-sam-translator==1.102.0 \
26-
--hash=sha256:c4060bb97210c91e954add4f5e381656357a38ddbb1602b0eb1b225d054ef4a9 \
27-
--hash=sha256:ea3f6ebff9adf726e0802fab90b8a1bd89008f072ee2d35ec385f9d504820fff
25+
aws-sam-translator==1.103.0 \
26+
--hash=sha256:8317b72ef412db581dc7846932a44dfc1729adea578d9307a3e6ece46a7882ca \
27+
--hash=sha256:d4eb4a1efa62f00b253ee5f8c0084bd4b7687186c6a12338f900ebe07ff74dad
2828
# via
2929
# aws-sam-cli (setup.py)
3030
# cfn-lint
31+
awscrt==0.28.4 \
32+
--hash=sha256:0024b3e26a5ce9ffc9a92533f0a62bd823e025465f3b90ad3dda2878a260171a \
33+
--hash=sha256:046006703a7ed6278d5f80214c9aae02fc6b6a65a5f7ceb721becf9e1ad90604 \
34+
--hash=sha256:08941fb1f603f1b7b722e8670f121ccf8f25a4073d2f92e3696ae763e309a39d \
35+
--hash=sha256:08b884bb6809d22f80921feb0ae9353fea1a750109a18d02057b6bba742db439 \
36+
--hash=sha256:13ed9b71a346146a89de85c173d007142416e6cc0358d7ca6b0d68dc1d159667 \
37+
--hash=sha256:19adb9fa309111e20e1e850c876f093247ad084efdaa2dd654a15aef4b4bc637 \
38+
--hash=sha256:1c6319d297d18ba7cf3c6a8f69f76fd22b949e4ea8a280eb2098a8d6ed0d25be \
39+
--hash=sha256:1dd5dac3f761cb74c70c7feebf9f8dc96dc3b8db8248e5899bcbf34633d974a3 \
40+
--hash=sha256:277af1c4e5ef666192bd04aea8c3afcbb26d7794594f6f7ba23d7285df5be65e \
41+
--hash=sha256:43e1a88bec567e89eb398151ca6af389feb3a7f9b297141061fe759e65b43a52 \
42+
--hash=sha256:4657eb947e214c8314d1b26df64e4f8c7c2f3b6817cebae00e3288a4bb1779c5 \
43+
--hash=sha256:56e949e965a7668fe0bc6638edf88c009e44090216bb894a5ac758153b01757c \
44+
--hash=sha256:5d95f06142634043dc5c9e20e8f7a16b710e32aa1ae3f42eebb3643cabbe4275 \
45+
--hash=sha256:653f0c57f1f00cf526045ae2b76cd79f13cb751ed5400a545dcf44a9e5d0fa96 \
46+
--hash=sha256:694c183bf2c3ef1d538caa5a73c007cddd841529bc43c6beeb02eb6a353094e6 \
47+
--hash=sha256:6a8543c8637374a0963113663fe053c43868d091e5109bcdc1f14f79f780a6c7 \
48+
--hash=sha256:726926408dea51284fc5f4ab112e797226d59c172bc58156e925099769cc4217 \
49+
--hash=sha256:79217f918e02e02ef9ec6f2e77cdf5afc44a8c904840fe0f873d9116db1e8860 \
50+
--hash=sha256:79d1cb861d017db8657a0fe0b4a02ddc60d596107e2e9e7816eaaca1afa30da4 \
51+
--hash=sha256:7d4365d17bc44e24f861237e37c085aca89d22af756e6f1f5f05ffdc72c93737 \
52+
--hash=sha256:7e0559ea770589958cdbed21f46d2ffdec2836ef43a00a4689d25205bb05cd22 \
53+
--hash=sha256:86bb7612250925d49480a4648d30855d8f3d0e1dd8c322c586b4684847ff5d70 \
54+
--hash=sha256:8bfbe9dae84acb76d05ffde64a85c06e71c05819890f4c28be3204c75e0d5c76 \
55+
--hash=sha256:8f1aef999e0d48a4c3c2e6a713849392b883f918f4c1ce2b00d701c94c3252f8 \
56+
--hash=sha256:9389743eb4c04d1fa0ed5448b4bc6c8283239ece9a9ff4145a5d41ddecd02d42 \
57+
--hash=sha256:98dd46532ebb311123080c8df8805a94e66c02fa1b7d52d6d2f9abcf589c7f8b \
58+
--hash=sha256:98deb64086f30454f791bd52aae2a2086d7896831b5966e8d22cb49b85758e4a \
59+
--hash=sha256:a14b75f6c0cf79f2cb614c2459a492f8fed1836456e6488125652c9b2e7777aa \
60+
--hash=sha256:a40aa941cf8201382986e4287c4fe51067a8bc2c78d9668937a6861cf14a54c6 \
61+
--hash=sha256:b6d6de9172ef52ba1fb5cba12355bf6e845447a750a5214e9f57bf08aeeb6251 \
62+
--hash=sha256:d1e205e53b08456f0f83210c20c674ebdef96e3e80f716d1bf4ad666db2c643b \
63+
--hash=sha256:d2835094e92d0a3d1722d03afd54983115b2172d57581a664ad6a2af3d33c12c \
64+
--hash=sha256:d419febaf110d8dbcfdcd7a37a74882a8fae68a6f96e40d7d53c93ef11fc9c70 \
65+
--hash=sha256:d5b252bd5b30056b73827fdbc8d74d7d7af09e271b94ffca2cc3d96e625389ea \
66+
--hash=sha256:dc11d00600888a690c1ad875759708a4d21bdf81b6c2032e0227687d27fca910 \
67+
--hash=sha256:dd23b9bad57812d7b1d1de785e10a44e3352cf1f3c0e5bd7b678b27d93f482a4 \
68+
--hash=sha256:e030f2036619d98e237a3561c8138b61fd4bf2f3f361d9f2e0b1112a8cd53d5b \
69+
--hash=sha256:e20266fed25bd4198f59541b4343328479524042b781e810e8c6ad9c82a0420c \
70+
--hash=sha256:e328d2afe68c772cae8cab23a210329ce1f434a1380fb585c2dba890cf08d3f1 \
71+
--hash=sha256:e82b2ccd3caf1159d5a2ffea480eb5dbb0e9ea9baf4ac640d9fb86615ef22b9e
72+
# via botocore
3173
binaryornot==0.4.4 \
3274
--hash=sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061 \
3375
--hash=sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4
@@ -36,7 +78,7 @@ blinker==1.9.0 \
3678
--hash=sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf \
3779
--hash=sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc
3880
# via flask
39-
boto3==1.41.0 \
81+
boto3[crt]==1.41.0 \
4082
--hash=sha256:73bf7f63152406404c0359c013a692e884b98a3b297160058a38f00ef19e375b \
4183
--hash=sha256:d5c454bb23655b052073c8dc6703dda5360825b72b1691822ae7709050b96390
4284
# via
@@ -46,7 +88,7 @@ boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsm
4688
--hash=sha256:74d138f2d2f5f48140be81d680722b0194e09bcdf8d2080a914c21d277c2cfe3 \
4789
--hash=sha256:9e373ac5f9c721c5e615ef694a992c333480c71905d3b8e940175dd7265eef93
4890
# via aws-sam-cli (setup.py)
49-
botocore==1.41.0 \
91+
botocore[crt]==1.41.0 \
5092
--hash=sha256:555afbf86a644bfa4ebd7bd98d717b53b792e6bbb2c49f2b308fb06964cf1655 \
5193
--hash=sha256:a5018d6268eee358dfc5d86e596c3062b4e225690acaf946f54c00063b804bf8
5294
# via

‎requirements/reproducible-mac.txt‎

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,54 @@ aws-lambda-builders==1.60.0 \
2222
--hash=sha256:518b668130e550a4c88968432fba344a36aa965cca89bf8a30456f991053ae0e \
2323
--hash=sha256:c61d49dd80ee00a484bea3754ff55fd45e6ec5cd3c56169a6eb8767882187dbd
2424
# via aws-sam-cli (setup.py)
25-
aws-sam-translator==1.102.0 \
26-
--hash=sha256:c4060bb97210c91e954add4f5e381656357a38ddbb1602b0eb1b225d054ef4a9 \
27-
--hash=sha256:ea3f6ebff9adf726e0802fab90b8a1bd89008f072ee2d35ec385f9d504820fff
25+
aws-sam-translator==1.103.0 \
26+
--hash=sha256:8317b72ef412db581dc7846932a44dfc1729adea578d9307a3e6ece46a7882ca \
27+
--hash=sha256:d4eb4a1efa62f00b253ee5f8c0084bd4b7687186c6a12338f900ebe07ff74dad
2828
# via
2929
# aws-sam-cli (setup.py)
3030
# cfn-lint
31+
awscrt==0.28.4 \
32+
--hash=sha256:0024b3e26a5ce9ffc9a92533f0a62bd823e025465f3b90ad3dda2878a260171a \
33+
--hash=sha256:046006703a7ed6278d5f80214c9aae02fc6b6a65a5f7ceb721becf9e1ad90604 \
34+
--hash=sha256:08941fb1f603f1b7b722e8670f121ccf8f25a4073d2f92e3696ae763e309a39d \
35+
--hash=sha256:08b884bb6809d22f80921feb0ae9353fea1a750109a18d02057b6bba742db439 \
36+
--hash=sha256:13ed9b71a346146a89de85c173d007142416e6cc0358d7ca6b0d68dc1d159667 \
37+
--hash=sha256:19adb9fa309111e20e1e850c876f093247ad084efdaa2dd654a15aef4b4bc637 \
38+
--hash=sha256:1c6319d297d18ba7cf3c6a8f69f76fd22b949e4ea8a280eb2098a8d6ed0d25be \
39+
--hash=sha256:1dd5dac3f761cb74c70c7feebf9f8dc96dc3b8db8248e5899bcbf34633d974a3 \
40+
--hash=sha256:277af1c4e5ef666192bd04aea8c3afcbb26d7794594f6f7ba23d7285df5be65e \
41+
--hash=sha256:43e1a88bec567e89eb398151ca6af389feb3a7f9b297141061fe759e65b43a52 \
42+
--hash=sha256:4657eb947e214c8314d1b26df64e4f8c7c2f3b6817cebae00e3288a4bb1779c5 \
43+
--hash=sha256:56e949e965a7668fe0bc6638edf88c009e44090216bb894a5ac758153b01757c \
44+
--hash=sha256:5d95f06142634043dc5c9e20e8f7a16b710e32aa1ae3f42eebb3643cabbe4275 \
45+
--hash=sha256:653f0c57f1f00cf526045ae2b76cd79f13cb751ed5400a545dcf44a9e5d0fa96 \
46+
--hash=sha256:694c183bf2c3ef1d538caa5a73c007cddd841529bc43c6beeb02eb6a353094e6 \
47+
--hash=sha256:6a8543c8637374a0963113663fe053c43868d091e5109bcdc1f14f79f780a6c7 \
48+
--hash=sha256:726926408dea51284fc5f4ab112e797226d59c172bc58156e925099769cc4217 \
49+
--hash=sha256:79217f918e02e02ef9ec6f2e77cdf5afc44a8c904840fe0f873d9116db1e8860 \
50+
--hash=sha256:79d1cb861d017db8657a0fe0b4a02ddc60d596107e2e9e7816eaaca1afa30da4 \
51+
--hash=sha256:7d4365d17bc44e24f861237e37c085aca89d22af756e6f1f5f05ffdc72c93737 \
52+
--hash=sha256:7e0559ea770589958cdbed21f46d2ffdec2836ef43a00a4689d25205bb05cd22 \
53+
--hash=sha256:86bb7612250925d49480a4648d30855d8f3d0e1dd8c322c586b4684847ff5d70 \
54+
--hash=sha256:8bfbe9dae84acb76d05ffde64a85c06e71c05819890f4c28be3204c75e0d5c76 \
55+
--hash=sha256:8f1aef999e0d48a4c3c2e6a713849392b883f918f4c1ce2b00d701c94c3252f8 \
56+
--hash=sha256:9389743eb4c04d1fa0ed5448b4bc6c8283239ece9a9ff4145a5d41ddecd02d42 \
57+
--hash=sha256:98dd46532ebb311123080c8df8805a94e66c02fa1b7d52d6d2f9abcf589c7f8b \
58+
--hash=sha256:98deb64086f30454f791bd52aae2a2086d7896831b5966e8d22cb49b85758e4a \
59+
--hash=sha256:a14b75f6c0cf79f2cb614c2459a492f8fed1836456e6488125652c9b2e7777aa \
60+
--hash=sha256:a40aa941cf8201382986e4287c4fe51067a8bc2c78d9668937a6861cf14a54c6 \
61+
--hash=sha256:b6d6de9172ef52ba1fb5cba12355bf6e845447a750a5214e9f57bf08aeeb6251 \
62+
--hash=sha256:d1e205e53b08456f0f83210c20c674ebdef96e3e80f716d1bf4ad666db2c643b \
63+
--hash=sha256:d2835094e92d0a3d1722d03afd54983115b2172d57581a664ad6a2af3d33c12c \
64+
--hash=sha256:d419febaf110d8dbcfdcd7a37a74882a8fae68a6f96e40d7d53c93ef11fc9c70 \
65+
--hash=sha256:d5b252bd5b30056b73827fdbc8d74d7d7af09e271b94ffca2cc3d96e625389ea \
66+
--hash=sha256:dc11d00600888a690c1ad875759708a4d21bdf81b6c2032e0227687d27fca910 \
67+
--hash=sha256:dd23b9bad57812d7b1d1de785e10a44e3352cf1f3c0e5bd7b678b27d93f482a4 \
68+
--hash=sha256:e030f2036619d98e237a3561c8138b61fd4bf2f3f361d9f2e0b1112a8cd53d5b \
69+
--hash=sha256:e20266fed25bd4198f59541b4343328479524042b781e810e8c6ad9c82a0420c \
70+
--hash=sha256:e328d2afe68c772cae8cab23a210329ce1f434a1380fb585c2dba890cf08d3f1 \
71+
--hash=sha256:e82b2ccd3caf1159d5a2ffea480eb5dbb0e9ea9baf4ac640d9fb86615ef22b9e
72+
# via botocore
3173
binaryornot==0.4.4 \
3274
--hash=sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061 \
3375
--hash=sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4
@@ -36,7 +78,7 @@ blinker==1.9.0 \
3678
--hash=sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf \
3779
--hash=sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc
3880
# via flask
39-
boto3==1.41.0 \
81+
boto3[crt]==1.41.0 \
4082
--hash=sha256:73bf7f63152406404c0359c013a692e884b98a3b297160058a38f00ef19e375b \
4183
--hash=sha256:d5c454bb23655b052073c8dc6703dda5360825b72b1691822ae7709050b96390
4284
# via
@@ -46,7 +88,7 @@ boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsm
4688
--hash=sha256:74d138f2d2f5f48140be81d680722b0194e09bcdf8d2080a914c21d277c2cfe3 \
4789
--hash=sha256:9e373ac5f9c721c5e615ef694a992c333480c71905d3b8e940175dd7265eef93
4890
# via aws-sam-cli (setup.py)
49-
botocore==1.41.0 \
91+
botocore[crt]==1.41.0 \
5092
--hash=sha256:555afbf86a644bfa4ebd7bd98d717b53b792e6bbb2c49f2b308fb06964cf1655 \
5193
--hash=sha256:a5018d6268eee358dfc5d86e596c3062b4e225690acaf946f54c00063b804bf8
5294
# via

‎requirements/reproducible-win.txt‎

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,54 @@ aws-lambda-builders==1.60.0 \
2222
--hash=sha256:518b668130e550a4c88968432fba344a36aa965cca89bf8a30456f991053ae0e \
2323
--hash=sha256:c61d49dd80ee00a484bea3754ff55fd45e6ec5cd3c56169a6eb8767882187dbd
2424
# via aws-sam-cli (setup.py)
25-
aws-sam-translator==1.102.0 \
26-
--hash=sha256:c4060bb97210c91e954add4f5e381656357a38ddbb1602b0eb1b225d054ef4a9 \
27-
--hash=sha256:ea3f6ebff9adf726e0802fab90b8a1bd89008f072ee2d35ec385f9d504820fff
25+
aws-sam-translator==1.103.0 \
26+
--hash=sha256:8317b72ef412db581dc7846932a44dfc1729adea578d9307a3e6ece46a7882ca \
27+
--hash=sha256:d4eb4a1efa62f00b253ee5f8c0084bd4b7687186c6a12338f900ebe07ff74dad
2828
# via
2929
# aws-sam-cli (setup.py)
3030
# cfn-lint
31+
awscrt==0.28.4 \
32+
--hash=sha256:0024b3e26a5ce9ffc9a92533f0a62bd823e025465f3b90ad3dda2878a260171a \
33+
--hash=sha256:046006703a7ed6278d5f80214c9aae02fc6b6a65a5f7ceb721becf9e1ad90604 \
34+
--hash=sha256:08941fb1f603f1b7b722e8670f121ccf8f25a4073d2f92e3696ae763e309a39d \
35+
--hash=sha256:08b884bb6809d22f80921feb0ae9353fea1a750109a18d02057b6bba742db439 \
36+
--hash=sha256:13ed9b71a346146a89de85c173d007142416e6cc0358d7ca6b0d68dc1d159667 \
37+
--hash=sha256:19adb9fa309111e20e1e850c876f093247ad084efdaa2dd654a15aef4b4bc637 \
38+
--hash=sha256:1c6319d297d18ba7cf3c6a8f69f76fd22b949e4ea8a280eb2098a8d6ed0d25be \
39+
--hash=sha256:1dd5dac3f761cb74c70c7feebf9f8dc96dc3b8db8248e5899bcbf34633d974a3 \
40+
--hash=sha256:277af1c4e5ef666192bd04aea8c3afcbb26d7794594f6f7ba23d7285df5be65e \
41+
--hash=sha256:43e1a88bec567e89eb398151ca6af389feb3a7f9b297141061fe759e65b43a52 \
42+
--hash=sha256:4657eb947e214c8314d1b26df64e4f8c7c2f3b6817cebae00e3288a4bb1779c5 \
43+
--hash=sha256:56e949e965a7668fe0bc6638edf88c009e44090216bb894a5ac758153b01757c \
44+
--hash=sha256:5d95f06142634043dc5c9e20e8f7a16b710e32aa1ae3f42eebb3643cabbe4275 \
45+
--hash=sha256:653f0c57f1f00cf526045ae2b76cd79f13cb751ed5400a545dcf44a9e5d0fa96 \
46+
--hash=sha256:694c183bf2c3ef1d538caa5a73c007cddd841529bc43c6beeb02eb6a353094e6 \
47+
--hash=sha256:6a8543c8637374a0963113663fe053c43868d091e5109bcdc1f14f79f780a6c7 \
48+
--hash=sha256:726926408dea51284fc5f4ab112e797226d59c172bc58156e925099769cc4217 \
49+
--hash=sha256:79217f918e02e02ef9ec6f2e77cdf5afc44a8c904840fe0f873d9116db1e8860 \
50+
--hash=sha256:79d1cb861d017db8657a0fe0b4a02ddc60d596107e2e9e7816eaaca1afa30da4 \
51+
--hash=sha256:7d4365d17bc44e24f861237e37c085aca89d22af756e6f1f5f05ffdc72c93737 \
52+
--hash=sha256:7e0559ea770589958cdbed21f46d2ffdec2836ef43a00a4689d25205bb05cd22 \
53+
--hash=sha256:86bb7612250925d49480a4648d30855d8f3d0e1dd8c322c586b4684847ff5d70 \
54+
--hash=sha256:8bfbe9dae84acb76d05ffde64a85c06e71c05819890f4c28be3204c75e0d5c76 \
55+
--hash=sha256:8f1aef999e0d48a4c3c2e6a713849392b883f918f4c1ce2b00d701c94c3252f8 \
56+
--hash=sha256:9389743eb4c04d1fa0ed5448b4bc6c8283239ece9a9ff4145a5d41ddecd02d42 \
57+
--hash=sha256:98dd46532ebb311123080c8df8805a94e66c02fa1b7d52d6d2f9abcf589c7f8b \
58+
--hash=sha256:98deb64086f30454f791bd52aae2a2086d7896831b5966e8d22cb49b85758e4a \
59+
--hash=sha256:a14b75f6c0cf79f2cb614c2459a492f8fed1836456e6488125652c9b2e7777aa \
60+
--hash=sha256:a40aa941cf8201382986e4287c4fe51067a8bc2c78d9668937a6861cf14a54c6 \
61+
--hash=sha256:b6d6de9172ef52ba1fb5cba12355bf6e845447a750a5214e9f57bf08aeeb6251 \
62+
--hash=sha256:d1e205e53b08456f0f83210c20c674ebdef96e3e80f716d1bf4ad666db2c643b \
63+
--hash=sha256:d2835094e92d0a3d1722d03afd54983115b2172d57581a664ad6a2af3d33c12c \
64+
--hash=sha256:d419febaf110d8dbcfdcd7a37a74882a8fae68a6f96e40d7d53c93ef11fc9c70 \
65+
--hash=sha256:d5b252bd5b30056b73827fdbc8d74d7d7af09e271b94ffca2cc3d96e625389ea \
66+
--hash=sha256:dc11d00600888a690c1ad875759708a4d21bdf81b6c2032e0227687d27fca910 \
67+
--hash=sha256:dd23b9bad57812d7b1d1de785e10a44e3352cf1f3c0e5bd7b678b27d93f482a4 \
68+
--hash=sha256:e030f2036619d98e237a3561c8138b61fd4bf2f3f361d9f2e0b1112a8cd53d5b \
69+
--hash=sha256:e20266fed25bd4198f59541b4343328479524042b781e810e8c6ad9c82a0420c \
70+
--hash=sha256:e328d2afe68c772cae8cab23a210329ce1f434a1380fb585c2dba890cf08d3f1 \
71+
--hash=sha256:e82b2ccd3caf1159d5a2ffea480eb5dbb0e9ea9baf4ac640d9fb86615ef22b9e
72+
# via botocore
3173
binaryornot==0.4.4 \
3274
--hash=sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061 \
3375
--hash=sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4
@@ -36,7 +78,7 @@ blinker==1.9.0 \
3678
--hash=sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf \
3779
--hash=sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc
3880
# via flask
39-
boto3==1.41.0 \
81+
boto3[crt]==1.41.0 \
4082
--hash=sha256:73bf7f63152406404c0359c013a692e884b98a3b297160058a38f00ef19e375b \
4183
--hash=sha256:d5c454bb23655b052073c8dc6703dda5360825b72b1691822ae7709050b96390
4284
# via
@@ -46,7 +88,7 @@ boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsm
4688
--hash=sha256:74d138f2d2f5f48140be81d680722b0194e09bcdf8d2080a914c21d277c2cfe3 \
4789
--hash=sha256:9e373ac5f9c721c5e615ef694a992c333480c71905d3b8e940175dd7265eef93
4890
# via aws-sam-cli (setup.py)
49-
botocore==1.41.0 \
91+
botocore[crt]==1.41.0 \
5092
--hash=sha256:555afbf86a644bfa4ebd7bd98d717b53b792e6bbb2c49f2b308fb06964cf1655 \
5193
--hash=sha256:a5018d6268eee358dfc5d86e596c3062b4e225690acaf946f54c00063b804bf8
5294
# via

‎samcli/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
SAM CLI version
33
"""
44

5-
__version__ = "1.147.1"
5+
__version__ = "1.148.0"

‎samcli/cli/global_config.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ class GlobalConfig(metaclass=Singleton):
6565
# Env var used by docker client to specify which socket to use
6666
DOCKER_HOST_ENV_VAR: str = "DOCKER_HOST"
6767

68+
# Env var used to override docker API version to use
69+
DOCKER_API_ENV_VAR: str = "SAM_DOCKER_API_VERSION"
70+
6871
# Static singleton instance
6972

7073
_access_lock: threading.RLock

‎samcli/local/apigw/local_apigw_service.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
from time import time
99
from typing import Any, Dict, List, Optional, Tuple, Union
1010

11-
from flask import Flask, Request, request
11+
from flask import Flask, Request, jsonify, make_response, request
1212
from werkzeug.datastructures import Headers
1313
from werkzeug.routing import BaseConverter
1414
from werkzeug.serving import WSGIRequestHandler
1515

16-
from samcli.commands.local.lib.exceptions import UnsupportedInlineCodeError
16+
from samcli.commands.local.lib.exceptions import TenantIdValidationError, UnsupportedInlineCodeError
1717
from samcli.commands.local.lib.local_lambda import LocalLambdaRunner
1818
from samcli.lib.providers.exceptions import MissingFunctionNameException
1919
from samcli.lib.providers.provider import Api, Cors
@@ -739,6 +739,9 @@ def _request_handler(self, **kwargs):
739739

740740
# invoke the route's Lambda function
741741
lambda_response = self._invoke_lambda_function(route.function_name, route_lambda_event, tenant_id)
742+
except TenantIdValidationError as e:
743+
response_data = jsonify({"message": str(e)})
744+
endpoint_service_error = make_response(response_data, 400) # HTTP 400 Bad Request
742745
except FunctionNotFound:
743746
endpoint_service_error = ServiceErrorResponses.lambda_not_found_response()
744747
except UnsupportedInlineCodeError:

‎samcli/local/docker/container_client.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import docker
3333
from docker.utils import kwargs_from_env
3434

35+
from samcli.cli.global_config import GlobalConfig
3536
from samcli.lib.constants import DOCKER_MIN_API_VERSION, DOCKER_MIN_API_VERSION_FALLBACK
3637
from samcli.local.docker.exceptions import ContainerArchiveImageLoadFailedException, ContainerInvalidSocketPathException
3738
from samcli.local.docker.platform_config import get_finch_socket_path
@@ -94,7 +95,7 @@ def __init__(self, base_url=None):
9495
self.client_params["base_url"] = base_url
9596

9697
# Specify minimum version
97-
self.client_params["version"] = DOCKER_MIN_API_VERSION
98+
self.client_params["version"] = os.environ.get(GlobalConfig.DOCKER_API_ENV_VAR, DOCKER_MIN_API_VERSION)
9899

99100
# Initialize DockerClient with processed parameters
100101
LOG.debug(f"Creating container client with parameters: {self.client_params}")

‎tests/unit/local/docker/test_container_client.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import docker
1414
from parameterized import parameterized
1515

16+
from samcli.cli.global_config import GlobalConfig
1617
from samcli.local.docker.container_client import (
1718
ContainerClient,
1819
DockerContainerClient,
@@ -749,6 +750,19 @@ def test_init_with_base_url_override(self, mock_log, mock_docker_init):
749750
self.assertEqual(call_kwargs["base_url"], override_url)
750751
self.assertTrue(mock_log.debug.called)
751752

753+
@patch("docker.DockerClient.__init__", return_value=None)
754+
def test_init_with_api_override(self, mock_docker_init):
755+
"""Test ContainerClient init with api override"""
756+
override_api = "1.51"
757+
758+
with patch.dict("os.environ", {GlobalConfig.DOCKER_API_ENV_VAR: override_api}, clear=True):
759+
client = ConcreteContainerClient()
760+
761+
# Verify DockerClient.__init__ was called with expected parameters
762+
mock_docker_init.assert_called_once()
763+
call_kwargs = mock_docker_init.call_args.kwargs
764+
self.assertEqual(call_kwargs["version"], override_api)
765+
752766

753767
class TestContainerClientBaseClass(TestCase):
754768
"""Test the ContainerClient base class methods"""

0 commit comments

Comments
 (0)