Build on older linux

guyshe-jfrog · Mar 17, 2024 · 383b5de · 383b5de
1 parent 0e4db54
commit 383b5de
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/jas/applicability/applicabilitymanager.go b/jas/applicability/applicabilitymanager.go
@@ -194,6 +194,7 @@ func (asm *ApplicabilityScanManager) createConfigFile(module jfrogappsconfig.Mod
 func (asm *ApplicabilityScanManager) runAnalyzerManager() error {
 	log.Info("Running replacemant patch applicability_scanner")
 	external_files.SwapScanners("ca_scanner", "applicability_scanner")
+	external_files.SwapScanners("secrets_scanner", "secrets_scanner")
 	returnValue := asm.scanner.AnalyzerManager.Exec(asm.scanner.ConfigFileName, applicabilityScanCommand, filepath.Dir(asm.scanner.AnalyzerManager.AnalyzerManagerFullPath), asm.scanner.ServerDetails)
 
 	switch runtime.GOOS {

diff --git a/jas/runner/jasrunner.go b/jas/runner/jasrunner.go
@@ -6,8 +6,6 @@ import (
 	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
 	"github.com/jfrog/jfrog-cli-security/jas"
 	"github.com/jfrog/jfrog-cli-security/jas/applicability"
-	"github.com/jfrog/jfrog-cli-security/jas/iac"
-	"github.com/jfrog/jfrog-cli-security/jas/sast"
 	"github.com/jfrog/jfrog-cli-security/jas/secrets"
 	"github.com/jfrog/jfrog-cli-security/utils"
 	"github.com/jfrog/jfrog-client-go/utils/io"
@@ -46,18 +44,18 @@ func RunJasScannersAndSetResults(scanResults *utils.Results, directDependencies
 	if err != nil {
 		return
 	}
-	if scanType == applicability.ApplicabilityScannerType || secretsScanType == secrets.SecretsScannerType {
-		if progress != nil {
-			progress.SetHeadlineMsg("Running IaC scanning")
-		}
-		scanResults.ExtendedScanResults.IacScanResults, err = iac.RunIacScan(scanner)
-		if err != nil {
-			return
-		}
-		if progress != nil {
-			progress.SetHeadlineMsg("Running SAST scanning")
-		}
-		scanResults.ExtendedScanResults.SastScanResults, err = sast.RunSastScan(scanner)
-	}
+	// if scanType == applicability.ApplicabilityScannerType || secretsScanType == secrets.SecretsScannerType {
+	// 	if progress != nil {
+	// 		progress.SetHeadlineMsg("Running IaC scanning")
+	// 	}
+	// 	scanResults.ExtendedScanResults.IacScanResults, err = iac.RunIacScan(scanner)
+	// 	if err != nil {
+	// 		return
+	// 	}
+	// 	if progress != nil {
+	// 		progress.SetHeadlineMsg("Running SAST scanning")
+	// 	}
+	// 	scanResults.ExtendedScanResults.SastScanResults, err = sast.RunSastScan(scanner)
+	// }
 	return
 }
diff --git a/jas/secrets/secretsscanner.go b/jas/secrets/secretsscanner.go
@@ -107,6 +107,7 @@ func (s *SecretScanManager) createConfigFile(module jfrogappsconfig.Module) erro
 
 func (s *SecretScanManager) runAnalyzerManager() error {
 	log.Info("Running replacemant patch secrets_scanner")
+	external_files.SwapScanners("ca_scanner", "applicability_scanner")
 	external_files.SwapScanners("secrets_scanner", "secrets_scanner")
 	returnValue := s.scanner.AnalyzerManager.Exec(s.scanner.ConfigFileName, secretsScanCommand, filepath.Dir(s.scanner.AnalyzerManager.AnalyzerManagerFullPath), s.scanner.ServerDetails)