Merge branch 'master' into events

SAP · May 6, 2024 · 3299bc9 · 3299bc9
2 parents 60a39a5 + fb809a2
commit 3299bc9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/cmd/detectExecuteScan.go b/cmd/detectExecuteScan.go
@@ -389,13 +389,16 @@ func getDetectScript(config detectExecuteScanOptions, utils detectUtils) error {
 
 	log.Entry().Infof("Downloading Detect Script")
 
-	err := utils.DownloadFile("https://detect.synopsys.com/detect8.sh", "detect.sh", nil, nil)
-	if err != nil {
-		time.Sleep(time.Second * 5)
-		err = utils.DownloadFile("https://detect.synopsys.com/detect8.sh", "detect.sh", nil, nil)
-		if err != nil {
-			return err
+	downloadScript := func() error {
+		if config.UseDetect9 {
+			return utils.DownloadFile("https://detect.synopsys.com/detect9.sh", "detect.sh", nil, nil)
 		}
+		return utils.DownloadFile("https://detect.synopsys.com/detect8.sh", "detect.sh", nil, nil)
+	}
+
+	if err := downloadScript(); err != nil {
+		time.Sleep(5 * time.Second)
+		return downloadScript()
 	}
 
 	return nil

diff --git a/cmd/detectExecuteScan_generated.go b/cmd/detectExecuteScan_generated.go
diff --git a/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml
@@ -601,6 +601,17 @@ spec:
         resourceRef:
           - name: commonPipelineEnvironment
             param: container/repositoryPassword
+      - name: useDetect9
+        description:
+          "This flag enables the use of the supported version 9 of the Detect Script instead of v8"
+        aliases:
+          - name: detect/useDetect9
+        type: bool
+        scope:
+          - PARAMETERS
+          - STAGES
+          - STEPS
+        default: false
   outputs:
     resources:
       - name: influx