Skip to content

Commit 229140a

Browse files
Merge from aws/aws-sam-cli/develop
2 parents 463f1bc + ec1c6e9 commit 229140a

41 files changed

Lines changed: 1014 additions & 306 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ jobs:
189189
ruby-version: '3.2.7'
190190

191191
# sync test only need ruby 3.4
192-
- name: Set up Ruby 3.4.2
192+
- name: Set up Ruby 3.4.7
193193
if: (contains(fromJSON('["build-integ","build-integ-dotnet-node-ruby", "build-integ-arm64"]'), matrix.test_suite) && matrix.container_runtime == 'no-container') || contains(fromJSON('["sync", "other-and-e2e"]'), matrix.test_suite)
194194
uses: ruby/setup-ruby@v1
195195
with:

appveyor-linux-binary.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ install:
5252
- sh: "mvn --version"
5353

5454
- sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate"
55+
- sh: "git -C ~/.rbenv/plugins/ruby-build pull"
5556
- sh: "rbenv install 3.3.7"
56-
- sh: "rbenv install 3.4.2"
57+
- sh: "rbenv install 3.4.7"
5758
- sh: "rbenv install 3.2.7"
5859
- sh: "rbenv global 3.3.7"
5960
- sh: "ruby --version"

appveyor-ubuntu.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,9 @@ for:
453453

454454
test_script:
455455
# Install Ruby for Ruby build tests
456+
- sh: "git -C ~/.rbenv/plugins/ruby-build pull"
456457
- sh: "rbenv install 3.3.7"
457-
- sh: "rbenv install 3.4.2"
458+
- sh: "rbenv install 3.4.7"
458459
- sh: "rbenv install 3.2.7"
459460
- sh: "rbenv global 3.3.7"
460461
- sh: "ruby --version"
@@ -474,8 +475,9 @@ for:
474475

475476
test_script:
476477
# Install Ruby for Ruby ARM64 build tests
478+
- sh: "git -C ~/.rbenv/plugins/ruby-build pull"
477479
- sh: "rbenv install 3.3.7"
478-
- sh: "rbenv install 3.4.2"
480+
- sh: "rbenv install 3.4.7"
479481
- sh: "rbenv install 3.2.7"
480482
- sh: "rbenv global 3.3.7"
481483
- sh: "ruby --version"
@@ -519,8 +521,9 @@ for:
519521

520522
test_script:
521523
# Install Ruby for Ruby sync tests
524+
- sh: "git -C ~/.rbenv/plugins/ruby-build pull"
522525
- sh: "rbenv install 3.3.7"
523-
- sh: "rbenv install 3.4.2"
526+
- sh: "rbenv install 3.4.7"
524527
- sh: "rbenv install 3.2.7"
525528
- sh: "rbenv global 3.3.7"
526529
- sh: "ruby --version"
@@ -565,8 +568,9 @@ for:
565568

566569
test_script:
567570
# Install Ruby for Ruby validation and other tests
571+
- sh: "git -C ~/.rbenv/plugins/ruby-build pull"
568572
- sh: "rbenv install 3.3.7"
569-
- sh: "rbenv install 3.4.2"
573+
- sh: "rbenv install 3.4.7"
570574
- sh: "rbenv install 3.2.7"
571575
- sh: "rbenv global 3.3.7"
572576
- sh: "ruby --version"

appveyor-windows-al2023.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ install:
5050
- choco upgrade gradle --version=9.0.0
5151
- choco install ruby --version=3.2.7.1
5252
- choco install ruby --version=3.3.7.1
53-
- choco install ruby --version=3.4.2.1
53+
- choco install ruby --version=3.4.7.1
5454
- "gradle -v"
5555
- "mvn --version"
5656

appveyor-windows-binary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ install:
6565
- "mvn --version"
6666
- choco install ruby --version=3.2.7.1
6767
- choco install ruby --version=3.3.7.1
68-
- choco install ruby --version=3.4.2.1
68+
- choco install ruby --version=3.4.7.1
6969

7070
# Make sure the temp directory exists for Python to use.
7171
- ps: "mkdir -Force C:\\tmp"

appveyor-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ install:
6262
- choco upgrade gradle --version=9.0.0
6363
- choco install ruby --version=3.2.7.1
6464
- choco install ruby --version=3.3.7.1
65-
- choco install ruby --version=3.4.2.1
65+
- choco install ruby --version=3.4.7.1
6666
- "gradle -v"
6767
- "mvn --version"
6868

