avoid passing boolean flag around when it is not necessary since there is a feature flag cache

Author: cx-leonardo-fontes

internal/commands/scan.go

@@ -913,7 +913,7 @@ func setupScanTypeProjectAndConfig(
 	featureFlagsWrapper wrappers.FeatureFlagsWrapper,
 	jwtWrapper wrappers.JWTWrapper,
 ) error {
-	userAllowedEngines, scsLicensingV2, _ := jwtWrapper.GetAllowedEngines(featureFlagsWrapper)
+	userAllowedEngines, _ := jwtWrapper.GetAllowedEngines(featureFlagsWrapper)
 	var info map[string]interface{}
 	newProjectName, _ := cmd.Flags().GetString(commonParams.ProjectName)
 
@@ -990,7 +990,8 @@ func setupScanTypeProjectAndConfig(
 		configArr = append(configArr, containersConfig)
 	}
 
-	var SCSConfig, scsErr = addSCSScan(cmd, resubmitConfig, scsLicensingV2, userAllowedEngines[commonParams.RepositoryHealthType],
+	scsLicensingV2Flag, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.ScsLicensingV2Enabled)
+	var SCSConfig, scsErr = addSCSScan(cmd, resubmitConfig, scsLicensingV2Flag.Status, userAllowedEngines[commonParams.RepositoryHealthType],
 		userAllowedEngines[commonParams.SecretDetectionType], userAllowedEngines[commonParams.EnterpriseSecretsType])
 	if scsErr != nil {
 		return scsErr
@@ -1413,7 +1414,9 @@ func isScsSecretDetectionAllowed(scsLicensingV2, hasSecretDetectionLicense, hasE
 func validateScanTypes(cmd *cobra.Command, jwtWrapper wrappers.JWTWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) error {
 	var scanTypes []string
 
-	allowedEngines, scsLicensingV2Enabled, err := jwtWrapper.GetAllowedEngines(featureFlagsWrapper)
+	scsLicensingV2Flag, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.ScsLicensingV2Enabled)
+
+	allowedEngines, err := jwtWrapper.GetAllowedEngines(featureFlagsWrapper)
 
 	isSbomScan, _ := cmd.PersistentFlags().GetBool(commonParams.SbomFlag)
 
@@ -1444,7 +1447,7 @@ func validateScanTypes(cmd *cobra.Command, jwtWrapper wrappers.JWTWrapper, featu
 		}
 
 		for _, scanType := range scanTypes {
-			if scanType == commonParams.ScsType && scsLicensingV2Enabled {
+			if scanType == commonParams.ScsType && scsLicensingV2Flag.Status {
 				// 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.
@@ -1460,7 +1463,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, scsLicensingV2Enabled)
+			err = validateSCSEngines(allowedEngines, userSCSScanTypes, scsLicensingV2Flag.Status)
 			if err != nil {
 				return err
 			}

internal/wrappers/jwt-helper.go

@@ -22,7 +22,7 @@ type JWTStruct struct {
 }
 
 type JWTWrapper interface {
-	GetAllowedEngines(featureFlagsWrapper FeatureFlagsWrapper) (allowedEngines map[string]bool, scsLicensingV2 bool, err error)
+	GetAllowedEngines(featureFlagsWrapper FeatureFlagsWrapper) (allowedEngines map[string]bool, err error)
 	IsAllowedEngine(engine string) (bool, error)
 	ExtractTenantFromToken() (tenant string, err error)
 	CheckPermissionByAccessToken(requiredPermission string) (permission bool, err error)
@@ -61,20 +61,19 @@ func getDefaultEngines(scsLicensingV2 bool) (defaultEngines map[string]bool) {
 }
 
 // GetAllowedEngines will return a map with user allowed engines
-func (*JWTStruct) GetAllowedEngines(featureFlagsWrapper FeatureFlagsWrapper) (allowedEngines map[string]bool, scsLicensingV2 bool, err error) {
+func (*JWTStruct) GetAllowedEngines(featureFlagsWrapper FeatureFlagsWrapper) (allowedEngines map[string]bool, err error) {
 	scsLicensingV2Flag, _ := GetSpecificFeatureFlag(featureFlagsWrapper, ScsLicensingV2Enabled)
-	scsLicensingV2 = scsLicensingV2Flag.Status
 	flagResponse, _ := GetSpecificFeatureFlag(featureFlagsWrapper, PackageEnforcementEnabled)
 	if flagResponse.Status {
 		jwtStruct, err := getJwtStruct()
 		if err != nil {
-			return nil, scsLicensingV2, err
+			return nil, err
 		}
-		allowedEngines = prepareEngines(jwtStruct.AstLicense.LicenseData.AllowedEngines, scsLicensingV2)
-		return allowedEngines, scsLicensingV2, nil
+		allowedEngines = prepareEngines(jwtStruct.AstLicense.LicenseData.AllowedEngines, scsLicensingV2Flag.Status)
+		return allowedEngines, nil
 	}
 
-	return getDefaultEngines(scsLicensingV2), scsLicensingV2, nil
+	return getDefaultEngines(scsLicensingV2Flag.Status), nil
 }
 
 func getJwtStruct() (*JWTStruct, error) {

internal/wrappers/mock/jwt-helper-mock.go

@@ -11,7 +11,6 @@ type JWTMockWrapper struct {
 	AIEnabled                 int
 	CheckmarxOneAssistEnabled int
 	CustomGetAllowedEngines   func(wrappers.FeatureFlagsWrapper) (map[string]bool, error)
-	ScsLicensingV2            bool
 }
 
 const AIProtectionDisabled = 1
@@ -20,17 +19,17 @@ const CheckmarxOneAssistDisabled = 1
 var engines = []string{"sast", "sca", "api-security", "iac-security", "scs", "containers", "enterprise-secrets"}
 
 // GetAllowedEngines mock for tests
-func (j *JWTMockWrapper) GetAllowedEngines(featureFlagsWrapper wrappers.FeatureFlagsWrapper) (allowedEngines map[string]bool, scsLicensingV2 bool, err error) {
+func (j *JWTMockWrapper) GetAllowedEngines(featureFlagsWrapper wrappers.FeatureFlagsWrapper) (allowedEngines map[string]bool, err error) {
 	if j.CustomGetAllowedEngines != nil {
 		allowedEngines, err = j.CustomGetAllowedEngines(featureFlagsWrapper)
-		return allowedEngines, j.ScsLicensingV2, err
+		return allowedEngines, err
 	}
 	allowedEngines = make(map[string]bool)
 
 	for _, value := range engines {
 		allowedEngines[strings.ToLower(value)] = true
 	}
-	return allowedEngines, j.ScsLicensingV2, nil
+	return allowedEngines, nil
 }
 
 func (*JWTMockWrapper) ExtractTenantFromToken() (tenant string, err error) {