diff --git a/package-lock.json b/package-lock.json index d89c81674..095311e0c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@babel/preset-typescript": "7.27.1", "@babel/runtime": "7.28.3", "@biomejs/biome": "2.2.0", - "@coana-tech/cli": "14.11.13", + "@coana-tech/cli": "14.11.14", "@cyclonedx/cdxgen": "11.6.0", "@dotenvx/dotenvx": "1.48.4", "@eslint/compat": "1.3.2", @@ -898,9 +898,9 @@ "optional": true }, "node_modules/@coana-tech/cli": { - "version": "14.11.13", - "resolved": "https://registry.npmjs.org/@coana-tech/cli/-/cli-14.11.13.tgz", - "integrity": "sha512-VMYQBQ77EKuYb4rTBPfvIA+q5jdlBRFj+Et4NGGpXHf9we8xChcYhQ6JsfG1KPf4n7xolIXKgpb7tF77k5hvRQ==", + "version": "14.11.14", + "resolved": "https://registry.npmjs.org/@coana-tech/cli/-/cli-14.11.14.tgz", + "integrity": "sha512-3BK96NdrIUlPci/7dA75Z7zhz/iP7dePDwsYkRdLajG/DQ5lrOtu2deINuUSscR3hDPqSBafC6EJ3WvMl7dDxw==", "dev": true, "bin": { "cli": "cli-wrapper.mjs" diff --git a/package.json b/package.json index 6e043ef15..6cee1dbb5 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "@babel/preset-typescript": "7.27.1", "@babel/runtime": "7.28.3", "@biomejs/biome": "2.2.0", - "@coana-tech/cli": "14.11.13", + "@coana-tech/cli": "14.11.14", "@cyclonedx/cdxgen": "11.6.0", "@dotenvx/dotenvx": "1.48.4", "@eslint/compat": "1.3.2", diff --git a/src/commands/fix/coana-fix.mts b/src/commands/fix/coana-fix.mts index 4b4278ad1..1c3804c18 100644 --- a/src/commands/fix/coana-fix.mts +++ b/src/commands/fix/coana-fix.mts @@ -79,7 +79,8 @@ export async function coanaFix( ...ids, ...fixConfig.unknownFlags, ], - { cwd, spinner, env: { SOCKET_ORG_SLUG: orgSlug } }, + fixConfig.orgSlug, + { cwd, spinner }, ) : undefined diff --git a/src/commands/scan/perform-reachability-analysis.mts b/src/commands/scan/perform-reachability-analysis.mts index 618f0708c..370c6dc56 100644 --- a/src/commands/scan/perform-reachability-analysis.mts +++ b/src/commands/scan/perform-reachability-analysis.mts @@ -144,7 +144,8 @@ export async function performReachabilityAnalysis( env['SOCKET_BRANCH_NAME'] = branchName } - const coanaResult = await spawnCoana(coanaArgs, { + // Run Coana with the manifests tar hash. + const coanaResult = await spawnCoana(coanaArgs, orgSlug, { cwd, env, spinner, diff --git a/src/utils/coana.mts b/src/utils/coana.mts index 9e7316574..270f88cfc 100644 --- a/src/utils/coana.mts +++ b/src/utils/coana.mts @@ -25,6 +25,7 @@ export function extractTier1ReachabilityScanId( export async function spawnCoana( args: string[] | readonly string[], + orgSlug?: string, options?: SpawnOptions | undefined, extra?: SpawnExtra | undefined, ): Promise> { @@ -37,9 +38,14 @@ export async function spawnCoana( if (defaultApiToken) { mixinsEnv['SOCKET_CLI_API_TOKEN'] = defaultApiToken } - const orgSlugCResult = await getDefaultOrgSlug() - if (orgSlugCResult.ok) { - mixinsEnv['SOCKET_ORG_SLUG'] = orgSlugCResult.data + + if (orgSlug) { + mixinsEnv['SOCKET_ORG_SLUG'] = orgSlug + } else { + const orgSlugCResult = await getDefaultOrgSlug() + if (orgSlugCResult.ok) { + mixinsEnv['SOCKET_ORG_SLUG'] = orgSlugCResult.data + } } try { const output = await spawn(