Remove useDetect7 option (#4717)

* removed-detect7-option * linting-fix * removed-comment
SAP · Jan 8, 2024 · f5f72bc · f5f72bc
1 parent 6cc6a4e
commit f5f72bc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 86 deletions.
diff --git a/cmd/detectExecuteScan.go b/cmd/detectExecuteScan.go
@@ -305,11 +305,16 @@ func getDetectScript(config detectExecuteScanOptions, utils detectUtils) error {
 
 	log.Entry().Infof("Downloading Detect Script")
 
-	if config.UseDetect7 {
-		return utils.DownloadFile("https://detect.synopsys.com/detect7.sh", "detect.sh", nil, nil)
+	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
+		}
 	}
 
-	return utils.DownloadFile("https://detect.synopsys.com/detect8.sh", "detect.sh", nil, nil)
+	return nil
 }
 
 func addDetectArgs(args []string, config detectExecuteScanOptions, utils detectUtils, sys *blackduckSystem) ([]string, error) {
@@ -376,49 +381,27 @@ func addDetectArgs(args []string, config detectExecuteScanOptions, utils detectU
 		codelocation = fmt.Sprintf("%v/%v", config.ProjectName, detectVersionName)
 	}
 
-	// Since detect8 adds quotes by default, to avoid double quotation they should be removed for several arguments
-	if config.UseDetect7 {
-		args = append(args, fmt.Sprintf("\"--detect.project.name='%v'\"", config.ProjectName))
-		args = append(args, fmt.Sprintf("\"--detect.project.version.name='%v'\"", detectVersionName))
-
-		// Groups parameter is added only when there is atleast one non-empty groupname provided
-		if len(config.Groups) > 0 && len(config.Groups[0]) > 0 {
-			args = append(args, fmt.Sprintf("\"--detect.project.user.groups='%v'\"", strings.Join(config.Groups, ",")))
-		}
-
-		// Atleast 1, non-empty category to fail on must be provided
-		if len(config.FailOn) > 0 && len(config.FailOn[0]) > 0 {
-			args = append(args, fmt.Sprintf("--detect.policy.check.fail.on.severities=%v", strings.Join(config.FailOn, ",")))
-		}
-
-		args = append(args, fmt.Sprintf("\"--detect.code.location.name='%v'\"", codelocation))
+	args = append(args, fmt.Sprintf("\"--detect.project.name=%v\"", config.ProjectName))
+	args = append(args, fmt.Sprintf("\"--detect.project.version.name=%v\"", detectVersionName))
 
-		if len(mavenArgs) > 0 && !checkIfArgumentIsInScanProperties(config, "detect.maven.build.command") {
-			args = append(args, fmt.Sprintf("\"--detect.maven.build.command='%v'\"", strings.Join(mavenArgs, " ")))
-		}
-	} else {
-		args = append(args, fmt.Sprintf("\"--detect.project.name=%v\"", config.ProjectName))
-		args = append(args, fmt.Sprintf("\"--detect.project.version.name=%v\"", detectVersionName))
-
-		// Groups parameter is added only when there is atleast one non-empty groupname provided
-		if len(config.Groups) > 0 && len(config.Groups[0]) > 0 {
-			args = append(args, fmt.Sprintf("\"--detect.project.user.groups=%v\"", strings.Join(config.Groups, ",")))
-		}
-
-		// Atleast 1, non-empty category to fail on must be provided
-		if len(config.FailOn) > 0 && len(config.FailOn[0]) > 0 {
-			args = append(args, fmt.Sprintf("--detect.policy.check.fail.on.severities=%v", strings.Join(config.FailOn, ",")))
-		}
+	// Groups parameter is added only when there is atleast one non-empty groupname provided
+	if len(config.Groups) > 0 && len(config.Groups[0]) > 0 {
+		args = append(args, fmt.Sprintf("\"--detect.project.user.groups=%v\"", strings.Join(config.Groups, ",")))
+	}
 
-		args = append(args, fmt.Sprintf("\"--detect.code.location.name=%v\"", codelocation))
+	// Atleast 1, non-empty category to fail on must be provided
+	if len(config.FailOn) > 0 && len(config.FailOn[0]) > 0 {
+		args = append(args, fmt.Sprintf("--detect.policy.check.fail.on.severities=%v", strings.Join(config.FailOn, ",")))
+	}
 
-		if len(mavenArgs) > 0 && !checkIfArgumentIsInScanProperties(config, "detect.maven.build.command") {
-			args = append(args, fmt.Sprintf("\"--detect.maven.build.command=%v\"", strings.Join(mavenArgs, " ")))
-		}
+	args = append(args, fmt.Sprintf("\"--detect.code.location.name=%v\"", codelocation))
 
-		args = append(args, fmt.Sprintf("\"--detect.force.success.on.skip=true\""))
+	if len(mavenArgs) > 0 && !checkIfArgumentIsInScanProperties(config, "detect.maven.build.command") {
+		args = append(args, fmt.Sprintf("\"--detect.maven.build.command=%v\"", strings.Join(mavenArgs, " ")))
 	}
 
+	args = append(args, fmt.Sprintf("\"--detect.force.success.on.skip=true\""))
+
 	if len(config.ScanPaths) > 0 && len(config.ScanPaths[0]) > 0 {
 		args = append(args, fmt.Sprintf("--detect.blackduck.signature.scanner.paths=%v", strings.Join(config.ScanPaths, ",")))
 	}

diff --git a/cmd/detectExecuteScan_generated.go b/cmd/detectExecuteScan_generated.go
diff --git a/resources/metadata/detectExecuteScan.yaml b/resources/metadata/detectExecuteScan.yaml
@@ -301,30 +301,6 @@ spec:
           - STAGES
           - STEPS
         deprecated: true
-      - name: useDetect7
-        description:
-          "This flag allows to use the currently supported 8 version of Detect Script instead of v7"
-        aliases:
-          - name: detect/useDetect7
-        type: bool
-        scope:
-          - PARAMETERS
-          - STAGES
-          - STEPS
-        default: false
-      - name: useDetect8
-        description:
-          "This flag allows to use the currently supported 8 version of Detect Script instead of v7"
-        aliases:
-          - name: detect/useDetect8
-            deprecated: true
-        type: bool
-        scope:
-          - PARAMETERS
-          - STAGES
-          - STEPS
-        default: true
-        deprecated: true
       - name: successOnSkip
         description:
           "This flag allows forces Black Duck to exit with 0 error code if any step is skipped"