chris/OSVauco
1
0
Fork 0
Code Issues 1 Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(cloudbuild): fix webhook notify step line break + correct smoke-test URL

Browse Source
This commit is contained in:
chrischristiansen-glitch 2026-06-10 22:27:50 +02:00
parent 1f126544f4
commit 2b1bd24e73
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cloudbuild.yaml
View File

@ -67,23 +67,16 @@ steps:
- '-c' - '-c'
- | - |
echo "=== Smoke Test ===" echo "=== Smoke Test ==="
BASE_URL="https://osvauco-agent-357036551735.us-central1.run.app" BASE_URL="https://osvauco-agent-zjbqp3prqq-uc.a.run.app"
echo "BASE_URL: $$BASE_URL" echo "BASE_URL: $$BASE_URL"
TOKEN=$$(curl -s -H "Metadata-Flavor: Google" "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/identity?audience=$$BASE_URL&format=full") TOKEN=$$(curl -s -H "Metadata-Flavor: Google" "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/identity?audience=$$BASE_URL&format=full")
echo "TOKEN_EMPTY: $([ -z "$$TOKEN" ] && echo YES || echo NO)" echo "TOKEN_EMPTY: $([ -z "$$TOKEN" ] && echo YES || echo NO)"
echo "TOKEN_PREFIX: $${TOKEN:0:30}"
echo "=== Raw curl output ===" curl -s -H "Authorization: Bearer $$TOKEN" "$$BASE_URL/health" && echo "OK" || echo "WARN: health check feilet"
curl -v -H "Authorization: Bearer $$TOKEN" \ echo "=== Smoke Test ferdig ==="
"$$BASE_URL/health" 2>&1
echo "=== Without auth ===" # Steg 6: Deploy-notifikasjon til Google Chat
curl -v "$$BASE_URL/health" 2>&1
echo "=== Debug done ==="
# Steg 6: Deploy-notifikasjon til webhook/chat-app
- name: 'gcr.io/google.com/cloudsdktool/cloud-sdk' - name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
id: notify id: notify
waitFor: ['smoke-test'] waitFor: ['smoke-test']
@ -91,15 +84,15 @@ steps:
args: args:
- '-c' - '-c'
- | - |
WH_URL=$$(gcloud secrets versions access latest WH_URL=$$(gcloud secrets versions access latest \
--secret=webhook-url --secret=webhook-url \
--project=${PROJECT_ID} 2>/dev/null || echo "") --project=${PROJECT_ID} 2>/dev/null || echo "")
if [[ -n "$$WH_URL" ]]; then if [[ -n "$$WH_URL" ]]; then
NOTIFY_MSG="✅ OSVauco Deploy fullført. Commit: $COMMIT_SHA, Service: ${_CLOUD_RUN_SERVICE}, Region: ${_REGION}" MSG="✅ OSVauco deploy fullført\nCommit: $COMMIT_SHA\nService: ${_CLOUD_RUN_SERVICE} (${_REGION})\nhttps://opax.vauco.no"
curl -s -X POST "$$WH_URL" \ curl -s -X POST "$$WH_URL" \
-H 'Content-Type: application/json' \ -H 'Content-Type: application/json' \
-d "{\"text\": \"$$NOTIFY_MSG\"}" || true -d "{\"text\": \"$$MSG\"}" || true
echo "✓ Deploy-notifikasjon sendt" echo "✓ Google Chat-varsling sendt"
else else
echo "⚠️ Ingen webhook-url i Secret Manager — hopper over varsling" echo "⚠️ Ingen webhook-url i Secret Manager — hopper over varsling"
fi fi
@ -108,7 +101,7 @@ substitutions:
_REGION: us-central1 _REGION: us-central1
_ARTIFACT_REPO: osvauco-repo _ARTIFACT_REPO: osvauco-repo
_CLOUD_RUN_SERVICE: osvauco-agent _CLOUD_RUN_SERVICE: osvauco-agent
_CLOUD_RUN_URL: osvauco-agent-357036551735.us-central1.run.app _CLOUD_RUN_URL: osvauco-agent-zjbqp3prqq-uc.a.run.app
_AGENT_SA: osvauco-agent-sa@propane-will-491900-m5.iam.gserviceaccount.com _AGENT_SA: osvauco-agent-sa@propane-will-491900-m5.iam.gserviceaccount.com
_GEMINI_LOCATION: global _GEMINI_LOCATION: global