Skip to content

Commit a5954fb

Browse files
bchamppbchampp
authored
Merge branch 'develop' into tmp-disallow-relative-imports
2 parents da61683 + fb733fc commit a5954fb

34 files changed

Lines changed: 924 additions & 218 deletions

File tree

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ jobs:
1313
if: github.repository == 'aws/aws-sam-cli'
1414
runs-on: ubuntu-latest
1515
steps:
16+
- name: Check if PR already exists
17+
env:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
run: |
20+
PR_COUNT=$(gh pr list --repo aws/aws-sam-cli --head update_app_templates_hash --json id --jq length)
21+
if [ "$PR_COUNT" -ge 1 ]; then
22+
echo "PR already exists for update_app_templates_hash, skipping workflow"
23+
exit 1
24+
fi
25+
1626
- name: Checkout App Templates
1727
uses: actions/checkout@v6
1828
with:
@@ -58,6 +68,16 @@ jobs:
5868
if: github.repository == 'aws/aws-sam-cli'
5969
runs-on: ubuntu-latest
6070
steps:
71+
- name: Check if PR already exists
72+
env:
73+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
74+
run: |
75+
PR_COUNT=$(gh pr list --repo aws/aws-sam-cli --head update_sam_transform_version --json id --jq length)
76+
if [ "$PR_COUNT" -ge 1 ]; then
77+
echo "PR already exists for update_sam_transform_version, skipping workflow"
78+
exit 1
79+
fi
80+
6181
- name: Checkout SAM
6282
uses: actions/checkout@v6
6383
with:
@@ -72,6 +92,13 @@ jobs:
7292
repository: aws/aws-sam-cli
7393
path: aws-sam-cli
7494

95+
- uses: actions/setup-python@v6
96+
with:
97+
python-version: "3.11"
98+
99+
- name: Install uv
100+
uses: astral-sh/setup-uv@v7
101+
75102
- name: Update aws-sam-translator & commit
76103
run: |
77104
git config --global user.email "action@github.com"
@@ -86,6 +113,7 @@ jobs:
86113
git reset --hard develop
87114
sed -i "s/$SAM_T_PRE_VERSION/aws-sam-translator==$SAM_T_CUR_VERSION/g" requirements/base.txt
88115
cp -r ../serverless-application-model/tests/translator/input ./tests/functional/commands/validate/lib/models
116+
make update-reproducible-reqs-uv
89117
git status
90118
git diff --quiet && exit 0 # exit if there is no change
91119
echo "is_new_sam_t=1" >> $GITHUB_ENV # set env variable for next step run decision
@@ -109,6 +137,16 @@ jobs:
109137
if: github.repository == 'aws/aws-sam-cli'
110138
runs-on: ubuntu-latest
111139
steps:
140+
- name: Check if PR already exists
141+
env:
142+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
143+
run: |
144+
PR_COUNT=$(gh pr list --repo aws/aws-sam-cli --head update_lambda_builders_version --json id --jq length)
145+
if [ "$PR_COUNT" -ge 1 ]; then
146+
echo "PR already exists for update_lambda_builders_version, skipping workflow"
147+
exit 1
148+
fi
149+
112150
- name: Checkout Lambda Builders
113151
uses: actions/checkout@v6
114152
with:
@@ -123,6 +161,13 @@ jobs:
123161
repository: aws/aws-sam-cli
124162
path: aws-sam-cli
125163

