fix: fix CLI update and discover commands (#160)

* fix: run update when CLI is found

* fix: fix discover issue with lack of account parameters

Author: alerizzo

src/cli/CodacyCli.ts

@@ -51,6 +51,19 @@ export abstract class CodacyCli {
     return path
   }
 
+  protected getIdentificationParameters(): Record<string, string> {
+    return (
+      this._accountToken && this.repository && this.provider && this.organization
+        ? {
+            provider: this.provider,
+            organization: this.organization,
+            repository: this.repository,
+            'api-token': this._accountToken,
+          }
+        : {}
+    ) as Record<string, string>
+  }
+
   protected execAsync(command: string, args?: Record<string, string>): Promise<{ stdout: string; stderr: string }> {
     // stringyfy the args
     const argsString = Object.entries(args || {})

src/cli/MacCodacyCli.ts

@@ -23,6 +23,12 @@ export class MacCodacyCli extends CodacyCli {
 
     if (fs.existsSync(fullPath)) {
       this.setCliCommand(this._cliVersion ? `CODACY_CLI_V2_VERSION=${this._cliVersion} ${localPath}` : localPath)
+
+      // CLI found, update it if necessary
+      if (!this._cliVersion) {
+        await this.update()
+      }
+
       return
     }
 
@@ -96,16 +102,7 @@ export class MacCodacyCli extends CodacyCli {
   }
 
   public async update(): Promise<void> {
-    const resetParams = (
-      this._accountToken && this.repository && this.provider && this.organization
-        ? {
-            provider: this.provider,
-            organization: this.organization,
-            repository: this.repository,
-            'api-token': this._accountToken,
-          }
-        : {}
-    ) as Record<string, string>
+    const resetParams = this.getIdentificationParameters()
     const updateCommand = `${this.getCliCommand()} update`
     const resetCommand = `${this.getCliCommand()} config reset`
     try {
@@ -148,19 +145,11 @@ export class MacCodacyCli extends CodacyCli {
       // install dependencies
       await this.installDependencies()
       Logger.debug('Dev mode enabled. Skipping initialization.')
+      return
     }
 
     if (needsInitialization) {
-      const initParams = (
-        this._accountToken && this.repository && this.provider && this.organization
-          ? {
-              provider: this.provider,
-              organization: this.organization,
-              repository: this.repository,
-              'api-token': this._accountToken,
-            }
-          : {}
-      ) as Record<string, string>
+      const initParams = this.getIdentificationParameters()
 
       try {
         // initialize codacy-cli
@@ -230,9 +219,12 @@ export class MacCodacyCli extends CodacyCli {
 
     Logger.debug(`Running Codacy CLI config discover for ${filePath}`)
 
+    const discoverParams = this.getIdentificationParameters()
+
     try {
       const { stdout, stderr } = await this.execAsync(
-        `${this.getCliCommand()} config discover ${this.preparePathForExec(filePath)}`
+        `${this.getCliCommand()} config discover ${this.preparePathForExec(filePath)}`,
+        discoverParams
       )
 
       if (stderr) {

src/extension.ts

@@ -340,14 +340,6 @@ export async function activate(context: vscode.ExtensionContext) {
       })
     )
 
-    const analysisMode = vscode.workspace.getConfiguration().get('codacy.cli.analysisMode')
-    const cliVersion = vscode.workspace.getConfiguration().get('codacy.cli.cliVersion')
-    // When the user doesn't have a specific version, update the CLI to the latest version
-    if (!cliVersion && codacyCloud.cli?.getCliCommand() && analysisMode !== 'disabled') {
-      await codacyCloud.cli.update()
-      // If it is not installed, don't do anything. On the next usage of the CLI it will be installed with the most recent version
-    }
-
     // Identify user if already authenticated
     if (Config.apiToken) {
       try {