Skip to content

Commit b477873

Browse files
authored
Merge branch 'develop' into tmp/1706920444/main
2 parents e8d1da7 + d9235ab commit b477873

File tree

13 files changed

+1081
-379
lines changed

13 files changed

+1081
-379
lines changed

.github/dependabot.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"
8+
commit-message:
9+
prefix: chore
10+
include: scope
11+
reviewers:
12+
- aws/sae-enterprise
13+
open-pull-requests-limit: 10

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
- "3.10"
2626
- "3.11"
2727
steps:
28-
- uses: actions/checkout@v3
29-
- uses: actions/setup-python@v4
28+
- uses: actions/checkout@v4
29+
- uses: actions/setup-python@v5
3030
with:
3131
python-version: ${{ matrix.python }}
3232
- run: make init

.github/workflows/check_compatibility.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111

1212
steps:
1313
- name: Checkout the PR
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

16-
- uses: actions/setup-python@v4
16+
- uses: actions/setup-python@v5
1717
with:
1818
python-version: "3.10"
1919

@@ -29,7 +29,7 @@ jobs:
2929
cp bin/public_interface.py "${{ runner.temp }}"/public_interface.py
3030
3131
- name: Checkout the base
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333
with:
3434
ref: "${{ github.base_ref }}"
3535

.github/workflows/close_issue_message.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@ jobs:
1414
# These inputs are both required
1515
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1616
message: |
17-
### ⚠️COMMENT VISIBILITY WARNING⚠️
18-
Comments on closed issues are hard for our team to see.
19-
If you need more assistance, please either tag a team member or open a new issue that references this one.
20-
If you wish to keep having a conversation with other community members under this issue feel free to do so.
17+
This issue is now closed. Comments on closed issues are hard for our team to see.
18+
If you need more assistance, please either tag a team member or open a new issue that references this one.

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v2
47+
uses: github/codeql-action/init@v3
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
5858
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5959
# If this step fails, then you should remove it and run the build manually (see below)
6060
- name: Autobuild
61-
uses: github/codeql-action/autobuild@v2
61+
uses: github/codeql-action/autobuild@v3
6262

6363
# ℹ️ Command-line programs to run using the OS shell.
6464
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -71,6 +71,6 @@ jobs:
7171
# ./location_of_script_within_repo/buildscript.sh
7272

7373
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@v2
74+
uses: github/codeql-action/analyze@v3
7575
with:
7676
category: "/language:${{matrix.language}}"

.github/workflows/schema.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
pull-requests: write
1616

1717
steps:
18-
- uses: actions/checkout@v3
19-
- uses: actions/setup-python@v4
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-python@v5
2020
with:
2121
python-version: "3.10"
2222

samtranslator/internal/data/aws_managed_policies.json

Lines changed: 133 additions & 0 deletions
Large diffs are not rendered by default.

samtranslator/plugins/api/implicit_http_api_plugin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ def _add_route_settings_to_api(
124124

125125
# Handle Resource-level conditions if necessary
126126
api_route_settings = resource.properties.get("RouteSettings", {})
127+
sam_expect(api_route_settings, api_id, "RouteSettings").to_be_a_map()
127128
event_route_settings = event_properties.get("RouteSettings", {})
128129
if condition:
129130
event_route_settings = make_conditional(condition, event_properties.get("RouteSettings", {}))

samtranslator/schema/schema.json

Lines changed: 280 additions & 132 deletions
Large diffs are not rendered by default.

schema_source/cloudformation-docs.json

Lines changed: 338 additions & 100 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)