Merge pull request #3047 from IntersectMBO/feat/3046-add-outcome-api-url-to-deployment-workflows-and-env

feat(#3064): add outcome api url env to workflows

Author: MSzalowski

.github/workflows/build-and-deploy-test-stack.yml

@@ -61,7 +61,7 @@ jobs:
             cd $DEST_DIR/tests/test-infrastructure
             ./build-and-deploy.sh update-images
             yes | docker system prune -f || echo "Ignoring system prune eror"
-          envs: GOVTOOL_TAG, GRAFANA_ADMIN_PASSWORD, GRAFANA_SLACK_RECIPIENT, GRAFANA_SLACK_OAUTH_TOKEN, SENTRY_DSN_BACKEND, GTM_ID, NPMRC_TOKEN, SENTRY_DSN_FRONTEND, PIPELINE_URL, USERSNAP_SPACE_API_KEY, APP_ENV, PDF_API_URL, KUBER_API_KEY, IPFS_GATEWAY, IPFS_PROJECT_ID
+          envs: GOVTOOL_TAG, GRAFANA_ADMIN_PASSWORD, GRAFANA_SLACK_RECIPIENT, GRAFANA_SLACK_OAUTH_TOKEN, SENTRY_DSN_BACKEND, GTM_ID, NPMRC_TOKEN, SENTRY_DSN_FRONTEND, PIPELINE_URL, USERSNAP_SPACE_API_KEY, APP_ENV, PDF_API_URL, KUBER_API_KEY, IPFS_GATEWAY, IPFS_PROJECT_ID, VITE_OUTCOMES_API_URL
         env:
           GOVTOOL_TAG: ${{ github.sha }}
           GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
@@ -75,6 +75,7 @@ jobs:
           USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}
           APP_ENV: test
           PDF_API_URL: ${{ secrets.PDF_API_URL }}
+          OUTCOMES_API_URL: ${{ secrets.OUTCOMES_API_URL }}
           KUBER_API_KEY: ${{ secrets.KUBER_API_KEY }}
           IPFS_GATEWAY: $${{secrets.IPFS_GATEWAY}}
           IPFS_PROJECT_ID: $${{secrets.IPFS_PROJECT_ID}}

.github/workflows/merge.yaml

@@ -136,6 +136,7 @@ jobs:
             VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
             VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED=${{ secrets.VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED }}
             VITE_PDF_API_URL=${{ secrets.VITE_PDF_API_URL }}
+            VITE_OUTCOMES_API_URL=${{ secrets.VITE_OUTCOMES_API_URL }}
             VITE_IPFS_GATEWAY=${{ secrets.IPFS_GATEWAY }}
             VITE_IPFS_PROJECT_ID=${{ secrets.IPFS_PROJECT_ID }}
             IPFS_GATEWAY=${{ secrets.IPFS_GATEWAY }}

.github/workflows/pr.yaml

@@ -122,6 +122,7 @@ jobs:
             VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
             VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
             VITE_PDF_API_URL=${{ secrets.VITE_PDF_API_URL }}
+            VITE_OUTCOMES_API_URL=${{ secrets.VITE_OUTCOMES_API_URL }}
             VITE_IPFS_GATEWAY=${{ secrets.IPFS_GATEWAY }}
             VITE_IPFS_PROJECT_ID=${{ secrets.IPFS_PROJECT_ID }}
             IPFS_GATEWAY=${{ secrets.IPFS_GATEWAY }}

CHANGELOG.md

@@ -34,6 +34,7 @@ changes.
 - Add script to update GovTool version
 - Add `isStakeKeyRegistered` for the usage by pillars [Issue 2384](https://github.com/IntersectMBO/govtool/issues/2384)
 - Add server side compression for large assets
+- Add outcomes
 
 ### Fixed
 

govtool/frontend/Dockerfile

@@ -10,6 +10,7 @@ ARG NPMRC_TOKEN
 ARG VITE_USERSNAP_SPACE_API_KEY
 ARG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='true'
 ARG VITE_PDF_API_URL
+ARG VITE_OUTCOMES_API_URL
 ARG VITE_IPFS_GATEWAY
 ARG VITE_IPFS_PROJECT_ID
 
@@ -25,6 +26,8 @@ RUN \
   : "${VITE_SENTRY_DSN:?Build argument VITE_SENTRY_DSN is not set}" && \
   : "${NPMRC_TOKEN:?Build argument NPMRC_TOKEN is not set}" && \
   : "${VITE_USERSNAP_SPACE_API_KEY:?Build argument VITE_USERSNAP_SPACE_API_KEY is not set}" && \
+  : "${VITE_PDF_API_URL:?Build argument VITE_PDF_API_URL is not set}" && \
+  : "${VITE_OUTCOMES_API_URL:?Build argument VITE_OUTCOMES_API_URL is not set}" && \
   : "${VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED:?Build argument VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED is not set}" && \
   : "${VITE_IPFS_GATEWAY:?Build argument VITE_IPFS_GATEWAY is not set}" && \
   : "${VITE_IPFS_PROJECT_ID:?Build argument VITE_IPFS_PROJECT_ID is not set}"

govtool/frontend/Dockerfile.qovery

@@ -10,6 +10,7 @@ ARG NPMRC_TOKEN
 ARG VITE_USERSNAP_SPACE_API_KEY
 ARG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED
 ARG VITE_PDF_API_URL
+ARG VITE_OUTCOMES_API_URL
 ARG VITE_IPFS_GATEWAY
 ARG VITE_IPFS_PROJECT_ID
 

govtool/frontend/default.nix

@@ -6,6 +6,7 @@
 , VITE_SENTRY_DSN ? ""
 , VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED ? ""
 , VITE_PDF_API_URL ? ""
+, VITE_OUTCOMES_API_URL ? ""
 , CARDANO_NETWORK ? "sanchonet"
 }:
 let

tests/test-infrastructure/.env.example

@@ -7,6 +7,7 @@ BASE_DOMAIN=govtool.cardanoapi.io
 GOVTOOL_TAG=test
 APP_ENV=test
 PDF_API_URL= 
+OUTCOMES_API_URL=
 KUBER_API_KEY=
 IPFS_GATEWAY=""
 IPFS_PROJECT_ID=""

tests/test-infrastructure/docker-compose-govtool.yml

@@ -48,6 +48,7 @@ services:
         VITE_METADATA_API_URL: https://${BASE_DOMAIN}/metadata-validation
         VITE_GTM_ID: ${GTM_ID}
         VITE_PDF_API_URL: ${PDF_API_URL}
+        VITE_OUTCOMES_API_URL: ${OUTCOMES_API_URL}
         VITE_IPFS_GATEWAY: ${IPFS_GATEWAY}
         VITE_IPFS_PROJECT_ID: ${IPFS_PROJECT_ID}
         VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED: "true"