check (#739)

* check * check --------- Co-authored-by: AlvoBen <[email protected]>
Checkmarx · May 19, 2024 · 2981c57 · 2981c57
1 parent e639d4a
commit 2981c57
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/internal/commands/root.go b/internal/commands/root.go
@@ -100,6 +100,16 @@ func NewAstCLI(
 	// This monitors and traps situations where "extra/garbage" commands
 	// are passed to Cobra.
 	rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
+		if wrappers.DefaultFFLoad {
+			if requiredFeatureFlagsCheck(cmd) {
+				err := wrappers.HandleFeatureFlags(featureFlagsWrapper)
+
+				if err != nil {
+					fmt.Println(err)
+					os.Exit(1)
+				}
+			}
+		}
 		PrintConfiguration()
 		// Need to check the __complete command to allow correct behavior of the autocomplete
 		if len(args) > 0 && cmd.Name() != params.Help && cmd.Name() != "__complete" {
@@ -219,6 +229,16 @@ func PrintConfiguration() {
 	}
 }
 
+func requiredFeatureFlagsCheck(cmd *cobra.Command) bool {
+	for _, cmdFlag := range wrappers.FeatureFlagsBaseMap {
+		if cmdFlag.CommandName == cmd.CommandPath() {
+			return true
+		}
+	}
+
+	return false
+}
+
 func setUpFeatureFlags(featureFlagsWrapper wrappers.FeatureFlagsWrapper) {
 	err := wrappers.HandleFeatureFlags(featureFlagsWrapper)
 

diff --git a/internal/wrappers/feature-flags.go b/internal/wrappers/feature-flags.go
@@ -11,6 +11,8 @@ const MinioEnabled = "MINIO_ENABLED"
 const ContainerEngineCLIEnabled = "CONTAINER_ENGINE_CLI_ENABLED"
 const NewScanReportEnabled = "NEW_SAST_SCAN_REPORT_ENABLED"
 
+var DefaultFFLoad bool = false
+
 var FeatureFlagsBaseMap = []CommandFlags{
 	{
 		CommandName: "cx scan create",
@@ -21,7 +23,7 @@ var FeatureFlagsBaseMap = []CommandFlags{
 			},
 			{
 				Name:    MinioEnabled,
-				Default: true,
+				Default: false,
 			},
 		},
 	},
@@ -33,7 +35,7 @@ var FeatureFlagsBaseMap = []CommandFlags{
 		FeatureFlags: []FlagBase{
 			{
 				Name:    MinioEnabled,
-				Default: true,
+				Default: false,
 			},
 			{
 				Name:    feature_flags.ByorEnabled,
@@ -91,6 +93,7 @@ func loadFeatureFlagsDefaultValues() {
 			FeatureFlags[flag.Name] = flag.Default
 		}
 	}
+	DefaultFFLoad = true
 }
 
 type FeatureFlagsWrapper interface {