diff --git a/internal/commands/.scripts/up.sh b/internal/commands/.scripts/up.sh index 8d6e57764..e9002f8d2 100755 --- a/internal/commands/.scripts/up.sh +++ b/internal/commands/.scripts/up.sh @@ -6,4 +6,4 @@ rm -rf ScaResolver-linux64.tar.gz # ignore mock, wrappers, cmd, logger, and osinstaller packages, as they checked by integration tests gotestsum --junitfile junit.xml --format testname -- \ $(go list ./... | grep -v "mock" | grep -v "wrappers" | grep -v "bitbucketserver" | grep -v "logger" | grep -v "cmd" | grep -v "osinstaller") \ - -timeout 25m -coverprofile cover.out \ No newline at end of file + -timeout 35m -coverprofile cover.out \ No newline at end of file diff --git a/internal/commands/agenthooks.go b/internal/commands/agenthooks.go index 82b95f5de..7a89197a0 100644 --- a/internal/commands/agenthooks.go +++ b/internal/commands/agenthooks.go @@ -160,7 +160,8 @@ func NewHookCheckAuthCommand(jwt wrappers.JWTWrapper) *cobra.Command { // Routes are declared per-agent in cxhooks.Agents (cx package). // ============================================================================= -func HookDispatchCommands(jwt wrappers.JWTWrapper, featureFlags wrappers.FeatureFlagsWrapper, realtimeScanner wrappers.RealtimeScannerWrapper, telemetryWrapper wrappers.TelemetryWrapper) []*cobra.Command { +// HookDispatchCommands returns the hidden dispatch subcommands, one per agent hook route. +func HookDispatchCommands(jwt wrappers.JWTWrapper, realtimeScanner wrappers.RealtimeScannerWrapper, telemetryWrapper wrappers.TelemetryWrapper) []*cobra.Command { var cmds []*cobra.Command for _, agent := range cxhooks.Agents { for _, r := range agent.Routes { @@ -175,7 +176,7 @@ func HookDispatchCommands(jwt wrappers.JWTWrapper, featureFlags wrappers.Feature Run: func(cmd *cobra.Command, _ []string) { if isLicensed(jwt) { logger.PrintIfVerbose(fmt.Sprintf("hooks: registering security guardrails for %s", cmd.Use)) - cxhooks.RegisterGuardrails(jwt, featureFlags, realtimeScanner, telemetryWrapper) + cxhooks.RegisterGuardrails(jwt, realtimeScanner, telemetryWrapper) } else { logger.PrintIfVerbose(fmt.Sprintf("hooks: registering pass-through for %s", cmd.Use)) cxhooks.RegisterPassThrough() diff --git a/internal/commands/agenthooks/cx/hooks.go b/internal/commands/agenthooks/cx/hooks.go index dbe0b0d65..24ac1179d 100644 --- a/internal/commands/agenthooks/cx/hooks.go +++ b/internal/commands/agenthooks/cx/hooks.go @@ -264,10 +264,10 @@ func promptWorkspaceRoots(raw any) []string { // RegisterGuardrails wires the four guardrail handlers and instantiates the // SCA, KICS, and secret-detection scanners used by the Bash and FileEdit handlers. -func RegisterGuardrails(jwt wrappers.JWTWrapper, ff wrappers.FeatureFlagsWrapper, rt wrappers.RealtimeScannerWrapper, tel wrappers.TelemetryWrapper) { - scaScanner = sca.NewScanner(jwt, ff, rt) - kicsScanner = kics.NewScanner(jwt, ff) - secretsScanner = secrets.NewScanner(jwt, ff) +func RegisterGuardrails(jwt wrappers.JWTWrapper, rt wrappers.RealtimeScannerWrapper, tel wrappers.TelemetryWrapper) { + scaScanner = sca.NewScanner(jwt, rt) + kicsScanner = kics.NewScanner(jwt) + secretsScanner = secrets.NewScanner(jwt) telemetryWrapper = tel agenthooks.WhenAgentIdle(cxWhenAgentIdle) agenthooks.BeforeToolCall(cxBeforeToolCall) diff --git a/internal/commands/agenthooks/cx/hooks_test.go b/internal/commands/agenthooks/cx/hooks_test.go index a70eeb8c1..9823dd0ba 100644 --- a/internal/commands/agenthooks/cx/hooks_test.go +++ b/internal/commands/agenthooks/cx/hooks_test.go @@ -594,7 +594,6 @@ func TestRegisterGuardrails_AndPassThrough(t *testing.T) { RegisterGuardrails( &mock.JWTMockWrapper{}, - mock.FeatureFlagsMockWrapper{}, mock.NewRealtimeScannerMockWrapper(), mock.TelemetryMockWrapper{}, ) @@ -831,7 +830,7 @@ func TestRegisterGuardrails_SetsScanners(t *testing.T) { }() telemetry := mock.TelemetryMockWrapper{} - RegisterGuardrails(&mock.JWTMockWrapper{}, &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, telemetry) + RegisterGuardrails(&mock.JWTMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, telemetry) assert.NotNil(t, scaScanner) assert.NotNil(t, kicsScanner) @@ -843,7 +842,7 @@ func TestRegisterPassThrough_ClearsScanners(t *testing.T) { prevSca, prevKics, prevSecrets := scaScanner, kicsScanner, secretsScanner defer func() { scaScanner, kicsScanner, secretsScanner = prevSca, prevKics, prevSecrets }() - RegisterGuardrails(&mock.JWTMockWrapper{}, &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, mock.TelemetryMockWrapper{}) + RegisterGuardrails(&mock.JWTMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, mock.TelemetryMockWrapper{}) assert.NotNil(t, scaScanner) RegisterPassThrough() @@ -917,7 +916,7 @@ func TestCodexApplyPatch_KICSFinding_DeniesEndToEnd(t *testing.T) { resetHookGlobals(t) agenthooks.ClearRoutes() - RegisterGuardrails(&mock.JWTMockWrapper{}, &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, mock.TelemetryMockWrapper{}) + RegisterGuardrails(&mock.JWTMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, mock.TelemetryMockWrapper{}) t.Cleanup(agenthooks.ClearRoutes) // RegisterGuardrails wires up real SCA/KICS scanners; swap KICS's underlying diff --git a/internal/commands/agenthooks/guardrails/kics/scanner.go b/internal/commands/agenthooks/guardrails/kics/scanner.go index 70716e982..fdb142ecd 100644 --- a/internal/commands/agenthooks/guardrails/kics/scanner.go +++ b/internal/commands/agenthooks/guardrails/kics/scanner.go @@ -17,7 +17,6 @@ import ( // substitute scan via NewScannerWithFunc. type Scanner struct { jwt wrappers.JWTWrapper - ff wrappers.FeatureFlagsWrapper scan func(path, ignoreFilePath string) ([]iacrealtime.IacRealtimeResult, error) // engine that last completed a scan. A delta edit scans twice (proposed and @@ -30,8 +29,8 @@ type Scanner struct { } // NewScanner returns a Scanner backed by the given wrappers. -func NewScanner(jwt wrappers.JWTWrapper, ff wrappers.FeatureFlagsWrapper) *Scanner { - s := &Scanner{jwt: jwt, ff: ff} +func NewScanner(jwt wrappers.JWTWrapper) *Scanner { + s := &Scanner{jwt: jwt} s.scan = s.runRealScan return s } @@ -143,7 +142,7 @@ func scanErrorAfterNoFallback(err error) error { } func (s *Scanner) runRealScan(path, ignoreFilePath string) ([]iacrealtime.IacRealtimeResult, error) { - svc := iacrealtime.NewIacRealtimeService(s.jwt, s.ff, iacrealtime.NewContainerManager()) + svc := iacrealtime.NewIacRealtimeService(s.jwt, iacrealtime.NewContainerManager()) engine := s.engine if engine == "" { diff --git a/internal/commands/agenthooks/guardrails/kics/scanner_test.go b/internal/commands/agenthooks/guardrails/kics/scanner_test.go index 0168aadfa..cf74f43da 100644 --- a/internal/commands/agenthooks/guardrails/kics/scanner_test.go +++ b/internal/commands/agenthooks/guardrails/kics/scanner_test.go @@ -16,9 +16,8 @@ import ( func TestNewScanner_ReturnsValidScanner(t *testing.T) { jwt := &mock.JWTMockWrapper{} - ff := &mock.FeatureFlagsMockWrapper{} - s := NewScanner(jwt, ff) + s := NewScanner(jwt) if s == nil { t.Fatal("expected non-nil scanner") } @@ -29,9 +28,8 @@ func TestNewScanner_ReturnsValidScanner(t *testing.T) { func TestNewScanner_HoldsWrappers(t *testing.T) { jwt := &mock.JWTMockWrapper{} - ff := &mock.FeatureFlagsMockWrapper{} - s := NewScanner(jwt, ff) + s := NewScanner(jwt) assert.NotNil(t, s) // Verify wrappers are internally stored assert.NotNil(t, s.scan) diff --git a/internal/commands/agenthooks/guardrails/secrets/scanner.go b/internal/commands/agenthooks/guardrails/secrets/scanner.go index a2eb58a1e..a4cd3eac4 100644 --- a/internal/commands/agenthooks/guardrails/secrets/scanner.go +++ b/internal/commands/agenthooks/guardrails/secrets/scanner.go @@ -9,13 +9,12 @@ import ( // Tests substitute scan via NewScannerWithFunc. type Scanner struct { jwt wrappers.JWTWrapper - ff wrappers.FeatureFlagsWrapper scan func(sourcePath, content, ignoreFilePath string) ([]secretsrealtime.SecretsRealtimeResult, error) } // NewScanner returns a Scanner backed by the secrets realtime engine. -func NewScanner(jwt wrappers.JWTWrapper, ff wrappers.FeatureFlagsWrapper) *Scanner { - s := &Scanner{jwt: jwt, ff: ff} +func NewScanner(jwt wrappers.JWTWrapper) *Scanner { + s := &Scanner{jwt: jwt} s.scan = s.runRealScan return s } @@ -27,6 +26,6 @@ func NewScannerWithFunc(f func(sourcePath, content, ignoreFilePath string) ([]se } func (s *Scanner) runRealScan(sourcePath, content, ignoreFilePath string) ([]secretsrealtime.SecretsRealtimeResult, error) { - svc := secretsrealtime.NewSecretsRealtimeService(s.jwt, s.ff) + svc := secretsrealtime.NewSecretsRealtimeService(s.jwt) return svc.ScanContent(sourcePath, content, ignoreFilePath) } diff --git a/internal/commands/agenthooks/sca/scan.go b/internal/commands/agenthooks/sca/scan.go index e78ab6b54..f4ad3c8a6 100644 --- a/internal/commands/agenthooks/sca/scan.go +++ b/internal/commands/agenthooks/sca/scan.go @@ -23,7 +23,6 @@ const ( // substitute scan via NewScannerWithFunc. type Scanner struct { JWT wrappers.JWTWrapper - FF wrappers.FeatureFlagsWrapper RT wrappers.RealtimeScannerWrapper scan func(path string) (*ossrealtime.OssPackageResults, error) // workDir is the workspace root reported by the hook event (its "cwd"). The @@ -35,8 +34,8 @@ type Scanner struct { // NewScanner returns a Scanner backed by the given wrappers. The scan call // goes through ossrealtime.NewOssRealtimeService.RunOssRealtimeScan. -func NewScanner(jwt wrappers.JWTWrapper, ff wrappers.FeatureFlagsWrapper, rt wrappers.RealtimeScannerWrapper) *Scanner { - s := &Scanner{JWT: jwt, FF: ff, RT: rt} +func NewScanner(jwt wrappers.JWTWrapper, rt wrappers.RealtimeScannerWrapper) *Scanner { + s := &Scanner{JWT: jwt, RT: rt} s.scan = s.runRealScan return s } @@ -48,7 +47,7 @@ func NewScannerWithFunc(f func(path string) (*ossrealtime.OssPackageResults, err } func (s *Scanner) runRealScan(path string) (*ossrealtime.OssPackageResults, error) { - svc := ossrealtime.NewOssRealtimeService(s.JWT, s.FF, s.RT) + svc := ossrealtime.NewOssRealtimeService(s.JWT, s.RT) return svc.RunOssRealtimeScan(path, existingIgnoreFilePath(s.workDir)) } diff --git a/internal/commands/containers-realtime-engine.go b/internal/commands/containers-realtime-engine.go index dddce085b..eb6d15eee 100644 --- a/internal/commands/containers-realtime-engine.go +++ b/internal/commands/containers-realtime-engine.go @@ -12,7 +12,6 @@ import ( func RunScanContainersRealtimeCommand( realtimeScannerWrapper wrappers.RealtimeScannerWrapper, jwtWrapper wrappers.JWTWrapper, - featureFlagWrapper wrappers.FeatureFlagsWrapper, ) func(cmd *cobra.Command, args []string) error { return func(cmd *cobra.Command, _ []string) error { fileSourceFlag, _ := cmd.Flags().GetString(commonParams.SourcesFlag) @@ -22,7 +21,7 @@ func RunScanContainersRealtimeCommand( ignoredFilePathFlag, _ := cmd.Flags().GetString(commonParams.IgnoredFilePathFlag) - containersRealtimeService := containersrealtime.NewContainersRealtimeService(jwtWrapper, featureFlagWrapper, realtimeScannerWrapper) + containersRealtimeService := containersrealtime.NewContainersRealtimeService(jwtWrapper, realtimeScannerWrapper) images, err := containersRealtimeService.RunContainersRealtimeScan(fileSourceFlag, ignoredFilePathFlag) if err != nil { diff --git a/internal/commands/containers-realtime-engine_test.go b/internal/commands/containers-realtime-engine_test.go index e0034b353..c325d5123 100644 --- a/internal/commands/containers-realtime-engine_test.go +++ b/internal/commands/containers-realtime-engine_test.go @@ -6,13 +6,10 @@ import ( "strings" "testing" - "github.com/checkmarx/ast-cli/internal/wrappers" - "github.com/checkmarx/ast-cli/internal/wrappers/mock" "github.com/stretchr/testify/assert" ) func TestRunScanContainersRealtimeCommand_EmptyFilePath_Fails(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} err := execCmdNotNilAssertion(t, "scan", "containers-realtime", "-s", "") assert.NotNil(t, err) assert.True(t, strings.Contains(err.Error(), "file path is required") || @@ -21,29 +18,24 @@ func TestRunScanContainersRealtimeCommand_EmptyFilePath_Fails(t *testing.T) { } func TestRunScanContainersRealtimeCommand_MissingSourcesFlag_Fails(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} err := execCmdNotNilAssertion(t, "scan", "containers-realtime") assert.NotNil(t, err) } func TestRunScanContainersRealtimeCommand_Dockerfile_Success(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} execCmdNilAssertion(t, "scan", "containers-realtime", "-s", "data/Dockerfile") } func TestRunScanContainersRealtimeCommand_ContainersTestdata_Success(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} execCmdNilAssertion(t, "scan", "containers-realtime", "-s", "data/containers/testdata/Dockerfile") } func TestRunScanContainersRealtimeCommand_MissingFile_Fails(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} err := execCmdNotNilAssertion(t, "scan", "containers-realtime", "-s", "data/does-not-exist-Dockerfile") assert.NotNil(t, err) } func TestRunScanContainersRealtimeCommand_WithIgnoredFilePathFlag(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} // Empty/missing ignore file should still succeed (service fail-opens on ignore load). execCmdNilAssertion(t, "scan", "containers-realtime", diff --git a/internal/commands/hooks.go b/internal/commands/hooks.go index 65c9b5c46..f96c7e8c6 100644 --- a/internal/commands/hooks.go +++ b/internal/commands/hooks.go @@ -10,7 +10,7 @@ import ( ) // NewHooksCommand creates the hooks command with pre-commit subcommand -func NewHooksCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper, realtimeScannerWrapper wrappers.RealtimeScannerWrapper, telemetryWrapper wrappers.TelemetryWrapper) *cobra.Command { +func NewHooksCommand(jwtWrapper wrappers.JWTWrapper, realtimeScannerWrapper wrappers.RealtimeScannerWrapper, telemetryWrapper wrappers.TelemetryWrapper) *cobra.Command { hooksCmd := &cobra.Command{ Use: "hooks", Short: "Manage Git hooks and AI coding agent hooks", @@ -33,8 +33,8 @@ func NewHooksCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrapper } // Add pre-commit, pre-receive, and agenthooks management subcommands - hooksCmd.AddCommand(PreCommitCommand(jwtWrapper, featureFlagsWrapper)) - hooksCmd.AddCommand(PreReceiveCommand(jwtWrapper, featureFlagsWrapper)) + hooksCmd.AddCommand(PreCommitCommand(jwtWrapper)) + hooksCmd.AddCommand(PreReceiveCommand(jwtWrapper)) hooksCmd.AddCommand(NewAgentHooksCommand()) // Hidden machine-readable readiness probe: cx hooks check-auth @@ -45,21 +45,15 @@ func NewHooksCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrapper // Register all hidden hook dispatch subcommands so that cx itself acts as // the hook binary. Agents invoke: cx hooks // e.g. cx hooks claude-pre-tool-use - for _, dispatchCmd := range HookDispatchCommands(jwtWrapper, featureFlagsWrapper, realtimeScannerWrapper, telemetryWrapper) { + for _, dispatchCmd := range HookDispatchCommands(jwtWrapper, realtimeScannerWrapper, telemetryWrapper) { hooksCmd.AddCommand(dispatchCmd) } return hooksCmd } -func validateLicense(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) error { - scsLicensingV2Flag, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.ScsLicensingV2Enabled) - var licenseName string - if scsLicensingV2Flag.Status { - licenseName = params.SecretDetectionLabel - } else { - licenseName = params.EnterpriseSecretsLabel - } +func validateLicense(jwtWrapper wrappers.JWTWrapper) error { + licenseName := params.SecretDetectionLabel logger.PrintIfVerbose("hooks: checking license for " + licenseName) diff --git a/internal/commands/iac-realtime-engine.go b/internal/commands/iac-realtime-engine.go index cf253471e..2dba6f0fa 100644 --- a/internal/commands/iac-realtime-engine.go +++ b/internal/commands/iac-realtime-engine.go @@ -11,7 +11,6 @@ import ( func RunScanIacRealtimeCommand( jwtWrapper wrappers.JWTWrapper, - featureFlagWrapper wrappers.FeatureFlagsWrapper, ) func(cmd *cobra.Command, args []string) error { return func(cmd *cobra.Command, _ []string) error { fileSourceFlag, _ := cmd.Flags().GetString(commonParams.SourcesFlag) @@ -22,7 +21,7 @@ func RunScanIacRealtimeCommand( ignoredFilePathFlag, _ := cmd.Flags().GetString(commonParams.IgnoredFilePathFlag) engine, _ := cmd.Flags().GetString(commonParams.EngineFlag) - iacRealtimeService := iacrealtime.NewIacRealtimeService(jwtWrapper, featureFlagWrapper, iacrealtime.NewContainerManager()) + iacRealtimeService := iacrealtime.NewIacRealtimeService(jwtWrapper, iacrealtime.NewContainerManager()) results, err := iacRealtimeService.RunIacRealtimeScan(fileSourceFlag, engine, ignoredFilePathFlag) if err != nil { diff --git a/internal/commands/iac-realtime-engine_test.go b/internal/commands/iac-realtime-engine_test.go index 8c8c1aead..f37dedbaf 100644 --- a/internal/commands/iac-realtime-engine_test.go +++ b/internal/commands/iac-realtime-engine_test.go @@ -22,7 +22,6 @@ import ( func TestRunScanIacRealtimeCommand_MissingFileSource_Error(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) cmd := &cobra.Command{} @@ -40,7 +39,6 @@ func TestRunScanIacRealtimeCommand_MissingFileSource_Error(t *testing.T) { func TestRunScanIacRealtimeCommand_EmptyFileSource_Error(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) cmd := &cobra.Command{} @@ -75,9 +73,8 @@ func TestRunScanIacRealtimeCommand_ValidFileSource_Success(t *testing.T) { } jwtMock := &mock.JWTMockWrapper{} - flagsMock := &mock.FeatureFlagsMockWrapper{} - handler := RunScanIacRealtimeCommand(jwtMock, flagsMock) + handler := RunScanIacRealtimeCommand(jwtMock) cmd := &cobra.Command{} cmd.SetOut(bytes.NewBuffer([]byte{})) @@ -114,9 +111,8 @@ func TestRunScanIacRealtimeCommand_WithIgnoredFilePath(t *testing.T) { } jwtMock := &mock.JWTMockWrapper{} - flagsMock := &mock.FeatureFlagsMockWrapper{} - handler := RunScanIacRealtimeCommand(jwtMock, flagsMock) + handler := RunScanIacRealtimeCommand(jwtMock) cmd := &cobra.Command{} cmd.SetOut(bytes.NewBuffer([]byte{})) @@ -151,7 +147,6 @@ func TestRunScanIacRealtimeCommand_WithDocker_Engine(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) cmd := &cobra.Command{} @@ -180,7 +175,6 @@ func TestRunScanIacRealtimeCommand_WithPodman_Engine(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) cmd := &cobra.Command{} @@ -209,7 +203,6 @@ func TestRunScanIacRealtimeCommand_WithEmptyEngine_Default(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) cmd := &cobra.Command{} @@ -241,7 +234,6 @@ func TestRunScanIacRealtimeCommand_OutputBuffer(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) outputBuffer := bytes.NewBuffer([]byte{}) @@ -268,7 +260,6 @@ func TestRunScanIacRealtimeCommand_OutputBuffer(t *testing.T) { func TestRunScanIacRealtimeCommand_NoFlagsSet_UsesDefaults(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) cmd := &cobra.Command{} @@ -300,7 +291,6 @@ func TestRunScanIacRealtimeCommand_PathWithSpaces(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) cmd := &cobra.Command{} @@ -329,7 +319,6 @@ func TestRunScanIacRealtimeCommand_AbsolutePath(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) cmd := &cobra.Command{} @@ -361,7 +350,6 @@ func TestRunScanIacRealtimeCommand_FlagRetrieval_FileSourceExtracted(t *testing. // Track if the correct file source is used by checking for error handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) cmd := &cobra.Command{} @@ -393,7 +381,6 @@ func TestRunScanIacRealtimeCommand_MultipleEngineTypes(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) cmd := &cobra.Command{} @@ -422,7 +409,6 @@ func TestRunScanIacRealtimeCommand_MultipleEngineTypes(t *testing.T) { func TestRunScanIacRealtimeCommand_ReturnsCobraErrorHandler(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) if handler == nil { @@ -447,9 +433,8 @@ func TestRunScanIacRealtimeCommand_ReturnsCobraErrorHandler(t *testing.T) { func TestRunScanIacRealtimeCommand_WithJWTWrapper(t *testing.T) { jwtWrapper := &mock.JWTMockWrapper{} - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} - handler := RunScanIacRealtimeCommand(jwtWrapper, featureFlagsWrapper) + handler := RunScanIacRealtimeCommand(jwtWrapper) if handler == nil { t.Error("handler should be created with wrappers") @@ -465,17 +450,6 @@ func TestRunScanIacRealtimeCommand_WithJWTWrapper(t *testing.T) { } } -func TestRunScanIacRealtimeCommand_WithFeatureFlagsWrapper(t *testing.T) { - jwtWrapper := &mock.JWTMockWrapper{} - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} - - handler := RunScanIacRealtimeCommand(jwtWrapper, featureFlagsWrapper) - - if handler == nil { - t.Error("handler should be created successfully") - } -} - // ============================================================================ // Integration Tests // ============================================================================ @@ -500,7 +474,6 @@ func TestRunScanIacRealtimeCommand_FullFlow_WithAllFlags(t *testing.T) { handler := RunScanIacRealtimeCommand( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, ) outputBuffer := bytes.NewBuffer([]byte{}) diff --git a/internal/commands/oss-realtime-engine.go b/internal/commands/oss-realtime-engine.go index 31d49d9e7..323248630 100644 --- a/internal/commands/oss-realtime-engine.go +++ b/internal/commands/oss-realtime-engine.go @@ -12,7 +12,6 @@ import ( func RunScanOssRealtimeCommand( realtimeScannerWrapper wrappers.RealtimeScannerWrapper, jwtWrapper wrappers.JWTWrapper, - featureFlagWrapper wrappers.FeatureFlagsWrapper, ) func(cmd *cobra.Command, args []string) error { return func(cmd *cobra.Command, _ []string) error { fileSourceFlag, _ := cmd.Flags().GetString(commonParams.SourcesFlag) @@ -22,7 +21,7 @@ func RunScanOssRealtimeCommand( ignoredFilePathFlag, _ := cmd.Flags().GetString(commonParams.IgnoredFilePathFlag) - ossRealtimeService := ossrealtime.NewOssRealtimeService(jwtWrapper, featureFlagWrapper, realtimeScannerWrapper) + ossRealtimeService := ossrealtime.NewOssRealtimeService(jwtWrapper, realtimeScannerWrapper) packages, err := ossRealtimeService.RunOssRealtimeScan(fileSourceFlag, ignoredFilePathFlag) if err != nil { diff --git a/internal/commands/oss-realtime-engine_test.go b/internal/commands/oss-realtime-engine_test.go index 630fcb577..20c9c3ec2 100644 --- a/internal/commands/oss-realtime-engine_test.go +++ b/internal/commands/oss-realtime-engine_test.go @@ -3,13 +3,10 @@ package commands import ( "testing" - "github.com/checkmarx/ast-cli/internal/wrappers" - "github.com/checkmarx/ast-cli/internal/wrappers/mock" "github.com/stretchr/testify/assert" ) func TestRunScanOssRealtimeCommand_RequirementsTxtFile_ScanSuccess(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} execCmdNilAssertion( t, "scan", "oss-realtime", "-s", "data/manifests/requirements.txt", @@ -17,7 +14,6 @@ func TestRunScanOssRealtimeCommand_RequirementsTxtFile_ScanSuccess(t *testing.T) } func TestRunScanOssRealtimeCommand_EmptyFilePath_ScanFailed(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} err := execCmdNotNilAssertion( t, "scan", "oss-realtime", "-s", "", @@ -26,7 +22,6 @@ func TestRunScanOssRealtimeCommand_EmptyFilePath_ScanFailed(t *testing.T) { } func TestRunScanOssRealtimeCommand_PackageJsonFile_ScanSuccess(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} execCmdNilAssertion( t, "scan", "oss-realtime", "-s", "data/manifests/package.json", @@ -34,7 +29,6 @@ func TestRunScanOssRealtimeCommand_PackageJsonFile_ScanSuccess(t *testing.T) { } func TestRunScanOssRealtimeCommand_UnsupportedFileType_ScanFailed(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} err := execCmdNotNilAssertion( t, "scan", "oss-realtime", "-s", "not-supported-extension.txt", diff --git a/internal/commands/pre-receive.go b/internal/commands/pre-receive.go index 4b7457c8d..a349e9486 100644 --- a/internal/commands/pre-receive.go +++ b/internal/commands/pre-receive.go @@ -15,7 +15,8 @@ const ( SuccessFullSecretsLicenceValidation = "License for pre-receive secret detection has been validated successfully" ) -func PreReceiveCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command { +// PreReceiveCommand creates the pre-receive subcommand +func PreReceiveCommand(jwtWrapper wrappers.JWTWrapper) *cobra.Command { preReceiveCmd := &cobra.Command{ Use: "pre-receive", Short: "Manage pre-receive hooks and run secret detection scans", @@ -27,7 +28,7 @@ func PreReceiveCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrapp ), } preReceiveCmd.AddCommand(scanSecretsPreReceiveCommand()) - preReceiveCmd.AddCommand(validateSecretsLicence(jwtWrapper, featureFlagsWrapper)) + preReceiveCmd.AddCommand(validateSecretsLicence(jwtWrapper)) return preReceiveCmd } @@ -54,7 +55,7 @@ func scanSecretsPreReceiveCommand() *cobra.Command { return scanPrereceiveCmd } -func validateSecretsLicence(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command { +func validateSecretsLicence(jwtWrapper wrappers.JWTWrapper) *cobra.Command { validateLicence := &cobra.Command{ Use: "validate", Short: "Validates the license for pre-receive secret detection", @@ -64,20 +65,14 @@ func validateSecretsLicence(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper $ cx hooks pre-receive validate `, ), - RunE: checkLicence(jwtWrapper, featureFlagsWrapper), + RunE: checkLicence(jwtWrapper), } return validateLicence } -func checkLicence(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) func(cmd *cobra.Command, args []string) error { +func checkLicence(jwtWrapper wrappers.JWTWrapper) func(cmd *cobra.Command, args []string) error { return func(cmd *cobra.Command, args []string) error { - scsLicensingV2Flag, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.ScsLicensingV2Enabled) - var licenseName string - if scsLicensingV2Flag.Status { - licenseName = params.SecretDetectionLabel - } else { - licenseName = params.EnterpriseSecretsLabel - } + licenseName := params.SecretDetectionLabel isAllowed, err := jwtWrapper.IsAllowedEngine(licenseName) if err != nil { diff --git a/internal/commands/pre_commit.go b/internal/commands/pre_commit.go index 44ff7c3ec..2d9c88b63 100644 --- a/internal/commands/pre_commit.go +++ b/internal/commands/pre_commit.go @@ -11,8 +11,7 @@ import ( ) // PreCommitCommand creates the pre-commit subcommand - -func PreCommitCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command { +func PreCommitCommand(jwtWrapper wrappers.JWTWrapper) *cobra.Command { preCommitCmd := &cobra.Command{ Use: "pre-commit", Short: "Manage pre-commit hooks and run secret detection scans", @@ -26,11 +25,11 @@ func PreCommitCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappe } preCommitCmd.PersistentFlags().Bool("global", false, "Install the hook globally for all repositories") - preCommitCmd.AddCommand(secretsInstallGitHookCommand(jwtWrapper, featureFlagsWrapper)) + preCommitCmd.AddCommand(secretsInstallGitHookCommand(jwtWrapper)) preCommitCmd.AddCommand(secretsUninstallGitHookCommand()) - preCommitCmd.AddCommand(secretsUpdateGitHookCommand(jwtWrapper, featureFlagsWrapper)) - preCommitCmd.AddCommand(secretsScanCommand(jwtWrapper, featureFlagsWrapper)) - preCommitCmd.AddCommand(secretsIgnoreCommand(jwtWrapper, featureFlagsWrapper)) + preCommitCmd.AddCommand(secretsUpdateGitHookCommand(jwtWrapper)) + preCommitCmd.AddCommand(secretsScanCommand(jwtWrapper)) + preCommitCmd.AddCommand(secretsIgnoreCommand(jwtWrapper)) preCommitCmd.AddCommand(secretsHelpCommand()) return preCommitCmd @@ -38,7 +37,7 @@ func PreCommitCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappe // / validateLicense verifies the user has the required license for secret detection -func secretsInstallGitHookCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command { +func secretsInstallGitHookCommand(jwtWrapper wrappers.JWTWrapper) *cobra.Command { cmd := &cobra.Command{ Use: "secrets-install-git-hook", Short: "Install the pre-commit hook", @@ -49,7 +48,7 @@ func secretsInstallGitHookCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWr `, ), PreRunE: func(cmd *cobra.Command, args []string) error { - return validateLicense(jwtWrapper, featureFlagsWrapper) + return validateLicense(jwtWrapper) }, RunE: func(cmd *cobra.Command, args []string) error { global, _ := cmd.Flags().GetBool("global") @@ -79,7 +78,7 @@ func secretsUninstallGitHookCommand() *cobra.Command { return cmd } -func secretsUpdateGitHookCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command { +func secretsUpdateGitHookCommand(jwtWrapper wrappers.JWTWrapper) *cobra.Command { cmd := &cobra.Command{ Use: "secrets-update-git-hook", Short: "Update the pre-commit hook", @@ -90,7 +89,7 @@ func secretsUpdateGitHookCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWra `, ), PreRunE: func(cmd *cobra.Command, args []string) error { - return validateLicense(jwtWrapper, featureFlagsWrapper) + return validateLicense(jwtWrapper) }, RunE: func(cmd *cobra.Command, args []string) error { global, _ := cmd.Flags().GetBool("global") @@ -101,7 +100,7 @@ func secretsUpdateGitHookCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWra return cmd } -func secretsScanCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command { +func secretsScanCommand(jwtWrapper wrappers.JWTWrapper) *cobra.Command { return &cobra.Command{ Use: "secrets-scan", Short: "Run the real-time secret detection scan", @@ -112,7 +111,7 @@ func secretsScanCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrap `, ), PreRunE: func(cmd *cobra.Command, args []string) error { - return validateLicense(jwtWrapper, featureFlagsWrapper) + return validateLicense(jwtWrapper) }, RunE: func(cmd *cobra.Command, args []string) error { return precommit.Scan() @@ -120,7 +119,7 @@ func secretsScanCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrap } } -func secretsIgnoreCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command { +func secretsIgnoreCommand(jwtWrapper wrappers.JWTWrapper) *cobra.Command { var resultIds string var all bool @@ -135,7 +134,7 @@ func secretsIgnoreCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wr `, ), PreRunE: func(cmd *cobra.Command, args []string) error { - if err := validateLicense(jwtWrapper, featureFlagsWrapper); err != nil { + if err := validateLicense(jwtWrapper); err != nil { return err } diff --git a/internal/commands/pre_commit_test.go b/internal/commands/pre_commit_test.go index 00001f798..96bc74360 100644 --- a/internal/commands/pre_commit_test.go +++ b/internal/commands/pre_commit_test.go @@ -5,17 +5,15 @@ package commands import ( "testing" - "github.com/checkmarx/ast-cli/internal/wrappers" "github.com/checkmarx/ast-cli/internal/wrappers/mock" "github.com/stretchr/testify/assert" ) func TestNewHooksCommand(t *testing.T) { mockJWT := &mock.JWTMockWrapper{} - mockFF := &mock.FeatureFlagsMockWrapper{} mockRealtime := &mock.RealtimeScannerMockWrapper{} mockTelemetry := &mock.TelemetryMockWrapper{} - cmd := NewHooksCommand(mockJWT, mockFF, mockRealtime, mockTelemetry) + cmd := NewHooksCommand(mockJWT, mockRealtime, mockTelemetry) assert.NotNil(t, cmd) assert.Equal(t, "hooks", cmd.Use) @@ -24,8 +22,7 @@ func TestNewHooksCommand(t *testing.T) { func TestPreCommitCommand(t *testing.T) { mockJWT := &mock.JWTMockWrapper{} - mockFF := &mock.FeatureFlagsMockWrapper{} - cmd := PreCommitCommand(mockJWT, mockFF) + cmd := PreCommitCommand(mockJWT) assert.NotNil(t, cmd) assert.Equal(t, "pre-commit", cmd.Use) @@ -52,65 +49,36 @@ func TestPreCommitCommand(t *testing.T) { func TestValidateLicense(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - allowSecretDetection int - allowEnterpriseSecrets int - aiEnabled int - wantErr bool + name string + allowSecretDetection int + aiEnabled int + wantErr bool }{ { - name: "scsLicensing V2 ON and Secret Detection allowed", - scsLicensingV2: true, - allowSecretDetection: 0, - allowEnterpriseSecrets: mock.EnterpriseSecretsDisabled, - wantErr: false, + name: "Secret Detection allowed", + allowSecretDetection: 0, + wantErr: false, }, { - name: "scsLicensing V2 ON and Secret Detection denied", - scsLicensingV2: true, - allowSecretDetection: mock.SecretDetectionDisabled, - allowEnterpriseSecrets: 0, - wantErr: true, + name: "Secret Detection denied", + allowSecretDetection: mock.SecretDetectionDisabled, + wantErr: true, }, { - name: "scsLicensing V2 OFF and Enterprise Secrets allowed", - scsLicensingV2: false, - allowSecretDetection: mock.SecretDetectionDisabled, - allowEnterpriseSecrets: 0, - wantErr: false, - }, - { - name: "scsLicensing V2 OFF and Enterprise Secrets denied", - scsLicensingV2: false, - allowSecretDetection: 0, - allowEnterpriseSecrets: mock.EnterpriseSecretsDisabled, - wantErr: true, - }, - { - name: "AI enabled and secrets license disabled", - aiEnabled: 1, - allowEnterpriseSecrets: mock.EnterpriseSecretsDisabled, - allowSecretDetection: mock.SecretDetectionDisabled, - wantErr: true, + name: "AI enabled and secrets license disabled", + aiEnabled: 1, + allowSecretDetection: mock.SecretDetectionDisabled, + wantErr: true, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - wrappers.ClearCache() - mockFF := &mock.FeatureFlagsMockWrapper{} - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - mockJWT := &mock.JWTMockWrapper{} mockJWT.AIEnabled = tt.aiEnabled - mockJWT.EnterpriseSecretsEnabled = tt.allowEnterpriseSecrets mockJWT.SecretDetectionEnabled = tt.allowSecretDetection - err := validateLicense(mockJWT, mockFF) + err := validateLicense(mockJWT) if tt.wantErr { assert.Error(t, err) @@ -124,8 +92,7 @@ func TestValidateLicense(t *testing.T) { func TestSecretsIgnoreCommand(t *testing.T) { mockJWT := &mock.JWTMockWrapper{} - mockFF := &mock.FeatureFlagsMockWrapper{} - cmd := secretsIgnoreCommand(mockJWT, mockFF) + cmd := secretsIgnoreCommand(mockJWT) assert.NotNil(t, cmd) resultIdsFlag := cmd.Flag("resultIds") diff --git a/internal/commands/pre_receive_test.go b/internal/commands/pre_receive_test.go index f141cd478..e6618c68c 100644 --- a/internal/commands/pre_receive_test.go +++ b/internal/commands/pre_receive_test.go @@ -11,8 +11,7 @@ import ( func TestPreReceiveCommand(t *testing.T) { mockJWT := &mock.JWTMockWrapper{} - mockFF := &mock.FeatureFlagsMockWrapper{} - cmd := PreReceiveCommand(mockJWT, mockFF) + cmd := PreReceiveCommand(mockJWT) assert.NotNil(t, cmd) assert.Equal(t, "pre-receive", cmd.Use) subCmds := cmd.Commands() diff --git a/internal/commands/result.go b/internal/commands/result.go index c3fc8c636..02a254e05 100644 --- a/internal/commands/result.go +++ b/internal/commands/result.go @@ -241,7 +241,7 @@ func NewResultsCommand( codeBashingCmd := resultCodeBashing(codeBashingWrapper) bflResultCmd := resultBflSubCommand(bflWrapper) exitCodeSubcommand := exitCodeSubCommand(scanWrapper) - riskManagementSubCommand := riskManagementSubCommand(riskManagementWrapper, featureFlagsWrapper) + riskManagementSubCommand := riskManagementSubCommand(riskManagementWrapper) resultCmd.AddCommand( showResultCmd, bflResultCmd, codeBashingCmd, exitCodeSubcommand, riskManagementSubCommand, ) @@ -266,8 +266,7 @@ func exitCodeSubCommand(scanWrapper wrappers.ScansWrapper) *cobra.Command { return exitCodeCmd } -func riskManagementSubCommand(riskManagement wrappers.RiskManagementWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper, -) *cobra.Command { +func riskManagementSubCommand(riskManagement wrappers.RiskManagementWrapper) *cobra.Command { riskManagementCmd := &cobra.Command{ Use: "risk-management", Short: "Show risk-management results of a project", @@ -277,7 +276,7 @@ func riskManagementSubCommand(riskManagement wrappers.RiskManagementWrapper, fea $ cx results risk-management --project-id --scan-id --limit (1-50, default: 50) `, ), - RunE: runRiskManagementCommand(riskManagement, featureFlagsWrapper), + RunE: runRiskManagementCommand(riskManagement), } riskManagementCmd.PersistentFlags().String(commonParams.ProjectIDFlag, "", "Project ID") @@ -397,19 +396,13 @@ func runGetExitCodeCommand(scanWrapper wrappers.ScansWrapper) func(cmd *cobra.Co } } -func runRiskManagementCommand(riskManagement wrappers.RiskManagementWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper, -) func(cmd *cobra.Command, args []string) error { +func runRiskManagementCommand(riskManagement wrappers.RiskManagementWrapper) func(cmd *cobra.Command, args []string) error { return func(cmd *cobra.Command, args []string) error { projectID, _ := cmd.Flags().GetString(commonParams.ProjectIDFlag) scanID, _ := cmd.Flags().GetString(commonParams.ScanIDFlag) limit, _ := cmd.Flags().GetInt(commonParams.LimitFlag) - flagResponse, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.RiskManagementEnabled) - ASPMEnabled := flagResponse.Status - if !ASPMEnabled { - return errors.Errorf("%s", "Risk management results are currently unavailable for your tenant.") - } results, err := getRiskManagementResults(riskManagement, projectID, scanID) if err != nil { return err diff --git a/internal/commands/result_test.go b/internal/commands/result_test.go index 660074995..cb6740548 100644 --- a/internal/commands/result_test.go +++ b/internal/commands/result_test.go @@ -1546,16 +1546,7 @@ func TestRiskManagementHelp(t *testing.T) { execCmdNilAssertion(t, "help", "results", "risk-management") } -func TestRiskManagement_ShouldFFBeFalseAndReturnError(t *testing.T) { - clearFlags() - err := execCmdNotNilAssertion(t, "results", "risk-management") - assert.Equal(t, err.Error(), "Risk management results are currently unavailable for your tenant.", "Expected error message") - -} - func TestRiskManagement(t *testing.T) { - clearFlags() - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.RiskManagementEnabled, Status: true} execCmdNilAssertion(t, "results", "risk-management") } diff --git a/internal/commands/root.go b/internal/commands/root.go index 3b968210e..7340f9116 100644 --- a/internal/commands/root.go +++ b/internal/commands/root.go @@ -253,7 +253,7 @@ func NewAstCLI( triageCmd := NewResultsPredicatesCommand(resultsPredicatesWrapper, featureFlagsWrapper, customStatesWrapper) chatCmd := NewChatCommand(chatWrapper, tenantWrapper) - hooksCmd := NewHooksCommand(jwtWrapper, featureFlagsWrapper, realTimeWrapper, telemetryWrapper) + hooksCmd := NewHooksCommand(jwtWrapper, realTimeWrapper, telemetryWrapper) telemetryCmd := NewTelemetryCommand(telemetryWrapper) // MCP server — directly uses the exported guardrail functions from agenthooks.go. diff --git a/internal/commands/scan.go b/internal/commands/scan.go index 37931d163..295b78c27 100644 --- a/internal/commands/scan.go +++ b/internal/commands/scan.go @@ -137,7 +137,6 @@ const ( ScsScorecardUnsupportedHostWarningMsg = "SCS scan warning: Unable to run Scorecard scanner due to unsupported repo host. Currently, Scorecard can only run on GitHub Cloud repos." gitCommitHistoryInvalidValueErrorMsg = "Invalid value for --git-commit-history. Valid values are: 'true' or 'false'" - gitCommitHistoryNotAvailableWarningMsg = "Secret Detection scan warning: --git-commit-history flag ignored because git commit history scanning is not available." gitCommitHistoryNotSelectedWarningMsg = "Secret Detection scan warning: --git-commit-history flag ignored because scs was not specified in scan types." gitCommitHistoryNotApplicableWarningMsg = "Secret Detection scan warning: --git-commit-history flag ignored because secret detection wasn't run on this scan." gitCommitHistoryNoGitRepositoryWarningMsg = "Secret Detection scan warning: No Git history found. Secret Detection will scan the working tree only." @@ -259,13 +258,13 @@ func NewScanCommand( scaRealtimeCmd := scarealtime.NewScaRealtimeCommand(scaRealTimeWrapper) - ossRealtimeCmd := scanOssRealtimeSubCommand(realtimeScannerWrapper, jwtWrapper, featureFlagsWrapper) + ossRealtimeCmd := scanOssRealtimeSubCommand(realtimeScannerWrapper, jwtWrapper) - containersRealtimeCmd := scanContainersRealtimeSubCommand(realtimeScannerWrapper, jwtWrapper, featureFlagsWrapper) + containersRealtimeCmd := scanContainersRealtimeSubCommand(realtimeScannerWrapper, jwtWrapper) - secretsRealtimeCmd := scanSecretsRealtimeSubCommand(jwtWrapper, featureFlagsWrapper) + secretsRealtimeCmd := scanSecretsRealtimeSubCommand(jwtWrapper) - iacRealtimeCmd := scanIacRealtimeSubCommand(jwtWrapper, featureFlagsWrapper) + iacRealtimeCmd := scanIacRealtimeSubCommand(jwtWrapper) addFormatFlagToMultipleCommands( []*cobra.Command{listScansCmd, showScanCmd, workflowScanCmd}, @@ -512,7 +511,6 @@ func scanASCASubCommand(jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrap func scanOssRealtimeSubCommand( realtimeScannerWrapper wrappers.RealtimeScannerWrapper, jwtWrapper wrappers.JWTWrapper, - featureFlagsWrapper wrappers.FeatureFlagsWrapper, ) *cobra.Command { scanOssRealtimeCmd := &cobra.Command{ Hidden: true, @@ -531,7 +529,7 @@ func scanOssRealtimeSubCommand( `, ), }, - RunE: RunScanOssRealtimeCommand(realtimeScannerWrapper, jwtWrapper, featureFlagsWrapper), + RunE: RunScanOssRealtimeCommand(realtimeScannerWrapper, jwtWrapper), } scanOssRealtimeCmd.PersistentFlags().StringP( @@ -552,7 +550,6 @@ func scanOssRealtimeSubCommand( func scanIacRealtimeSubCommand( jwtWrapper wrappers.JWTWrapper, - featureFlagsWrapper wrappers.FeatureFlagsWrapper, ) *cobra.Command { scanIacRealtimeCmd := &cobra.Command{ Hidden: true, @@ -571,7 +568,7 @@ func scanIacRealtimeSubCommand( `, ), }, - RunE: RunScanIacRealtimeCommand(jwtWrapper, featureFlagsWrapper), + RunE: RunScanIacRealtimeCommand(jwtWrapper), } scanIacRealtimeCmd.PersistentFlags().StringP( @@ -596,7 +593,7 @@ func scanIacRealtimeSubCommand( return scanIacRealtimeCmd } -func scanContainersRealtimeSubCommand(realtimeScannerWrapper wrappers.RealtimeScannerWrapper, jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command { +func scanContainersRealtimeSubCommand(realtimeScannerWrapper wrappers.RealtimeScannerWrapper, jwtWrapper wrappers.JWTWrapper) *cobra.Command { scanContainersRealtimeCmd := &cobra.Command{ Hidden: true, Use: "containers-realtime", @@ -615,7 +612,7 @@ func scanContainersRealtimeSubCommand(realtimeScannerWrapper wrappers.RealtimeSc `, ), }, - RunE: RunScanContainersRealtimeCommand(realtimeScannerWrapper, jwtWrapper, featureFlagsWrapper), + RunE: RunScanContainersRealtimeCommand(realtimeScannerWrapper, jwtWrapper), } scanContainersRealtimeCmd.PersistentFlags().StringP( @@ -631,7 +628,6 @@ func scanContainersRealtimeSubCommand(realtimeScannerWrapper wrappers.RealtimeSc func scanSecretsRealtimeSubCommand( jwtWrapper wrappers.JWTWrapper, - featureFlagsWrapper wrappers.FeatureFlagsWrapper, ) *cobra.Command { scanSecretsRealtimeCmd := &cobra.Command{ Hidden: true, @@ -647,7 +643,7 @@ func scanSecretsRealtimeSubCommand( https://docs.checkmarx.com/en/34965-68625-checkmarx-one-cli-commands.html `), }, - RunE: RunScanSecretsRealtimeCommand(jwtWrapper, featureFlagsWrapper), + RunE: RunScanSecretsRealtimeCommand(jwtWrapper), } scanSecretsRealtimeCmd.Flags().StringP(commonParams.SourcesFlag, "s", "", "Path to the file to scan") @@ -1060,14 +1056,14 @@ func setupScanTypeProjectAndConfig( } var SCSConfig, scsErr = addSCSScan(cmd, resubmitConfig, userAllowedEngines[commonParams.RepositoryHealthType], - userAllowedEngines[commonParams.SecretDetectionType], userAllowedEngines[commonParams.EnterpriseSecretsType], featureFlagsWrapper) + userAllowedEngines[commonParams.SecretDetectionType]) if scsErr != nil { return scsErr } else if SCSConfig != nil { configArr = append(configArr, SCSConfig) } - var aiscConfig = addAiscScan(featureFlagsWrapper, resubmitConfig) + var aiscConfig = addAiscScan(resubmitConfig) if aiscConfig != nil { configArr = append(configArr, aiscConfig) } @@ -1207,10 +1203,9 @@ func overrideSastConfigValue(sastFastScanChanged, sastIncrementalChanged, sastBa } } -func addAiscScan(featureFlagWrapper wrappers.FeatureFlagsWrapper, resubmitConfig []wrappers.Config) map[string]interface{} { +func addAiscScan(resubmitConfig []wrappers.Config) map[string]interface{} { // Add the aisc resubmit config, currently no value is passed in config - aiSupplyChainGAEnabled, _ := wrappers.GetSpecificFeatureFlag(featureFlagWrapper, wrappers.AISupplyChainGAEnabled) - if scanTypeEnabled(commonParams.AiscType) && aiSupplyChainGAEnabled.Status { + if scanTypeEnabled(commonParams.AiscType) { aiscMapConfig := make(map[string]interface{}) aiscConfig := wrappers.AISCConfig{} aiscMapConfig[resultsMapType] = commonParams.AiscType @@ -1468,14 +1463,12 @@ func isScorecardRunnable(isScsEnginesFlagSet, scsScorecardSelected bool, scsRepo } func addSCSScan(cmd *cobra.Command, resubmitConfig []wrappers.Config, hasRepositoryHealthLicense, - hasSecretDetectionLicense, hasEnterpriseSecretsLicense bool, featureFlagsWrapper wrappers.FeatureFlagsWrapper) (map[string]interface{}, error) { - scsLicensingV2Flag, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.ScsLicensingV2Enabled) - scsEnabled := isScsEnabled(scsLicensingV2Flag.Status) - if !scsEnabled { + hasSecretDetectionLicense bool) (map[string]interface{}, error) { + if !isScsEnabled() { return nil, nil } - scsScorecardAllowed := isScsScorecardAllowed(scsLicensingV2Flag.Status, hasRepositoryHealthLicense) - scsSecretDetectionAllowed := isScsSecretDetectionAllowed(scsLicensingV2Flag.Status, hasSecretDetectionLicense, hasEnterpriseSecretsLicense) + scsScorecardAllowed := hasRepositoryHealthLicense + scsSecretDetectionAllowed := hasSecretDetectionLicense if !scsScorecardAllowed && !scsSecretDetectionAllowed { return nil, nil } @@ -1507,9 +1500,8 @@ func addSCSScan(cmd *cobra.Command, resubmitConfig []wrappers.Config, hasReposit if scsSecretDetectionSelected && scsSecretDetectionAllowed { scsConfig.Twoms = trueString - // Set git commit history based on FF and validations - commitHistoryFlag, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.SscsCommitHistoryEnabled) - if gitCommitHistoryValue := getGitCommitHistoryValue(cmd, commitHistoryFlag.Status); gitCommitHistoryValue != "" { + // Set git commit history based on validations + if gitCommitHistoryValue := getGitCommitHistoryValue(cmd); gitCommitHistoryValue != "" { scsConfig.GitCommitHistory = gitCommitHistoryValue } } @@ -1537,33 +1529,14 @@ func addSCSScan(cmd *cobra.Command, resubmitConfig []wrappers.Config, hasReposit return scsMapConfig, nil } -func isScsEnabled(scsLicensingV2 bool) bool { - if scsLicensingV2 { - return scanTypeEnabled(commonParams.ScsType) || scanTypeEnabled(commonParams.SecretDetectionType) || - scanTypeEnabled(commonParams.RepositoryHealthType) - } - return scanTypeEnabled(commonParams.ScsType) -} - -func isScsScorecardAllowed(scsLicensingV2, hasRepositoryHealthLicense bool) bool { - if scsLicensingV2 { - return hasRepositoryHealthLicense - } - return true -} - -func isScsSecretDetectionAllowed(scsLicensingV2, hasSecretDetectionLicense, hasEnterpriseSecretsLicense bool) bool { - if scsLicensingV2 { - return hasSecretDetectionLicense - } - return hasEnterpriseSecretsLicense +func isScsEnabled() bool { + return scanTypeEnabled(commonParams.ScsType) || scanTypeEnabled(commonParams.SecretDetectionType) || + scanTypeEnabled(commonParams.RepositoryHealthType) } func validateScanTypes(cmd *cobra.Command, jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) error { var scanTypes []string - scsLicensingV2Flag, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.ScsLicensingV2Enabled) - allowedEngines, err := jwtWrapper.GetAllowedEngines(featureFlagsWrapper) logger.PrintIfVerbose(fmt.Sprintf("Allowed scan types: %v", allowedEngines)) @@ -1596,7 +1569,7 @@ func validateScanTypes(cmd *cobra.Command, jwtWrapper wrappers.JWTWrapper, featu } for _, scanType := range scanTypes { - if scanType == commonParams.ScsType && scsLicensingV2Flag.Status { + if scanType == commonParams.ScsType { // the SCS scan type is a special case because it contains two engines. // Before the new licensing model, the main license was named "scs". // Licenses are now separated for each engine, so this validation no longer makes sense. @@ -1612,7 +1585,7 @@ func validateScanTypes(cmd *cobra.Command, jwtWrapper wrappers.JWTWrapper, featu userSCSScanTypes, _ := cmd.Flags().GetString(commonParams.SCSEnginesFlag) if slices.Contains(scanTypes, commonParams.ScsType) { - err = validateSCSEngines(allowedEngines, userSCSScanTypes, scsLicensingV2Flag.Status) + err = validateSCSEngines(allowedEngines, userSCSScanTypes) if err != nil { return err } @@ -1637,21 +1610,17 @@ func validateScanTypes(cmd *cobra.Command, jwtWrapper wrappers.JWTWrapper, featu return nil } -func validateSCSEngines(allowedEngines map[string]bool, userSCSScanTypes string, scsLicensingV2 bool) error { +func validateSCSEngines(allowedEngines map[string]bool, userSCSScanTypes string) error { licensesAvailable := reflect.ValueOf(allowedEngines).MapKeys() scsScanTypes := strings.Split(userSCSScanTypes, ",") - if scsLicensingV2 { - secretDetectionAllowed := allowedEngines[commonParams.SecretDetectionType] - repositoryHeatlhAllowed := allowedEngines[commonParams.RepositoryHealthType] - if userSCSScanTypes == "" && !secretDetectionAllowed && !repositoryHeatlhAllowed { - return errors.Errorf(engineScsNotAllowed, licensesAvailable) - } else if slices.Contains(scsScanTypes, ScsSecretDetectionType) && !secretDetectionAllowed { - return errors.Errorf(engineNotAllowed, commonParams.SecretDetectionType, commonParams.SecretDetectionType, licensesAvailable) - } else if slices.Contains(scsScanTypes, ScsScoreCardType) && !repositoryHeatlhAllowed { - return errors.Errorf(engineNotAllowed, commonParams.RepositoryHealthType, commonParams.RepositoryHealthType, licensesAvailable) - } - } else if slices.Contains(scsScanTypes, ScsSecretDetectionType) && !allowedEngines[commonParams.EnterpriseSecretsType] { - return errors.Errorf(engineNotAllowed, ScsSecretDetectionType, ScsSecretDetectionType, licensesAvailable) + secretDetectionAllowed := allowedEngines[commonParams.SecretDetectionType] + repositoryHeatlhAllowed := allowedEngines[commonParams.RepositoryHealthType] + if userSCSScanTypes == "" && !secretDetectionAllowed && !repositoryHeatlhAllowed { + return errors.Errorf(engineScsNotAllowed, licensesAvailable) + } else if slices.Contains(scsScanTypes, ScsSecretDetectionType) && !secretDetectionAllowed { + return errors.Errorf(engineNotAllowed, commonParams.SecretDetectionType, commonParams.SecretDetectionType, licensesAvailable) + } else if slices.Contains(scsScanTypes, ScsScoreCardType) && !repositoryHeatlhAllowed { + return errors.Errorf(engineNotAllowed, commonParams.RepositoryHealthType, commonParams.RepositoryHealthType, licensesAvailable) } return nil } @@ -2565,8 +2534,7 @@ func uploadZip(uploadsWrapper wrappers.UploadsWrapper, zipFilePath string, unzip } logger.PrintIfVerbose(fmt.Sprintf("Zip size before upload: %.2fMB\n", float64(fileInfo.Size())/mbBytes)) - flagResponse, _ := featureFlagsWrapper.GetSpecificFlag(wrappers.IncreaseFileUploadLimit) - if flagResponse.Status && fileInfo.Size() > MaxSizeBytes { + if fileInfo.Size() > MaxSizeBytes { logger.PrintIfVerbose("Uploading source code in multiple parts.") preSignedURL, zipFilePathErr = uploadsWrapper.UploadFileInMultipart(zipFilePath, featureFlagsWrapper) } else { @@ -4396,13 +4364,8 @@ func validateGitCommitHistoryFlag(cmd *cobra.Command) error { return nil } -// getGitCommitHistoryValue determines the value for git commit history config based on flag and validations -func getGitCommitHistoryValue(cmd *cobra.Command, isFeatureFlagEnabled bool) string { - if !isFeatureFlagEnabled { - fmt.Println(gitCommitHistoryNotAvailableWarningMsg) - return "" - } - +// getGitCommitHistoryValue determines the value for git commit history config based on the flag and validations +func getGitCommitHistoryValue(cmd *cobra.Command) string { gitCommitHistory, _ := cmd.Flags().GetString(commonParams.GitCommitHistoryFlag) gitCommitHistoryValue := strings.ToLower(gitCommitHistory) diff --git a/internal/commands/scan_test.go b/internal/commands/scan_test.go index 76037be06..199a82992 100644 --- a/internal/commands/scan_test.go +++ b/internal/commands/scan_test.go @@ -871,23 +871,16 @@ func TestAddScaScan(t *testing.T) { } } -func TestAddAiscScan_WhenAiscEnabledAndFeatureFlagEnabled_ShouldReturnConfig(t *testing.T) { - wrappers.ClearCache() +func TestAddAiscScan_WhenAiscEnabled_ShouldReturnConfig(t *testing.T) { var resubmitConfig []wrappers.Config - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.AISupplyChainGAEnabled, - Status: true, - } - defer clearFlags() originalScanTypes := actualScanTypes actualScanTypes = commonParams.SastType + "," + commonParams.KicsType + "," + commonParams.ScaType + "," + commonParams.AiscType defer func() { actualScanTypes = originalScanTypes }() - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} - result := addAiscScan(featureFlagsWrapper, resubmitConfig) + result := addAiscScan(resubmitConfig) - assert.Assert(t, result != nil, "Expected non-nil result when AISC is enabled and feature flag is true") + assert.Assert(t, result != nil, "Expected non-nil result when AISC is enabled") assert.Assert(t, result[resultsMapType] == commonParams.AiscType, "Expected type '%s', got '%v'", commonParams.AiscType, result[resultsMapType]) @@ -899,76 +892,38 @@ func TestAddAiscScan_WhenAiscEnabledAndFeatureFlagEnabled_ShouldReturnConfig(t * } func TestAddAiscScan_WhenAiscDisabled_ShouldReturnNil(t *testing.T) { - wrappers.ClearCache() var resubmitConfig []wrappers.Config - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.AISupplyChainGAEnabled, - Status: true, - } - defer clearFlags() originalScanTypes := actualScanTypes actualScanTypes = commonParams.SastType + "," + commonParams.KicsType + "," + commonParams.ScaType defer func() { actualScanTypes = originalScanTypes }() - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} - result := addAiscScan(featureFlagsWrapper, resubmitConfig) + result := addAiscScan(resubmitConfig) assert.Assert(t, result == nil, "Expected nil result when AISC is disabled in scan types") } -func TestAddAiscScan_WhenFeatureFlagDisabled_ShouldReturnNil(t *testing.T) { - wrappers.ClearCache() - var resubmitConfig []wrappers.Config - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.AISupplyChainGAEnabled, - Status: false, - } - defer clearFlags() - originalScanTypes := actualScanTypes - actualScanTypes = commonParams.SastType + "," + commonParams.KicsType + "," + commonParams.ScaType + "," + commonParams.AiscType - defer func() { actualScanTypes = originalScanTypes }() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} - result := addAiscScan(featureFlagsWrapper, resubmitConfig) - assert.Assert(t, result == nil, "Expected nil result when feature flag is disabled") -} - func TestAddAiscScan_WithResubmitConfig_ShouldHandleCorrectly(t *testing.T) { - wrappers.ClearCache() resubmitConfig := []wrappers.Config{ { Type: commonParams.AiscType, Value: map[string]interface{}{}, }, } - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.AISupplyChainGAEnabled, - Status: true, - } - defer clearFlags() originalScanTypes := actualScanTypes actualScanTypes = commonParams.SastType + "," + commonParams.KicsType + "," + commonParams.ScaType + "," + commonParams.AiscType defer func() { actualScanTypes = originalScanTypes }() - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} - result := addAiscScan(featureFlagsWrapper, resubmitConfig) + result := addAiscScan(resubmitConfig) assert.Assert(t, result != nil, "Expected non-nil result with resubmit config") assert.Assert(t, result[resultsMapType] == commonParams.AiscType, "Expected type '%s'", commonParams.AiscType) } func TestAddAiscScan_ConfigStructure_ShouldHaveCorrectFormat(t *testing.T) { - wrappers.ClearCache() var resubmitConfig []wrappers.Config - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.AISupplyChainGAEnabled, - Status: true, - } - defer clearFlags() originalScanTypes := actualScanTypes actualScanTypes = commonParams.SastType + "," + commonParams.KicsType + "," + commonParams.ScaType + "," + commonParams.AiscType defer func() { actualScanTypes = originalScanTypes }() - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} - result := addAiscScan(featureFlagsWrapper, resubmitConfig) + result := addAiscScan(resubmitConfig) expectedMapConfig := make(map[string]interface{}) expectedMapConfig[resultsMapType] = commonParams.AiscType @@ -983,25 +938,14 @@ func TestAddAiscScan_ConfigStructure_ShouldHaveCorrectFormat(t *testing.T) { func TestAddSCSScan_ResubmitWithoutScorecardFlags_ShouldPass(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -1032,15 +976,8 @@ func TestAddSCSScan_ResubmitWithoutScorecardFlags_ShouldPass(t *testing.T) { }, } - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) expectedConfig := wrappers.SCSConfig{ Twoms: trueString, @@ -1060,25 +997,14 @@ func TestAddSCSScan_ResubmitWithoutScorecardFlags_ShouldPass(t *testing.T) { func TestAddSCSScan_ResubmitWithScorecardFlags_ShouldPass(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -1109,15 +1035,8 @@ func TestAddSCSScan_ResubmitWithScorecardFlags_ShouldPass(t *testing.T) { }, } - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) expectedConfig := wrappers.SCSConfig{ Twoms: "true", @@ -1377,25 +1296,14 @@ func TestCreateScan_WithSCSScorecard_ShouldFail(t *testing.T) { func TestAddSCSScan_WithSCSSecretDetectionAndScorecard_scsMapHasBoth(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -1416,15 +1324,8 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecard_scsMapHasBoth(t *testing. _ = cmdCommand.Flags().Set(commonParams.SCSRepoTokenFlag, dummyToken) _ = cmdCommand.Flags().Set(commonParams.SCSRepoURLFlag, dummyRepo) - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) scsConfig := wrappers.SCSConfig{ Twoms: "true", @@ -1445,25 +1346,14 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecard_scsMapHasBoth(t *testing. func TestAddSCSScan_WithoutSCSSecretDetection_scsMapNoSecretDetection(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: false, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: false, }, } @@ -1484,15 +1374,8 @@ func TestAddSCSScan_WithoutSCSSecretDetection_scsMapNoSecretDetection(t *testing _ = cmdCommand.Flags().Set(commonParams.SCSRepoTokenFlag, dummyToken) _ = cmdCommand.Flags().Set(commonParams.SCSRepoURLFlag, dummyRepo) - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) scsConfig := wrappers.SCSConfig{ Twoms: "", @@ -1513,25 +1396,14 @@ func TestAddSCSScan_WithoutSCSSecretDetection_scsMapNoSecretDetection(t *testing func TestAddSCSScan_WithSCSSecretDetection_scsMapHasSecretDetection(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -1548,15 +1420,8 @@ func TestAddSCSScan_WithSCSSecretDetection_scsMapHasSecretDetection(t *testing.T _ = cmdCommand.Execute() _ = cmdCommand.Flags().Set(commonParams.SCSEnginesFlag, "secret-detection") - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) scsConfig := wrappers.SCSConfig{ Twoms: "true", @@ -1574,25 +1439,14 @@ func TestAddSCSScan_WithSCSSecretDetection_scsMapHasSecretDetection(t *testing.T func TestAddSCSScan_WithSCSSecretDetectionAndGitCommitHistoryFlag_scsMapHasSecretDetection(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -1621,21 +1475,8 @@ func TestAddSCSScan_WithSCSSecretDetectionAndGitCommitHistoryFlag_scsMapHasSecre _ = cmdCommand.Flags().Set(commonParams.ScanTypes, "scs") _ = cmdCommand.Flags().Set(commonParams.SourcesFlag, tempDir) - mock.Flags = wrappers.FeatureFlagsResponseModel{ - { - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - }, - { - Name: wrappers.SscsCommitHistoryEnabled, - Status: true, - }, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) scsConfig := wrappers.SCSConfig{ Twoms: "true", @@ -1654,25 +1495,14 @@ func TestAddSCSScan_WithSCSSecretDetectionAndGitCommitHistoryFlag_scsMapHasSecre func TestAddSCSScan_WithSCSSecretDetectionAndScorecardWithScanTypesAndNoScorecardFlags_scsMapHasSecretDetection(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -1695,15 +1525,8 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardWithScanTypesAndNoScorecar _ = cmdCommand.Execute() _ = cmdCommand.Flags().Set(commonParams.ScanTypeFlag, "scs") - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) scsConfig := wrappers.SCSConfig{ Twoms: "true", @@ -1737,25 +1560,14 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardWithScanTypesAndNoScorecar func TestAddSCSScan_WithSCSSecretDetectionAndWithoutScanTypes_scsMapHasSecretDetection(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: false, + hasSecretDetectionLicense: true, }, } @@ -1769,15 +1581,8 @@ func TestAddSCSScan_WithSCSSecretDetectionAndWithoutScanTypes_scsMapHasSecretDet Long: `Scan a project`, } - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) scsConfig := wrappers.SCSConfig{ Twoms: "true", @@ -1796,25 +1601,14 @@ func TestAddSCSScan_WithSCSSecretDetectionAndWithoutScanTypes_scsMapHasSecretDet func TestAddSCSScan_WithSCSSecretDetectionAndScorecardShortenedGithubRepo_scsMapHasBoth(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -1841,15 +1635,8 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardShortenedGithubRepo_scsMap _ = cmdCommand.Flags().Set(commonParams.SCSRepoTokenFlag, dummyToken) _ = cmdCommand.Flags().Set(commonParams.SCSRepoURLFlag, dummyShortenedGithubRepo) - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) // Close the writer to signal that we are done capturing the output w.Close() @@ -1885,25 +1672,14 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardShortenedGithubRepo_scsMap func TestAddSCSScan_WithSCSSecretDetectionAndScorecardShortenedGithubRepoWithTokenInURL_scsMapHasBoth(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -1930,15 +1706,8 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardShortenedGithubRepoWithTok _ = cmdCommand.Flags().Set(commonParams.SCSRepoTokenFlag, dummyToken) _ = cmdCommand.Flags().Set(commonParams.SCSRepoURLFlag, dummyShortenedRepoWithToken) - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) // Close the writer to signal that we are done capturing the output w.Close() @@ -1974,25 +1743,14 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardShortenedGithubRepoWithTok func TestAddSCSScan_WithSCSSecretDetectionAndScorecardGithubRepoWithTokenInURL_scsMapHasBoth(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -2019,15 +1777,8 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardGithubRepoWithTokenInURL_s _ = cmdCommand.Flags().Set(commonParams.SCSRepoTokenFlag, dummyToken) _ = cmdCommand.Flags().Set(commonParams.SCSRepoURLFlag, dummyRepoWithToken) - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) // Close the writer to signal that we are done capturing the output w.Close() @@ -2063,25 +1814,14 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardGithubRepoWithTokenInURL_s func TestAddSCSScan_WithSCSSecretDetectionAndScorecardGithubRepoWithTokenAndUsernameInURL_scsMapHasBoth(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -2108,15 +1848,8 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardGithubRepoWithTokenAndUser _ = cmdCommand.Flags().Set(commonParams.SCSRepoTokenFlag, dummyToken) _ = cmdCommand.Flags().Set(commonParams.SCSRepoURLFlag, dummyRepoWithTokenAndUsername) - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) // Close the writer to signal that we are done capturing the output w.Close() @@ -2152,25 +1885,14 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardGithubRepoWithTokenAndUser func TestAddSCSScan_WithSCSSecretDetectionAndScorecardShortenedGithubRepoWithTokenAndUsernameInURL_scsMapHasBoth(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -2197,15 +1919,8 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardShortenedGithubRepoWithTok _ = cmdCommand.Flags().Set(commonParams.SCSRepoTokenFlag, dummyToken) _ = cmdCommand.Flags().Set(commonParams.SCSRepoURLFlag, dummyShortenedRepoWithTokenAndUsername) - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) // Close the writer to signal that we are done capturing the output w.Close() @@ -2241,25 +1956,14 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardShortenedGithubRepoWithTok func TestAddSCSScan_WithSCSSecretDetectionAndScorecardGitLabRepo_scsMapHasSecretDetection(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -2286,15 +1990,8 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardGitLabRepo_scsMapHasSecret _ = cmdCommand.Flags().Set(commonParams.SCSRepoTokenFlag, dummyToken) _ = cmdCommand.Flags().Set(commonParams.SCSRepoURLFlag, dummyGitlabRepo) - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) // Close the writer to signal that we are done capturing the output w.Close() @@ -2330,25 +2027,14 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardGitLabRepo_scsMapHasSecret func TestAddSCSScan_WithSCSSecretDetectionAndScorecardGitSSHRepo_scsMapHasSecretDetection(t *testing.T) { tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool + name string + hasRepositoryHealthLicense bool + hasSecretDetectionLicense bool }{ { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - hasRepositoryHealthLicense: false, - hasSecretDetectionLicense: false, - hasEnterpriseSecretsLicense: true, - }, - { - name: "scsLicensingV2 enabled", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - hasSecretDetectionLicense: true, - hasEnterpriseSecretsLicense: false, + name: "licenses available", + hasRepositoryHealthLicense: true, + hasSecretDetectionLicense: true, }, } @@ -2375,15 +2061,8 @@ func TestAddSCSScan_WithSCSSecretDetectionAndScorecardGitSSHRepo_scsMapHasSecret _ = cmdCommand.Flags().Set(commonParams.SCSRepoTokenFlag, dummyToken) _ = cmdCommand.Flags().Set(commonParams.SCSRepoURLFlag, dummySSHRepo) - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() - - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} result, _ := addSCSScan(cmdCommand, resubmitConfig, - tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense, featureFlagsWrapper) + tt.hasRepositoryHealthLicense, tt.hasSecretDetectionLicense) // Close the writer to signal that we are done capturing the output w.Close() @@ -3903,7 +3582,6 @@ func TestValidateScanTypes(t *testing.T) { userScanTypes string userSCSScanTypes string allowedEngines map[string]bool - scsLicensingV2 bool expectedError string }{ { @@ -3911,7 +3589,6 @@ func TestValidateScanTypes(t *testing.T) { userScanTypes: "scs", userSCSScanTypes: "", allowedEngines: map[string]bool{"repository-health": false, "secret-detection": false}, - scsLicensingV2: true, expectedError: "This requires either the \"repository‑health\" or the \"secret‑detection\" package license", }, { @@ -3919,7 +3596,6 @@ func TestValidateScanTypes(t *testing.T) { userScanTypes: "scs", userSCSScanTypes: "", allowedEngines: map[string]bool{"repository-health": true, "secret-detection": false}, - scsLicensingV2: true, expectedError: "", }, { @@ -3927,7 +3603,6 @@ func TestValidateScanTypes(t *testing.T) { userScanTypes: "scs", userSCSScanTypes: "", allowedEngines: map[string]bool{"repository-health": false, "secret-detection": true}, - scsLicensingV2: true, expectedError: "", }, { @@ -3935,55 +3610,13 @@ func TestValidateScanTypes(t *testing.T) { userScanTypes: "scs", userSCSScanTypes: "", allowedEngines: map[string]bool{"repository-health": true, "secret-detection": true}, - scsLicensingV2: true, - expectedError: "", - }, - { - name: "no specific micro engines selected with no licenses available using old sscs licensing", - userScanTypes: "scs", - userSCSScanTypes: "", - allowedEngines: map[string]bool{"scs": false, "enterprise-secrets": false}, - scsLicensingV2: false, - expectedError: "It looks like the \"scs\" scan type does not exist or", - }, - { - name: "no specific micro engines selected with scs license available using old sscs licensing", - userScanTypes: "scs", - userSCSScanTypes: "", - allowedEngines: map[string]bool{"scs": true, "enterprise-secrets": false}, - scsLicensingV2: false, - expectedError: "", - }, - { - name: "no specific micro engines selected with all licenses available using old sscs licensing", - userScanTypes: "scs", - userSCSScanTypes: "", - allowedEngines: map[string]bool{"scs": true, "enterprise-secrets": true}, - scsLicensingV2: false, expectedError: "", }, - { - name: "scorecard and secret-detection selected with no licenses available using old sscs licensing", - userScanTypes: "scs", - userSCSScanTypes: "scorecard,secret-detection", - allowedEngines: map[string]bool{"scs": false, "enterprise-secrets": false}, - scsLicensingV2: false, - expectedError: "It looks like the \"scs\" scan type does not exist or", - }, { name: "scorecard and secret-detection selected with no licenses available using new sscs licensing", userScanTypes: "scs", userSCSScanTypes: "scorecard,secret-detection", allowedEngines: map[string]bool{"repository-health": false, "secret-detection": false}, - scsLicensingV2: true, - expectedError: "It looks like the \"secret-detection\" scan type does not exist or", - }, - { - name: "secret-detection selected with SCS license available, secret-detection not available using old sscs licensing", - userScanTypes: "scs", - userSCSScanTypes: "secret-detection", - allowedEngines: map[string]bool{"scs": true, "enterprise-secrets": false}, - scsLicensingV2: false, expectedError: "It looks like the \"secret-detection\" scan type does not exist or", }, { @@ -3991,7 +3624,6 @@ func TestValidateScanTypes(t *testing.T) { userScanTypes: "scs", userSCSScanTypes: "secret-detection", allowedEngines: map[string]bool{"repository-health": true, "secret-detection": false}, - scsLicensingV2: true, expectedError: "It looks like the \"secret-detection\" scan type does not exist or", }, { @@ -3999,23 +3631,13 @@ func TestValidateScanTypes(t *testing.T) { userScanTypes: "scs", userSCSScanTypes: "scorecard", allowedEngines: map[string]bool{"repository-health": false, "secret-detection": true}, - scsLicensingV2: true, expectedError: "It looks like the \"repository-health\" scan type does not exist or", }, - { - name: "secret-detection selected with all licenses available using old sscs licensing", - userScanTypes: "scs", - userSCSScanTypes: "secret-detection", - allowedEngines: map[string]bool{"scs": true, "enterprise-secrets": true}, - scsLicensingV2: false, - expectedError: "", - }, { name: "secret-detection selected with secret-detection license available using new sscs licensing", userScanTypes: "scs", userSCSScanTypes: "secret-detection", allowedEngines: map[string]bool{"repository-health": false, "secret-detection": true}, - scsLicensingV2: true, expectedError: "", }, { @@ -4023,7 +3645,6 @@ func TestValidateScanTypes(t *testing.T) { userScanTypes: "scs", userSCSScanTypes: "scorecard", allowedEngines: map[string]bool{"repository-health": true, "secret-detection": false}, - scsLicensingV2: true, expectedError: "", }, } @@ -4031,11 +3652,6 @@ func TestValidateScanTypes(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { wrappers.ClearCache() - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.ScsLicensingV2Enabled, - Status: tt.scsLicensingV2, - } - defer clearFlags() cmd := &cobra.Command{} cmd.Flags().String(commonParams.ScanTypes, tt.userScanTypes, "") @@ -4058,82 +3674,6 @@ func TestValidateScanTypes(t *testing.T) { } } -func TestIsScsScorecardAllowed(t *testing.T) { - tests := []struct { - name string - scsLicensingV2 bool - hasRepositoryHealthLicense bool - expectedAllowed bool - }{ - { - name: "scsLicensingV2 disabled", - scsLicensingV2: false, - expectedAllowed: true, - }, - { - name: "scsLicensingV2 enabled and has repository health license", - scsLicensingV2: true, - hasRepositoryHealthLicense: true, - expectedAllowed: true, - }, - { - name: "scsLicensingV2 enabled and does not have repository health license", - scsLicensingV2: true, - hasRepositoryHealthLicense: false, - expectedAllowed: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - actualAllowed := isScsScorecardAllowed(tt.scsLicensingV2, tt.hasRepositoryHealthLicense) - assert.Equal(t, tt.expectedAllowed, actualAllowed) - }) - } -} - -func TestIsScsSecretDetectionAllowed(t *testing.T) { - tests := []struct { - name string - scsLicensingV2 bool - hasSecretDetectionLicense bool - hasEnterpriseSecretsLicense bool - expectedAllowed bool - }{ - { - name: "scsLicensingV2 disabled and has enterprise secrets license", - scsLicensingV2: false, - hasEnterpriseSecretsLicense: true, - expectedAllowed: true, - }, - { - name: "scsLicensingV2 disabled but does not have enterprise secrets license", - scsLicensingV2: false, - hasEnterpriseSecretsLicense: false, - expectedAllowed: false, - }, - { - name: "scsLicensingV2 enabled and has secret detection license", - scsLicensingV2: true, - hasSecretDetectionLicense: true, - expectedAllowed: true, - }, - { - name: "scsLicensingV2 enabled and does not have secret detection license", - scsLicensingV2: true, - hasSecretDetectionLicense: false, - expectedAllowed: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - actualAllowed := isScsSecretDetectionAllowed(tt.scsLicensingV2, tt.hasSecretDetectionLicense, tt.hasEnterpriseSecretsLicense) - assert.Equal(t, tt.expectedAllowed, actualAllowed) - }) - } -} - func TestCreateScanWith_ScaResolver_Source_as_Zip(t *testing.T) { clearFlags() baseArgs := []string{ @@ -4913,12 +4453,11 @@ func TestEnforceLocalResolutionForTarFiles_Integration(t *testing.T) { } } -func TestUploadZip_AsMultipartUpload_when_FF_Enable_ZIP_Exceeds_5GB(t *testing.T) { +func TestUploadZip_AsMultipartUpload_when_ZIP_Exceeds_5GB(t *testing.T) { // Simulate a file size > 5GB by setting MaxSizeBytes to less than actual size MaxSizeBytes = 1 defer func() { MaxSizeBytes = 5 * 1024 * 1024 * 1024 }() // Reset after test uploadWrapper := mock.UploadsMockWrapper{} - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.IncreaseFileUploadLimit, Status: true} featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} url, zipPath, err := uploadZip(&uploadWrapper, "data/sources.zip", false, true, featureFlagsWrapper) assert.NilError(t, err) @@ -4926,37 +4465,8 @@ func TestUploadZip_AsMultipartUpload_when_FF_Enable_ZIP_Exceeds_5GB(t *testing.T assert.Equal(t, url, "multiPart/path/to/nowhere") } -func TestUploadZip_AsMultipartUpload_when_FF_Disable_ZIP_Exceeds_5GB(t *testing.T) { - fileInfo, err := os.Stat("data/sources.zip") - if err != nil { - t.Fatalf("Failed to close zip file: %v", err) - } - // Simulate a file size > 5GB by setting MaxSizeBytes to less than actual size - MaxSizeBytes = fileInfo.Size() - 1 - defer func() { MaxSizeBytes = 5 * 1024 * 1024 * 1024 }() // Reset after test - - uploadWrapper := mock.UploadsMockWrapper{} - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.IncreaseFileUploadLimit, Status: false} - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} - url, zipPath, err := uploadZip(&uploadWrapper, "data/sources.zip", false, true, featureFlagsWrapper) - assert.NilError(t, err) - assert.Equal(t, zipPath, "") - assert.Equal(t, url, "singlePart/path/to/nowhere") -} - -func TestUploadZip_AsMultipartUpload_when_FF_Enable_ZIP_LessThan_5GB(t *testing.T) { - uploadWrapper := mock.UploadsMockWrapper{} - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.IncreaseFileUploadLimit, Status: true} - featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} - url, zipPath, err := uploadZip(&uploadWrapper, "data/sources.zip", false, true, featureFlagsWrapper) - assert.NilError(t, err) - assert.Equal(t, zipPath, "") - assert.Equal(t, url, "singlePart/path/to/nowhere") -} - -func TestUploadZip_AsMultipartUpload_when_FF_Disable_ZIP_LessThan_5GB(t *testing.T) { +func TestUploadZip_AsSinglePartUpload_when_ZIP_LessThan_5GB(t *testing.T) { uploadWrapper := mock.UploadsMockWrapper{} - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.IncreaseFileUploadLimit, Status: false} featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} url, zipPath, err := uploadZip(&uploadWrapper, "data/sources.zip", false, true, featureFlagsWrapper) assert.NilError(t, err) @@ -4964,7 +4474,7 @@ func TestUploadZip_AsMultipartUpload_when_FF_Disable_ZIP_LessThan_5GB(t *testing assert.Equal(t, url, "singlePart/path/to/nowhere") } -func TestUploadZip_AsMultipartUpload_when_FF_Enable_ZIP_Exceeds_5GB_Error(t *testing.T) { +func TestUploadZip_AsMultipartUpload_when_ZIP_Exceeds_5GB_Error(t *testing.T) { // Create a temporary zip file dir := t.TempDir() zipPathTemp := filepath.Join(dir, "failureCaseLarge.zip") @@ -4998,7 +4508,6 @@ func TestUploadZip_AsMultipartUpload_when_FF_Enable_ZIP_Exceeds_5GB_Error(t *tes defer func() { MaxSizeBytes = 5 * 1024 * 1024 * 1024 }() // uploadWrapper := mock.UploadsMockWrapper{} - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.IncreaseFileUploadLimit, Status: true} featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{} _, zipPath, err := uploadZip(&uploadWrapper, zipPathTemp, false, true, featureFlagsWrapper) assert.Assert(t, err != nil) @@ -5079,7 +4588,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes string scsEngines string source string - ffEnabled bool expectedValue string }{ { @@ -5088,7 +4596,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: tempDir, - ffEnabled: true, expectedValue: "true", }, { @@ -5097,7 +4604,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: tempDir, - ffEnabled: true, expectedValue: "false", }, { @@ -5106,7 +4612,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: tempDirWithSubGit, - ffEnabled: true, expectedValue: "true", }, { @@ -5115,7 +4620,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection,scorecard", source: tempDir, - ffEnabled: true, expectedValue: "true", }, { @@ -5124,7 +4628,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection,scorecard", source: tempDir, - ffEnabled: true, expectedValue: "false", }, { @@ -5133,7 +4636,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: "https://github.com/user/repo.git", - ffEnabled: true, expectedValue: "true", }, { @@ -5142,7 +4644,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: "https://gitlab.com/user/repo.git", - ffEnabled: true, expectedValue: "true", }, { @@ -5151,7 +4652,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: "git@github.com:user/repo.git", - ffEnabled: true, expectedValue: "true", }, { @@ -5160,7 +4660,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: "ssh://git@github.com/user/repo.git", - ffEnabled: true, expectedValue: "true", }, { @@ -5169,7 +4668,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: "https://github.com/user/repo.git", - ffEnabled: true, expectedValue: "false", }, { @@ -5178,7 +4676,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: "/path/to/source.zip", - ffEnabled: true, expectedValue: "true", }, { @@ -5187,7 +4684,6 @@ func TestGetGitCommitHistoryValue(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: "/path/to/source.zip", - ffEnabled: true, expectedValue: "false", }, } @@ -5210,7 +4706,7 @@ func TestGetGitCommitHistoryValue(t *testing.T) { _ = cmdCommand.Flags().Set(commonParams.SCSEnginesFlag, tt.scsEngines) _ = cmdCommand.Flags().Set(commonParams.SourcesFlag, tt.source) - result := getGitCommitHistoryValue(cmdCommand, tt.ffEnabled) + result := getGitCommitHistoryValue(cmdCommand) assert.Equal(t, tt.expectedValue, result, "Expected value=%s, got=%s", tt.expectedValue, result) }) @@ -5232,37 +4728,15 @@ func TestGetGitCommitHistoryValue_WithWarnings(t *testing.T) { scanTypes string scsEngines string source string - ffEnabled bool expectedValue string expectWarnings string }{ - { - name: "Flag true with FF disabled - returns empty with warning", - flagValue: "true", - scanTypes: "scs", - scsEngines: "secret-detection", - source: tempDir, - ffEnabled: false, - expectedValue: "", - expectWarnings: gitCommitHistoryNotAvailableWarningMsg, - }, - { - name: "Flag false with FF disabled - returns empty with warning", - flagValue: "false", - scanTypes: "scs", - scsEngines: "secret-detection", - source: tempDir, - ffEnabled: false, - expectedValue: "", - expectWarnings: gitCommitHistoryNotAvailableWarningMsg, - }, { name: "Flag true without SCS scan type - returns empty with warning", flagValue: "true", scanTypes: "sast", scsEngines: "secret-detection", source: tempDir, - ffEnabled: true, expectedValue: "", expectWarnings: gitCommitHistoryNotSelectedWarningMsg, }, @@ -5272,7 +4746,6 @@ func TestGetGitCommitHistoryValue_WithWarnings(t *testing.T) { scanTypes: "sast", scsEngines: "secret-detection", source: tempDir, - ffEnabled: true, expectedValue: "", expectWarnings: gitCommitHistoryNotSelectedWarningMsg, }, @@ -5282,7 +4755,6 @@ func TestGetGitCommitHistoryValue_WithWarnings(t *testing.T) { scanTypes: "scs", scsEngines: "scorecard", source: tempDir, - ffEnabled: true, expectedValue: "", expectWarnings: gitCommitHistoryNotApplicableWarningMsg, }, @@ -5292,7 +4764,6 @@ func TestGetGitCommitHistoryValue_WithWarnings(t *testing.T) { scanTypes: "scs", scsEngines: "scorecard", source: tempDir, - ffEnabled: true, expectedValue: "", expectWarnings: gitCommitHistoryNotApplicableWarningMsg, }, @@ -5302,7 +4773,6 @@ func TestGetGitCommitHistoryValue_WithWarnings(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: tempDirNoGit, - ffEnabled: true, expectedValue: "", expectWarnings: gitCommitHistoryNoGitRepositoryWarningMsg, }, @@ -5312,7 +4782,6 @@ func TestGetGitCommitHistoryValue_WithWarnings(t *testing.T) { scanTypes: "scs", scsEngines: "secret-detection", source: tempDirNoGit, - ffEnabled: true, expectedValue: "", expectWarnings: gitCommitHistoryNoGitRepositoryWarningMsg, }, @@ -5341,7 +4810,7 @@ func TestGetGitCommitHistoryValue_WithWarnings(t *testing.T) { r, w, _ := os.Pipe() os.Stdout = w - result := getGitCommitHistoryValue(cmdCommand, tt.ffEnabled) + result := getGitCommitHistoryValue(cmdCommand) w.Close() os.Stdout = oldStdout diff --git a/internal/commands/secrets-realtime.go b/internal/commands/secrets-realtime.go index d309197f5..68e532e95 100644 --- a/internal/commands/secrets-realtime.go +++ b/internal/commands/secrets-realtime.go @@ -11,7 +11,6 @@ import ( func RunScanSecretsRealtimeCommand( jwtWrapper wrappers.JWTWrapper, - featureFlagWrapper wrappers.FeatureFlagsWrapper, ) func(cmd *cobra.Command, args []string) error { return func(cmd *cobra.Command, _ []string) error { fileSourceFlag, _ := cmd.Flags().GetString(commonParams.SourcesFlag) @@ -21,7 +20,7 @@ func RunScanSecretsRealtimeCommand( ignoredFilePathFlag, _ := cmd.Flags().GetString(commonParams.IgnoredFilePathFlag) - secretsRealtimeService := secretsrealtime.NewSecretsRealtimeService(jwtWrapper, featureFlagWrapper) + secretsRealtimeService := secretsrealtime.NewSecretsRealtimeService(jwtWrapper) results, err := secretsRealtimeService.RunSecretsRealtimeScan(fileSourceFlag, ignoredFilePathFlag) if err != nil { diff --git a/internal/commands/secrets-realtime_test.go b/internal/commands/secrets-realtime_test.go index 096dfefda..e482441b4 100644 --- a/internal/commands/secrets-realtime_test.go +++ b/internal/commands/secrets-realtime_test.go @@ -3,14 +3,11 @@ package commands import ( "testing" - "github.com/checkmarx/ast-cli/internal/wrappers" - "github.com/checkmarx/ast-cli/internal/wrappers/mock" "github.com/stretchr/testify/assert" ) func TestRunScanSecretsRealtimeCommand_TxtFile_ScanSuccess(t *testing.T) { clearFlags() - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} execCmdNilAssertion( t, "scan", "secrets-realtime", "-s", "data/secret-exposed.txt", "--ignored-file-path", "", @@ -19,20 +16,9 @@ func TestRunScanSecretsRealtimeCommand_TxtFile_ScanSuccess(t *testing.T) { func TestRunScanSecretsRealtimeCommand_EmptyFilePath_ScanFailed(t *testing.T) { clearFlags() - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} err := execCmdNotNilAssertion( t, "scan", "secrets-realtime", "-s", "", "--ignored-file-path", "", ) assert.NotNil(t, err) } - -func TestRunScanSecretsRealtimeCommand_FFDisable_ScanFailed(t *testing.T) { - clearFlags() - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: false} - err := execCmdNotNilAssertion( - t, - "scan", "secrets-realtime", "-s", "data/secret-exposed.txt", "--ignored-file-path", "", - ) - assert.NotNil(t, err) -} diff --git a/internal/commands/telemetry_test.go b/internal/commands/telemetry_test.go index 539929235..109f4c1d2 100644 --- a/internal/commands/telemetry_test.go +++ b/internal/commands/telemetry_test.go @@ -2,13 +2,9 @@ package commands import ( "testing" - - "github.com/checkmarx/ast-cli/internal/wrappers" - "github.com/checkmarx/ast-cli/internal/wrappers/mock" ) func TestRunTelemetryAI_SendToLogSuccess(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} execCmdNilAssertion( t, "telemetry", "ai", "--ai-provider", "Cursor", "--problem-severity", "Critical", "--type", "click", "--sub-type", "ast-results.viewPackageDetails", "--agent", "Cursor", "--engine", "secrets") diff --git a/internal/constants/errors/errors.go b/internal/constants/errors/errors.go index e9cc42627..674b328e0 100644 --- a/internal/constants/errors/errors.go +++ b/internal/constants/errors/errors.go @@ -33,7 +33,6 @@ const ( // Realtime RealtimeEngineErrFormat = "realtime engine error: %s" - RealtimeEngineNotAvailable = "Realtime engine is not available for this tenant" RealtimeEngineFilePathRequired = "file path is required for realtime scan" ) diff --git a/internal/constants/errors/errors_test.go b/internal/constants/errors/errors_test.go index fc5fbe6c4..056f3ecf1 100644 --- a/internal/constants/errors/errors_test.go +++ b/internal/constants/errors/errors_test.go @@ -56,7 +56,6 @@ func TestErrorConstants_NonEmpty(t *testing.T) { ApplicationNotFound, ErrMissingAIFeatureLicense, FileExtensionIsRequired, - RealtimeEngineNotAvailable, RealtimeEngineFilePathRequired, } for _, c := range consts { diff --git a/internal/params/flags.go b/internal/params/flags.go index 5b322ff39..2e24a2081 100644 --- a/internal/params/flags.go +++ b/internal/params/flags.go @@ -344,8 +344,6 @@ const ( SCSSecretDetectionType = "sscs-secret-detection" SecretDetectionType = "secret-detection" SecretDetectionLabel = "Secret Detection" - EnterpriseSecretsLabel = "Enterprise Secrets" - EnterpriseSecretsType = "enterprise-secrets" RepositoryHealthType = "repository-health" RepositoryHealthLabel = "Repository Health" SCSScorecardOverviewType = "Scorecard" diff --git a/internal/services/realtimeengine/common.go b/internal/services/realtimeengine/common.go index 9537a1eb2..9e9c6d97c 100644 --- a/internal/services/realtimeengine/common.go +++ b/internal/services/realtimeengine/common.go @@ -9,15 +9,6 @@ import ( "github.com/pkg/errors" ) -// IsFeatureFlagEnabled checks if a specific feature flag is enabled. -func IsFeatureFlagEnabled(flagWrapper wrappers.FeatureFlagsWrapper, flagName string) (bool, error) { - enabled, err := flagWrapper.GetSpecificFlag(flagName) - if err != nil { - return false, errors.Wrap(err, "failed to get feature flag") - } - return enabled.Status, nil -} - // EnsureLicense validates that a valid JWT wrapper is available. func EnsureLicense(jwtWrapper wrappers.JWTWrapper) error { if jwtWrapper == nil { diff --git a/internal/services/realtimeengine/common_test.go b/internal/services/realtimeengine/common_test.go index 20919f52d..c27e53a16 100644 --- a/internal/services/realtimeengine/common_test.go +++ b/internal/services/realtimeengine/common_test.go @@ -11,34 +11,6 @@ import ( "github.com/stretchr/testify/assert" ) -func TestIsFeatureFlagEnabled_Success(t *testing.T) { - // nolint:gocritic // resetting shared mock package state between tests - mock.FFErr = nil - defer func() { - // nolint:gocritic // resetting shared mock package state between tests - mock.FFErr = nil - }() - mock.Flag.Name = "SOME_FLAG" - mock.Flag.Status = true - - enabled, err := IsFeatureFlagEnabled(&mock.FeatureFlagsMockWrapper{}, "SOME_FLAG") - assert.NoError(t, err) - assert.True(t, enabled) -} - -func TestIsFeatureFlagEnabled_WrapperError_ReturnsWrappedError(t *testing.T) { - mock.FFErr = errors.New("feature flag lookup failed") //nolint:gocritic // resetting shared mock package state between tests - defer func() { - // nolint:gocritic // resetting shared mock package state between tests - mock.FFErr = nil - }() - - enabled, err := IsFeatureFlagEnabled(&mock.FeatureFlagsMockWrapper{}, "SOME_FLAG") - assert.Error(t, err) - assert.Contains(t, err.Error(), "failed to get feature flag") - assert.False(t, enabled) -} - func TestEnsureLicense_NilWrapper_ReturnsError(t *testing.T) { err := EnsureLicense(nil) assert.Error(t, err) diff --git a/internal/services/realtimeengine/containersrealtime/containers-realtime.go b/internal/services/realtimeengine/containersrealtime/containers-realtime.go index afdc026ed..8dad95a98 100644 --- a/internal/services/realtimeengine/containersrealtime/containers-realtime.go +++ b/internal/services/realtimeengine/containersrealtime/containers-realtime.go @@ -22,19 +22,16 @@ const defaultTag = "latest" // ContainersRealtimeService is the service responsible for performing real-time container scanning. type ContainersRealtimeService struct { JwtWrapper wrappers.JWTWrapper - FeatureFlagWrapper wrappers.FeatureFlagsWrapper RealtimeScannerWrapper wrappers.RealtimeScannerWrapper } // NewContainersRealtimeService creates a new ContainersRealtimeService. func NewContainersRealtimeService( jwtWrapper wrappers.JWTWrapper, - featureFlagWrapper wrappers.FeatureFlagsWrapper, realtimeScannerWrapper wrappers.RealtimeScannerWrapper, ) *ContainersRealtimeService { return &ContainersRealtimeService{ JwtWrapper: jwtWrapper, - FeatureFlagWrapper: featureFlagWrapper, RealtimeScannerWrapper: realtimeScannerWrapper, } } @@ -77,9 +74,6 @@ func (c *ContainersRealtimeService) RunContainersRealtimeScan(filePath, ignoredF if filePath == "" { return nil, errorconstants.NewRealtimeEngineError("file path is required").Error() } - if enabled, err := realtimeengine.IsFeatureFlagEnabled(c.FeatureFlagWrapper, wrappers.OssRealtimeEnabled); err != nil || !enabled { - return nil, errorconstants.NewRealtimeEngineError(errorconstants.RealtimeEngineNotAvailable).Error() - } if err := realtimeengine.EnsureLicense(c.JwtWrapper); err != nil { return nil, errorconstants.NewRealtimeEngineError(err.Error()).Error() } diff --git a/internal/services/realtimeengine/containersrealtime/containers-realtime_test.go b/internal/services/realtimeengine/containersrealtime/containers-realtime_test.go index de193081d..7ba48e6cc 100644 --- a/internal/services/realtimeengine/containersrealtime/containers-realtime_test.go +++ b/internal/services/realtimeengine/containersrealtime/containers-realtime_test.go @@ -13,10 +13,8 @@ import ( const testImageName = "nginx" func TestRunContainersRealtimeScan_ValidLicenseAndFile_Success(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} service := NewContainersRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{ CustomScanImages: func(images *wrappers.ContainerImageRequest) (*wrappers.ContainerImageResponse, error) { return &wrappers.ContainerImageResponse{ @@ -41,10 +39,8 @@ func TestRunContainersRealtimeScan_ValidLicenseAndFile_Success(t *testing.T) { } func TestRunContainersRealtimeScan_EmptyFilePath_Fails(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} service := NewContainersRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) result, err := service.RunContainersRealtimeScan("", "") @@ -54,10 +50,8 @@ func TestRunContainersRealtimeScan_EmptyFilePath_Fails(t *testing.T) { } func TestRunContainersRealtimeScan_InvalidLicense_Fails(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} service := NewContainersRealtimeService( nil, // Invalid JWT wrapper - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) result, err := service.RunContainersRealtimeScan("../../../commands/data/containers/testdata/Dockerfile", "") @@ -66,24 +60,9 @@ func TestRunContainersRealtimeScan_InvalidLicense_Fails(t *testing.T) { assert.Contains(t, err.Error(), "JWT wrapper is not initialized, cannot ensure license") } -func TestRunContainersRealtimeScan_FeatureFlagDisabled_Fails(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: false} - service := NewContainersRealtimeService( - &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, - &mock.RealtimeScannerMockWrapper{}, - ) - result, err := service.RunContainersRealtimeScan("../../../commands/data/containers/testdata/Dockerfile", "") - assert.Error(t, err) - assert.Nil(t, result) - assert.Contains(t, err.Error(), "realtime engine error: Realtime engine is not available for this tenant") -} - func TestRunContainersRealtimeScan_InvalidFilePath_Fails(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} service := NewContainersRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) result, err := service.RunContainersRealtimeScan("/non/existent/Dockerfile", "") @@ -93,10 +72,8 @@ func TestRunContainersRealtimeScan_InvalidFilePath_Fails(t *testing.T) { } func TestRunContainersRealtimeScan_NoImagesFound_ReturnsEmpty(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} service := NewContainersRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) result, err := service.RunContainersRealtimeScan("../../../commands/data/containers/emptytestdata/Dockerfile", "") @@ -106,10 +83,8 @@ func TestRunContainersRealtimeScan_NoImagesFound_ReturnsEmpty(t *testing.T) { } func TestRunContainersRealtimeScan_ScanError_ReturnsError(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} service := NewContainersRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{ CustomScanImages: func(images *wrappers.ContainerImageRequest) (*wrappers.ContainerImageResponse, error) { return nil, errors.New("mock scan error") @@ -123,10 +98,8 @@ func TestRunContainersRealtimeScan_ScanError_ReturnsError(t *testing.T) { } func TestRunContainersRealtimeScan_ImageVulnerabilityMapping(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} service := NewContainersRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{ CustomScanImages: func(images *wrappers.ContainerImageRequest) (*wrappers.ContainerImageResponse, error) { return &wrappers.ContainerImageResponse{ @@ -217,13 +190,11 @@ func TestSplitLocationsToSeparateResults_NoLocations(t *testing.T) { } func TestRunContainersRealtimeScan_WithIgnoreFile_FiltersResult(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} ignoreFile := "../../../commands/data/containers/testdata/ignoredContainers.json" service := NewContainersRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) diff --git a/internal/services/realtimeengine/iacrealtime/iac-realtime.go b/internal/services/realtimeengine/iacrealtime/iac-realtime.go index a0290b92b..e2a412e4b 100644 --- a/internal/services/realtimeengine/iacrealtime/iac-realtime.go +++ b/internal/services/realtimeengine/iacrealtime/iac-realtime.go @@ -23,23 +23,22 @@ const ( ) type IacRealtimeService struct { - JwtWrapper wrappers.JWTWrapper - FeatureFlagWrapper wrappers.FeatureFlagsWrapper - fileHandler *FileHandler - containerManager IContainerManager - scanner *Scanner + JwtWrapper wrappers.JWTWrapper + fileHandler *FileHandler + containerManager IContainerManager + scanner *Scanner } -func NewIacRealtimeService(jwt wrappers.JWTWrapper, flags wrappers.FeatureFlagsWrapper, containerManager IContainerManager) *IacRealtimeService { +// NewIacRealtimeService creates a new IacRealtimeService. +func NewIacRealtimeService(jwt wrappers.JWTWrapper, containerManager IContainerManager) *IacRealtimeService { fileHandler := NewFileHandler() scanner := NewScanner(containerManager) return &IacRealtimeService{ - JwtWrapper: jwt, - FeatureFlagWrapper: flags, - fileHandler: fileHandler, - containerManager: containerManager, - scanner: scanner, + JwtWrapper: jwt, + fileHandler: fileHandler, + containerManager: containerManager, + scanner: scanner, } } @@ -114,10 +113,6 @@ func (svc *IacRealtimeService) RunIacRealtimeScan(filePath, engine, ignoredFileP } func (svc *IacRealtimeService) runValidations(filePath string) error { - if err := svc.checkFeatureFlag(); err != nil { - return err - } - if err := svc.ensureLicense(); err != nil { return err } @@ -128,14 +123,6 @@ func (svc *IacRealtimeService) runValidations(filePath string) error { return nil } -func (svc *IacRealtimeService) checkFeatureFlag() error { - enabled, err := realtimeengine.IsFeatureFlagEnabled(svc.FeatureFlagWrapper, wrappers.OssRealtimeEnabled) - if err != nil || !enabled { - return errorconstants.NewRealtimeEngineError(errorconstants.RealtimeEngineNotAvailable).Error() - } - return nil -} - func (svc *IacRealtimeService) ensureLicense() error { if err := realtimeengine.EnsureLicense(svc.JwtWrapper); err != nil { return errorconstants.NewRealtimeEngineError("failed to ensure license").Error() diff --git a/internal/services/realtimeengine/iacrealtime/iac-realtime_test.go b/internal/services/realtimeengine/iacrealtime/iac-realtime_test.go index 17181e83d..fd279a34b 100644 --- a/internal/services/realtimeengine/iacrealtime/iac-realtime_test.go +++ b/internal/services/realtimeengine/iacrealtime/iac-realtime_test.go @@ -8,7 +8,6 @@ import ( "testing" commonParams "github.com/checkmarx/ast-cli/internal/params" - "github.com/checkmarx/ast-cli/internal/wrappers" "github.com/checkmarx/ast-cli/internal/wrappers/mock" ) @@ -19,9 +18,8 @@ const ( func TestNewIacRealtimeService(t *testing.T) { mockJWT := &mock.JWTMockWrapper{} - mockFlags := &mock.FeatureFlagsMockWrapper{} - service := NewIacRealtimeService(mockJWT, mockFlags, NewMockContainerManager()) + service := NewIacRealtimeService(mockJWT, NewMockContainerManager()) if service == nil { t.Error("NewIacRealtimeService() should not return nil") @@ -32,10 +30,6 @@ func TestNewIacRealtimeService(t *testing.T) { t.Error("NewIacRealtimeService() should set JwtWrapper") } - if service.FeatureFlagWrapper == nil { - t.Error("NewIacRealtimeService() should set FeatureFlagWrapper") - } - if service.fileHandler == nil { t.Error("NewIacRealtimeService() should initialize fileHandler") } @@ -49,57 +43,6 @@ func TestNewIacRealtimeService(t *testing.T) { } } -func TestIacRealtimeService_checkFeatureFlag(t *testing.T) { - tests := []struct { - name string - setupMock func() - expectErr bool - }{ - { - name: "Feature flag enabled", - setupMock: func() { - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.OssRealtimeEnabled, - Status: true, - } - }, - expectErr: false, - }, - { - name: "Feature flag disabled", - setupMock: func() { - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.OssRealtimeEnabled, - Status: false, - } - }, - expectErr: true, - }, - } - - for _, tt := range tests { - ttt := tt - t.Run(tt.name, func(t *testing.T) { - // Setup mock - ttt.setupMock() - - mockJWT := &mock.JWTMockWrapper{} - mockFlags := &mock.FeatureFlagsMockWrapper{} - - service := NewIacRealtimeService(mockJWT, mockFlags, NewMockContainerManager()) - err := service.checkFeatureFlag() - - if ttt.expectErr && err == nil { - t.Error("checkFeatureFlag() expected error but got none") - } - - if !ttt.expectErr && err != nil { - t.Errorf("checkFeatureFlag() unexpected error: %v", err) - } - }) - } -} - func TestIacRealtimeService_ensureLicense(t *testing.T) { tests := []struct { name string @@ -121,9 +64,8 @@ func TestIacRealtimeService_ensureLicense(t *testing.T) { ttt.setupMock() mockJWT := &mock.JWTMockWrapper{} - mockFlags := &mock.FeatureFlagsMockWrapper{} - service := NewIacRealtimeService(mockJWT, mockFlags, NewMockContainerManager()) + service := NewIacRealtimeService(mockJWT, NewMockContainerManager()) err := service.ensureLicense() if ttt.expectErr && err == nil { @@ -139,8 +81,7 @@ func TestIacRealtimeService_ensureLicense(t *testing.T) { func TestIacRealtimeService_validateFilePath(t *testing.T) { mockJWT := &mock.JWTMockWrapper{} - mockFlags := &mock.FeatureFlagsMockWrapper{} - service := NewIacRealtimeService(mockJWT, mockFlags, NewMockContainerManager()) + service := NewIacRealtimeService(mockJWT, NewMockContainerManager()) // Create a real test file for valid path testing testFile, err := os.CreateTemp("", "validate-test-*.yaml") @@ -198,78 +139,11 @@ func TestIacRealtimeService_validateFilePath(t *testing.T) { } } -func TestIacRealtimeService_RunIacRealtimeScan_FeatureFlagValidation(t *testing.T) { - tests := []struct { - name string - setupMock func() - expectErr bool - errorCheck func(error) bool - }{ - { - name: "Feature flag disabled should fail", - setupMock: func() { - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.OssRealtimeEnabled, - Status: false, - } - }, - expectErr: true, - errorCheck: func(err error) bool { - return err != nil // Should get a realtime engine error - }, - }, - { - name: "Feature flag enabled should proceed to next validation", - setupMock: func() { - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.OssRealtimeEnabled, - Status: true, - } - }, - expectErr: true, // Will fail at file validation stage since file doesn't exist - errorCheck: func(err error) bool { - return err != nil // Should get to file validation and fail there - }, - }, - } - - for _, tt := range tests { - ttt := tt - t.Run(tt.name, func(t *testing.T) { - ttt.setupMock() - - mockJWT := &mock.JWTMockWrapper{} - mockFlags := &mock.FeatureFlagsMockWrapper{} - - service := NewIacRealtimeService(mockJWT, mockFlags, NewMockContainerManager()) - - _, err := service.RunIacRealtimeScan("test.yaml", "docker", "") - - if ttt.expectErr && err == nil { - t.Error("RunIacRealtimeScan() expected error but got none") - } - - if !ttt.expectErr && err != nil { - t.Errorf("RunIacRealtimeScan() unexpected error: %v", err) - } - - if ttt.errorCheck != nil && !ttt.errorCheck(err) { - t.Errorf("RunIacRealtimeScan() error doesn't match expected pattern: %v", err) - } - }) - } -} - func TestIacRealtimeService_RunIacRealtimeScan_FilePathValidation(t *testing.T) { // Setup feature flag to be enabled so we get to file path validation - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.OssRealtimeEnabled, - Status: true, - } mockJWT := &mock.JWTMockWrapper{} - mockFlags := &mock.FeatureFlagsMockWrapper{} - service := NewIacRealtimeService(mockJWT, mockFlags, NewMockContainerManager()) + service := NewIacRealtimeService(mockJWT, NewMockContainerManager()) tests := []struct { name string @@ -306,10 +180,6 @@ func TestIacRealtimeService_RunIacRealtimeScan_FilePathValidation(t *testing.T) func TestIacRealtimeService_RunIacRealtimeScan_WithRealFile(t *testing.T) { // Setup mocks for successful validation - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.OssRealtimeEnabled, - Status: true, - } // Setup supported file extensions for testing originalFilters := commonParams.KicsBaseFilters @@ -319,8 +189,7 @@ func TestIacRealtimeService_RunIacRealtimeScan_WithRealFile(t *testing.T) { }() mockJWT := &mock.JWTMockWrapper{} - mockFlags := &mock.FeatureFlagsMockWrapper{} - service := NewIacRealtimeService(mockJWT, mockFlags, NewMockContainerManager()) + service := NewIacRealtimeService(mockJWT, NewMockContainerManager()) // Create a real test file testContent := "`apiVersion: v1\nkind: Pod\nmetadata:\n name: test-pod" @@ -353,25 +222,16 @@ func TestIacRealtimeService_RunIacRealtimeScan_WithRealFile(t *testing.T) { func TestIacRealtimeService_Integration(t *testing.T) { // Setup successful mocks - mock.Flag = wrappers.FeatureFlagResponseModel{ - Name: wrappers.OssRealtimeEnabled, - Status: true, - } mockJWT := &mock.JWTMockWrapper{} - mockFlags := &mock.FeatureFlagsMockWrapper{} - service := NewIacRealtimeService(mockJWT, mockFlags, NewMockContainerManager()) + service := NewIacRealtimeService(mockJWT, NewMockContainerManager()) // Test service initialization if service.JwtWrapper == nil { t.Error("Service should have JWT wrapper") } - if service.FeatureFlagWrapper == nil { - t.Error("Service should have feature flag wrapper") - } - if service.fileHandler == nil { t.Error("Service should have file handler") } @@ -385,10 +245,6 @@ func TestIacRealtimeService_Integration(t *testing.T) { } // Test individual validation methods - if err := service.checkFeatureFlag(); err != nil { - t.Errorf("checkFeatureFlag() should succeed with enabled flag: %v", err) - } - if err := service.ensureLicense(); err != nil { t.Errorf("ensureLicense() should succeed with valid JWT: %v", err) } @@ -1218,3 +1074,35 @@ func TestIsEngineRunning_UnresolvableEngine(t *testing.T) { t.Error("IsEngineRunning should be false for an engine that is not installed") } } + +func TestIacRealtimeService_ensureLicense_NoLicense_ReturnsError(t *testing.T) { + mockJWT := &mock.JWTMockWrapper{ + CustomIsAllowedEngine: func(engine string) (bool, error) { return false, nil }, + } + service := NewIacRealtimeService(mockJWT, NewMockContainerManager()) + + err := service.ensureLicense() + + if err == nil { + t.Fatal("ensureLicense() expected an error when no license is allowed") + } + if !strings.Contains(err.Error(), "failed to ensure license") { + t.Errorf("unexpected error: %v", err) + } +} + +func TestIacRealtimeService_RunIacRealtimeScan_NoLicense_ReturnsError(t *testing.T) { + mockJWT := &mock.JWTMockWrapper{ + CustomIsAllowedEngine: func(engine string) (bool, error) { return false, nil }, + } + service := NewIacRealtimeService(mockJWT, NewMockContainerManager()) + + results, err := service.RunIacRealtimeScan("test.yaml", "docker", "") + + if err == nil { + t.Fatal("RunIacRealtimeScan() expected an error when no license is allowed") + } + if results != nil { + t.Errorf("expected nil results, got %v", results) + } +} diff --git a/internal/services/realtimeengine/ossrealtime/oss-realtime.go b/internal/services/realtimeengine/ossrealtime/oss-realtime.go index 5cd10397b..f462f7093 100644 --- a/internal/services/realtimeengine/ossrealtime/oss-realtime.go +++ b/internal/services/realtimeengine/ossrealtime/oss-realtime.go @@ -42,19 +42,16 @@ func convertLocations(locations []models.Location) []realtimeengine.Location { // OssRealtimeService is the service responsible for performing real-time OSS scanning. type OssRealtimeService struct { JwtWrapper wrappers.JWTWrapper - FeatureFlagWrapper wrappers.FeatureFlagsWrapper RealtimeScannerWrapper wrappers.RealtimeScannerWrapper } // NewOssRealtimeService creates a new OssRealtimeService. func NewOssRealtimeService( jwtWrapper wrappers.JWTWrapper, - featureFlagWrapper wrappers.FeatureFlagsWrapper, realtimeScannerWrapper wrappers.RealtimeScannerWrapper, ) *OssRealtimeService { return &OssRealtimeService{ JwtWrapper: jwtWrapper, - FeatureFlagWrapper: featureFlagWrapper, RealtimeScannerWrapper: realtimeScannerWrapper, } } @@ -65,11 +62,6 @@ func (o *OssRealtimeService) RunOssRealtimeScan(filePath, ignoredFilePath string return nil, errorconstants.NewRealtimeEngineError("file path is required").Error() } - if enabled, err := realtimeengine.IsFeatureFlagEnabled(o.FeatureFlagWrapper, wrappers.OssRealtimeEnabled); err != nil || !enabled { - logger.PrintfIfVerbose("Containers Realtime scan is not available (feature flag disabled or error: %v)", err) - return nil, errorconstants.NewRealtimeEngineError(errorconstants.RealtimeEngineNotAvailable).Error() - } - if err := realtimeengine.EnsureLicense(o.JwtWrapper); err != nil { return nil, errorconstants.NewRealtimeEngineError(err.Error()).Error() } diff --git a/internal/services/realtimeengine/ossrealtime/oss-realtime_test.go b/internal/services/realtimeengine/ossrealtime/oss-realtime_test.go index 9c5daa637..6b153f06e 100644 --- a/internal/services/realtimeengine/ossrealtime/oss-realtime_test.go +++ b/internal/services/realtimeengine/ossrealtime/oss-realtime_test.go @@ -37,10 +37,8 @@ func cleanCacheFile(t *testing.T) { } func TestRunOssRealtimeScan_ValidLicenseAndManifest_ScanSuccess(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} ossRealtimeService := NewOssRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) @@ -57,7 +55,6 @@ func TestRunOssRealtimeScan_InvalidLicenseAndValidManifest_ScanFail(t *testing.T t.Skip() // Skip this test for now, no license check implemented ossRealtimeService := NewOssRealtimeService( &mock.JWTMockWrapper{AIEnabled: mock.AIProtectionDisabled}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) @@ -70,10 +67,8 @@ func TestRunOssRealtimeScan_InvalidLicenseAndValidManifest_ScanFail(t *testing.T } func TestRunOssRealtimeScan_ValidLicenseAndInvalidManifest_ScanFail(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} ossRealtimeService := NewOssRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) @@ -86,10 +81,8 @@ func TestRunOssRealtimeScan_ValidLicenseAndInvalidManifest_ScanFail(t *testing.T } func TestRunOssRealtimeScan_WithIgnoredPackage_IgnoresPackage(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} ossRealtimeService := NewOssRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) @@ -107,10 +100,8 @@ func TestRunOssRealtimeScan_WithIgnoredPackage_IgnoresPackage(t *testing.T) { } func TestRunOssRealtimeScan_WithEmptyIgnoreFile_AllPackagesIncluded(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} ossRealtimeService := NewOssRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) @@ -133,10 +124,8 @@ func TestRunOssRealtimeScan_WithEmptyIgnoreFile_AllPackagesIncluded(t *testing.T } func TestRunOssRealtimeScan_IgnoredPackageWithDifferentVersion_IsNotIgnored(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} ossRealtimeService := NewOssRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) @@ -162,7 +151,6 @@ func TestRunOssRealtimeScan_IgnoredPackageWithDifferentVersion_IsNotIgnored(t *t } func TestPrepareScan_CacheExistsAndContainsPartialResults_RealtimeScannerRequestIsCalledPartially(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} cleanCacheFile(t) allPackages := setupPackages() storedPackages := []osscache.PackageEntry{ @@ -185,7 +173,6 @@ func TestPrepareScan_CacheExistsAndContainsPartialResults_RealtimeScannerRequest } func TestPrepareScan_CacheExpiredAndContainsPartialResults_RealtimeScannerRequestIsCalledFully(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} cleanCacheFile(t) allPackages := setupPackages() storedPackages := []osscache.PackageEntry{ @@ -205,7 +192,6 @@ func TestPrepareScan_CacheExpiredAndContainsPartialResults_RealtimeScannerReques } func TestPrepareScan_NoCache_RealtimeScannerRequestIsCalledFully(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} cleanCacheFile(t) allPackages := setupPackages() @@ -219,7 +205,6 @@ func TestPrepareScan_NoCache_RealtimeScannerRequestIsCalledFully(t *testing.T) { } func TestPrepareScan_AllDataInCache_RealtimeScannerRequestIsEmpty(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} cleanCacheFile(t) singlePackage := setupSinglePackage() storedPackages := []osscache.PackageEntry{ @@ -242,11 +227,9 @@ func TestPrepareScan_AllDataInCache_RealtimeScannerRequestIsEmpty(t *testing.T) } func TestScanAndCache_NoCacheAndScanSuccess_CacheUpdated(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} cleanCacheFile(t) ossRealtimeService := NewOssRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{ CustomScanPackages: func(packages *wrappers.RealtimeScannerPackageRequest) (*wrappers.RealtimeScannerPackageResponse, error) { var response wrappers.RealtimeScannerPackageResponse @@ -278,12 +261,10 @@ func TestScanAndCache_NoCacheAndScanSuccess_CacheUpdated(t *testing.T) { } func TestScanAndCache_CacheExistsAndScanSuccess_CacheUpdated(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} cleanCacheFile(t) ossRealtimeService := NewOssRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) @@ -341,10 +322,8 @@ func TestScanAndCache_CacheExistsAndScanSuccess_CacheUpdated(t *testing.T) { func TestOssRealtimeScan_CsprojFile_ReturnsLocations(t *testing.T) { // Arrange - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} ossRealtimeService := NewOssRealtimeService( &mock.JWTMockWrapper{}, - &mock.FeatureFlagsMockWrapper{}, &mock.RealtimeScannerMockWrapper{}, ) response, err := ossRealtimeService.RunOssRealtimeScan("../../../commands/data/manifests/test.csproj", "") diff --git a/internal/services/realtimeengine/secretsrealtime/secrets-realtime.go b/internal/services/realtimeengine/secretsrealtime/secrets-realtime.go index 406261caf..d4513f95c 100644 --- a/internal/services/realtimeengine/secretsrealtime/secrets-realtime.go +++ b/internal/services/realtimeengine/secretsrealtime/secrets-realtime.go @@ -28,17 +28,14 @@ const ( type SecretsRealtimeService struct { JwtWrapper wrappers.JWTWrapper - FeatureFlagWrapper wrappers.FeatureFlagsWrapper RealtimeScannerWrapper wrappers.RealtimeScannerWrapper } func NewSecretsRealtimeService( jwtWrapper wrappers.JWTWrapper, - featureFlagWrapper wrappers.FeatureFlagsWrapper, ) *SecretsRealtimeService { return &SecretsRealtimeService{ - JwtWrapper: jwtWrapper, - FeatureFlagWrapper: featureFlagWrapper, + JwtWrapper: jwtWrapper, } } @@ -112,10 +109,6 @@ func (s *SecretsRealtimeService) ScanContent(sourcePath, content, ignoredFilePat } func (s *SecretsRealtimeService) ensureReady() error { - if enabled, err := realtimeengine.IsFeatureFlagEnabled(s.FeatureFlagWrapper, wrappers.OssRealtimeEnabled); err != nil || !enabled { - logger.PrintfIfVerbose("Failed to print OSS Realtime scan results: %v", err) - return errorconstants.NewRealtimeEngineError(errorconstants.RealtimeEngineNotAvailable).Error() - } if err := realtimeengine.EnsureLicense(s.JwtWrapper); err != nil { return errorconstants.NewRealtimeEngineError(err.Error()).Error() } diff --git a/internal/services/realtimeengine/secretsrealtime/secrets-realtime_test.go b/internal/services/realtimeengine/secretsrealtime/secrets-realtime_test.go index 4eb3b93fc..329ee2232 100644 --- a/internal/services/realtimeengine/secretsrealtime/secrets-realtime_test.go +++ b/internal/services/realtimeengine/secretsrealtime/secrets-realtime_test.go @@ -8,26 +8,22 @@ import ( "github.com/checkmarx/2ms/v3/lib/reporting" "github.com/checkmarx/2ms/v3/lib/secrets" - "github.com/checkmarx/ast-cli/internal/wrappers" "github.com/checkmarx/ast-cli/internal/wrappers/mock" "github.com/stretchr/testify/assert" ) func TestNewSecretsRealtimeService(t *testing.T) { jwtWrapper := &mock.JWTMockWrapper{} - featureFlagWrapper := &mock.FeatureFlagsMockWrapper{} - service := NewSecretsRealtimeService(jwtWrapper, featureFlagWrapper) + service := NewSecretsRealtimeService(jwtWrapper) assert.NotNil(t, service) assert.Equal(t, jwtWrapper, service.JwtWrapper) - assert.Equal(t, featureFlagWrapper, service.FeatureFlagWrapper) } func TestRunSecretsRealtimeScan_EmptyFilePath_ReturnsError(t *testing.T) { service := &SecretsRealtimeService{ - JwtWrapper: &mock.JWTMockWrapper{}, - FeatureFlagWrapper: &mock.FeatureFlagsMockWrapper{}, + JwtWrapper: &mock.JWTMockWrapper{}, } results, err := service.RunSecretsRealtimeScan("", "") @@ -37,27 +33,10 @@ func TestRunSecretsRealtimeScan_EmptyFilePath_ReturnsError(t *testing.T) { assert.Contains(t, err.Error(), "file path is required") } -func TestRunSecretsRealtimeScan_FeatureFlagDisabled_ReturnsError(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: false} - - service := &SecretsRealtimeService{ - JwtWrapper: &mock.JWTMockWrapper{}, - FeatureFlagWrapper: &mock.FeatureFlagsMockWrapper{}, - } - - results, err := service.RunSecretsRealtimeScan("test.txt", "") - - assert.Nil(t, results) - assert.NotNil(t, err) - assert.Contains(t, err.Error(), "Realtime engine is not available") -} - func TestRunSecretsRealtimeScan_FileNotFound_ReturnsError(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} service := &SecretsRealtimeService{ - JwtWrapper: &mock.JWTMockWrapper{}, - FeatureFlagWrapper: &mock.FeatureFlagsMockWrapper{}, + JwtWrapper: &mock.JWTMockWrapper{}, } results, err := service.RunSecretsRealtimeScan("nonexistent-file.txt", "") @@ -68,7 +47,6 @@ func TestRunSecretsRealtimeScan_FileNotFound_ReturnsError(t *testing.T) { } func TestRunSecretsRealtimeScan_WithIgnoreFile_FiltersResult(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} tempDir := t.TempDir() @@ -84,8 +62,7 @@ func TestRunSecretsRealtimeScan_WithIgnoreFile_FiltersResult(t *testing.T) { assert.NoError(t, os.WriteFile(ignoreFile, data, 0644)) service := &SecretsRealtimeService{ - JwtWrapper: &mock.JWTMockWrapper{}, - FeatureFlagWrapper: &mock.FeatureFlagsMockWrapper{}, + JwtWrapper: &mock.JWTMockWrapper{}, } results, err := service.RunSecretsRealtimeScan(testFile, ignoreFile) @@ -98,7 +75,6 @@ func TestRunSecretsRealtimeScan_WithIgnoreFile_FiltersResult(t *testing.T) { } func TestRunSecretsRealtimeScan_PatVulAndGenericVul_ReturnedOnlyPathVul(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} tempDir := t.TempDir() @@ -107,8 +83,7 @@ func TestRunSecretsRealtimeScan_PatVulAndGenericVul_ReturnedOnlyPathVul(t *testi assert.NoError(t, os.WriteFile(testFile, []byte(testContent), 0644)) service := &SecretsRealtimeService{ - JwtWrapper: &mock.JWTMockWrapper{}, - FeatureFlagWrapper: &mock.FeatureFlagsMockWrapper{}, + JwtWrapper: &mock.JWTMockWrapper{}, } results, err := service.RunSecretsRealtimeScan(testFile, "") @@ -121,7 +96,6 @@ func TestRunSecretsRealtimeScan_PatVulAndGenericVul_ReturnedOnlyPathVul(t *testi } func TestRunSecretsRealtimeScan_ValidFile_Success(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} // Create a temporary file for testing tempDir := t.TempDir() @@ -131,8 +105,7 @@ func TestRunSecretsRealtimeScan_ValidFile_Success(t *testing.T) { assert.NoError(t, err) service := &SecretsRealtimeService{ - JwtWrapper: &mock.JWTMockWrapper{}, - FeatureFlagWrapper: &mock.FeatureFlagsMockWrapper{}, + JwtWrapper: &mock.JWTMockWrapper{}, } results, err := service.RunSecretsRealtimeScan(tempFile, "") @@ -142,7 +115,6 @@ func TestRunSecretsRealtimeScan_ValidFile_Success(t *testing.T) { } func TestRunSecretsRealtimeScan_MultiLineResult_Success(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} value := "PRIVATE_KEY = \"\"\"\n-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA7v8wF+SECRETKEYEXAMPLE+QIDAQABAoIBAQC0\n-----END RSA PRIVATE KEY-----\n\"\"\"" // Create a temporary file for testing tempDir := t.TempDir() @@ -152,8 +124,7 @@ func TestRunSecretsRealtimeScan_MultiLineResult_Success(t *testing.T) { assert.NoError(t, err) service := &SecretsRealtimeService{ - JwtWrapper: &mock.JWTMockWrapper{}, - FeatureFlagWrapper: &mock.FeatureFlagsMockWrapper{}, + JwtWrapper: &mock.JWTMockWrapper{}, } results, err := service.RunSecretsRealtimeScan(tempFile, "") @@ -346,11 +317,9 @@ func TestGetSeverity_EmptyStatus_ReturnsHigh(t *testing.T) { } func TestScanContent_ReportsSourcePathAndHonorsIgnoreFile(t *testing.T) { - mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.OssRealtimeEnabled, Status: true} service := &SecretsRealtimeService{ - JwtWrapper: &mock.JWTMockWrapper{}, - FeatureFlagWrapper: &mock.FeatureFlagsMockWrapper{}, + JwtWrapper: &mock.JWTMockWrapper{}, } content := "token = \"ghp_1234567890abcdef1234567890abcdef12345678\"" results, err := service.ScanContent("app.env", content, "") @@ -368,3 +337,41 @@ func TestScanContent_ReportsSourcePathAndHonorsIgnoreFile(t *testing.T) { assert.NoError(t, err) assert.Empty(t, filtered) } + +func TestRunSecretsRealtimeScan_NoLicense_ReturnsLicenseError(t *testing.T) { + service := &SecretsRealtimeService{ + JwtWrapper: &mock.JWTMockWrapper{ + CustomIsAllowedEngine: func(engine string) (bool, error) { return false, nil }, + }, + } + + results, err := service.RunSecretsRealtimeScan("test.txt", "") + + assert.Nil(t, results) + assert.NotNil(t, err) + assert.Contains(t, err.Error(), "required license") +} + +func TestScanContent_EmptySourcePath_ReturnsError(t *testing.T) { + service := &SecretsRealtimeService{JwtWrapper: &mock.JWTMockWrapper{}} + + results, err := service.ScanContent("", "content", "") + + assert.Nil(t, results) + assert.NotNil(t, err) + assert.Contains(t, err.Error(), "file path is required") +} + +func TestScanContent_NoLicense_ReturnsLicenseError(t *testing.T) { + service := &SecretsRealtimeService{ + JwtWrapper: &mock.JWTMockWrapper{ + CustomIsAllowedEngine: func(engine string) (bool, error) { return false, nil }, + }, + } + + results, err := service.ScanContent("test.txt", "content", "") + + assert.Nil(t, results) + assert.NotNil(t, err) + assert.Contains(t, err.Error(), "required license") +} diff --git a/internal/wrappers/feature-flags.go b/internal/wrappers/feature-flags.go index c4008f64e..710769a82 100644 --- a/internal/wrappers/feature-flags.go +++ b/internal/wrappers/feature-flags.go @@ -12,22 +12,14 @@ const PackageEnforcementEnabled = "PACKAGE_ENFORCEMENT_ENABLED" const CVSSV3Enabled = "CVSS_V3_ENABLED" const MinioEnabled = "MINIO_ENABLED" const SastCustomStateEnabled = "SAST_CUSTOM_STATES_ENABLED" -const RiskManagementEnabled = "RISK_MANAGEMENT_IDES_PROJECT_RESULTS_SCORES_API_ENABLED" -const OssRealtimeEnabled = "OSS_REALTIME_ENABLED" -const ScsLicensingV2Enabled = "SSCS_NEW_LICENSING_ENABLED" -const SscsCommitHistoryEnabled = "SSCS_COMMIT_HISTORY_ENABLED" const DirectAssociationEnabled = "DIRECT_APP_ASSOCIATION_ENABLED" const DaMigrationEnabled = "DA_MIGRATION_ENABLED" const maxRetries = 3 -const IncreaseFileUploadLimit = "INCREASE_FILE_UPLOAD_LIMIT" const ScaDeltaScanEnabled = "SCA_DELTASCAN_ENABLED" // RepostoreCustomerContributorsCsvEnabled is the feature flag for generating contributors.csv and metadata.json. const RepostoreCustomerContributorsCsvEnabled = "REPOSTORE_CUSTOMER_CONTRIBUTORS_CSV_ENABLED" -// AISupplyChainGAEnabled is the feature flag for AI Supply Chain Engine GA. -const AISupplyChainGAEnabled = "AI_SUPPLY_CHAIN_ENGINE_GA_ENABLED" - var DefaultFFLoad bool = false var FeatureFlagsBaseMap = []CommandFlags{ @@ -78,15 +70,6 @@ var FeatureFlagsBaseMap = []CommandFlags{ }, }, }, - { - CommandName: "cx results risk-management", - FeatureFlags: []FlagBase{ - { - Name: RiskManagementEnabled, - Default: false, - }, - }, - }, } var featureFlags = map[string]bool{} diff --git a/internal/wrappers/jwt-helper.go b/internal/wrappers/jwt-helper.go index 566a88303..7b1b5f58b 100644 --- a/internal/wrappers/jwt-helper.go +++ b/internal/wrappers/jwt-helper.go @@ -40,49 +40,37 @@ func NewJwtWrapper() JWTWrapper { return &JWTStruct{} } -func getEnabledEngines(scsLicensingV2 bool) (enabledEngines []string) { - enabledEngines = []string{"sast", "sca", "api-security", "iac-security", "containers", "aisc"} - if scsLicensingV2 { - enabledEngines = append(enabledEngines, commonParams.RepositoryHealthType, commonParams.SecretDetectionType) - } else { - enabledEngines = append(enabledEngines, commonParams.ScsType, commonParams.EnterpriseSecretsType) - } - return enabledEngines +func getEnabledEngines() []string { + return []string{"sast", "sca", "api-security", "iac-security", "containers", "aisc", + commonParams.RepositoryHealthType, commonParams.SecretDetectionType} } -func getDefaultEngines(scsLicensingV2 bool) (defaultEngines map[string]bool) { - defaultEngines = map[string]bool{ - "sast": true, - "sca": true, - "api-security": true, - "iac-security": true, - "containers": true, - "aisc": true, - } - if scsLicensingV2 { - defaultEngines[commonParams.RepositoryHealthType] = true - defaultEngines[commonParams.SecretDetectionType] = true - } else { - defaultEngines[commonParams.ScsType] = true - defaultEngines[commonParams.EnterpriseSecretsType] = true +func getDefaultEngines() map[string]bool { + return map[string]bool{ + "sast": true, + "sca": true, + "api-security": true, + "iac-security": true, + "containers": true, + "aisc": true, + commonParams.RepositoryHealthType: true, + commonParams.SecretDetectionType: true, } - return defaultEngines } // GetAllowedEngines will return a map with user allowed engines func (*JWTStruct) GetAllowedEngines(featureFlagsWrapper FeatureFlagsWrapper) (allowedEngines map[string]bool, err error) { - scsLicensingV2Flag, _ := GetSpecificFeatureFlag(featureFlagsWrapper, ScsLicensingV2Enabled) flagResponse, _ := GetSpecificFeatureFlag(featureFlagsWrapper, PackageEnforcementEnabled) if flagResponse.Status { jwtStruct, err := getJwtStruct() if err != nil { return nil, err } - allowedEngines = prepareEngines(jwtStruct.AstLicense.LicenseData.AllowedEngines, scsLicensingV2Flag.Status) + allowedEngines = prepareEngines(jwtStruct.AstLicense.LicenseData.AllowedEngines) return allowedEngines, nil } - return getDefaultEngines(scsLicensingV2Flag.Status), nil + return getDefaultEngines(), nil } func (*JWTStruct) GetLicenseDetails() (licenseDetails map[string]string, err error) { @@ -140,20 +128,16 @@ func (*JWTStruct) IsAllowedEngine(engine string) (bool, error) { return false, nil } -func prepareEngines(engines []string, scsLicensingV2 bool) map[string]bool { +func prepareEngines(engines []string) map[string]bool { m := make(map[string]bool) for _, value := range engines { engine := strings.Replace(strings.ToLower(value), strings.ToLower(commonParams.APISecurityLabel), commonParams.APISecurityType, 1) engine = strings.Replace(strings.ToLower(engine), commonParams.KicsType, commonParams.IacType, 1) - if scsLicensingV2 { - engine = strings.Replace(strings.ToLower(engine), strings.ToLower(commonParams.RepositoryHealthLabel), commonParams.RepositoryHealthType, 1) - engine = strings.Replace(strings.ToLower(engine), strings.ToLower(commonParams.SecretDetectionLabel), commonParams.SecretDetectionType, 1) - } else { - engine = strings.Replace(strings.ToLower(engine), strings.ToLower(commonParams.EnterpriseSecretsLabel), commonParams.EnterpriseSecretsType, 1) - } + engine = strings.Replace(strings.ToLower(engine), strings.ToLower(commonParams.RepositoryHealthLabel), commonParams.RepositoryHealthType, 1) + engine = strings.Replace(strings.ToLower(engine), strings.ToLower(commonParams.SecretDetectionLabel), commonParams.SecretDetectionType, 1) // Current limitation, CxOne is including non-engines in the JWT - enabledEngines := getEnabledEngines(scsLicensingV2) + enabledEngines := getEnabledEngines() if utils.Contains(enabledEngines, strings.ToLower(engine)) { m[strings.ToLower(engine)] = true } diff --git a/internal/wrappers/jwt-helper_test.go b/internal/wrappers/jwt-helper_test.go index 9356921ef..1f2aad388 100644 --- a/internal/wrappers/jwt-helper_test.go +++ b/internal/wrappers/jwt-helper_test.go @@ -10,69 +10,33 @@ import ( ) func TestGetDefaultEngines(t *testing.T) { - tests := []struct { - name string - scsLicensingV2 bool - expectedEngines map[string]bool - }{ - { - name: "using new sscs licensing", - scsLicensingV2: true, - expectedEngines: map[string]bool{ - "sast": true, - "sca": true, - "api-security": true, - "iac-security": true, - "containers": true, - "repository-health": true, - "secret-detection": true, - }, - }, - { - name: "using old sscs licensing", - scsLicensingV2: false, - expectedEngines: map[string]bool{ - "sast": true, - "sca": true, - "api-security": true, - "iac-security": true, - "containers": true, - "scs": true, - "enterprise-secrets": true, - }, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - actualEngines := getDefaultEngines(tt.scsLicensingV2) - assert.Equal(t, tt.expectedEngines, actualEngines) - }) + expectedEngines := map[string]bool{ + "sast": true, + "sca": true, + "api-security": true, + "iac-security": true, + "containers": true, + "aisc": true, + "repository-health": true, + "secret-detection": true, } + assert.DeepEqual(t, expectedEngines, getDefaultEngines()) } func TestGetEnabledEngines(t *testing.T) { - tests := []struct { - name string - scsLicensingV2 bool - expectedEngines []string - }{ - { - name: "using new sscs licensing", - scsLicensingV2: true, - expectedEngines: []string{"sast", "sca", "api-security", "iac-security", "containers", "repository-health", "secret-detection"}, - }, - { - name: "using old sscs licensing", - scsLicensingV2: false, - expectedEngines: []string{"sast", "sca", "api-security", "iac-security", "containers", "scs", "enterprise-secrets"}, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - actualEngines := getDefaultEngines(tt.scsLicensingV2) - assert.Equal(t, tt.expectedEngines, actualEngines) - }) + expectedEngines := []string{"sast", "sca", "api-security", "iac-security", "containers", "aisc", "repository-health", "secret-detection"} + assert.DeepEqual(t, expectedEngines, getEnabledEngines()) +} + +func TestPrepareEngines(t *testing.T) { + licenseEngines := []string{"SAST", "Secret Detection", "Repository Health", "KICS", "Enterprise Secrets", "Checkmarx One Assist"} + expectedEngines := map[string]bool{ + "sast": true, + "secret-detection": true, + "repository-health": true, + "iac-security": true, } + assert.DeepEqual(t, expectedEngines, prepareEngines(licenseEngines)) } func TestGetUniqueID(t *testing.T) { diff --git a/internal/wrappers/mock/jwt-helper-mock.go b/internal/wrappers/mock/jwt-helper-mock.go index b487a959f..36abed9ae 100644 --- a/internal/wrappers/mock/jwt-helper-mock.go +++ b/internal/wrappers/mock/jwt-helper-mock.go @@ -10,7 +10,6 @@ import ( type JWTMockWrapper struct { AIEnabled int - EnterpriseSecretsEnabled int SecretDetectionEnabled int CheckmarxOneAssistEnabled int DastEnabled bool @@ -20,10 +19,9 @@ type JWTMockWrapper struct { const AIProtectionDisabled = 1 const CheckmarxOneAssistDisabled = 1 -const EnterpriseSecretsDisabled = 1 const SecretDetectionDisabled = 1 -var engines = []string{"sast", "sca", "api-security", "iac-security", "scs", "containers", "enterprise-secrets"} +var engines = []string{"sast", "sca", "api-security", "iac-security", "containers", "repository-health", "secret-detection"} const licenseEnabledValue = "true" @@ -57,13 +55,6 @@ func (j *JWTMockWrapper) IsAllowedEngine(engine string) (bool, error) { return true, nil } - if engine == params.EnterpriseSecretsLabel { - if j.EnterpriseSecretsEnabled == EnterpriseSecretsDisabled { - return false, nil - } - return true, nil - } - if engine == params.SecretDetectionLabel { if j.SecretDetectionEnabled == SecretDetectionDisabled { return false, nil diff --git a/test/integration/scan_test.go b/test/integration/scan_test.go index f9062be1e..211cdf58b 100644 --- a/test/integration/scan_test.go +++ b/test/integration/scan_test.go @@ -325,12 +325,12 @@ func TestScanCreate_FolderWithSymbolicLinkWithAbsolutePath_CreateScanSuccessfull func TestScanCreate_IaCWithPresetID_CreateScanSuccessfully(t *testing.T) { bindKeysToEnvAndDefault(t) - // The createPreset(...) function requires these feature flags to be ON. - // If ast-cli runs with these flags OFF, the KICS engine in CxOne will ignore + // The createPreset(...) function requires this feature flag to be ON. + // If ast-cli runs with this flag OFF, the KICS engine in CxOne will ignore // the submitted preset and perform a full scan instead. - // Since this test is only meaningful when the flags are ON, it is skipped otherwise. - if !isFFEnabled(t, "NEW_PRESET_MANAGEMENT_ENABLED") || !isFFEnabled(t, "KICS_PRESETS_MANAGER_ENABLED") { - t.Skip("Preset FFs are not enabled... Skipping test") + // Since this test is only meaningful when the flag is ON, it is skipped otherwise. + if !isFFEnabled(t, "NEW_PRESET_MANAGEMENT_ENABLED") { + t.Skip("Preset FF is not enabled... Skipping test") } requestData := CreatePresetRequest{