handle envs better

Author: jon-bell

dist/index.js

@@ -24,6 +24,7 @@ import {
   startApplicationByUuid,
   startServiceByUuid,
   updateApplicationByUuid,
+  updateEnvByServiceUuid,
   updateEnvsByServiceUuid,
   updateServiceByUuid
 } from './client/sdk.gen.js'
@@ -216,15 +217,28 @@ export default class Coolify {
       checkStatus()
     })
   }
-  private async createEnvsForService({
+  private async createOrUpdateEnv({
     serviceUUID,
-    envs
+    env
   }: {
     serviceUUID: string
-    envs: { key: string; value: string | undefined }[]
+    env: { key: string; value: string | undefined }
   }) {
-    for (const env of envs) {
-      await createEnvByServiceUuid({
+    if (!env.value) {
+      throw new Error(`Env ${env.key} has no value`)
+    }
+    const res = await updateEnvByServiceUuid({
+      client: this.client,
+      path: {
+        uuid: serviceUUID
+      },
+      body: {
+        key: env.key,
+        value: env.value
+      }
+    })
+    if (res.error && res.error.message === 'Environment variable not found.') {
+      const res2 = await createEnvByServiceUuid({
         client: this.client,
         path: {
           uuid: serviceUUID
@@ -234,6 +248,28 @@ export default class Coolify {
           value: env.value
         }
       })
+      if (res2.error) {
+        throw new Error(
+          `Error creating env ${env.key} for service ${serviceUUID}: ${res2.error.message}`
+        )
+      }
+    }
+  }
+  private async createEnvsForService({
+    serviceUUID,
+    envs
+  }: {
+    serviceUUID: string
+    envs: { key: string; value: string | undefined }[]
+  }) {
+    for (const env of envs) {
+      if (!env.value) {
+        throw new Error(`Env ${env.key} has no value`)
+      }
+      await this.createOrUpdateEnv({
+        serviceUUID,
+        env
+      })
     }
   }
 
@@ -322,12 +358,9 @@ export default class Coolify {
       // Generate a random 64-character deployment key
       const deploymentKey = randomBytes(32).toString('hex')
       //Set the functions deployment key
-      await createEnvByServiceUuid({
-        client: this.client,
-        path: {
-          uuid: backendServiceUUID
-        },
-        body: {
+      await this.createOrUpdateEnv({
+        serviceUUID: backendServiceUUID,
+        env: {
           key: 'SERVICE_SUPABASE_FUNCTIONS_DEPLOYMENT_KEY',
           value: deploymentKey
         }
@@ -412,12 +445,9 @@ export default class Coolify {
     )
 
     console.log(`SERVICE_SUPABASE_URL: ${supabase_url}`)
-    await createEnvByServiceUuid({
-      client: this.client,
-      path: {
-        uuid: backendServiceUUID
-      },
-      body: {
+    await this.createOrUpdateEnv({
+      serviceUUID: backendServiceUUID,
+      env: {
         key: 'SERVICE_SUPABASE_URL',
         value: supabase_url
       }
@@ -516,6 +546,16 @@ export default class Coolify {
       ephemeral
     })
     console.log(`Backend service UUID: ${backendServiceUUID}`)
+    if (backendServiceUUID !== '123') {
+      return {
+        serviceUUID: backendServiceUUID,
+        appUUID: '123',
+        appURL: `https://${deploymentName}.dev.pawtograder.net`,
+        supabase_url,
+        supabase_service_role_key,
+        supabase_anon_key
+      }
+    }
 
     const frontendAppName = `${deploymentName}-frontend`
     //If there is already a frontend app with the target name, delete it

dist/index.js.map

@@ -819,7 +819,6 @@ services:
       - 'SUPABASE_SERVICE_ROLE_KEY=${SERVICE_SUPABASESERVICE_KEY}'
       - 'SUPABASE_DB_URL=postgresql://postgres:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOSTNAME:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}'
       - 'VERIFY_JWT=${FUNCTIONS_VERIFY_JWT:-false}'
-      - 'AWS_ACCESS_KEY_ID=${SERVICE_AWS_ACCESS_KEY_ID}'
       - 'AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}'
       - 'GITHUB_APP_ID=${GITHUB_APP_ID}'
       - 'GITHUB_OAUTH_CLIENT_ID=${GITHUB_OAUTH_CLIENT_ID}'