fix tests

jfrog · Sep 23, 2024 · 32c4cd5 · 32c4cd5
1 parent b075e4c
commit 32c4cd5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/commands/audit/audit.go b/commands/audit/audit.go
@@ -272,7 +272,9 @@ func downloadAnalyzerManagerAndRunScanners(auditParallelRunner *utils.SecurityPa
 	if err = jas.DownloadAnalyzerManagerIfNeeded(threadId); err != nil {
 		return fmt.Errorf("%s failed to download analyzer manager: %s", clientutils.GetLogMsgPrefix(threadId, false), err.Error())
 	}
-
+	if scanner.AnalyzerManager.AnalyzerManagerFullPath, err = jas.GetAnalyzerManagerExecutable(); err != nil {
+		return fmt.Errorf("%s failed to get analyzer manager executable: %s", clientutils.GetLogMsgPrefix(threadId, false), err.Error())
+	}
 	if err = runner.AddJasScannersTasks(auditParallelRunner, scanResults, auditParams.DirectDependencies(), auditParams.thirdPartyApplicabilityScan, scanner, applicability.ApplicabilityScannerType, secrets.SecretsScannerType, auditParallelRunner.AddErrorToChan, auditParams.ScansToPerform(), auditParams.configProfile, auditParams.scanResultsOutputDir); err != nil {
 		return fmt.Errorf("%s failed to run JAS scanners: %s", clientutils.GetLogMsgPrefix(threadId, false), err.Error())
 	}

diff --git a/commands/scan/scan.go b/commands/scan/scan.go
@@ -459,6 +459,11 @@ func (scanCmd *ScanCommand) createIndexerHandlerFunc(file *spec.File, entitledFo
 						log.Debug(fmt.Sprintf("Jas scanner was not created for %s, skipping Jas scans", filePath))
 						return nil
 					}
+					if scanner.AnalyzerManager.AnalyzerManagerFullPath, err = jas.GetAnalyzerManagerExecutable(); err != nil {
+						log.Error(fmt.Sprintf("failed to get analyzer manager executable: %s", err.Error()))
+						indexedFileErrors[threadId] = append(indexedFileErrors[threadId], formats.SimpleJsonError{FilePath: filePath, ErrorMessage: err.Error()})
+						return nil
+					}
 					err = runner.AddJasScannersTasks(jasFileProducerConsumer, &scanResults, &depsList, false, scanner, applicability.ApplicabilityDockerScanScanType, secrets.SecretsScannerDockerScanType, jasErrHandlerFunc, utils.GetAllSupportedScans(), nil, "")
 					if err != nil {
 						log.Error(fmt.Sprintf("scanning '%s' failed with error: %s", graph.Id, err.Error()))

diff --git a/jas/common.go b/jas/common.go
@@ -51,17 +51,14 @@ func CreateJasScanner(jfrogAppsConfig *jfrogappsconfig.JFrogAppsConfig, serverDe
 		err = errors.New(NoServerDetailsError)
 		return
 	}
-	if serverDetails.Url == "" {
+	if len(serverDetails.Url) == 0 {
 		log.Warn(NoServerUrlError)
 		return
 	}
 	scanner = &JasScanner{}
 	if scanner.EnvVars, err = getJasEnvVars(serverDetails, envVars); err != nil {
 		return
 	}
-	if scanner.AnalyzerManager.AnalyzerManagerFullPath, err = GetAnalyzerManagerExecutable(); err != nil {
-		return
-	}
 	var tempDir string
 	if tempDir, err = fileutils.CreateTempDir(); err != nil {
 		return