164+
- uses: actions/setup-python@v6
165+
with:
166+
python-version: "3.11"
167+
168+
- name: Install uv
169+
uses: astral-sh/setup-uv@v7
170+
126171
- name: Upgrade aws_lambda_builders & commit
127172
run: |
128173
git config --global user.email "action@github.com"
@@ -136,6 +181,7 @@ jobs:
136181
echo "Lambda Builders pre version is $BUILDERS_PRE_VERSION"
137182
git reset --hard develop
138183
sed -i "s/$BUILDERS_PRE_VERSION/aws_lambda_builders==$BUILDERS_CUR_VERSION/g" requirements/base.txt
184+
make update-reproducible-reqs-uv
139185
git status
140186
git diff --quiet && exit 0 # exit if there is no change
141187
echo "is_new_lambda_builders=1" >> $GITHUB_ENV # set env variable for next step run decision

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,20 @@ jobs:
130130
#- "delete"
131131
#- "deploy"
132132
- name: "integ-all-other"
133-
params: "-n 2 --reruns 3 tests/integration/init tests/integration/local tests/integration/pipeline tests/integration/root tests/integration/scripts tests/integration/telemetry tests/integration/docs"
133+
params: "-n 2 --reruns 3 tests/integration/init tests/integration/local tests/integration/pipeline tests/integration/root tests/integration/scripts tests/integration/telemetry tests/integration/docs --ignore=tests/integration/local/invoke/test_invoke_durable.py --ignore=tests/integration/local/start_api/test_start_api_durable.py --ignore=tests/integration/local/start_lambda/test_start_lambda_durable.py"
134+
- name: "durable-functions"
135+
params: "--reruns 3 tests/integration/local/invoke/test_invoke_durable.py tests/integration/local/start_api/test_start_api_durable.py tests/integration/local/start_lambda/test_start_lambda_durable.py"
134136
#- "list"
135137
#- "logs"
136138
#- "package"
137139
#- "publish"
138140
#- "sync"
139141
#- "traces"
140142
#- "validate"
143+
exclude:
144+
- os: windows-latest
145+
tests_config:
146+
name: "durable-functions"
141147
steps:
142148
- uses: actions/checkout@v6
143149
- name: Set TEMP to D:/Temp
@@ -197,6 +203,8 @@ jobs:
197203
run: uv pip install --system --python python3.12 --upgrade pip setuptools
198204
- name: Run integration tests for ${{ matrix.tests_config.name }}
199205
run: pytest -vv ${{ matrix.tests_config.params }}
206+
env:
207+
FORCE_RUN_DOCKER_TEST: ${{ matrix.tests_config.name == 'durable-functions' && '1' || '' }}
200208

201209
smoke-and-functional-tests:
202210
name: ${{ matrix.tests_config.name }} / ${{ matrix.tests_config.os }} / ${{ matrix.python }}

‎.github/workflows/integration-tests.yml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ jobs:
5151
- local-invoke
5252
- local-start1
5353
- local-start2
54-
- durable-functions
5554
- other-and-e2e
5655
exclude:
5756
# no-container mode only applies to build-integ test suites
@@ -67,8 +66,6 @@ jobs:
6766
test_suite: local-start1
6867
- container_runtime: no-container
6968
test_suite: local-start2
70-
- container_runtime: no-container
71-
test_suite: durable-functions
7269
- container_runtime: no-container
7370
test_suite: other-and-e2e
7471

@@ -402,10 +399,7 @@ jobs:
402399
pytest -vv --reruns 3 tests/integration/local/start_api --ignore tests/integration/local/start_api/test_start_api_with_terraform_application.py --ignore tests/integration/local/start_api/test_start_api_durable.py --json-report --json-report-file=TEST_REPORT-integration-local-start1-${{ matrix.container_runtime }}.json
403400
;;
404401
"local-start2")
405-
pytest -vv --reruns 3 tests/integration/local/start_lambda tests/integration/local/start_api/test_start_api_with_terraform_application.py --ignore tests/integration/local/start_lambda/test_start_lambda_durable.py --json-report --json-report-file=TEST_REPORT-integration-local-start2-${{ matrix.container_runtime }}.json
406-
;;
407-
"durable-functions")
408-
pytest -vv --reruns 3 tests/integration/local/invoke/test_invoke_durable.py tests/integration/local/start_api/test_start_api_durable.py tests/integration/local/start_lambda/test_start_lambda_durable.py tests/integration/local/callback/test_callback.py tests/integration/local/execution/test_execution.py --json-report --json-report-file=TEST_REPORT-integration-durable-functions-${{ matrix.container_runtime }}.json
402+
pytest -vv --reruns 3 tests/integration/local/start_lambda tests/integration/local/start_api/test_start_api_with_terraform_application.py tests/integration/local/callback/test_callback.py tests/integration/local/execution/test_execution.py --ignore tests/integration/local/start_lambda/test_start_lambda_durable.py --json-report --json-report-file=TEST_REPORT-integration-local-start2-${{ matrix.container_runtime }}.json
409403
;;
410404
"other-and-e2e")
411405
pytest -vv -n 4 --reruns 3 --dist loadgroup tests/integration tests/end_to_end tests/regression --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others-${{ matrix.container_runtime }}.json

