fix(infrastructure): add env variables to deployment

2026-03-22 15:12:08 +01:00 · 2025-10-16 14:47:16 +02:00
parent 3b6b64d472
commit c4991ea3c4
7 changed files with 116 additions and 130 deletions
--- a/.github/workflows/deploy-pr.yaml
+++ b/.github/workflows/deploy-pr.yaml
@@ -29,6 +29,14 @@ jobs:
      pr_number: ${{ github.event.pull_request.number }}
    secrets: inherit

+  get_urls:
+    if: github.event.action != 'closed'
+    uses: ./.github/workflows/url_generator.yml
+    with:
+      mode: pr
+      pr_number: ${{ github.event.pull_request.number }}
+    secrets: inherit
+
  deploy:
    if: github.event.action != 'closed'
    name: Helm upgrade/install (PR preview)
@@ -36,7 +44,7 @@ jobs:
    concurrency:
      group: pr-${{ github.event.pull_request.number }}
      cancel-in-progress: false
-    needs: [build, frontend]
+    needs: [build, frontend, get_urls]
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -64,23 +72,23 @@ jobs:
          DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
          IMAGE_REPO: ${{ needs.build.outputs.image_repo }}
          DIGEST: ${{ needs.build.outputs.digest }}
+          DOMAIN: ${{ needs.get_urls.outputs.backend_url }}
+          DOMAIN_SCHEME: ${{ needs.get_urls.outputs.backend_url_scheme }}
+          FRONTEND_DOMAIN: ${{ needs.get_urls.outputs.frontend_url }}
+          FRONTEND_DOMAIN_SCHEME: ${{ needs.get_urls.outputs.frontend_url_scheme }}
        run: |
          PR=${{ github.event.pull_request.number }}
-          if [ -z "$PR" ]; then echo "PR number missing"; exit 1; fi
-          if [ -z "$DEV_BASE_DOMAIN" ]; then echo "Secret DEV_BASE_DOMAIN is required (e.g., dev.example.com)"; exit 1; fi
-          if [ -z "$RABBITMQ_PASSWORD" ]; then echo "Secret DEV_RABBITMQ_PASSWORD is required"; exit 1; fi
-          if [ -z "$DB_PASSWORD" ]; then echo "Secret DEV_DB_PASSWORD is required"; exit 1; fi
          RELEASE=myapp-pr-$PR
          NAMESPACE=pr-$PR
-          DOMAIN=pr-$PR.$DEV_BASE_DOMAIN
-          if [ -z "$IMAGE_REPO" ]; then IMAGE_REPO="lukastrkan/cc-app-demo"; fi
          helm upgrade --install "$RELEASE" ./7project/charts/myapp-chart \
            -n "$NAMESPACE" --create-namespace \
            -f 7project/charts/myapp-chart/values-dev.yaml \
            --set prNumber="$PR" \
            --set deployment="pr-$PR" \
            --set domain="$DOMAIN" \
-            --set image.repository="$IMAGE_REPO" \
+            --set domain_scheme="$DOMAIN_SCHEME" \
+            --set frontend_domain="$FRONTEND_DOMAIN" \
+            --set frontend_domain_scheme="$FRONTEND_DOMAIN_SCHEME" \
            --set image.digest="$DIGEST" \
            --set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
            --set-string database.password="$DB_PASSWORD"
@@ -88,17 +96,14 @@ jobs:
      - name: Post preview URLs as PR comment
        uses: actions/github-script@v7
        env:
-          DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }}
-          FRONTEND_URL: ${{ needs.frontend.outputs.deployed_url }}
+          BACKEND_URL: ${{ needs.get_urls.outputs.backend_url_scheme }}
+          FRONTEND_URL: ${{ needs.get_urls.outputs.frontend_url_scheme }}
        with:
          script: |
            const pr = context.payload.pull_request;
            if (!pr) { core.setFailed('No pull_request context'); return; }
            const prNumber = pr.number;
-            const domainBase = process.env.DEV_BASE_DOMAIN;
-            if (!domainBase) { core.setFailed('DEV_BASE_DOMAIN is required'); return; }
-            const backendDomain = `pr-${prNumber}.${domainBase}`;
-            const backendUrl = `https://${backendDomain}`;
+            const backendUrl = process.env.BACKEND_URL || '(not available)';
            const frontendUrl = process.env.FRONTEND_URL || '(not available)';
            const marker = '<!-- preview-link -->';
            const body = `${marker}\nPreview environment is running\n- Frontend: ${frontendUrl}\n- Backend: ${backendUrl}\n`;
