feat(detect): Add support for Detect 10 (#5224)

* Changes for detect 10 and repo change from synopsys to blackduck * change for blakcduck * Making detect 10 as default version * changing test file * Updated description for useDetect8 and useDetect9 * added udeDetect10 field * Apply suggestions from code review * commiting with go generate file * Removing useDetect10 flag --------- Co-authored-by: Vijayan T <[email protected]> Co-authored-by: Christopher Fenner <[email protected]>
SAP · Jan 17, 2025 · 64ae652 · 64ae652
1 parent 6dfccc5
commit 64ae652
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/cmd/detectExecuteScan.go b/cmd/detectExecuteScan.go
@@ -429,9 +429,11 @@ func getDetectScript(config detectExecuteScanOptions, utils detectUtils) error {
 
 	downloadScript := func() error {
 		if config.UseDetect8 {
-			return utils.DownloadFile("https://detect.synopsys.com/detect8.sh", "detect.sh", nil, nil)
+			return utils.DownloadFile("https://detect.blackduck.com/detect8.sh", "detect.sh", nil, nil)
+		} else if config.UseDetect9 {
+			return utils.DownloadFile("https://detect.blackduck.com/detect9.sh", "detect.sh", nil, nil)
 		}
-		return utils.DownloadFile("https://detect.synopsys.com/detect9.sh", "detect.sh", nil, nil)
+		return utils.DownloadFile("https://detect.blackduck.com/detect10.sh", "detect.sh", nil, nil)
 
 	}
 

diff --git a/cmd/detectExecuteScan_generated.go b/cmd/detectExecuteScan_generated.go
diff --git a/cmd/detectExecuteScan_test.go b/cmd/detectExecuteScan_test.go
@@ -310,7 +310,7 @@ func TestRunDetect(t *testing.T) {
 		utilsMock.AddFile("detect.sh", []byte(""))
 		err := runDetect(ctx, detectExecuteScanOptions{}, utilsMock, &detectExecuteScanInflux{})
 
-		assert.Equal(t, utilsMock.downloadedFiles["https://detect.synopsys.com/detect9.sh"], "detect.sh")
+		assert.Equal(t, utilsMock.downloadedFiles["https://detect.blackduck.com/detect10.sh"], "detect.sh")
 		assert.True(t, utilsMock.HasRemovedFile("detect.sh"))
 		assert.NoError(t, err)
 		assert.Equal(t, ".", utilsMock.Dir, "Wrong execution directory used")

diff --git a/pkg/whitesource/configHelper.go b/pkg/whitesource/configHelper.go
@@ -153,7 +153,7 @@ func (c *ConfigOptions) addGeneralDefaults(config *ScanOptions, utils Utils, pro
 		{Name: "forceUpdate", Value: true, Force: true},
 		{Name: "offline", Value: false, Force: true},
 		{Name: "resolveAllDependencies", Value: false, Force: false},
-		{Name: "failErrorLevel", Value: "ALL", Force: true},
+		{Name: "failErrorLevel", Value: "ALL", Force: false},
 		{Name: "case.sensitive.glob", Value: false},
 		{Name: "followSymbolicLinks", Value: true},
 	}...)

diff --git a/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml
@@ -655,7 +655,7 @@ spec:
             param: container/repositoryPassword
       - name: useDetect8
         description:
-          "This flag enables the use of the supported version 8 of the Detect Script instead of v9"
+          "This flag enables the use of the supported version 8 of the Detect script instead of default version 10"
         aliases:
           - name: detect/useDetect8
         type: bool
@@ -664,6 +664,17 @@ spec:
           - STAGES
           - STEPS
         default: false
+      - name: useDetect9
+        description:
+          "This flag enables the use of the supported version 9 of the Detect script instead of default version 10"
+        aliases:
+          - name: detect/useDetect9
+        type: bool
+        scope:
+          - PARAMETERS
+          - STAGES
+          - STEPS
+        default: false
   outputs:
     resources:
       - name: influx