Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion src/commands/fix/coana-fix.mts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ export async function coanaFix(
...ids,
...fixConfig.unknownFlags,
],
{ cwd, spinner, env: { SOCKET_ORG_SLUG: orgSlug } },
fixConfig.orgSlug,
{ cwd, spinner },
)
: undefined

Expand Down
3 changes: 2 additions & 1 deletion src/commands/scan/perform-reachability-analysis.mts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 9 additions & 3 deletions src/utils/coana.mts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export function extractTier1ReachabilityScanId(

export async function spawnCoana(
args: string[] | readonly string[],
orgSlug?: string,
options?: SpawnOptions | undefined,
extra?: SpawnExtra | undefined,
): Promise<CResult<string>> {
Expand All @@ -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(
Expand Down
Loading