Detect script version 9 (#5154)

* detect script v9 as default and detect script v8 as optional for blackduck * unit test fix --------- Co-authored-by: Dmitrii Pavlukhin <[email protected]>
SAP · Oct 23, 2024 · 7b08d47 · 7b08d47
1 parent 3ad2628
commit 7b08d47
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/cmd/detectExecuteScan.go b/cmd/detectExecuteScan.go
@@ -427,10 +427,11 @@ func getDetectScript(config detectExecuteScanOptions, utils detectUtils) error {
 	log.Entry().Infof("Downloading Detect Script")
 
 	downloadScript := func() error {
-		if config.UseDetect9 {
-			return utils.DownloadFile("https://detect.synopsys.com/detect9.sh", "detect.sh", nil, nil)
+		if config.UseDetect8 {
+			return utils.DownloadFile("https://detect.synopsys.com/detect8.sh", "detect.sh", nil, nil)
 		}
-		return utils.DownloadFile("https://detect.synopsys.com/detect8.sh", "detect.sh", nil, nil)
+		return utils.DownloadFile("https://detect.synopsys.com/detect9.sh", "detect.sh", nil, nil)
+
 	}
 
 	if err := downloadScript(); err != 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/detect8.sh"], "detect.sh")
+		assert.Equal(t, utilsMock.downloadedFiles["https://detect.synopsys.com/detect9.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/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml
@@ -653,11 +653,11 @@ spec:
         resourceRef:
           - name: commonPipelineEnvironment
             param: container/repositoryPassword
-      - name: useDetect9
+      - name: useDetect8
         description:
-          "This flag enables the use of the supported version 9 of the Detect Script instead of v8"
+          "This flag enables the use of the supported version 8 of the Detect Script instead of v9"
         aliases:
-          - name: detect/useDetect9
+          - name: detect/useDetect8
         type: bool
         scope:
           - PARAMETERS