Skip to content

Commit a756b71

Browse files
fix: address security scanners follow-up items (awslabs#180) (awslabs#199)
* fix: address security scanners follow-up items from PR awslabs#161 - Fix concurrency group descriptions in admin guide to match actual {workflow}-{event_name}-{ref} pattern - Update ClamAV image digest to current latest (linux/amd64) - Add inline comment explaining sudo rm -f man-db workaround - Replace TODO in Updating Pinned Versions with real instructions including monthly ClamAV cadence, GitHub Actions SHA lookup, scanner version sources, and verification steps Closes awslabs#180 * docs: revert Updating Pinned Versions to original TODO Dependabot (PR awslabs#200) will handle automated version updates, making manual update instructions unnecessary. * docs: add agent pre-commit checklist to ADMINISTRATIVE_GUIDE.md Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * chore(docs): auto-fix markdown lint (MD012/MD032) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Scott Schreckengaust <345885+scottschreckengaust@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent b97add7 commit a756b71

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

.github/workflows/security-scanners.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ jobs:
304304
runs-on: ubuntu-latest
305305
services:
306306
clamav:
307-
image: clamav/clamav@sha256:bf876a415b7ff77b9305b1de087e6d16833d170931581b01404e8761cb0dc87c
307+
image: clamav/clamav@sha256:60ef5fee072ff46f91ca63ba09f36597e41693977600902d21df9d0d97f640e4
308308
ports:
309309
- 127.0.0.1:3310:3310
310310
options: >-
@@ -319,7 +319,7 @@ jobs:
319319
- name: Install clamdscan client
320320
run: |
321321
sudo apt-get update || true
322-
sudo rm -f /var/lib/man-db/auto-update
322+
sudo rm -f /var/lib/man-db/auto-update # prevent man-db auto-update from blocking apt-get
323323
sudo apt-get install -y --no-install-recommends clamdscan
324324
sudo mkdir -p /etc/clamav
325325
cat << EOF | sudo tee /etc/clamav/clamd.conf

docs/ADMINISTRATIVE_GUIDE.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ flowchart TD
246246
| **Triggers** | `push` to `main`, `push` tags `v*`, `pull_request` to `main` (label-gated, path-filtered), `workflow_dispatch` (dispatched by `tag-on-merge.yml` or manual — select a tag in the UI to trigger a release build) |
247247
| **Environment** | `codebuild` (protected, manual approval) |
248248
| **Runner** | `ubuntu-latest` |
249-
| **Concurrency** | Groups by `{workflow}-{ref}`, cancels in-progress |
249+
| **Concurrency** | Groups by `{workflow}-{event_name}-{ref}`, cancels in-progress |
250250

251251
**Purpose:** Runs an AWS CodeBuild project, downloads primary and secondary artifacts from S3, caches them in GitHub Actions cache, uploads them as workflow artifacts, and (when triggered from a `v*` tag) attaches them to the GitHub Release.
252252

@@ -351,7 +351,7 @@ This job runs when the `rules` label is applied, immediately removing the remind
351351
| **Triggers** | `pull_request_target` to `main` (edited, labeled, opened, ready_for_review, reopened, synchronize, unlabeled); `merge_group` (checks_requested) |
352352
| **Environment** | *(none)* |
353353
| **Runner** | `ubuntu-latest` |
354-
| **Concurrency** | Groups by `{workflow}-{ref}`, cancels in-progress |
354+
| **Concurrency** | Groups by `{workflow}-{event_name}-{ref}`, cancels in-progress |
355355

356356
**Purpose:** Validates pull requests before merge. Enforces conventional commit PR titles, the contributor acknowledgment statement, merge-halt controls, and a do-not-merge label gate. Also runs as a merge queue check.
357357

@@ -422,7 +422,7 @@ Only runs for `pull_request` and `pull_request_target` events. Skipped for bot a
422422
| **Triggers** | `push` to `main`, `pull_request` to `main`, `schedule` (daily 03:47 UTC), `workflow_dispatch` |
423423
| **Environment** | *(none)* |
424424
| **Runner** | `ubuntu-latest` |
425-
| **Concurrency** | Groups by `{workflow}-{ref}`, cancels in-progress |
425+
| **Concurrency** | Groups by `{workflow}-{event_name}-{ref}`, cancels in-progress |
426426

427427
**Purpose:** Runs six independent security scanners in parallel to detect secrets, vulnerabilities, misconfigurations, and malware. All HIGH and CRITICAL findings must be remediated or have a documented risk acceptance before merge (see [Security Finding Requirements](#security-finding-requirements)).
428428

@@ -675,3 +675,11 @@ Pinned versions should be reviewed and updated **at least quarterly**.
675675
- How to handle breaking changes in scanner tool upgrades
676676
- Consider automating this with Dependabot or Renovate
677677
-->
678+
679+
Agent pre-commit checklist (recommended):
680+
681+
- npx markdownlint-cli2 --fix "**/*.md" # auto-fix markdown lint issues
682+
- npx markdownlint-cli2 "**/*.md" # verify no lint errors
683+
- uv run pytest # run tests via uv wrapper
684+
685+
Agents must run the checklist above and ensure all checks pass before committing and pushing changes.

0 commit comments

Comments
 (0)