Moved staticscantimeout as a local flag to cicheck

Author: ginilpg

appknox/sarif_generator.go

@@ -13,7 +13,6 @@ import (
 	"github.com/iancoleman/strcase"
 	"github.com/vbauerster/mpb/v4"
 	"github.com/vbauerster/mpb/v4/decor"
-	"github.com/spf13/viper"
 )
 
 type SARIF struct {
@@ -120,7 +119,7 @@ func GenerateSARIFGivenFileID(client *Client, fileID int, riskThreshold int) (SA
 		sarifReportProgess = file.StaticScanProgress
 		bar.SetCurrent(int64(sarifReportProgess), time.Since(start))
 
-		if time.Since(start) > time.Duration(viper.GetInt("timeout")) * time.Minute {
+		if time.Since(start) > 15*time.Minute {
 			err := errors.New("Request timed out")
 			PrintError(err)
 			os.Exit(1)

cmd/cicheck.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/appknox/appknox-go/helper"
 	"github.com/spf13/cobra"
@@ -45,12 +46,18 @@ var cicheckCmd = &cobra.Command{
 			helper.PrintError(err)
 			os.Exit(1)
 		}
-		helper.ProcessCiCheck(fileID, riskThresholdInt)
+		timeoutMinutes, _ := cmd.Flags().GetInt("sast-timeout")
+		timeout := time.Duration(timeoutMinutes) * time.Minute
+		
+		helper.ProcessCiCheck(fileID, riskThresholdInt, timeout)
 	},
 }
 
 func init() {
 	RootCmd.AddCommand(cicheckCmd)
 	cicheckCmd.Flags().StringP(
 		"risk-threshold", "r", "low", "Risk threshold to fail the command. Available options: low, medium, high")
+	cicheckCmd.Flags().IntP(
+			"sast-timeout", "t", 30, "Timeout in minutes for the CI check (default: 30)")
+	
 }

cmd/root.go

@@ -40,10 +40,6 @@ func init() {
     viper.BindEnv("host", "APPKNOX_API_HOST")
 
 	// Define flags globally here for all subcommands
-	RootCmd.PersistentFlags().String("timeout", "", "Timeout for Appknox scanner, default is 30 minutes")
-	viper.BindPFlag("timeout", RootCmd.PersistentFlags().Lookup("timeout"))
-	viper.BindEnv("timeout", "APPKNOX_TIMEOUT")
-	viper.SetDefault("timeout", "30") // Default to 30 minutes
 	RootCmd.PersistentFlags().String("region", "", "Region names, e.g., global, saudi, uae. By default, global is used")
     viper.BindPFlag("region", RootCmd.PersistentFlags().Lookup("region"))
     viper.BindEnv("region", "APPKNOX_API_REGION")

helper/cicheck.go

@@ -9,21 +9,27 @@ import (
 
 	"github.com/appknox/appknox-go/appknox"
 	"github.com/appknox/appknox-go/appknox/enums"
-	"github.com/spf13/viper"
 	"github.com/cheynewallace/tabby"
 	"github.com/vbauerster/mpb/v4"
 	"github.com/vbauerster/mpb/v4/decor"
 )
 
 // ProcessCiCheck takes the list of analyses and print it to CLI.
-func ProcessCiCheck(fileID, riskThreshold int) {
+func ProcessCiCheck(fileID, riskThreshold int, staticScanTimeout time.Duration) {
+	// Add timeout validation
+	const minTimeout=1;//1 minute
+	const maxTimeout=240;//4 hours
+
+	if staticScanTimeout < minTimeout*time.Minute || staticScanTimeout > maxTimeout*time.Minute {
+		errMsg := fmt.Sprintf("Error: timeout must be between %v minute and %v minutes", minTimeout, maxTimeout)
+		fmt.Println(errMsg) // Print error message to standard output
+		os.Exit(1)
+	}
 	ctx := context.Background()
 	client := getClient()
 	var staticScanProgess int
 	start := time.Now()
-	timeoutMinutes := viper.GetInt("timeout")
-	timeout := time.Duration(timeoutMinutes) * time.Minute
-	fmt.Printf("Starting scan at: %v with timeout of %d minutes\n", start.Format(time.RFC3339), timeoutMinutes)
+	fmt.Printf("Starting scan at: %v with timeout of %v\n", start.Format(time.RFC3339), staticScanTimeout)
 	p := mpb.New(
 		mpb.WithWidth(60),
 		mpb.WithRefreshRate(180*time.Millisecond),
@@ -49,7 +55,7 @@ func ProcessCiCheck(fileID, riskThreshold int) {
 		staticScanProgess = file.StaticScanProgress
 		bar.SetCurrent(int64(staticScanProgess), time.Since(start))
 
-		if time.Since(start) > timeout {
+		if time.Since(start) > staticScanTimeout {
 			err := errors.New("Request timed out")
 			PrintError(err)
 			os.Exit(1)