@alwaysai/device-agent 1.3.0 → 1.3.1-2

package/src/application-control/environment-variables.ts

@@ -4,6 +4,7 @@ import { buildApp, getAppDir, requireAppReady } from './utils';
 import { logger } from '../util/logger';
 import { AgentConfigFile } from '../infrastructure/agent-config';
 import { isAppStarted, restartApp } from './status';
+import { replaceFalseyWithNull } from '../util/parsing';
 
 export interface EnvVars {
   [service: string]: {
@@ -37,26 +38,32 @@ export async function setEnv(props: { projectId: string; envVars: EnvVars }) {
         )}`
       );
     }
-    const envVarList: string[] = [];
+
+    const service = composeParsed['services'][s];
+    const oldEnv: string[] | undefined = service['environment'];
+
+    const newEnvVarsObj = {};
+    oldEnv?.forEach((envVarStr: string) => {
+      const envVarSplit = envVarStr.split('=');
+      const key = envVarSplit[0];
+      const value = envVarSplit[1];
+      newEnvVarsObj[key] = value;
+    });
+
     for (const envVar of Object.keys(envVars[s])) {
-      envVarList.push(`${envVar}=${envVars[s][envVar]}`);
+      newEnvVarsObj[envVar] = envVars[s][envVar];
     }
-    const service = composeParsed['services'][s];
-    // The environment field overrides the env files, so by appending to
-    // the environment list we can assure the value will be used over
-    // the env_file.
-
-    // NOTE: We are only appending the new values to the end of the
-    // environment variable list, which will override but not replace
-    // previous instances of the same environment variable.
-    if ('environment' in service) {
-      const environment: string[] = service['environment'];
-      composeParsed['services'][s]['environment'] =
-        environment.concat(envVarList);
-    } else {
-      composeParsed['services'][s]['environment'] = envVarList;
+
+    const envVarList: string[] = [];
+    for (const envVar of Object.keys(newEnvVarsObj)) {
+      envVarList.push(
+        `${envVar}=${newEnvVarsObj[envVar] ? newEnvVarsObj[envVar] : ''}`
+      );
     }
+
+    service['environment'] = envVarList;
   }
+
   await writeDockerCompose({ projectId, dockerCompose: composeParsed });
 
   const appDir = getAppDir(projectId);
@@ -79,7 +86,7 @@ export async function setEnv(props: { projectId: string; envVars: EnvVars }) {
   );
 }
 
-async function convertStringEnvsToKeyVal(stringEnvs: string[]) {
+export function convertStringEnvsToKeyVal(stringEnvs: string[]) {
   const envVars = {};
   stringEnvs.forEach((env: string) => {
     const keyVal = env.split('=');
@@ -117,17 +124,20 @@ export async function getAllEnvs(props: {
           envFileLines = envFileLines.filter((v) => {
             return v !== '' && !v.includes('#');
           });
-          const newEnvVars = await convertStringEnvsToKeyVal(envFileLines);
+          const newEnvVars = convertStringEnvsToKeyVal(envFileLines);
           envVars[s] = { ...envVars[s], ...newEnvVars };
         }
       }
       if ('environment' in service) {
         const environment: string[] = service['environment'];
-        const newEnvVars = await convertStringEnvsToKeyVal(environment);
+        const newEnvVars = convertStringEnvsToKeyVal(environment);
         envVars[s] = { ...envVars[s], ...newEnvVars };
       }
     }
   }
 
+  // Device shadow needs null to delete
+  replaceFalseyWithNull(envVars, true);
+
   return envVars;
 }

package/src/application-control/install.ts

@@ -65,7 +65,7 @@ export async function installApp(props: {
     if (!(await AgentConfigFile().isAppReady({ projectId }))) {
       throw new Error('Application already has installation in progress!');
     }
-    logger.info('Application is already installed, updating');
+    logger.info('Application is already installed, updating...');
 
     // make sure the app is stopped if it's running, to clear the docker container.
     if (await isAppStarted({ projectId })) {