nhcarrigan/amari
9
0
Fork 0
generated from nhcarrigan/template
Code Issues 2 Pull Requests 6 Actions Releases 1 Activity

fix: log the curl results, pipx for semgrep #1

Merged
naomi merged 2 commits from ci/security into main 2025-12-17 17:28:22 -08:00
Conversation 0 Commits 2 Files Changed 1
+20 -1
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 87455f8092 - Show all commits
.gitea/workflows/security.yml
+20 -1
View File
@@ -73,6 +73,9 @@ jobs:
DD_TOKEN: ${{ secrets.DD_TOKEN }} DD_TOKEN: ${{ secrets.DD_TOKEN }}
run: | run: |
echo "Uploading Trivy results..." echo "Uploading Trivy results..."
# Generate today's date in YYYY-MM-DD format
TODAY=$(date +%Y-%m-%d)
HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \ HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \
-H "Authorization: Token $DD_TOKEN" \ -H "Authorization: Token $DD_TOKEN" \
-F "active=true" \ -F "active=true" \
@@ -80,11 +83,15 @@ jobs:
-F "scan_type=Trivy Scan" \ -F "scan_type=Trivy Scan" \
-F "engagement_name=CI/CD Pipeline" \ -F "engagement_name=CI/CD Pipeline" \
-F "product_name=${{ github.repository }}" \ -F "product_name=${{ github.repository }}" \
-F "scan_date=$TODAY" \
-F "auto_create_context=true" \
-F "file=@trivy-results.json") -F "file=@trivy-results.json")
if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then
echo "::error::Upload Failed with HTTP $HTTP_CODE" echo "::error::Upload Failed with HTTP $HTTP_CODE"
echo "--- SERVER RESPONSE ---"
cat response.txt cat response.txt
echo "-----------------------"
exit 1 exit 1
else else
echo "Upload Success!" echo "Upload Success!"
@@ -105,7 +112,9 @@ jobs:
DD_URL: ${{ secrets.DD_URL }} DD_URL: ${{ secrets.DD_URL }}
DD_TOKEN: ${{ secrets.DD_TOKEN }} DD_TOKEN: ${{ secrets.DD_TOKEN }}
run: | run: |
echo "Uploading Gitleaks results..." echo "Uploading Gitleaks results..."
TODAY=$(date +%Y-%m-%d)
HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \ HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \
-H "Authorization: Token $DD_TOKEN" \ -H "Authorization: Token $DD_TOKEN" \
-F "active=true" \ -F "active=true" \
@@ -113,11 +122,15 @@ jobs:
-F "scan_type=Gitleaks Scan" \ -F "scan_type=Gitleaks Scan" \
-F "engagement_name=CI/CD Pipeline" \ -F "engagement_name=CI/CD Pipeline" \
-F "product_name=${{ github.repository }}" \ -F "product_name=${{ github.repository }}" \
-F "scan_date=$TODAY" \
-F "auto_create_context=true" \
-F "file=@gitleaks-results.json") -F "file=@gitleaks-results.json")
if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then
echo "::error::Upload Failed with HTTP $HTTP_CODE" echo "::error::Upload Failed with HTTP $HTTP_CODE"
echo "--- SERVER RESPONSE ---"
cat response.txt cat response.txt
echo "-----------------------"
exit 1 exit 1
else else
echo "Upload Success!" echo "Upload Success!"
@@ -140,6 +153,8 @@ jobs:
DD_TOKEN: ${{ secrets.DD_TOKEN }} DD_TOKEN: ${{ secrets.DD_TOKEN }}
run: | run: |
echo "Uploading Semgrep results..." echo "Uploading Semgrep results..."
TODAY=$(date +%Y-%m-%d)
HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \ HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \
-H "Authorization: Token $DD_TOKEN" \ -H "Authorization: Token $DD_TOKEN" \
-F "active=true" \ -F "active=true" \
@@ -147,11 +162,15 @@ jobs:
-F "scan_type=Semgrep JSON Report" \ -F "scan_type=Semgrep JSON Report" \
-F "engagement_name=CI/CD Pipeline" \ -F "engagement_name=CI/CD Pipeline" \
-F "product_name=${{ github.repository }}" \ -F "product_name=${{ github.repository }}" \
-F "scan_date=$TODAY" \
-F "auto_create_context=true" \
-F "file=@semgrep-results.json") -F "file=@semgrep-results.json")
if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then
echo "::error::Upload Failed with HTTP $HTTP_CODE" echo "::error::Upload Failed with HTTP $HTTP_CODE"
echo "--- SERVER RESPONSE ---"
cat response.txt cat response.txt
echo "-----------------------"
exit 1 exit 1
else else
echo "Upload Success!" echo "Upload Success!"