Skip to content

Commit 4dc144b

Browse files
bluesentinelsecMichael Long
andauthored
updated workflows and license text (#41)
Co-authored-by: Michael Long <mlongii@amazon.com>
1 parent fb4e69d commit 4dc144b

File tree

8 files changed

+26
-21
lines changed

8 files changed

+26
-21
lines changed

.github/workflows/build_scan_container.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ jobs:
4747
# TODO: use an IAM role
4848

4949
- name: Scan built image with Inspector
50-
uses: aws/amazon-inspector-github-actions-plugin@main
51-
# TODO: bump action to v1 on release
50+
uses: aws-actions/vulnerability-scan-github-action-for-amazon-inspector@main
5251
id: inspector
5352
with:
5453
artifact_type: 'container'
5554
artifact_path: 'ubuntu:14.04'
55+
display_vulnerability_findings: "enabled"
5656
output_sbom_path: 'sbom.json'
5757
output_inspector_scan_path: 'inspector_scan.json'
5858
output_inspector_scan_path_csv: 'inspector_scan.csv'
@@ -64,7 +64,7 @@ jobs:
6464

6565
- name: Demonstrate SBOM Output (JSON)
6666
run: cat ${{ steps.inspector.outputs.artifact_sbom }}
67-
67+
6868
- name: Demonstrate Inspector Scan Output (JSON)
6969
run: cat ${{ steps.inspector.outputs.inspector_scan_results }}
7070

.github/workflows/test_archive.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,20 @@ jobs:
3232

3333
- name: Test archive scan
3434
id: inspector
35-
uses: aws/amazon-inspector-github-actions-plugin@main
36-
# TODO: update this to point to public v1.0.0 release
35+
uses: aws-actions/vulnerability-scan-github-action-for-amazon-inspector@main
3736
with:
3837
artifact_type: 'archive'
39-
artifact_path: 'entrypoint/tests/test_data/artifacts/archives/testData.zip'
38+
artifact_path: 'entrypoint/tests/test_data/artifacts/archives/testData.zip'
39+
display_vulnerability_findings: "enabled"
40+
4041
- name: Display scan results
4142
run: cat ${{ steps.inspector.outputs.inspector_scan_results }}
4243

4344
- name: Validate scan content
4445
run: python3 validator/validate_inspector_scan.py --file ${{ steps.inspector.outputs.inspector_scan_results }}
4546

4647
# only run if the previous step failed
47-
- name: Notify maintainers of validation failure
48+
- name: Notify maintainers of validation failure
4849
if: ${{ failure() }}
4950
run: echo "this feature is not implemented"
5051
# TODO: add steps to send notification to a Lambda to cut a ticket on job failure

.github/workflows/test_binary.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,20 @@ jobs:
3232

3333
- name: Test binary scan
3434
id: inspector
35-
uses: aws/amazon-inspector-github-actions-plugin@main
36-
# TODO: update this to point to public v1.0.0 release
35+
uses: aws-actions/vulnerability-scan-github-action-for-amazon-inspector@main
3736
with:
3837
artifact_type: 'binary'
39-
artifact_path: 'entrypoint/tests/test_data/artifacts/binaries/inspector-sbomgen'
38+
artifact_path: 'entrypoint/tests/test_data/artifacts/binaries/inspector-sbomgen'
39+
display_vulnerability_findings: "enabled"
40+
4041
- name: Display scan results
4142
run: cat ${{ steps.inspector.outputs.inspector_scan_results }}
4243

4344
- name: Validate scan content
4445
run: python3 validator/validate_inspector_scan.py --file ${{ steps.inspector.outputs.inspector_scan_results }}
4546

4647
# only run if the previous step failed
47-
- name: Notify maintainers of validation failure
48+
- name: Notify maintainers of validation failure
4849
if: ${{ failure() }}
4950
run: echo "this feature is not implemented"
5051
# TODO: add steps to send notification to a Lambda to cut a ticket on job failure

.github/workflows/test_containers.yml

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

3333
- name: Test container scan
3434
id: inspector
35-
uses: aws/amazon-inspector-github-actions-plugin@main
36-
# TODO: update this to point to public v1.0.0 release
35+
uses: aws-actions/vulnerability-scan-github-action-for-amazon-inspector@main
3736
with:
3837
artifact_type: 'container'
3938
artifact_path: 'ubuntu:14.04'
39+
display_vulnerability_findings: "enabled"
4040

4141
- name: Display scan results
4242
run: cat ${{ steps.inspector.outputs.inspector_scan_results }}
@@ -45,7 +45,7 @@ jobs:
4545
run: python3 validator/validate_inspector_scan.py --file ${{ steps.inspector.outputs.inspector_scan_results }}
4646

4747
# only run if the previous step failed
48-
- name: Notify maintainers of validation failure
48+
- name: Notify maintainers of validation failure
4949
if: ${{ failure() }}
5050
run: echo "this feature is not implemented"
5151
# TODO: add steps to send notification to a Lambda to cut a ticket on job failure

.github/workflows/test_installation.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ jobs:
2727
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2828

2929
- name: Test Amazon Inspector GitHub Actions plugin
30-
uses: aws/amazon-inspector-github-actions-plugin@main
30+
uses: aws-actions/vulnerability-scan-github-action-for-amazon-inspector@main
3131
with:
3232
artifact_type: 'container'
3333
artifact_path: 'alpine:latest'
34+
display_vulnerability_findings: "enabled"
3435

3536
# only run if the previous step failed
3637
- name: Notify maintainers of installation failure

.github/workflows/test_repository.yml

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

3232
- name: Test repository scan
3333
id: inspector
34-
uses: aws/amazon-inspector-github-actions-plugin@main
35-
# TODO: update this to point to public v1.0.0 release
34+
uses: aws-actions/vulnerability-scan-github-action-for-amazon-inspector@main
3635
with:
3736
artifact_type: 'repository'
38-
artifact_path: './'
37+
artifact_path: './'
38+
display_vulnerability_findings: "enabled"
3939

4040
- name: Display scan results
4141
run: cat ${{ steps.inspector.outputs.inspector_scan_results }}
@@ -44,7 +44,7 @@ jobs:
4444
run: python3 validator/validate_inspector_scan.py --file ${{ steps.inspector.outputs.inspector_scan_results }}
4545

4646
# only run if the previous step failed
47-
- name: Notify maintainers of validation failure
47+
- name: Notify maintainers of validation failure
4848
if: ${{ failure() }}
4949
run: echo "this feature is not implemented"
5050
# TODO: add steps to send notification to a Lambda to cut a ticket on job failure

.github/workflows/test_vuln_thresholds.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ jobs:
2929
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
3030

3131
- name: Scan artifact with Inspector
32-
uses: ./ # Uses an action in the root directory
32+
uses: aws-actions/vulnerability-scan-github-action-for-amazon-inspector@main
3333
id: inspector
3434
with:
3535
artifact_type: 'archive'
3636
artifact_path: 'entrypoint/tests/test_data/artifacts/archives/testData.zip'
37+
display_vulnerability_findings: "enabled"
3738
output_sbom_path: 'sbom.json'
3839
output_inspector_scan_path: 'inspector_scan.json'
3940
output_inspector_scan_path_csv: 'inspector_scan.csv'

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,5 +375,6 @@ See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more inform
375375

376376
## License
377377

378-
This project is licensed under the Apache-2.0 License.
378+
This project is licensed under the MIT license.
379379

380+
Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved

0 commit comments

Comments
 (0)