detectExecuteScan - Removed option to change min-scan-interval for Si…

…gnature Scan to enforce global interval value (#4875)

* removed option to change min-scan-interval to enforce global interval value

* returned-param-to-avoid-pipeline-breaks

* fix-for-tests

cmd/detectExecuteScan.go

@@ -426,12 +426,6 @@ func addDetectArgs(args []string, config detectExecuteScanOptions, utils detectU
  args = append(args, fmt.Sprintf("--detect.excluded.directories=%s", strings.Join(config.ExcludedDirectories, ",")))
  }
 
- if config.MinScanInterval > 0 {
- //Unmap doesnt work well with min-scan-interval and should be removed
- config.Unmap = false
- args = append(args, fmt.Sprintf("--detect.blackduck.signature.scanner.arguments='--min-scan-interval=%d'", config.MinScanInterval))
- }
-
  if config.Unmap {
  if !piperutils.ContainsString(config.ScanProperties, "--detect.project.codelocation.unmap=true") {
  args = append(args, "--detect.project.codelocation.unmap=true")

cmd/detectExecuteScan_test.go

@@ -700,11 +700,9 @@ func TestAddDetectArgs(t *testing.T) {
  VersioningModel: "major-minor",
  CodeLocation: "",
  ScanPaths: []string{"path1", "path2"},
- MinScanInterval: 4,
  },
  expected: []string{
  "--testProp1=1",
- "--detect.blackduck.signature.scanner.arguments='--min-scan-interval=4'",
  "--blackduck.url=https://server.url",
  "--blackduck.api.token=apiToken",
  "\"--detect.project.name=testName\"",
@@ -725,13 +723,11 @@ func TestAddDetectArgs(t *testing.T) {
  VersioningModel: "major-minor",
  CodeLocation: "",
  ScanPaths: []string{"path1", "path2"},
- MinScanInterval: 4,
  CustomScanVersion: "1.0",
  },
  isPullRequest: true,
  expected: []string{
  "--testProp1=1",
- "--detect.blackduck.signature.scanner.arguments='--min-scan-interval=4'",
  "--blackduck.url=https://server.url",
  "--blackduck.api.token=apiToken",
  "\"--detect.project.name=Rapid_scan_on_PRs\"",
@@ -763,13 +759,11 @@ func TestAddDetectArgs(t *testing.T) {
  "--detect.excluded.directories=dir1,dir2",
  },
  ExcludedDirectories: []string{"dir3,dir4"},
- MinScanInterval: 4,
  CustomScanVersion: "2.0",
  },
  isPullRequest: true,
  expected: []string{
  "--testProp1=1",
- "--detect.blackduck.signature.scanner.arguments='--min-scan-interval=4'",
  "--detect.detector.search.depth=5",
  "--detect.detector.search.continue=false",
  "--detect.excluded.directories=dir1,dir2",
@@ -802,13 +796,11 @@ func TestAddDetectArgs(t *testing.T) {
  ScanProperties: []string{
  "--detect.maven.build.command= --settings .pipeline/settings.xml -DskipTests install",
  },
- MinScanInterval: 4,
  CustomScanVersion: "2.0",
  },
  isPullRequest: true,
  expected: []string{
  "--testProp1=1",
- "--detect.blackduck.signature.scanner.arguments='--min-scan-interval=4'",
  "--detect.maven.build.command=",
  "--settings",
  ".pipeline/settings.xml",

resources/metadata/detectExecuteScan.yaml

@@ -340,15 +340,17 @@ spec:
  - PARAMETERS
  - STAGES
  - STEPS
+ ## --- to remove minScanInterval from parameters list ---
  - name: minScanInterval
  description:
- "This parameter controls the frequency (in number of hours) at which the signature scan is re-submitted for scan. When set to a
+ "[DEPRECATED] This parameter controls the frequency (in number of hours) at which the signature scan is re-submitted for scan. When set to a
  value greater than 0, the signature scans are skipped until the specified number of hours has elapsed since the last signature scan."
  type: int
  scope:
  - PARAMETERS
  - STAGES
  - STEPS
+ ## -----------
  - name: githubToken
  description: "GitHub personal access token as per
  https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line"