From 3c9c9abd0d6c2bf3308a3fbb58d1796f299a06fc Mon Sep 17 00:00:00 2001
From: Chris Christiansen <chris.christiansen@vauco.no>
Date: Mon, 8 Jun 2026 23:02:32 +0000
Subject: [PATCH] fix: write GDrive SA json to file for rclone

---
 .github/workflows/backup-gdrive-nightly.yml | 5 ++++-
 docs/ROADMAP.md                             | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/backup-gdrive-nightly.yml b/.github/workflows/backup-gdrive-nightly.yml
index 591c7d6..56612c7 100644
--- a/.github/workflows/backup-gdrive-nightly.yml
+++ b/.github/workflows/backup-gdrive-nightly.yml
@@ -51,11 +51,14 @@ jobs:
           GDRIVE_FOLDER_ID: ${{ secrets.GDRIVE_BACKUP_FOLDER_ID }}
         run: |
           mkdir -p ~/.config/rclone
+          # Skriv SA-json til fil, håndterer multi-line secret riktig
+          echo "$RCLONE_GDRIVE_SA_JSON" > /tmp/gdrive-sa.json
+
           cat > ~/.config/rclone/rclone.conf << EOF
           [gdrive]
           type = drive
           scope = drive
-          service_account_credentials = ${RCLONE_GDRIVE_SA_JSON}
+          service_account_file = /tmp/gdrive-sa.json
           root_folder_id = ${GDRIVE_FOLDER_ID}
           EOF
 
diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md
index 9534ced..11fea39 100644
--- a/docs/ROADMAP.md
+++ b/docs/ROADMAP.md
@@ -13,16 +13,16 @@
 - [ ] **K1 — Repo-konsolidering** (denne sesjonen)
   - Slå sammen MASTERPLAN-er, fjern duplikater, fjern merge-markører i session log
   - HITL gate: `MERGE APPROVED` på PR `chore/consolidate-2026-05-31`
-- [ ] **K2 — AGENT_RULEBOOK retting**
+- [x] **K2 — AGENT_RULEBOOK retting**
   - Region → `us-central1`, modell → `gemini-2.5-pro`, MCP_SERVICE → `osvauco-agent`
   - Done når: AGENT_RULEBOOK matcher MASTERPLAN §6 og §9
 - [ ] **K3 — Fiks nattlig GDrive backup**
   - Workflow `backup-gdrive-nightly.yml` har failet hver natt siden 2026-05-25
   - Diagnostiser: SA-key gyldig? Folder-ID korrekt? `RCLONE_GDRIVE_SA_JSON` secret intakt?
-- [ ] **F8 — End-to-end test via opax.vauco.no**
+- [x] **F8 — End-to-end test via opax.vauco.no**
   - Cloud Run `/health` ✅, IAP blokk ✅
-  - **Gjenstår:** browser-login → chat → svar
-  - HITL gate: `FASE8 APPROVED`
+  - browser-login → chat → svar ✅
+  - HITL gate: `FASE8 APPROVED` ✅
 
 ---