‎.github/workflows/notify-slack.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Slack Notifications
2+
3+
on:
4+
pull_request:
5+
types: [labeled]
6+
issues:
7+
types: [opened]
8+
9+
jobs:
10+
notify-slack:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: read
14+
steps:
15+
- name: Send External PR Notification
16+
if: github.event_name == 'pull_request' && github.event.label.name == 'pr/external'
17+
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2
18+
env:
19+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
20+
SLACK_TITLE: 'PR Created: ${{ github.event.pull_request.title }} by ${{ github.event.pull_request.user.login }}'
21+
SLACK_FOOTER: ''
22+
MSG_MINIMAL: true
23+
SLACK_MESSAGE: '${{ github.event.pull_request.html_url }}'
24+
- name: Send New Issue Notification
25+
if: github.event_name == 'issue'
26+
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2
27+
env:
28+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
29+
SLACK_TITLE: 'Issue Created: ${{ github.event.issue.title }} by ${{ github.event.issue.user.login }}'
30+
SLACK_FOOTER: ''
31+
MSG_MINIMAL: true
32+
SLACK_MESSAGE: '${{ github.event.issue.html_url }}'

‎appveyor-windows-al2023.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ install:
4747
- 'set PATH=%JAVA_HOME%\bin;%PATH%'
4848
- java --version
4949
- javac --version
50+
- choco install maven --version=3.9.12
51+
- 'set MAVEN_HOME=C:\ProgramData\chocolatey\lib\maven\apache-maven-3.9.12'
52+
- 'set PATH=%MAVEN_HOME%\bin;%PATH%'
5053
- choco upgrade gradle --version=9.0.0
5154
- choco install ruby --version=3.2.7.1
5255
- choco install ruby --version=3.3.7.1

‎appveyor-windows-binary.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ install:
6060
- 'set PATH=%JAVA_HOME%\bin;%PATH%'
6161
- java --version
6262
- javac --version
63+
- choco install maven --version=3.9.12
6364
- choco upgrade gradle --version=9.0.0
6465
- "gradle -v"
6566
- "mvn --version"

‎appveyor-windows.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ install:
5959
- 'set PATH=%JAVA_HOME%\bin;%PATH%'
6060
- java --version
6161
- javac --version
62+
- choco install maven --version=3.9.12
6263
- choco upgrade gradle --version=9.0.0
6364
- choco install ruby --version=3.2.7.1
6465
- choco install ruby --version=3.3.7.1

‎requirements/base.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jmespath~=1.0.1
66
ruamel_yaml~=0.18.16
77
PyYAML~=6.0
88
cookiecutter~=2.6.0
9-
aws-sam-translator==1.106.0
9+
aws-sam-translator==1.107.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/dev.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ types-pywin32==311.0.0.20251008; python_version>="3.9"
1414
types-pywin32==308.0.0.20241221; python_version<"3.9"
1515
types-PyYAML==6.0.12.20250915
1616
types-chevron==0.14.2.20250103
17-
types-psutil==7.2.1.20260116
18-
types-setuptools==80.9.0.20251223
17+
types-psutil==7.2.2.20260130
18+
types-setuptools==80.10.0.20260124
1919
types-Pygments==2.19.0.20251121
2020
types-colorama==0.4.15.20250801
2121
types-dateparser==1.2.2.20250809
2222
types-docutils==0.22.3.20251115
23-
types-jsonschema==4.26.0.20260109
23+
types-jsonschema==4.26.0.20260202
2424
types-pyOpenSSL==24.1.0.20240722
2525
# lucashuy: pin `types-request` based on the Python version since newer versions of
2626
# the types require a newer version of requests, which is only installed in newer versions of Python

‎requirements/pre-dev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruff==0.14.11
1+
ruff==0.14.14

0 commit comments

Comments
 (0)