v2: cleanup deployment to Cloudflare (#2937)

Author: SamyPesse

.github/composite/deploy-cloudflare/action.yaml

@@ -10,12 +10,18 @@ inputs:
   environment:
     description: 'Environment to deploy to'
     required: true
+  deploy:
+    description: 'Deploy as main version for all traffic instead of uploading versions'
+    required: true
   NEXT_SERVER_ACTIONS_ENCRYPTION_KEY:
     description: 'Next server actions encryption key'
     required: true
   GITBOOK_URL:
     description: 'GitBook URL'
     required: true
+  GITBOOK_SECRET:
+    description: 'GitBook secret'
+    required: true
   GITBOOK_APP_URL:
     description: 'GitBook app URL'
     required: false
@@ -60,6 +66,7 @@ runs:
           env:
             NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: ${{ inputs.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY }}
             GITBOOK_URL: ${{ inputs.GITBOOK_URL }}
+            GITBOOK_SECRET: ${{ inputs.GITBOOK_SECRET }}
             GITBOOK_APP_URL: ${{ inputs.GITBOOK_APP_URL }}
             GITBOOK_API_URL: ${{ inputs.GITBOOK_API_URL }}
             GITBOOK_INTEGRATIONS_HOST: ${{ inputs.GITBOOK_INTEGRATIONS_HOST }}
@@ -77,7 +84,7 @@ runs:
               workingDirectory: ./
               wranglerVersion: '3.112.0'
               environment: ${{ inputs.environment }}
-              command: ${{ inputs.environment == 'production' && 'deploy' || 'versions upload' }} --config ./packages/gitbook-v2/wrangler.toml
+              command: ${{ inputs.deploy && 'deploy' || 'versions upload' }} --config ./packages/gitbook-v2/wrangler.toml
         - name: Outputs
           shell: bash
           env:

.github/workflows/deploy-preview.yaml

@@ -103,6 +103,7 @@ jobs:
               uses: ./.github/composite/deploy-cloudflare
               with:
                   environment: ${{ github.ref == 'refs/heads/main' && 'production' || 'preview' }}
+                  deploy: ${{ github.ref == 'refs/heads/main' }}
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: ${{ secrets.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY }}
@@ -111,13 +112,14 @@ jobs:
                   GITBOOK_IMAGE_RESIZE_URL: ${{ vars.GITBOOK_IMAGE_RESIZE_URL }}
                   GITBOOK_ICONS_URL: ${{ vars.GITBOOK_ICONS_URL }}
                   GITBOOK_ICONS_TOKEN: ${{ vars.GITBOOK_ICONS_TOKEN }}
+                  GITBOOK_SECRET: ${{ github.ref == 'refs/heads/main' && secrets.PRODUCTION_GITBOOK_SECRET|| '' }}
             - name: Outputs
               run: |
                   echo "URL: ${{ steps.deploy.outputs.deployment-url }}"
     comment-deployments:
         runs-on: ubuntu-latest
         name: Comment Deployments (preview)
-        if: always()
+        if: always() && !startsWith(github.ref, 'refs/heads/main')
         needs:
             - deploy-v1-cloudflare
             - deploy-v2-vercel

.github/workflows/deploy-staging.yaml

@@ -35,10 +35,12 @@ jobs:
               uses: ./.github/composite/deploy-cloudflare
               with:
                   environment: staging
+                  deploy: true
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   NEXT_SERVER_ACTIONS_ENCRYPTION_KEY: ${{ secrets.NEXT_SERVER_ACTIONS_ENCRYPTION_KEY }}
                   GITBOOK_URL: ${{ vars.STAGING_2C_GITBOOK_URL }}
+                  GITBOOK_SECRET: ${{ secrets.STAGING_GITBOOK_SECRET }}
                   GITBOOK_APP_URL: https://app.gitbook-staging.com
                   GITBOOK_API_URL: https://api.gitbook-staging.com
                   GITBOOK_INTEGRATIONS_HOST: https://integrations.gitbook-staging.com

packages/gitbook-v2/next.config.mjs

@@ -11,6 +11,12 @@ const nextConfig = {
     env: {
         BUILD_VERSION: (process.env.GITHUB_SHA ?? '').slice(0, 7),
         GITBOOK_URL: process.env.GITBOOK_URL,
+        GITBOOK_SECRET: process.env.GITBOOK_SECRET,
+        GITBOOK_API_URL: process.env.GITBOOK_API_URL,
+        GITBOOK_APP_URL: process.env.GITBOOK_APP_URL,
+        GITBOOK_INTEGRATIONS_HOST: process.env.GITBOOK_INTEGRATIONS_HOST,
+        GITBOOK_IMAGE_RESIZE_SIGNING_KEY: process.env.GITBOOK_IMAGE_RESIZE_SIGNING_KEY,
+        GITBOOK_IMAGE_RESIZE_URL: process.env.GITBOOK_IMAGE_RESIZE_URL,
         GITBOOK_ASSETS_PREFIX: process.env.GITBOOK_ASSETS_PREFIX,
         GITBOOK_ICONS_URL: process.env.GITBOOK_ICONS_URL,
         GITBOOK_ICONS_TOKEN: process.env.GITBOOK_ICONS_TOKEN,

packages/gitbook-v2/wrangler.toml

@@ -14,6 +14,10 @@ d1_databases = [
 ]
 
 [env.staging]
+routes = [
+  { pattern = "open-2c.gitbook-staging.com/*", zone_name = "gitbook-staging.com" },
+  { pattern = "static-2c.gitbook-staging.com/*", zone_name = "gitbook-staging.com" }
+]
 kv_namespaces = [
   { binding = "NEXT_CACHE_WORKERS_KV", id = "a446e25f12b741afb185f1e5b4474f0a" } # gitbook-open-v2-cache-staging
 ]
@@ -22,6 +26,10 @@ d1_databases = [
 ]
 
 [env.production]
+routes = [
+  { pattern = "open-2c.gitbook.com/*", zone_name = "gitbook.com" },
+  { pattern = "static-2c.gitbook.com/*", zone_name = "gitbook.com" }
+]
 kv_namespaces = [
   { binding = "NEXT_CACHE_WORKERS_KV", id = "72379746280d4e79acf24440eea950dc" } # gitbook-open-v2-cache-production
 ]