From 1f6e4a56b4186ee608c5c6a6ab9f19e9bc51e783 Mon Sep 17 00:00:00 2001
From: Eyal Kapon <eyalk@jfrog.com>
Date: Mon, 19 Jan 2026 14:12:03 +0200
Subject: [PATCH] Enable all scans in default test config profile

Renamed emptyConfigProfile to defaultConfigProfile and enabled all scan
types (SCA, Contextual Analysis, SAST, Secrets, IaC). The empty config
was causing tests to skip all scans since EnableScaScan etc. defaulted
to false.

Also renamed services2 alias to xscservices for clarity.
---
 scanpullrequest/scanpullrequest_test.go | 19 +++++++++++++------
 scanrepository/scanrepository_test.go   | 23 +++++++++++++++--------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/scanpullrequest/scanpullrequest_test.go b/scanpullrequest/scanpullrequest_test.go
index 71ec8aebb..bc2e665b0 100644
--- a/scanpullrequest/scanpullrequest_test.go
+++ b/scanpullrequest/scanpullrequest_test.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"github.com/CycloneDX/cyclonedx-go"
 	"github.com/jfrog/jfrog-cli-security/utils/formats/violationutils"
-	services2 "github.com/jfrog/jfrog-client-go/xsc/services"
+	xscservices "github.com/jfrog/jfrog-client-go/xsc/services"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -46,19 +46,26 @@ const (
 	testTargetBranchName = "master"
 )
 
-var emptyConfigProfile = services2.ConfigProfile{
+var defaultConfigProfile = xscservices.ConfigProfile{
 	ProfileName:   "test-profile",
-	GeneralConfig: services2.GeneralConfig{},
-	FrogbotConfig: services2.FrogbotConfig{
+	GeneralConfig: xscservices.GeneralConfig{},
+	FrogbotConfig: xscservices.FrogbotConfig{
 		BranchNameTemplate:    "",
 		PrTitleTemplate:       "",
 		CommitMessageTemplate: "",
 	},
-	Modules: []services2.Module{
+	Modules: []xscservices.Module{
 		{
 			ModuleId:     0,
 			ModuleName:   "test-module",
 			PathFromRoot: ".",
+			ScanConfig: xscservices.ScanConfig{
+				ScaScannerConfig:                xscservices.ScaScannerConfig{EnableScaScan: true},
+				ContextualAnalysisScannerConfig: xscservices.CaScannerConfig{EnableCaScan: true},
+				SastScannerConfig:               xscservices.SastScannerConfig{EnableSastScan: true},
+				SecretsScannerConfig:            xscservices.SecretsScannerConfig{EnableSecretsScan: true},
+				IacScannerConfig:                xscservices.IacScannerConfig{EnableIacScan: true},
+			},
 		},
 	},
 }
@@ -291,7 +298,7 @@ func prepareConfigAndClient(t *testing.T, xrayVersion, xscVersion string, server
 	assert.NoError(t, err)
 
 	// We must set a non-nil config profile to avoid panic
-	repository.ConfigProfile = &emptyConfigProfile
+	repository.ConfigProfile = &defaultConfigProfile
 
 	return repository, client
 }
diff --git a/scanrepository/scanrepository_test.go b/scanrepository/scanrepository_test.go
index f6a4b011d..c0c684487 100644
--- a/scanrepository/scanrepository_test.go
+++ b/scanrepository/scanrepository_test.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	services2 "github.com/jfrog/jfrog-client-go/xsc/services"
+	xscservices "github.com/jfrog/jfrog-client-go/xsc/services"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -40,19 +40,26 @@ import (
 
 const rootTestDir = "scanrepository"
 
-var emptyConfigProfile = services2.ConfigProfile{
+var defaultConfigProfile = xscservices.ConfigProfile{
 	ProfileName:   "test-profile",
-	GeneralConfig: services2.GeneralConfig{},
-	FrogbotConfig: services2.FrogbotConfig{
+	GeneralConfig: xscservices.GeneralConfig{},
+	FrogbotConfig: xscservices.FrogbotConfig{
 		BranchNameTemplate:    "",
 		PrTitleTemplate:       "",
 		CommitMessageTemplate: "",
 	},
-	Modules: []services2.Module{
+	Modules: []xscservices.Module{
 		{
 			ModuleId:     0,
 			ModuleName:   "test-module",
 			PathFromRoot: ".",
+			ScanConfig: xscservices.ScanConfig{
+				ScaScannerConfig:                xscservices.ScaScannerConfig{EnableScaScan: true},
+				ContextualAnalysisScannerConfig: xscservices.CaScannerConfig{EnableCaScan: true},
+				SastScannerConfig:               xscservices.SastScannerConfig{EnableSastScan: true},
+				SecretsScannerConfig:            xscservices.SecretsScannerConfig{EnableSecretsScan: true},
+				IacScannerConfig:                xscservices.IacScannerConfig{EnableIacScan: true},
+			},
 		},
 	},
 }
@@ -201,7 +208,7 @@ func TestScanRepositoryCmd_Run(t *testing.T) {
 			assert.NoError(t, err)
 
 			// We must set a non-nil config profile to avoid panic
-			repository.ConfigProfile = &emptyConfigProfile
+			repository.ConfigProfile = &defaultConfigProfile
 
 			// Run
 			var cmd = ScanRepositoryCmd{XrayVersion: xrayVersion, XscVersion: xscVersion, dryRun: true, dryRunRepoPath: testDir}
@@ -330,7 +337,7 @@ pr body
 			repository, err := utils.BuildRepositoryFromEnv(xrayVersion, xscVersion, client, gitTestParams, &serverParams, utils.ScanRepository)
 			assert.NoError(t, err)
 			// We must set a non-nil config profile to avoid panic
-			repository.ConfigProfile = &emptyConfigProfile
+			repository.ConfigProfile = &defaultConfigProfile
 
 			// Run
 			var cmd = ScanRepositoryCmd{dryRun: true, dryRunRepoPath: testDir}
@@ -428,7 +435,7 @@ func TestPackageTypeFromScan(t *testing.T) {
 				XrayVersion:   xrayVersion,
 				XscVersion:    xscVersion,
 				ServerDetails: &frogbotParams.Server,
-				ConfigProfile: &emptyConfigProfile,
+				ConfigProfile: &defaultConfigProfile,
 			}
 			testScan.scanDetails = &scanSetup
 			scanResponse, err := testScan.scan()