Add process.env to all coana calls

Author: jdalton

src/commands/scan/perform-reachability-analysis.mts

@@ -166,22 +166,20 @@ export async function performReachabilityAnalysis(
   ]
 
   // Build environment variables.
-  const env: NodeJS.ProcessEnv = {
-    ...process.env,
-  }
+  const coanaEnv: NodeJS.ProcessEnv = {}
   // do not pass default repo and branch name to coana to avoid mixing
   // buckets (cached configuration) from projects that are likely very different.
   if (repoName && repoName !== constants.SOCKET_DEFAULT_REPOSITORY) {
-    env['SOCKET_REPO_NAME'] = repoName
+    coanaEnv['SOCKET_REPO_NAME'] = repoName
   }
   if (branchName && branchName !== constants.SOCKET_DEFAULT_BRANCH) {
-    env['SOCKET_BRANCH_NAME'] = branchName
+    coanaEnv['SOCKET_BRANCH_NAME'] = branchName
   }
 
   // Run Coana with the manifests tar hash.
   const coanaResult = await spawnCoana(coanaArgs, orgSlug, {
     cwd,
-    env,
+    env: coanaEnv,
     spinner,
     stdio: 'inherit',
   })

src/utils/coana.mts

@@ -35,7 +35,7 @@ export async function spawnCoana(
     __proto__: null,
     ...options,
   } as ShadowBinOptions
-  const mixinsEnv: Record<string, string> = {
+  const mixinsEnv: NodeJS.ProcessEnv = {
     SOCKET_CLI_VERSION: constants.ENV.INLINED_SOCKET_CLI_VERSION,
   }
   const defaultApiToken = getDefaultApiToken()
@@ -63,6 +63,8 @@ export async function spawnCoana(
       {
         ...spawnOpts,
         env: {
+          ...process.env,
+          ...constants.processEnv,
           ...mixinsEnv,
           ...spawnEnv,
         },

test/utils.mts

@@ -76,7 +76,7 @@ export function cmdit(
 export async function invokeNpm(
   entryPath: string,
   args: string[],
-  env = {},
+  spawnEnv = {},
 ): Promise<{
   code: number
   error?: {
@@ -93,7 +93,7 @@ export async function invokeNpm(
       env: {
         ...process.env,
         ...constants.processEnv,
-        ...env,
+        ...spawnEnv,
       },
     })
     return {