requirements/base.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ jmespath~=1.0.1
66
ruamel_yaml~=0.18.16
77
PyYAML~=6.0
88
cookiecutter~=2.6.0
9-
aws-sam-translator==1.101.0
9+
aws-sam-translator==1.102.0
1010
#docker minor version updates can include breaking changes. Auto update micro version only.
1111
docker~=7.1.0
1212
dateparser~=1.2
1313
requests~=2.32.5
14-
aws_lambda_builders==1.59.0
14+
aws_lambda_builders==1.60.0
1515
tomlkit==0.13.3
1616
# NOTE: For supporting watchdog in Python3.8, version is pinned to 4.0.2 as
1717
# version 5.0.2 introduced some breaking changes for versions > Python3.8
@@ -31,7 +31,7 @@ regex!=2021.10.8
3131
tzlocal==5.3.1
3232

3333
#Adding cfn-lint dependency for SAM validate
34-
cfn-lint~=1.40.4
34+
cfn-lint~=1.41.0
3535

3636
# Type checking boto3 objects
37-
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.40.61
37+
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.41.0

requirements/reproducible-linux.txt

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ attrs==25.4.0 \
1818
# via
1919
# jsonschema
2020
# referencing
21-
aws-lambda-builders==1.59.0 \
22-
--hash=sha256:87b3ac37598418e8d41c1c65bfd90768ad6737da73585d645274b9bdb1122565 \
23-
--hash=sha256:d863db6b6fcf1377bd6e4b2eb5443874b839ffa65d4cde2b531c8c2120bd99e3
21+
aws-lambda-builders==1.60.0 \
22+
--hash=sha256:518b668130e550a4c88968432fba344a36aa965cca89bf8a30456f991053ae0e \
23+
--hash=sha256:c61d49dd80ee00a484bea3754ff55fd45e6ec5cd3c56169a6eb8767882187dbd
2424
# via aws-sam-cli (setup.py)
25-
aws-sam-translator==1.101.0 \
26-
--hash=sha256:234c1ca29d47f2cd276858371d4a646bc5cdb0de1e07724721d9358d6de005aa \
27-
--hash=sha256:a83f0c2e1712a7695446675faf93276518a690d75e190f861636d5326a3d2f30
25+
aws-sam-translator==1.102.0 \
26+
--hash=sha256:c4060bb97210c91e954add4f5e381656357a38ddbb1602b0eb1b225d054ef4a9 \
27+
--hash=sha256:ea3f6ebff9adf726e0802fab90b8a1bd89008f072ee2d35ec385f9d504820fff
2828
# via
2929
# aws-sam-cli (setup.py)
3030
# cfn-lint
@@ -36,25 +36,25 @@ blinker==1.9.0 \
3636
--hash=sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf \
3737
--hash=sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc
3838
# via flask
39-
boto3==1.40.61 \
40-
--hash=sha256:6b9c57b2a922b5d8c17766e29ed792586a818098efe84def27c8f582b33f898c \
41-
--hash=sha256:d6c56277251adf6c2bdd25249feae625abe4966831676689ff23b4694dea5b12
39+
boto3==1.41.0 \
40+
--hash=sha256:73bf7f63152406404c0359c013a692e884b98a3b297160058a38f00ef19e375b \
41+
--hash=sha256:d5c454bb23655b052073c8dc6703dda5360825b72b1691822ae7709050b96390
4242
# via
4343
# aws-sam-cli (setup.py)
4444
# aws-sam-translator
45-
boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.40.61 \
46-
--hash=sha256:1837e1c29d79d7a8d096d60235cb89cff9f4142466d9ee310cc1f8562da340ee \
47-
--hash=sha256:fd6e73f15b8688c2d3dc1d19c139dd8c853cbcd33c306f7649e7f1c06bf70118
45+
boto3-stubs[apigateway,cloudformation,ecr,iam,kinesis,lambda,s3,schemas,secretsmanager,signer,sqs,stepfunctions,sts,xray]==1.41.0 \
46+
--hash=sha256:74d138f2d2f5f48140be81d680722b0194e09bcdf8d2080a914c21d277c2cfe3 \
47+
--hash=sha256:9e373ac5f9c721c5e615ef694a992c333480c71905d3b8e940175dd7265eef93
4848
# via aws-sam-cli (setup.py)
49-
botocore==1.40.61 \
50-
--hash=sha256:17ebae412692fd4824f99cde0f08d50126dc97954008e5ba2b522eb049238aa7 \
51-
--hash=sha256:a2487ad69b090f9cccd64cf07c7021cd80ee9c0655ad974f87045b02f3ef52cd
49+
botocore==1.41.0 \
50+
--hash=sha256:555afbf86a644bfa4ebd7bd98d717b53b792e6bbb2c49f2b308fb06964cf1655 \
51+
--hash=sha256:a5018d6268eee358dfc5d86e596c3062b4e225690acaf946f54c00063b804bf8
5252
# via
5353
# boto3
5454
# s3transfer
55-
botocore-stubs==1.40.61 \
56-
--hash=sha256:71cbdbc3b277bfeb2c98e2c65c985ad42f18ad33a54a53d524a396482a86092a \
57-
--hash=sha256:c208d9066613d6990cca3eb6dd3a2fcbef1ef02368e5df6701c5e35735527fe4
55+
botocore-stubs==1.40.76 \
56+
--hash=sha256:261d51e71a164a93abf9c6a5c779c5664d307ec4450de917ad9cbe7c29782223 \
57+
--hash=sha256:84c9a24c2a38a59dd173f2655afacf7b6484c05f3d61cf198b59bb54a6efebc5
5858
# via boto3-stubs
5959
certifi==2025.10.5 \
6060
--hash=sha256:0f212c2744a9bb6de0c56639a6f68afe01ecd92d91f14ae897c4fe7bbeeef0de \
@@ -146,9 +146,9 @@ cffi==2.0.0 \
146146
--hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
147147
--hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
148148
# via cryptography
149-
cfn-lint==1.40.4 \
150-
--hash=sha256:7b8bf9dac877842633d8403a8b2c31874b21c9922d74813da34e552b4cf03915 \
151-
--hash=sha256:7c8bcf3cf5f2cf8d96fd30fdee1115bfc2480a4c619afc8bce36d551fbb228e1
149+
cfn-lint==1.41.0 \
150+
--hash=sha256:6feca1cf57f9ed2833bab68d9b1d38c8033611e571fa792e45ab4a39e2b8ab57 \
151+
--hash=sha256:cd43f76f59a664b2bad580840827849fac0d56a3b80e9a41315d8ab5ff6b563a
152152
# via aws-sam-cli (setup.py)
153153
chardet==5.2.0 \
154154
--hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
@@ -497,61 +497,61 @@ mpmath==1.3.0 \
497497
--hash=sha256:7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a25b91f \
498498
--hash=sha256:a0b2b9fe80bbcd81a6647ff13108738cfb482d481d826cc0e02f5b35e5c88d2c
499499
# via sympy
500-
mypy-boto3-apigateway==1.40.0 \
501-
--hash=sha256:99f3134375d25470e34e340463f10bd71ab8b7429168fc06d8dbb43f0b1b937a \
502-
--hash=sha256:d2e49373bb4a5df6b927aebe0d6f93a99e5c168c9748c1f52dd70ef19308e3e4
500+
mypy-boto3-apigateway==1.41.0 \
501+
--hash=sha256:53846bc7fb3d3be5a1e92ecfbe452883aadc338c625bcaa0b7a0a076616b6568 \
502+
--hash=sha256:ba599596b79523973eda5792894f63a47c32d8215b38e12f03d832f5277f6e2f
503503
# via boto3-stubs
504-
mypy-boto3-cloudformation==1.40.57 \
505-
--hash=sha256:bc4571198323edb65869ff203644024886a33e68252cad269865520df139de35 \
506-
--hash=sha256:fc951f5891fa345b5256973f38a8436d80a4289c5c621d52fe9cb7bf64348b7e
504+
mypy-boto3-cloudformation==1.41.0 \
505+
--hash=sha256:7c82cf681971353be62f586f549a7025293bab6bfb7346a49ebc8be0ae46b3ab \
506+
--hash=sha256:8ae1e5dec9619df339479785890c335fc37f4e48bb081fc6b1e0bc76bcc18f43
507507
# via boto3-stubs
508-
mypy-boto3-ecr==1.40.58 \
509-
--hash=sha256:3191a420ec4df1ecb5d2bdc2a4de2e97e983dffae9c4e138c2aa4d283912a985 \
510-
--hash=sha256:3aada75efd32e3b9549a1effce2f706e29c773cf56e33ce6cf7d37e453466d8b
508+
mypy-boto3-ecr==1.41.0 \
509+
--hash=sha256:71507c0437008fb7c61cd5cf255d31e38503e127a5ae8db15070b5b6683b2704 \
510+
--hash=sha256:f4f299334302a460d9f491370c3fbcd6f0334206ce28f07ac2e3a30cffde8b5f
511511
# via boto3-stubs
512-
mypy-boto3-iam==1.40.60 \
513-
--hash=sha256:3a5a27947c3bcef9519a9d7de852e1d892029f818046575e72a3b73886499af0 \
514-
--hash=sha256:8ade5e06096f591e76ae0c72615e58e10d57780767b0e469161799dd92dfa02a
512+
mypy-boto3-iam==1.41.0 \
513+
--hash=sha256:1f6f9f19d61639e351484971313f606fcb1ae7877c5e67ca0fc3f0af9030c6d9 \
514+
--hash=sha256:fe6c997cf15dc3c2edeee6f1a8af975fa65c86430442198ef4125c69803b0cbf
515515
# via boto3-stubs
516-
mypy-boto3-kinesis==1.40.60 \
517-
--hash=sha256:1b4e3f31629dcf1035bc06ce894f89f0e15664fe3806a32b60c084ef175ae0a8 \
518-
--hash=sha256:98c87acbb4baf00edea4e46dd02909e54f58d30f14c099957fa2fc77f1b41d40
516+
mypy-boto3-kinesis==1.41.0 \
517+
--hash=sha256:41730a3ee1b1afe6c2425c1e1c0fa51e8285de30461b87012725f78f42c75277 \
518+
--hash=sha256:697d0dcdbe7e00a1eed852aa6598acf79b6c6a4cfb2df89bccec8fbb8fdc5dae
519519
# via boto3-stubs
520-
mypy-boto3-lambda==1.40.61 \
521-
--hash=sha256:543ab0ba798ac63ee0d73c1092caf70495d1566ef29c79fb2b462ee1b5c73d4a \
522-
--hash=sha256:7df9d7508a40688b0a48b436dd68777f22fb095820fd122778c18537d7009fb9
520+
mypy-boto3-lambda==1.41.0 \
521+
--hash=sha256:8af5e91b554f2b585feb8eb8075d5c692958374f4e9675cc8900d3d4771fb531 \
522+
--hash=sha256:e49a257d93ef7e8f8d88b94dc702562ac21d9c63d8b9ae10bc025e3b5de65665
523523
# via boto3-stubs
524-
mypy-boto3-s3==1.40.61 \
525-
--hash=sha256:2655db143cae37fbc68b53aae34fbc5c904925d04b0f263ae7c38fb560b6a85f \
526-
--hash=sha256:51666977f81b6f7a88fe22eaf041b755a2873d0225e481ad5241bb28e6f6bd47
524+
mypy-boto3-s3==1.41.0 \
525+
--hash=sha256:0e14246af9dc001145e450e10afaace98fc5249c213179688e05e6d9c0dce20a \
526+
--hash=sha256:3af4b4029d800a898f24df38d35e8a2cbe4af96c1f7aa965b56989c239b64e6a
527527
# via boto3-stubs
528-
mypy-boto3-schemas==1.40.19 \
529-
--hash=sha256:70d0066555d9283c5f535c7dd9c04761ad8c9551426854d510db77a5bb18a5c6 \
530-
--hash=sha256:ab912d94b2db90a2c158ee9310129484704411925bc3a501b1ed09170ff0c68e
528+
mypy-boto3-schemas==1.41.0 \
529+
--hash=sha256:1b576d120138357d70a18e66137af11dc8cde22227177e4d9c78dd097048230b \
530+
--hash=sha256:b70a9ab402875ebc4daa4e58fbde8f3c4be01b660f94a80ea858a9431ff6fc02
531531
# via boto3-stubs
532-
mypy-boto3-secretsmanager==1.40.60 \
533-
--hash=sha256:286c77f528b85a87851ec313b9daf71e6bbf79a7d2b1d0d7607dab7547436c61 \
534-
--hash=sha256:be682734934f79cb18ed7799a09ecb091b4c53e1b7c79127f4ea14288095110c
532+
mypy-boto3-secretsmanager==1.41.0 \
533+
--hash=sha256:5fc73568d6d4eb24e73416320f594776695ab4c4ab788b734ccec74d810c22bf \
534+
--hash=sha256:d8ca3c3e4c7dfd88b85cf0f956562734e8f3608aaf9f98e9669dc298c0624d5f
535535
# via boto3-stubs
536-
mypy-boto3-signer==1.40.55 \
537-
--hash=sha256:07ad05fd0d8594bb8d08666ec5267703d41200c14c80538ed0014bce64ddca85 \
538-
--hash=sha256:ba6323259d68292e7f23d4f80f85a86c643e2414451510c57ec8d03dc83191f8
536+
mypy-boto3-signer==1.41.0 \
537+
--hash=sha256:ed7b60e290243dc5f9d317cb32fd1e0afd39d11a13c0eb333ebfaa94e90500ea \
538+
--hash=sha256:efd4b641bda58fcaa972f65711cd60320469caf511665e41293dd0e1b3439bac
539539
# via boto3-stubs
540-
mypy-boto3-sqs==1.40.61 \
541-
--hash=sha256:16d34db653dcf28618b4e422ae32eb2d34f3f937dcee5edd4ca4de3ddb9c3857 \
542-
--hash=sha256:32478c2530c39aebb399c0b6824d5c8324ebfd37d7145ce201cd77a989c1f8ca
540+
mypy-boto3-sqs==1.41.0 \
541+
--hash=sha256:806a8f6eb9348eaf8765ee2dda18883b1e882832cc99d12ae770f83b642885da \
542+
--hash=sha256:feb7d88ff4c1415d5d823e55b177ae661d9ab82c23c384a1b70b7465ce278fef
543543
# via boto3-stubs
544-
mypy-boto3-stepfunctions==1.40.60 \
545-
--hash=sha256:be996c90e66b87feb9b099c41ec5e062aa64c45f8520a871c1731823e5d3a76f \
546-
--hash=sha256:cc337ea66a6d523abd0a773a53b9a65aa6ade8f8925b12626e012e62ad4ff7a4
544+
mypy-boto3-stepfunctions==1.41.0 \
545+
--hash=sha256:706e1d38c0cff489a9b97d39ecf964f951600e8a0fafb9a88efc49064d855ec9 \
546+
--hash=sha256:8fc7f87f2c5766dd5cecf4790789b9a202f82a463f132507784a6b2df260688a
547547
# via boto3-stubs
548-
mypy-boto3-sts==1.40.0 \
549-
--hash=sha256:eb55e50960ae6194d09488464c302196392df712a6a5f4308b6a0e24244cfd5c \
550-
--hash=sha256:fff731694cab2474bf7e7d3344b049b4ac0272d76b72fc4f7e4ae543ead8a5e6
548+
mypy-boto3-sts==1.41.0 \
549+
--hash=sha256:5d6dd24e3fbebbc82f8c7d22400bfeb4561a5f71c1e5f59c00da364ab590d933 \
550+
--hash=sha256:b6043349bddc7cb82956c4851d728bafc21a6f2b0043b6ccae1e0e049b34fa9a
551551
# via boto3-stubs
552-
mypy-boto3-xray==1.40.61 \
553-
--hash=sha256:14402542efbd1a175daf8a5e10eeb36e11ccf4b37afda259ffeb5d30a1c7f1b3 \
554-
--hash=sha256:88162c8a17dc5cae95933e9def28ab6cc16080dc9b4040fe5486e527b849dc80
552+
mypy-boto3-xray==1.41.0 \
553+
--hash=sha256:bf795faf292ea64213bc1f6912316b78e20dbf73f30e1cc596834f1b3e848023 \
554+
--hash=sha256:f3431332f76a1fc1f11018c7abd27720d1562a06fc9eda16756c6f610d5362ed
555555
# via boto3-stubs
556556
networkx==3.5 \
557557
--hash=sha256:0030d386a9a06dee3565298b4a734b68589749a544acbb6c412dc9e2489ec6ec \

0 commit comments

Comments
 (0)