Skip to content

Harden beats-cve-report against ECR scan/finding consistency lag #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Harden beats-cve-report against ECR scan/finding consistency lag #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
effed3e
Initial plan
Copilot Jun 29, 2026
93fd8b2
fix: retry beats CVE findings fetch when scan metadata lags
Copilot Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,35 @@ jobs:
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
run: |
aws ecr describe-image-scan-findings \
--repository-name $ECR_REPOSITORY \
--image-id imageTag=latest \
--output json > beats-cve-raw.json
echo "Total findings: $(jq '.imageScanFindings.enhancedFindings | length' beats-cve-raw.json)"
echo "Retrieving ECR enhanced findings for $ECR_REPOSITORY:latest..."
TIMEOUT=300
ELAPSED=0
while true; do
if aws ecr describe-image-scan-findings \
--repository-name $ECR_REPOSITORY \
--image-id imageTag=latest \
--output json > beats-cve-raw.json 2>scan.err; then
echo "Total findings: $(jq '.imageScanFindings.enhancedFindings | length' beats-cve-raw.json)"
rm -f scan.err
break
fi

if ! grep -q "ScanNotFoundException" scan.err; then
echo "ERROR: Failed to retrieve ECR scan findings" >&2
cat scan.err >&2
exit 1
fi

if [ "$ELAPSED" -ge "$TIMEOUT" ]; then
echo "ERROR: ECR scan findings were not ready within ${TIMEOUT}s" >&2
cat scan.err >&2
exit 1
fi

echo " Scan findings not ready yet (${ELAPSED}s elapsed)"
sleep 15
ELAPSED=$((ELAPSED + 15))
done

- name: Filter findings to beats and generate CSV
run: |
Expand Down