WIP: web/client: add build-defined bucket names

MobilityData · Aug 28, 2023 · 338ed86 · 338ed86
1 parent 3de871c
commit 338ed86
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/web/client/.gitignore b/web/client/.gitignore
@@ -9,3 +9,4 @@ node_modules
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 /notice_schema.json
+rules.json
diff --git a/web/client/src/routes/+page.svelte b/web/client/src/routes/+page.svelte
@@ -15,6 +15,7 @@
   import { fly } from 'svelte/transition';
   import { onMount, tick } from 'svelte';
   import { quintOut } from 'svelte/easing';
+  import { env } from '$env/dynamic/public';
 
   /**
    * @typedef CreateJobParameters
@@ -35,7 +36,7 @@
 
   let showDocs = true;
 
-  const apiRoot = 'https://gtfs-validator-web-mbzoxaljzq-ue.a.run.app';
+  const apiRoot = `${env.PUBLIC_CLIENT_API_ROOT}`;
 
   /** @type {HTMLInputElement} */
   let fileInput;
@@ -67,7 +68,7 @@
   /** @type {HTMLDialogElement} */
   let statusModal;
 
-  $: reportUrl = `https://gtfs-validator-results.mobilitydata.org/${jobId}/report.html`;
+  $: reportUrl = `${env.PUBLIC_CLIENT_REPORTS_ROOT}/${jobId}/report.html`;
 
   function clearErrors() {
     errors = [];

diff --git a/web/pipeline/prd.env b/web/pipeline/prd.env
@@ -3,3 +3,5 @@ WEB_BUILD_ENV=prd
 WEB_DEPLOY_CLIENT_BUCKET=gtfs-validator-web
 WEB_DEPLOY_SVC_IMAGE=gcr.io/web-based-gtfs-validator/gtfs-validator-web
 WEB_DEPLOY_SVC_CLOUDRUN=gtfs-validator-web
+PUBLIC_CLIENT_API_ROOT=https://gtfs-validator-web-mbzoxaljzq-ue.a.run.app
+PUBLIC_CLIENT_REPORTS_ROOT=https://gtfs-validator-results.mobilitydata.org
diff --git a/web/pipeline/stg.env b/web/pipeline/stg.env
@@ -3,3 +3,5 @@ WEB_BUILD_ENV=stg
 WEB_DEPLOY_CLIENT_BUCKET=stg-gtfs-validator-web
 WEB_DEPLOY_SVC_IMAGE=gcr.io/web-based-gtfs-validator/gtfs-validator-web
 WEB_DEPLOY_SVC_CLOUDRUN=stg-gtfs-validator-web
+PUBLIC_CLIENT_API_ROOT=https://stg-gtfs-validator-web-mbzoxaljzq-ue.a.run.app
+PUBLIC_CLIENT_REPORTS_ROOT=https://staging-gtfs-validator-results.mobilitydata.org