ci: fix cloudflare purge (#60)

* ci: fix cloudflare purge

* fix: add secrets to workflow

* refactor: rename zone id variable

Author: FoxtrotSierra6829

.github/workflows/pr.yml

@@ -18,6 +18,8 @@ jobs:
       - name: Upload to CloudFlare CDN
         env:
           CLOUDFLARE_BUCKET_PASSWORD: ${{ secrets.CLOUDFLARE_BUCKET_PASSWORD }}
+          CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
+          CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
           CDN_BUCKET_DESTINATION: installer/config
         run: ./scripts/cdn-cf.sh ./dist $CDN_BUCKET_DESTINATION
       - name: Upload to Bunny CDN

.github/workflows/production.yml

@@ -21,6 +21,8 @@ jobs:
       - name: Upload to CloudFlare CDN
         env:
           CLOUDFLARE_BUCKET_PASSWORD: ${{ secrets.CLOUDFLARE_BUCKET_PASSWORD }}
+          CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
+          CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
           CDN_BUCKET_DESTINATION: installer/config
         run: ./scripts/cdn-cf.sh ./dist $CDN_BUCKET_DESTINATION
       - name: Upload to Bunny CDN

.github/workflows/staging.yml

@@ -21,6 +21,8 @@ jobs:
       - name: Upload to CloudFlare CDN
         env:
           CLOUDFLARE_BUCKET_PASSWORD: ${{ secrets.CLOUDFLARE_BUCKET_PASSWORD }}
+          CLOUDFLARE_PURGE_TOKEN: ${{ secrets.CLOUDFLARE_PURGE_TOKEN }}
+          CLOUDFLARE_CDN_ZONE_ID: ${{ secrets.CLOUDFLARE_CDN_ZONE_ID }}
           CDN_BUCKET_DESTINATION: installer/config
         run: ./scripts/cdn-cf.sh ./dist $CDN_BUCKET_DESTINATION
       - name: Upload to Bunny CDN

scripts/cdn-cf.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 CDN_URL="flybywirecdn.com"
-CDN_PURGE_LINK="https://flybywirecdn.com/purgeCache?url=http://flybywirecdn.com"
 FILES=${1}
 CDN_DIR=${2:-"installer/config/test"}
 
@@ -17,9 +16,46 @@ done
 
 # Purge after all uploads that the files are somewhat in sync
 echo "Purging cache"
+
+# Check if required environment variables are set
+if [ -z "$CLOUDFLARE_CDN_ZONE_ID" ]; then
+    echo "Error: CLOUDFLARE_CDN_ZONE_ID environment variable is not set"
+    exit 1
+fi
+
+if [ -z "$CLOUDFLARE_PURGE_TOKEN" ]; then
+    echo "Error: CLOUDFLARE_PURGE_TOKEN environment variable is not set"
+    exit 1
+fi
+
+# Build array of URLs to purge
+PURGE_URLS=()
 for FILE in "${FILES}"/*; do
-    DEST="$CDN_PURGE_LINK/$CDN_DIR/$(basename -- "$FILE")"
-    echo "Purging cache for file: $FILE"
-    echo "Purge URL: $DEST"
-   curl -X POST -H "X-FBW-Access-Key: $CLOUDFLARE_BUCKET_PASSWORD" -H "Content-Length: 0" "$DEST"
+    FILE_URL="https://$CDN_URL/$CDN_DIR/$(basename -- "$FILE")"
+    PURGE_URLS+=("$FILE_URL")
+    echo "Will purge: $FILE_URL"
 done
+
+# Create JSON payload for Cloudflare API
+PURGE_JSON=$(printf '{"files":["%s"]}' "$(IFS='","'; echo "${PURGE_URLS[*]}")")
+
+echo "Purging cache via Cloudflare API"
+echo "JSON payload: $PURGE_JSON"
+
+# Call Cloudflare API to purge cache
+PURGE_RESPONSE=$(curl -s -X POST \
+    -H "Authorization: Bearer $CLOUDFLARE_PURGE_TOKEN" \
+    -H "Content-Type: application/json" \
+    -d "$PURGE_JSON" \
+    "https://api.cloudflare.com/client/v4/zones/$CLOUDFLARE_CDN_ZONE_ID/purge_cache")
+
+echo "Purge response: $PURGE_RESPONSE"
+
+# Check if purge was successful
+if echo "$PURGE_RESPONSE" | grep -q '"success":true'; then
+    echo "Cache purge successful"
+else
+    echo "Cache purge failed"
+    echo "Response: $PURGE_RESPONSE"
+    exit 1
+fi