--- a/.github/workflows/deploy-prod.yaml
+++ b/.github/workflows/deploy-prod.yaml
@@ -37,10 +37,17 @@ jobs:
      mode: prod
    secrets: inherit

+  get_urls:
+    name: Get URLs
+    uses: ./.github/workflows/url_generator.yml
+    with:
+      mode: prod
+    secrets: inherit
+
  deploy:
    name: Helm upgrade/install (prod)
    runs-on: vhs
-    needs: [build, frontend]
+    needs: [build, frontend, get_urls]
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -63,25 +70,23 @@ jobs:

      - name: Helm upgrade/install prod
        env:
-          DOMAIN: ${{ secrets.PROD_DOMAIN }}
+          DOMAIN: ${{ needs.get_urls.outputs.backend_url }}
+          DOMAIN_SCHEME: ${{ needs.get_urls.outputs.backend_url_scheme }}
+          FRONTEND_DOMAIN: ${{ needs.get_urls.outputs.frontend_url }}
+          FRONTEND_DOMAIN_SCHEME: ${{ needs.get_urls.outputs.frontend_url_scheme }}
          RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }}
          DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
          IMAGE_REPO: ${{ needs.build.outputs.image_repo }}
          DIGEST: ${{ needs.build.outputs.digest }}
        run: |
-          if [ -z "$DOMAIN" ]; then
-            echo "Secret PROD_DOMAIN is required (e.g., app.example.com)"; exit 1; fi
-          if [ -z "$RABBITMQ_PASSWORD" ]; then
-            echo "Secret PROD_RABBITMQ_PASSWORD is required"; exit 1; fi
-          if [ -z "$DB_PASSWORD" ]; then
-            echo "Secret PROD_DB_PASSWORD is required"; exit 1; fi
-          if [ -z "$IMAGE_REPO" ]; then IMAGE_REPO="lukastrkan/cc-app-demo"; fi
          helm upgrade --install myapp ./7project/charts/myapp-chart \
            -n prod --create-namespace \
            -f 7project/charts/myapp-chart/values-prod.yaml \
            --set deployment="prod" \
            --set domain="$DOMAIN" \
-            --set image.repository="$IMAGE_REPO" \
+            --set domain_scheme="$DOMAIN_SCHEME" \
+            --set frontend_domain="$FRONTEND_DOMAIN" \
+            --set frontend_domain_scheme="$FRONTEND_DOMAIN_SCHEME" \
            --set image.digest="$DIGEST" \
            --set-string rabbitmq.password="$RABBITMQ_PASSWORD" \
-            --set-string database.password="$DB_PASSWORD" 
+            --set-string database.password="$DB_PASSWORD"
--- a/.github/workflows/frontend-pages.yml
+++ b/.github/workflows/frontend-pages.yml
@@ -25,18 +25,18 @@ on:
        description: 'URL of deployed frontend'
        value: ${{ jobs.deploy.outputs.deployed_url }}

-# Required repository secrets:
-#   CLOUDFLARE_API_TOKEN     - API token with Pages:Edit (or Account:Workers Scripts:Edit) permissions
-#   CLOUDFLARE_ACCOUNT_ID    - Your Cloudflare account ID
-# Optional repository variables:
-#   CF_PAGES_PROJECT_NAME      - Default Cloudflare Pages project name
-#   PROD_DOMAIN                - App domain for prod releases (e.g., api.example.com or https://api.example.com)
-#   BACKEND_URL_PR_TEMPLATE    - Template for PR backend URL. Use {PR} placeholder for PR number (e.g., https://api-pr-{PR}.example.com)
-
 jobs:
+  get_urls:
+    uses: ./.github/workflows/url_generator.yml
+    with:
+      mode: ${{ inputs.mode }}
+      pr_number: ${{ inputs.pr_number }}
+    secrets: inherit
+
  build:
    name: Build frontend
    runs-on: ubuntu-latest
+    needs: [get_urls]
    defaults:
      run:
        working-directory: 7project/frontend
@@ -54,50 +54,9 @@ jobs:
      - name: Install dependencies
        run: npm ci

