Skip to content

Commit 854394b

Browse files
authored
Merge branch 'develop' into update_lambda_builders_version
2 parents c8ecab3 + d6ec326 commit 854394b

17 files changed

Lines changed: 1119 additions & 792 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
- uses: ruby/setup-ruby@v1
163163
with:
164164
ruby-version: "3.3"
165-
- uses: actions/setup-node@v5
165+
- uses: actions/setup-node@v6
166166
with:
167167
node-version: 22
168168
- uses: actions/setup-java@v5

.github/workflows/validate_pyinstaller.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
sudo ./sam-installation/install
3333
sam-beta --version
3434
./tests/sanity-check.sh
35-
- uses: actions/upload-artifact@v4
35+
- uses: actions/upload-artifact@v5
3636
with:
3737
name: pyinstaller-linux-zip
3838
path: .build/output/aws-sam-cli-linux-x86_64.zip
@@ -61,7 +61,7 @@ jobs:
6161
sudo ./sam-installation/install
6262
sam-beta --version
6363
./tests/sanity-check.sh
64-
- uses: actions/upload-artifact@v4
64+
- uses: actions/upload-artifact@v5
6565
with:
6666
name: pyinstaller-macos-zip
6767
path: .build/output/aws-sam-cli-macos-x86_64.zip

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ init:
1313
fi
1414

1515
test:
16-
# Run unit tests
17-
# Fail if coverage falls below 95%
16+
# Run unit tests and fail if coverage falls below 94%
1817
pytest --cov samcli --cov schema --cov-report term-missing --cov-fail-under 94 tests/unit
1918

2019
test-cov-report:

requirements/base.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ click==8.1.8
33
Flask<3.2
44
boto3>=1.29.2,<2
55
jmespath~=1.0.1
6-
ruamel_yaml~=0.18.15
6+
ruamel_yaml~=0.18.16
77
PyYAML~=6.0
88
cookiecutter~=2.6.0
99
aws-sam-translator==1.101.0
@@ -34,4 +34,4 @@ tzlocal==5.3.1
3434
cfn-lint~=1.40.2
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.50
37+
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.40.61

requirements/dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ filelock==3.19.1; python_version<"3.10"
4848
# formatter
4949
black==25.9.0; python_version>="3.9"
5050
black==24.8.0; python_version<"3.9"
51-
psutil==7.1.0
51+
psutil==7.1.1

requirements/reproducible-linux.txt

Lines changed: 288 additions & 254 deletions
Large diffs are not rendered by default.

requirements/reproducible-mac.txt

Lines changed: 288 additions & 254 deletions
Large diffs are not rendered by default.

requirements/reproducible-win.txt

Lines changed: 287 additions & 255 deletions
Large diffs are not rendered by default.

samcli/commands/remote/invoke/cli.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,15 @@ def do_cli(
166166
and remote_invoke_context.resource_summary
167167
and remote_invoke_context.resource_summary.resource_type == AWS_LAMBDA_FUNCTION
168168
):
169-
lambda_test_event = remote_invoke_context.get_lambda_shared_test_event_provider()
170169
LOG.debug("Retrieving remote event %s", test_event_name)
171-
event = lambda_test_event.get_event(test_event_name, remote_invoke_context.resource_summary)
170+
lambda_test_event = remote_invoke_context.get_lambda_shared_test_event_provider().get_event(
171+
test_event_name, remote_invoke_context.resource_summary
172+
)
173+
event = lambda_test_event["json"]
172174
LOG.debug("Remote event contents: %s", event)
175+
metadata = lambda_test_event["metadata"]
176+
if "invocationType" in metadata:
177+
parameter.setdefault("InvocationType", metadata["invocationType"])
173178
elif test_event_name:
174179
LOG.info("Note: remote event is only supported for AWS Lambda Function resource.")
175180
test_event_name = ""

samcli/commands/remote/test_event/get/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def do_cli(
127127
raise UserException(str(ex), wrapped_from=ex.__class__.__name__) from ex
128128

129129
LOG.debug("Getting remote event '%s' for resource: %s", name, function_resource)
130-
event = lambda_test_event.get_event(name, function_resource)
130+
event = lambda_test_event.get_event(name, function_resource)["json"]
131131

132132
try:
133133
output_file.write(event)

0 commit comments

Comments
 (0)