Skip to content

Commit fdda244

Browse files
salemgolemugoosalemgolemugoo
authored
Merge branch 'aws:develop' into domainname-validator
2 parents 4c98593 + 9d0edaa commit fdda244

File tree

650 files changed

+18582
-8064
lines changed

Some content is hidden

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

650 files changed

+18582
-8064
lines changed

‎.github/ISSUE_TEMPLATE/bug_report_2.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ assignees: ''
1010
If you have an active AWS support contract, please open a case with AWS Premium Support team using the below documentation to report the issue:
1111
https://docs.aws.amazon.com/awssupport/latest/user/case-management.html
1212

13-
Before submitting a new issue, please search through open [GitHub Issues](https://github.com/aws/aws-parallelcluster/issues) and check out the [troubleshooting documentation](https://docs.aws.amazon.com/parallelcluster/latest/ug/troubleshooting.html).
13+
Before submitting a new issue, please search through [GitHub Issues](https://github.com/aws/aws-parallelcluster/issues?q=is%3Aissue),
14+
[GitHub Wiki](https://github.com/aws/aws-parallelcluster/wiki) and check out the [troubleshooting documentation](https://docs.aws.amazon.com/parallelcluster/latest/ug/troubleshooting.html).
1415

1516
Please make sure to add the following data in order to facilitate the root cause detection.
1617

‎.github/ISSUE_TEMPLATE/bug_report_3.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ assignees: ''
1010
If you have an active AWS support contract, please open a case with AWS Premium Support team using the below documentation to report the issue:
1111
https://docs.aws.amazon.com/awssupport/latest/user/case-management.html
1212

13-
Before submitting a new issue, please search through open [GitHub Issues](https://github.com/aws/aws-parallelcluster/issues) and check out the [troubleshooting documentation](https://docs.aws.amazon.com/parallelcluster/latest/ug/troubleshooting-v3.html).
13+
Before submitting a new issue, please search through [GitHub Issues](https://github.com/aws/aws-parallelcluster/issues?q=is%3Aissue),
14+
[GitHub Wiki](https://github.com/aws/aws-parallelcluster/wiki) and check out the [troubleshooting documentation](https://docs.aws.amazon.com/parallelcluster/latest/ug/troubleshooting.html).
1415

1516
Please make sure to add the following data in order to facilitate the root cause detection.
1617

‎.github/workflows/bump_version.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Bump Version workflow that is triggered manually
2+
name: Bump Version
3+
4+
on:
5+
workflow_dispatch:
6+
# Inputs the workflow accepts.
7+
inputs:
8+
pcluster-version:
9+
description: 'The target version of ParallelCluster CLI'
10+
required: true
11+
type: string
12+
branch:
13+
description: 'The Github branch name'
14+
required: true
15+
type: string
16+
17+
jobs:
18+
create-pull-requests:
19+
permissions:
20+
contents: write
21+
pull-requests: write
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v2
25+
with:
26+
fetch-depth: 0
27+
ref: ${{ inputs.branch }}
28+
- uses: actions/setup-java@v1
29+
with:
30+
java-version: 11
31+
- run: |
32+
sudo npm install -g redoc-cli
33+
sudo snap install yq
34+
- name: Modifiy Code to Change version
35+
run: ./util/bump-version.sh --version ${{ inputs.pcluster-version }}
36+
37+
- name: Create a Pull Request
38+
uses: peter-evans/create-pull-request@v6
39+
with:
40+
commit-message: 'Bump version to ${{ inputs.pcluster-version }}'
41+
title: 'Bump version to ${{ inputs.pcluster-version }}'
42+
body: |
43+
This PR contains version bump.
44+
Auto-generated by Github Action
45+
branch: versionbump${{ inputs.branch }}${{ inputs.pcluster-version }}
46+
delete-branch: true
47+
labels: skip-changelog-update

‎.github/workflows/bump_version_awsbatch_cli.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Bump Version workflow that is triggered manually
2+
name: Bump Version for AWSBatch CLI
3+
4+
on:
5+
workflow_dispatch:
6+
# Inputs the workflow accepts.
7+
inputs:
8+
awsbatch-cli-version:
9+
description: 'The target version of AWSBatch CLI'
10+
required: true
11+
type: string
12+
branch:
13+
description: 'The Github branch name'
14+
required: true
15+
type: string
16+
17+
jobs:
18+
create-pull-requests:
19+
permissions:
20+
contents: write
21+
pull-requests: write
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v2
25+
with:
26+
fetch-depth: 0
27+
ref: ${{ inputs.branch }}
28+
- name: Modifiy Code to Change version
29+
run: ./util/bump-awsbatch-cli-version.sh ${{ inputs.awsbatch-cli-version }}
30+
31+
- name: Create a Pull Request
32+
uses: peter-evans/create-pull-request@v6
33+
with:
34+
commit-message: 'Bump version for awsbatch-cli to ${{ inputs.awsbatch-cli-version }}'
35+
title: 'Bump version for awsbatch-cli to ${{ inputs.awsbatch-cli-version }}'
36+
body: |
37+
This PR contains version bump for awsbatch-cli.
38+
Auto-generated by Github Action
39+
branch: versionbumpbatch${{ inputs.branch }}${{ inputs.awsbatch-cli-version }}
40+
delete-branch: true
41+
labels: skip-changelog-update

‎.github/workflows/ci.yml

+38-25
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,16 @@ jobs:
3838
matrix:
3939
os: [ubuntu-latest]
4040
name:
41-
- Python 3.7 Tests
42-
- Python 3.8 Tests
4341
- Python 3.9 Tests
4442
- Python 3.10 Tests
43+
- Python 3.11 Tests
44+
- Python 3.12 Tests
4545
- Python 3.10 Tests Coverage
4646
- Code Checks
4747
- CLI CloudFormation Templates Checks
4848
- API CloudFormation Templates Checks
4949
- Integration Tests Config Checks
5050
include:
51-
- name: Python 3.7 Tests
52-
python: 3.7
53-
toxdir: cli
54-
toxenv: py37-nocov
55-
- name: Python 3.8 Tests
56-
python: 3.8
57-
toxdir: cli
58-
toxenv: py38-nocov
5951
- name: Python 3.9 Tests
6052
python: 3.9
6153
toxdir: cli
@@ -64,6 +56,14 @@ jobs:
6456
python: '3.10'
6557
toxdir: cli
6658
toxenv: py310-nocov
59+
- name: Python 3.11 Tests
60+
python: '3.11'
61+
toxdir: cli
62+
toxenv: py311-nocov
63+
- name: Python 3.12 Tests
64+
python: '3.12'
65+
toxdir: cli
66+
toxenv: py312-nocov
6767
- name: Python 3.10 Tests Coverage
6868
python: '3.10'
6969
toxdir: cli
@@ -109,21 +109,13 @@ jobs:
109109
matrix:
110110
os: [ubuntu-latest]
111111
name:
112-
- Python 3.7 AWS Batch CLI Tests
113-
- Python 3.8 AWS Batch CLI Tests
114112
- Python 3.9 AWS Batch CLI Tests
115113
- Python 3.10 AWS Batch CLI Tests
114+
- Python 3.11 AWS Batch CLI Tests
115+
- Python 3.12 AWS Batch CLI Tests
116116
- Python 3.10 AWS Batch CLI Tests Coverage
117117
- Code Checks AWS Batch CLI
118118
include:
119-
- name: Python 3.7 AWS Batch CLI Tests
120-
python: 3.7
121-
toxdir: awsbatch-cli
122-
toxenv: py37-nocov
123-
- name: Python 3.8 AWS Batch CLI Tests
124-
python: 3.8
125-
toxdir: awsbatch-cli
126-
toxenv: py38-nocov
127119
- name: Python 3.9 AWS Batch CLI Tests
128120
python: 3.9
129121
toxdir: awsbatch-cli
@@ -132,6 +124,14 @@ jobs:
132124
python: '3.10'
133125
toxdir: awsbatch-cli
134126
toxenv: py310-nocov
127+
- name: Python 3.11 AWS Batch CLI Tests
128+
python: '3.11'
129+
toxdir: awsbatch-cli
130+
toxenv: py311-nocov
131+
- name: Python 3.12 AWS Batch CLI Tests
132+
python: '3.12'
133+
toxdir: awsbatch-cli
134+
toxenv: py312-nocov
135135
- name: Python 3.10 AWS Batch CLI Tests Coverage
136136
python: '3.10'
137137
toxdir: awsbatch-cli
@@ -171,13 +171,25 @@ jobs:
171171
- name: Verify Generation of API client
172172
run: |
173173
git diff --exit-code --quiet -- api/client/src/ ':!api/client/src/.openapi-generator/FILES'
174-
api-docker-test:
175-
name: API Docker Tests
174+
validate-external-slurmdbd-template:
175+
name: External SlurmDBD Template Validation
176176
runs-on: ubuntu-latest
177177
steps:
178178
- uses: actions/checkout@v2
179-
- uses: mikefarah/yq@v4.32.2
180-
- run: api/docker/awslambda/docker-build.sh
179+
- name: Setup Python
180+
uses: actions/setup-python@v2
181+
with:
182+
python-version: '3.12'
183+
- name: Install AWS CDK
184+
run: |
185+
pip install typeguard~=2.13
186+
npm install -g aws-cdk
187+
pip install -r cloudformation/external-slurmdbd/requirements.txt
188+
- working-directory: cloudformation/external-slurmdbd
189+
run: cdk synth --no-version-reporting
190+
- name: Verify External SlurmDBD Template
191+
run:
192+
git diff --exit-code --quiet cloudformation/external-slurmdbd/external-slurmdbd.json cloudformation/external-slurmdbd/cdk.out/ExternalSlurmdbdStack.template.json
181193
shellcheck:
182194
name: Shellcheck
183195
runs-on: ubuntu-latest
@@ -186,5 +198,6 @@ jobs:
186198
- name: Run ShellCheck
187199
uses: ludeeus/action-shellcheck@master
188200
with:
189-
severity: error
201+
severity: warning
202+
ignore_paths: tests
190203
ignore_names: user_data.sh

‎.github/workflows/closed-issue-message.yml

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

‎.github/workflows/unsafe_patterns_checker.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Unsafe Patterns Checker
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
5+
6+
jobs:
7+
# Prevent bad URL suffix
8+
bad-url-suffix-check:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Check PR for Disallowed URL Suffixes
12+
uses: francesco-giordano/gh-pr-content-checker@v1.0.0
13+
with:
14+
diffDoesNotContainRegex: "amazonaws\\.com|amazonaws\\.com\\.cn|c2s\\.ic\\.gov|sc2s\\.sgov\\.gov"
15+
skipLabels: skip-bad-url-suffix-check

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
__pycache__
2+
.pytest_cache
13
*.pyc
24
*.pyo
35
*.class
@@ -11,6 +13,7 @@ build/
1113
.tox/
1214
*.iml
1315
.coverage
16+
.coverage.*
1417
coverage.xml
1518
assets/
1619
report.html

0 commit comments

Comments
 (0)