-      - name: Compute backend URL for Vite
-        id: be
-        env:
-          EVENT_NAME: ${{ github.event_name }}
-          PR_NUMBER: ${{ github.event.pull_request.number || inputs.pr_number }}
-          PR_TEMPLATE: ${{ vars.BACKEND_URL_PR_TEMPLATE }}
-          DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }}
-          PROD_DOMAIN_VAR: ${{ vars.PROD_DOMAIN }}
-          PROD_DOMAIN_SECRET: ${{ secrets.PROD_DOMAIN }}
-          BACKEND_URL_OVERRIDE: ${{ vars.BACKEND_URL || secrets.BACKEND_URL }}
-          MODE: ${{ inputs.mode }}
+      - name: Set backend URL from url_generator
        run: |
-          set -euo pipefail
-          URL=""
-          # 1) Explicit override wins (from repo var or secret)
-          if [ -n "${BACKEND_URL_OVERRIDE:-}" ]; then
-            if echo "$BACKEND_URL_OVERRIDE" | grep -Eiq '^https?://'; then
-              URL="$BACKEND_URL_OVERRIDE"
-            else
-              URL="https://${BACKEND_URL_OVERRIDE}"
-            fi
-          else
-            # 2) PR-specific URL when building for PR
-            if [ "${MODE:-}" = "pr" ] || [ "${EVENT_NAME}" = "pull_request" ]; then
-              if [ -n "${PR_TEMPLATE:-}" ] && [ -n "${PR_NUMBER:-}" ] ; then
-                URL="${PR_TEMPLATE//\{PR\}/${PR_NUMBER}}"
-              elif [ -n "${DEV_BASE_DOMAIN:-}" ] && [ -n "${PR_NUMBER:-}" ]; then
-                URL="https://pr-${PR_NUMBER}.${DEV_BASE_DOMAIN}"
-              fi
-            fi
-            # 3) Fallback to PROD_DOMAIN (prefer repo var, then secret)
-            if [ -z "$URL" ]; then
-              PROD_DOMAIN="${PROD_DOMAIN_VAR:-${PROD_DOMAIN_SECRET:-}}"
-              if [ -n "$PROD_DOMAIN" ]; then
-                if echo "$PROD_DOMAIN" | grep -Eiq '^https?://'; then
-                  URL="$PROD_DOMAIN"
-                else
-                  URL="https://${PROD_DOMAIN}"
-                fi
-              fi
-            fi
-          fi
-          echo "Using backend URL: ${URL:-<empty>}"
-          echo "VITE_BACKEND_URL=${URL}" >> $GITHUB_ENV
+          echo "VITE_BACKEND_URL=${{ needs.get_urls.outputs.backend_url_scheme }}" >> $GITHUB_ENV

      - name: Build
        run: npm run build
--- a/.github/workflows/url_generator.yml
+++ b/.github/workflows/url_generator.yml
@@ -0,0 +1,43 @@
+name: url_generator
+on:
+  workflow_call:
+    inputs:
+      mode:
+        description: "Mode: 'prod' or 'pr'"
+        required: true
+        type: string
+      pr_number:
+        description: 'PR number (required when mode=pr)'
+        required: false
+        type: string
+
+jobs:
+  get_urls:
+    runs-on: ubuntu-latest
+    outputs:
+      backend_url: ${{ steps.urls.outputs.backend_url }}
+      frontend_url: ${{ steps.urls.outputs.frontend_url }}
+      frontend_url_scheme: ${{ steps.urls.outputs.frontend_url_scheme }}
+      backend_url_scheme: ${{ steps.urls.outputs.backend_url_scheme }}
+
+    steps:
+      - name: Compute URLs PROD
+        id: urls
+        run: |
+          set -euo pipefail
+          
+          if [ "${{ inputs.mode }}" = "prod" ]; then
+            BACKEND_URL="api.${{ secrets.PROD_DOMAIN }}"
+            FRONTEND_URL="finance.${{ secrets.PROD_DOMAIN }}"
+
+          else
+            FRONTEND_URL="pr-${{inputs.pr_number}}.${{ secrets.DEV_FRONTEND_BASE_DOMAIN }}"
+            BACKEND_URL="api-pr-${{inputs.pr_number}}.${{ secrets.DEV_BASE_DOMAIN }}"
+          
+          FRONTEND_URL_SCHEME="https://$FRONTEND_URL"
+          BACKEND_URL_SCHEME="https://$BACKEND_URL"
+          
+          echo "backend_url_scheme=$BACKEND_URL_SCHEME" >> $GITHUB_OUTPUT
+          echo "frontend_url_scheme=$FRONTEND_URL_SCHEME" >> $GITHUB_OUTPUT
+          echo "backend_url=$BACKEND_URL" >> $GITHUB_OUTPUT
+          echo "frontend_url=$FRONTEND_URL" >> $GITHUB_OUTPUT