Skip to content

Commit f67e539

Browse files
introduce detectt11 as default, deprecate detect9
1 parent 8034b7c commit f67e539

File tree

4 files changed

+36
-8
lines changed

4 files changed

+36
-8
lines changed

cmd/detectExecuteScan.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,13 +448,17 @@ func getDetectScript(config detectExecuteScanOptions, utils detectUtils) error {
448448

449449
log.Entry().Infof("Downloading Detect Script")
450450

451+
const detectTargetFilename = "detect.sh"
452+
451453
downloadScript := func() error {
452454
if config.UseDetect8 {
453455
log.Entry().Warn("The useDetect8 option is deprecated")
454456
} else if config.UseDetect9 {
455-
return utils.DownloadFile("https://detect.blackduck.com/detect9.sh", "detect.sh", nil, nil)
457+
log.Entry().Warn("The useDetect9 option is deprecated")
458+
} else if config.UseDetect10 {
459+
return utils.DownloadFile("https://detect.blackduck.com/detect10.sh", detectTargetFilename, nil, nil)
456460
}
457-
return utils.DownloadFile("https://detect.blackduck.com/detect10.sh", "detect.sh", nil, nil)
461+
return utils.DownloadFile("https://detect.blackduck.com/detect11.sh", detectTargetFilename, nil, nil)
458462
}
459463

460464
if err := downloadScript(); err != nil {

cmd/detectExecuteScan_generated.go

Lines changed: 14 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/detectExecuteScan_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ func TestRunDetect(t *testing.T) {
309309
utilsMock.AddFile("detect.sh", []byte(""))
310310
err := runDetect(ctx, detectExecuteScanOptions{}, utilsMock, &detectExecuteScanInflux{})
311311

312-
assert.Equal(t, utilsMock.downloadedFiles["https://detect.blackduck.com/detect10.sh"], "detect.sh")
312+
assert.Equal(t, utilsMock.downloadedFiles["https://detect.blackduck.com/detect11.sh"], "detect.sh")
313313
assert.True(t, utilsMock.HasRemovedFile("detect.sh"))
314314
assert.NoError(t, err)
315315
assert.Equal(t, ".", utilsMock.Dir, "Wrong execution directory used")

resources/metadata/detectExecuteScan.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ spec:
648648
param: container/repositoryPassword
649649
- name: useDetect8
650650
description:
651-
"DEPRECATED: This flag enables the use of the supported version 8 of the Detect script instead of default version 10"
651+
"DEPRECATED: This flag enables the use of the supported version 8 of the Detect script instead of default version 11"
652652
aliases:
653653
- name: detect/useDetect8
654654
deprecated: true
@@ -661,9 +661,22 @@ spec:
661661
deprecated: true
662662
- name: useDetect9
663663
description:
664-
"This flag enables the use of the supported version 9 of the Detect script instead of default version 10"
664+
"DEPRECATED: This flag enables the use of the supported version 9 of the Detect script instead of default version 11"
665665
aliases:
666666
- name: detect/useDetect9
667+
deprecated: true
668+
type: bool
669+
scope:
670+
- PARAMETERS
671+
- STAGES
672+
- STEPS
673+
default: false
674+
deprecated: true
675+
- name: useDetect10
676+
description:
677+
"This flag enables the use of the supported version 10 of the Detect script instead of default version 11"
678+
aliases:
679+
- name: detect/useDetect10
667680
type: bool
668681
scope:
669682
- PARAMETERS

0 commit comments

Comments
 (0)