Improve suggestion handling

Author: pvdz

src/commands/scan/cmd-scan-create.ts

@@ -13,7 +13,7 @@ import { suggestTarget } from './suggest_target'
 import constants from '../../constants'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
-import { getDefaultToken, setupSdk } from '../../utils/sdk'
+import { getDefaultToken } from '../../utils/sdk'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
 
@@ -172,20 +172,17 @@ async function run(
   // If the current cwd is unknown and is used as a repo slug anyways, we will
   // first need to register the slug before we can use it.
   let repoDefaultBranch = ''
-
   // Only do suggestions with an apiToken and when not in dryRun mode
   if (apiToken && !dryRun) {
-    const socketSdk = await setupSdk()
-
     if (!orgSlug) {
-      const suggestion = await suggestOrgSlug(socketSdk)
+      const suggestion = await suggestOrgSlug()
       if (suggestion) orgSlug = suggestion
       updatedInput = true
     }
 
     // (Don't bother asking for the rest if we didn't get an org slug above)
     if (orgSlug && !repoName) {
-      const suggestion = await suggestRepoSlug(socketSdk, orgSlug)
+      const suggestion = await suggestRepoSlug(orgSlug)
       if (suggestion) {
         repoDefaultBranch = suggestion.defaultBranch
         repoName = suggestion.slug
@@ -201,15 +198,15 @@ async function run(
     }
   }
 
-  if (updatedInput) {
+  if (updatedInput && repoName && branchName && orgSlug && targets?.length) {
     logger.error(
       'Note: You can invoke this command next time to skip the interactive questions:'
     )
     logger.error('```')
     logger.error(
       `    socket scan create [other flags...] --repo ${repoName} --branch ${branchName} ${orgSlug} ${targets.join(' ')}`
     )
-    logger.error('```')
+    logger.error('```\n')
   }
 
   if (!orgSlug || !repoName || !branchName || !targets.length) {

src/commands/scan/suggest-org-slug.ts

@@ -1,11 +1,11 @@
+import { logger } from '@socketsecurity/registry/lib/logger'
 import { select } from '@socketsecurity/registry/lib/prompts'
-import { SocketSdk } from '@socketsecurity/sdk'
 
 import { handleApiCall } from '../../utils/api'
+import { setupSdk } from '../../utils/sdk'
 
-export async function suggestOrgSlug(
-  socketSdk: SocketSdk
-): Promise<string | void> {
+export async function suggestOrgSlug(): Promise<string | void> {
+  const socketSdk = await setupSdk()
   const result = await handleApiCall(
     socketSdk.getOrganizations(),
     'looking up organizations'
@@ -33,6 +33,8 @@ export async function suggestOrgSlug(
       return proceed
     }
   } else {
-    // TODO: in verbose mode, report this error to stderr
+    logger.fail(
+      'Failed to lookup organization list from API, unable to suggest.'
+    )
   }
 }

src/commands/scan/suggest-repo-slug.ts

@@ -1,18 +1,18 @@
 import path from 'node:path'
 import process from 'node:process'
 
+import { logger } from '@socketsecurity/registry/lib/logger'
 import { select } from '@socketsecurity/registry/lib/prompts'
-import { SocketSdk } from '@socketsecurity/sdk'
 
 import { handleApiCall } from '../../utils/api'
+import { setupSdk } from '../../utils/sdk'
 
-export async function suggestRepoSlug(
-  socketSdk: SocketSdk,
-  orgSlug: string
-): Promise<{
+export async function suggestRepoSlug(orgSlug: string): Promise<{
   slug: string
   defaultBranch: string
 } | void> {
+  const socketSdk = await setupSdk()
+
   // Same as above, but if there's a repo with the same name as cwd then
   // default the selection to that name.
   const result = await handleApiCall(
@@ -28,6 +28,7 @@ export async function suggestRepoSlug(
     }),
     'looking up known repos'
   )
+
   // Ignore a failed request here. It was not the primary goal of
   // running this command and reporting it only leads to end-user confusion.
   if (result.success) {
@@ -92,7 +93,7 @@ export async function suggestRepoSlug(
       return { slug: repoName, defaultBranch: repoDefaultBranch }
     }
   } else {
-    // TODO: in verbose mode, report this error to stderr
+    logger.fail('Failed to lookup repo list from API, unable to suggest.')
   }
 }