Merge branch 'main' into bug/alex-fix-sca-configurations

Author: cx-elchanan-arbiv

internal/commands/result.go

@@ -201,7 +201,7 @@ func NewResultsCommand(
 	codeBashingCmd := resultCodeBashing(codeBashingWrapper)
 	bflResultCmd := resultBflSubCommand(bflWrapper)
 	exitCodeSubcommand := exitCodeSubCommand(scanWrapper)
-	riskManagementSubCommand := riskManagementSubCommand(riskManagementWrapper)
+	riskManagementSubCommand := riskManagementSubCommand(riskManagementWrapper, featureFlagsWrapper)
 	resultCmd.AddCommand(
 		showResultCmd, bflResultCmd, codeBashingCmd, exitCodeSubcommand, riskManagementSubCommand,
 	)
@@ -226,7 +226,8 @@ func exitCodeSubCommand(scanWrapper wrappers.ScansWrapper) *cobra.Command {
 
 	return exitCodeCmd
 }
-func riskManagementSubCommand(riskManagement wrappers.RiskManagementWrapper) *cobra.Command {
+func riskManagementSubCommand(riskManagement wrappers.RiskManagementWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper,
+) *cobra.Command {
 	riskManagementCmd := &cobra.Command{
 		Use:   "risk-management",
 		Short: "Show risk-management results of a project",
@@ -236,7 +237,7 @@ func riskManagementSubCommand(riskManagement wrappers.RiskManagementWrapper) *co
 			$ cx results risk-management --project-id <project Id> --limit <limit> (1-50, default: 50)
 		`,
 		),
-		RunE: runRiskManagementCommand(riskManagement),
+		RunE: runRiskManagementCommand(riskManagement, featureFlagsWrapper),
 	}
 
 	riskManagementCmd.PersistentFlags().String(commonParams.ProjectIDFlag, "", "Project ID")
@@ -350,11 +351,17 @@ func runGetExitCodeCommand(scanWrapper wrappers.ScansWrapper) func(cmd *cobra.Co
 	}
 }
 
-func runRiskManagementCommand(riskManagement wrappers.RiskManagementWrapper) func(cmd *cobra.Command, args []string) error {
+func runRiskManagementCommand(riskManagement wrappers.RiskManagementWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper,
+) func(cmd *cobra.Command, args []string) error {
 	return func(cmd *cobra.Command, args []string) error {
 		projectID, _ := cmd.Flags().GetString(commonParams.ProjectIDFlag)
 		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)
 		if err != nil {
 			return err

internal/commands/result_test.go

@@ -1562,7 +1562,16 @@ 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")
 }
 

internal/wrappers/feature-flags.go

@@ -15,6 +15,7 @@ const SastCustomStateEnabled = "SAST_CUSTOM_STATES_ENABLED"
 const ContainerEngineCLIEnabled = "CONTAINER_ENGINE_CLI_ENABLED"
 const SCSEngineCLIEnabled = "NEW_2MS_SCORECARD_RESULTS_CLI_ENABLED"
 const NewScanReportEnabled = "NEW_SAST_SCAN_REPORT_ENABLED"
+const RiskManagementEnabled = "RISK_MANAGEMENT_IDES_PROJECT_RESULTS_SCORES_API_ENABLED"
 const maxRetries = 3
 
 var DefaultFFLoad bool = false
@@ -76,6 +77,15 @@ var FeatureFlagsBaseMap = []CommandFlags{
 			},
 		},
 	},
+	{
+		CommandName: "cx results risk-management",
+		FeatureFlags: []FlagBase{
+			{
+				Name:    RiskManagementEnabled,
+				Default: false,
+			},
+		},
+	},
 }
 
 var featureFlags = map[string]bool{}