Use base64 for encoding site-configs (#733)

vivid-planet · Feb 26, 2025 · 7edf7c4 · 7edf7c4
1 parent 9398e0e
commit 7edf7c4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/.digitalocean/deploy.sh b/.digitalocean/deploy.sh
@@ -6,10 +6,10 @@ doctl apps update <imgproxy-app-id> --spec .digitalocean/comet-starter-imgproxy.
 
 sed -i '' 's/dev\.comet\-dxp\.com/digitalocean.comet-dxp.com/g' site-configs/main.ts
 
-APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-cms.tpl.yaml -o .digitalocean/comet-starter-cms.yaml
+APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-cms.tpl.yaml -o .digitalocean/comet-starter-cms.yaml --base64
 doctl apps update <cms-app-id> --spec .digitalocean/comet-starter-cms.yaml # configuration changes
 doctl apps create-deployment xxxx # code changes
 
-APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-site-main.tpl.yaml -o .digitalocean/comet-starter-site-main.yaml
+APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-site-main.tpl.yaml -o .digitalocean/comet-starter-site-main.yaml --base64
 doctl apps update <site-main-app-id> --spec .digitalocean/comet-starter-site-main.yaml # configuration changes
 doctl apps create-deployment yyyy # code changes
diff --git a/.docker-compose/README.md b/.docker-compose/README.md
@@ -1,6 +1,6 @@
 ```
 sed -i 's/dev\.comet\-dxp\.com/docker.comet-dxp.com/g' site-configs/main.ts
-APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .docker-compose/docker-compose.tpl.yml -o .docker-compose/docker-compose.yml
+APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .docker-compose/docker-compose.tpl.yml -o .docker-compose/docker-compose.yml --base64
 
 docker compose -f .docker-compose/docker-compose.yml build
 docker compose -f .docker-compose/docker-compose.yml up

diff --git a/.github/workflows/update-digital-ocean-deployment.yml b/.github/workflows/update-digital-ocean-deployment.yml
@@ -22,8 +22,8 @@ jobs:
       - name: Inject Site Configurations
         run: |
           sed -i 's/dev\.comet\-dxp\.com/digitalocean.comet-dxp.com/g' site-configs/main.ts
-          APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-cms.tpl.yaml -o .digitalocean/comet-starter-cms.yaml
-          APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-site-main.tpl.yaml -o .digitalocean/comet-starter-site-main.yaml
+          APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-cms.tpl.yaml -o .digitalocean/comet-starter-cms.yaml --base64
+          APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-site-main.tpl.yaml -o .digitalocean/comet-starter-site-main.yaml --base64
 
       - name: Update DigitalOcean comet-starter-imgproxy Deployment
         uses: digitalocean/app_action/deploy@v2

diff --git a/admin/src/config.tsx b/admin/src/config.tsx
@@ -22,7 +22,7 @@ export function createConfig() {
         apiUrl: environmentVariables.API_URL,
         adminUrl: environmentVariables.ADMIN_URL,
         previewUrl: environmentVariables.PREVIEW_URL,
-        sitesConfig: JSON.parse(environmentVariables.PUBLIC_SITE_CONFIGS) as PublicSiteConfig[],
+        sitesConfig: JSON.parse(atob(environmentVariables.PUBLIC_SITE_CONFIGS)) as PublicSiteConfig[],
         buildDate: environmentVariables.BUILD_DATE,
         buildNumber: environmentVariables.BUILD_NUMBER,
         commitSha: environmentVariables.COMMIT_SHA,

diff --git a/api/src/config/environment-variables.ts b/api/src/config/environment-variables.ts
@@ -122,7 +122,7 @@ export class EnvironmentVariables {
     CDN_ORIGIN_CHECK_SECRET?: string;
 
     @IsArray()
-    @Transform(({ value }) => JSON.parse(value))
+    @Transform(({ value }) => JSON.parse(Buffer.from(value, "base64").toString()))
     PRIVATE_SITE_CONFIGS: PrivateSiteConfig[];
 
     @IsArray()

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "starter",
     "private": true,
     "scripts": {
-        "create-site-configs-env": "npx @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .env.site-configs.tpl -o .env.site-configs",
+        "create-site-configs-env": "npx @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .env.site-configs.tpl -o .env.site-configs --base64",
         "dev": "npm run create-site-configs-env && dev-pm start",
         "copy-schema-files": "node copy-schema-files.js",
         "lint": "run-p lint:*",

diff --git a/site/src/util/siteConfig.ts b/site/src/util/siteConfig.ts
@@ -28,7 +28,7 @@ export function getSiteConfigs() {
     if (!siteConfigs) {
         const json = process.env.PUBLIC_SITE_CONFIGS;
         if (!json) throw new Error("process.env.PUBLIC_SITE_CONFIGS must be set.");
-        siteConfigs = JSON.parse(json) as PublicSiteConfig[];
+        siteConfigs = JSON.parse(atob(json)) as PublicSiteConfig[];
     }
     return siteConfigs;
 }