mirror of
https://github.com/SAP/jenkins-library.git
synced 2024-12-12 10:55:20 +02:00
eec0ebb235
* changes to detectExec before master merge * changes for detectExecuteScan * self generated code added * fix syntax errors and update docu * added unit tests for fail and Group * fix failOn bug * add Groups as string array * add Groups as string array * tests and validation for groups, failOn * Updated docs and added more tests * documentation md files should not be changed * Handle merge conflicts from PR 1845 * fix merge errors * remove duplicate groups, merge error * adding buildCode and buildTool as params * switching build options * building maven modules * parameter correction * parameter correction * gnerate with new build parameter * adding comments * removing piper lib master and modifying goUtils to download 1.5.7 release * first cleaning then installing * multi module maven built * multi module maven built removing unwanted code * multi module maven built moving inside switch * testing * modifying the default use case to also call maven build * modifying the default use case to also call maven build wih -- * corrected maven build command * corrected maven build command with %v * skipping test runs * testing for MTA project with single pom * adding absolute path to m2 path * clean up * adding switch for mta and maven and removing env from containers * commiting changes for new detect step * correting log message * code clean up * unit tests changes to detectExecute * basic tests for new change * restoring piperGoUtils to download correct piper binary * code clean up * code clean up * clean detect code version * Changes for detect codelocation * remove unmap from scanProperties * fix/add unit tests for remove unmap * handle spaces in scanProperties * update default scanproperties to remove deprecations * Set default scanonchange to true * handle multiple unmap true params * add custom env variables * fix codeclimate issues * Update resources/metadata/detect.yaml Co-authored-by: Christopher Fenner <26137398+CCFenner@users.noreply.github.com> * Update resources/metadata/detect.yaml Co-authored-by: Christopher Fenner <26137398+CCFenner@users.noreply.github.com> * update generated files from yaml * bug fix - revert code location changes Co-authored-by: Keshav <anil.keshav@sap.com> Co-authored-by: Oliver Nocon <33484802+OliverNocon@users.noreply.github.com> Co-authored-by: Sven Merk <33895725+nevskrem@users.noreply.github.com> Co-authored-by: Christopher Fenner <26137398+CCFenner@users.noreply.github.com>
414 lines
15 KiB
Go
414 lines
15 KiB
Go
package cmd
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
piperhttp "github.com/SAP/jenkins-library/pkg/http"
|
|
"github.com/SAP/jenkins-library/pkg/mock"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
type detectTestUtilsBundle struct {
|
|
expectedError error
|
|
downloadedFiles map[string]string // src, dest
|
|
*mock.ShellMockRunner
|
|
*mock.FilesMock
|
|
}
|
|
|
|
func (c *detectTestUtilsBundle) RunExecutable(string, ...string) error {
|
|
panic("not expected to be called in test")
|
|
}
|
|
|
|
func (c *detectTestUtilsBundle) SetOptions(piperhttp.ClientOptions) {
|
|
|
|
}
|
|
|
|
func (c *detectTestUtilsBundle) DownloadFile(url, filename string, _ http.Header, _ []*http.Cookie) error {
|
|
|
|
if c.expectedError != nil {
|
|
return c.expectedError
|
|
}
|
|
|
|
if c.downloadedFiles == nil {
|
|
c.downloadedFiles = make(map[string]string)
|
|
}
|
|
c.downloadedFiles[url] = filename
|
|
return nil
|
|
}
|
|
|
|
func newDetectTestUtilsBundle() *detectTestUtilsBundle {
|
|
utilsBundle := detectTestUtilsBundle{
|
|
ShellMockRunner: &mock.ShellMockRunner{},
|
|
FilesMock: &mock.FilesMock{},
|
|
}
|
|
return &utilsBundle
|
|
}
|
|
|
|
func TestRunDetect(t *testing.T) {
|
|
t.Parallel()
|
|
t.Run("success case", func(t *testing.T) {
|
|
t.Parallel()
|
|
utilsMock := newDetectTestUtilsBundle()
|
|
utilsMock.AddFile("detect.sh", []byte(""))
|
|
err := runDetect(detectExecuteScanOptions{}, utilsMock)
|
|
|
|
assert.Equal(t, utilsMock.downloadedFiles["https://detect.synopsys.com/detect.sh"], "detect.sh")
|
|
assert.True(t, utilsMock.HasRemovedFile("detect.sh"))
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, ".", utilsMock.Dir, "Wrong execution directory used")
|
|
assert.Equal(t, "/bin/bash", utilsMock.Shell[0], "Bash shell expected")
|
|
expectedScript := "./detect.sh --blackduck.url= --blackduck.api.token= \"--detect.project.name=''\" \"--detect.project.version.name=''\" \"--detect.code.location.name=''\" --detect.source.path='.'"
|
|
assert.Equal(t, expectedScript, utilsMock.Calls[0])
|
|
})
|
|
|
|
t.Run("failure case", func(t *testing.T) {
|
|
t.Parallel()
|
|
utilsMock := newDetectTestUtilsBundle()
|
|
utilsMock.ShouldFailOnCommand = map[string]error{"./detect.sh --blackduck.url= --blackduck.api.token= \"--detect.project.name=''\" \"--detect.project.version.name=''\" \"--detect.code.location.name=''\" --detect.source.path='.'": fmt.Errorf("Test Error")}
|
|
utilsMock.AddFile("detect.sh", []byte(""))
|
|
err := runDetect(detectExecuteScanOptions{}, utilsMock)
|
|
assert.EqualError(t, err, "Test Error")
|
|
assert.True(t, utilsMock.HasRemovedFile("detect.sh"))
|
|
})
|
|
|
|
t.Run("maven parameters", func(t *testing.T) {
|
|
t.Parallel()
|
|
utilsMock := newDetectTestUtilsBundle()
|
|
utilsMock.CurrentDir = "root_folder"
|
|
utilsMock.AddFile("detect.sh", []byte(""))
|
|
err := runDetect(detectExecuteScanOptions{
|
|
M2Path: ".pipeline/local_repo",
|
|
ProjectSettingsFile: "project-settings.xml",
|
|
GlobalSettingsFile: "global-settings.xml",
|
|
}, utilsMock)
|
|
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, ".", utilsMock.Dir, "Wrong execution directory used")
|
|
assert.Equal(t, "/bin/bash", utilsMock.Shell[0], "Bash shell expected")
|
|
absoluteLocalPath := string(os.PathSeparator) + filepath.Join("root_folder", ".pipeline", "local_repo")
|
|
|
|
expectedParam := "\"--detect.maven.build.command='--global-settings global-settings.xml --settings project-settings.xml -Dmaven.repo.local=" + absoluteLocalPath + "'\""
|
|
assert.Contains(t, utilsMock.Calls[0], expectedParam)
|
|
})
|
|
}
|
|
|
|
func TestAddDetectArgs(t *testing.T) {
|
|
t.Parallel()
|
|
testData := []struct {
|
|
args []string
|
|
options detectExecuteScanOptions
|
|
expected []string
|
|
}{
|
|
{
|
|
args: []string{"--testProp1=1"},
|
|
options: detectExecuteScanOptions{
|
|
ScanProperties: []string{"--scan1=1", "--scan2=2"},
|
|
ServerURL: "https://server.url",
|
|
Token: "apiToken",
|
|
ProjectName: "testName",
|
|
Version: "1.0",
|
|
VersioningModel: "major-minor",
|
|
CodeLocation: "",
|
|
Scanners: []string{"signature"},
|
|
ScanPaths: []string{"path1", "path2"},
|
|
},
|
|
expected: []string{
|
|
"--testProp1=1",
|
|
"--scan1=1",
|
|
"--scan2=2",
|
|
"--blackduck.url=https://server.url",
|
|
"--blackduck.api.token=apiToken",
|
|
"\"--detect.project.name='testName'\"",
|
|
"\"--detect.project.version.name='1.0'\"",
|
|
"\"--detect.code.location.name='testName/1.0'\"",
|
|
"--detect.blackduck.signature.scanner.paths=path1,path2",
|
|
"--detect.source.path='.'",
|
|
},
|
|
},
|
|
{
|
|
args: []string{"--testProp1=1"},
|
|
options: detectExecuteScanOptions{
|
|
ServerURL: "https://server.url",
|
|
Token: "apiToken",
|
|
ProjectName: "testName",
|
|
Version: "1.0",
|
|
VersioningModel: "major-minor",
|
|
CodeLocation: "testLocation",
|
|
FailOn: []string{"BLOCKER", "MAJOR"},
|
|
Scanners: []string{"source"},
|
|
ScanPaths: []string{"path1", "path2"},
|
|
Groups: []string{"testGroup"},
|
|
},
|
|
expected: []string{
|
|
"--testProp1=1",
|
|
"--blackduck.url=https://server.url",
|
|
"--blackduck.api.token=apiToken",
|
|
"\"--detect.project.name='testName'\"",
|
|
"\"--detect.project.version.name='1.0'\"",
|
|
"\"--detect.project.user.groups='testGroup'\"",
|
|
"--detect.policy.check.fail.on.severities=BLOCKER,MAJOR",
|
|
"\"--detect.code.location.name='testLocation'\"",
|
|
"--detect.blackduck.signature.scanner.paths=path1,path2",
|
|
"--detect.source.path='.'",
|
|
},
|
|
},
|
|
{
|
|
args: []string{"--testProp1=1"},
|
|
options: detectExecuteScanOptions{
|
|
ServerURL: "https://server.url",
|
|
Token: "apiToken",
|
|
ProjectName: "testName",
|
|
CodeLocation: "testLocation",
|
|
FailOn: []string{"BLOCKER", "MAJOR"},
|
|
Scanners: []string{"source"},
|
|
ScanPaths: []string{"path1", "path2"},
|
|
Groups: []string{"testGroup", "testGroup2"},
|
|
Version: "1.0",
|
|
VersioningModel: "major-minor",
|
|
},
|
|
expected: []string{
|
|
"--testProp1=1",
|
|
"--blackduck.url=https://server.url",
|
|
"--blackduck.api.token=apiToken",
|
|
"\"--detect.project.name='testName'\"",
|
|
"\"--detect.project.version.name='1.0'\"",
|
|
"\"--detect.project.user.groups='testGroup,testGroup2'\"",
|
|
"--detect.policy.check.fail.on.severities=BLOCKER,MAJOR",
|
|
"\"--detect.code.location.name='testLocation'\"",
|
|
"--detect.blackduck.signature.scanner.paths=path1,path2",
|
|
"--detect.source.path='.'",
|
|
},
|
|
},
|
|
{
|
|
args: []string{"--testProp1=1"},
|
|
options: detectExecuteScanOptions{
|
|
ServerURL: "https://server.url",
|
|
Token: "apiToken",
|
|
ProjectName: "testName",
|
|
CodeLocation: "testLocation",
|
|
FailOn: []string{"BLOCKER", "MAJOR"},
|
|
Scanners: []string{"source"},
|
|
ScanPaths: []string{"path1", "path2"},
|
|
Groups: []string{"testGroup", "testGroup2"},
|
|
Version: "1.0",
|
|
VersioningModel: "major-minor",
|
|
DependencyPath: "pathx",
|
|
},
|
|
expected: []string{
|
|
"--testProp1=1",
|
|
"--blackduck.url=https://server.url",
|
|
"--blackduck.api.token=apiToken",
|
|
"\"--detect.project.name='testName'\"",
|
|
"\"--detect.project.version.name='1.0'\"",
|
|
"\"--detect.project.user.groups='testGroup,testGroup2'\"",
|
|
"--detect.policy.check.fail.on.severities=BLOCKER,MAJOR",
|
|
"\"--detect.code.location.name='testLocation'\"",
|
|
"--detect.blackduck.signature.scanner.paths=path1,path2",
|
|
"--detect.source.path=pathx",
|
|
},
|
|
},
|
|
{
|
|
args: []string{"--testProp1=1"},
|
|
options: detectExecuteScanOptions{
|
|
ServerURL: "https://server.url",
|
|
Token: "apiToken",
|
|
ProjectName: "testName",
|
|
CodeLocation: "testLocation",
|
|
FailOn: []string{"BLOCKER", "MAJOR"},
|
|
Scanners: []string{"source"},
|
|
ScanPaths: []string{"path1", "path2"},
|
|
Groups: []string{"testGroup", "testGroup2"},
|
|
Version: "1.0",
|
|
VersioningModel: "major-minor",
|
|
DependencyPath: "pathx",
|
|
Unmap: true,
|
|
},
|
|
expected: []string{
|
|
"--testProp1=1",
|
|
"--detect.project.codelocation.unmap=true",
|
|
"--blackduck.url=https://server.url",
|
|
"--blackduck.api.token=apiToken",
|
|
"\"--detect.project.name='testName'\"",
|
|
"\"--detect.project.version.name='1.0'\"",
|
|
"\"--detect.project.user.groups='testGroup,testGroup2'\"",
|
|
"--detect.policy.check.fail.on.severities=BLOCKER,MAJOR",
|
|
"\"--detect.code.location.name='testLocation'\"",
|
|
"--detect.blackduck.signature.scanner.paths=path1,path2",
|
|
"--detect.source.path=pathx",
|
|
},
|
|
},
|
|
{
|
|
args: []string{"--testProp1=1"},
|
|
options: detectExecuteScanOptions{
|
|
ServerURL: "https://server.url",
|
|
Token: "apiToken",
|
|
ProjectName: "testName",
|
|
CodeLocation: "testLocation",
|
|
FailOn: []string{"BLOCKER", "MAJOR"},
|
|
Scanners: []string{"source"},
|
|
ScanPaths: []string{"path1", "path2"},
|
|
Groups: []string{"testGroup", "testGroup2"},
|
|
Version: "1.0",
|
|
VersioningModel: "major-minor",
|
|
DependencyPath: "pathx",
|
|
Unmap: true,
|
|
IncludedPackageManagers: []string{"maven", "GRADLE"},
|
|
ExcludedPackageManagers: []string{"npm", "NUGET"},
|
|
MavenExcludedScopes: []string{"TEST", "compile"},
|
|
DetectTools: []string{"DETECTOR"},
|
|
},
|
|
expected: []string{
|
|
"--testProp1=1",
|
|
"--detect.project.codelocation.unmap=true",
|
|
"--blackduck.url=https://server.url",
|
|
"--blackduck.api.token=apiToken",
|
|
"\"--detect.project.name='testName'\"",
|
|
"\"--detect.project.version.name='1.0'\"",
|
|
"\"--detect.project.user.groups='testGroup,testGroup2'\"",
|
|
"--detect.policy.check.fail.on.severities=BLOCKER,MAJOR",
|
|
"\"--detect.code.location.name='testLocation'\"",
|
|
"--detect.blackduck.signature.scanner.paths=path1,path2",
|
|
"--detect.source.path=pathx",
|
|
"--detect.included.detector.types=MAVEN,GRADLE",
|
|
"--detect.excluded.detector.types=NPM,NUGET",
|
|
"--detect.maven.excluded.scopes=test,compile",
|
|
"--detect.tools=DETECTOR",
|
|
},
|
|
},
|
|
{
|
|
args: []string{"--testProp1=1"},
|
|
options: detectExecuteScanOptions{
|
|
ServerURL: "https://server.url",
|
|
Token: "apiToken",
|
|
ProjectName: "testName",
|
|
CodeLocation: "testLocation",
|
|
FailOn: []string{"BLOCKER", "MAJOR"},
|
|
Scanners: []string{"source"},
|
|
ScanPaths: []string{"path1", "path2"},
|
|
Groups: []string{"testGroup", "testGroup2"},
|
|
Version: "1.0",
|
|
VersioningModel: "major-minor",
|
|
DependencyPath: "pathx",
|
|
Unmap: true,
|
|
IncludedPackageManagers: []string{"maven", "GRADLE"},
|
|
ExcludedPackageManagers: []string{"npm", "NUGET"},
|
|
MavenExcludedScopes: []string{"TEST", "compile"},
|
|
DetectTools: []string{"DETECTOR"},
|
|
ScanOnChanges: true,
|
|
},
|
|
expected: []string{
|
|
"--testProp1=1",
|
|
"--report",
|
|
"--blackduck.url=https://server.url",
|
|
"--blackduck.api.token=apiToken",
|
|
"\"--detect.project.name='testName'\"",
|
|
"\"--detect.project.version.name='1.0'\"",
|
|
"\"--detect.project.user.groups='testGroup,testGroup2'\"",
|
|
"--detect.policy.check.fail.on.severities=BLOCKER,MAJOR",
|
|
"\"--detect.code.location.name='testLocation'\"",
|
|
"--detect.blackduck.signature.scanner.paths=path1,path2",
|
|
"--detect.source.path=pathx",
|
|
"--detect.included.detector.types=MAVEN,GRADLE",
|
|
"--detect.excluded.detector.types=NPM,NUGET",
|
|
"--detect.maven.excluded.scopes=test,compile",
|
|
"--detect.tools=DETECTOR",
|
|
},
|
|
},
|
|
{
|
|
args: []string{"--testProp1=1"},
|
|
options: detectExecuteScanOptions{
|
|
ServerURL: "https://server.url",
|
|
Token: "apiToken",
|
|
ProjectName: "testName",
|
|
CodeLocation: "testLocation",
|
|
FailOn: []string{"BLOCKER", "MAJOR"},
|
|
Scanners: []string{"source"},
|
|
ScanPaths: []string{"path1", "path2"},
|
|
Groups: []string{"testGroup", "testGroup2"},
|
|
Version: "1.0",
|
|
VersioningModel: "major-minor",
|
|
DependencyPath: "pathx",
|
|
Unmap: true,
|
|
IncludedPackageManagers: []string{"maven", "GRADLE"},
|
|
ExcludedPackageManagers: []string{"npm", "NUGET"},
|
|
MavenExcludedScopes: []string{"TEST", "compile"},
|
|
DetectTools: []string{"DETECTOR"},
|
|
ScanOnChanges: true,
|
|
},
|
|
expected: []string{
|
|
"--testProp1=1",
|
|
"--report",
|
|
"--blackduck.url=https://server.url",
|
|
"--blackduck.api.token=apiToken",
|
|
"\"--detect.project.name='testName'\"",
|
|
"\"--detect.project.version.name='1.0'\"",
|
|
"\"--detect.project.user.groups='testGroup,testGroup2'\"",
|
|
"--detect.policy.check.fail.on.severities=BLOCKER,MAJOR",
|
|
"\"--detect.code.location.name='testLocation'\"",
|
|
"--detect.blackduck.signature.scanner.paths=path1,path2",
|
|
"--detect.source.path=pathx",
|
|
"--detect.included.detector.types=MAVEN,GRADLE",
|
|
"--detect.excluded.detector.types=NPM,NUGET",
|
|
"--detect.maven.excluded.scopes=test,compile",
|
|
"--detect.tools=DETECTOR",
|
|
},
|
|
},
|
|
{
|
|
args: []string{"--testProp1=1"},
|
|
options: detectExecuteScanOptions{
|
|
ScanProperties: []string{"--scan=1", "--detect.project.codelocation.unmap=true"},
|
|
ServerURL: "https://server.url",
|
|
Token: "apiToken",
|
|
ProjectName: "testName",
|
|
CodeLocation: "testLocation",
|
|
FailOn: []string{"BLOCKER", "MAJOR"},
|
|
Scanners: []string{"source"},
|
|
ScanPaths: []string{"path1", "path2"},
|
|
Groups: []string{"testGroup", "testGroup2"},
|
|
Version: "1.0",
|
|
VersioningModel: "major-minor",
|
|
DependencyPath: "pathx",
|
|
Unmap: true,
|
|
IncludedPackageManagers: []string{"maven", "GRADLE"},
|
|
ExcludedPackageManagers: []string{"npm", "NUGET"},
|
|
MavenExcludedScopes: []string{"TEST", "compile"},
|
|
DetectTools: []string{"DETECTOR"},
|
|
ScanOnChanges: true,
|
|
},
|
|
expected: []string{
|
|
"--testProp1=1",
|
|
"--report",
|
|
"--scan=1",
|
|
"--blackduck.url=https://server.url",
|
|
"--blackduck.api.token=apiToken",
|
|
"\"--detect.project.name='testName'\"",
|
|
"\"--detect.project.version.name='1.0'\"",
|
|
"\"--detect.project.user.groups='testGroup,testGroup2'\"",
|
|
"--detect.policy.check.fail.on.severities=BLOCKER,MAJOR",
|
|
"\"--detect.code.location.name='testLocation'\"",
|
|
"--detect.blackduck.signature.scanner.paths=path1,path2",
|
|
"--detect.source.path=pathx",
|
|
"--detect.included.detector.types=MAVEN,GRADLE",
|
|
"--detect.excluded.detector.types=NPM,NUGET",
|
|
"--detect.maven.excluded.scopes=test,compile",
|
|
"--detect.tools=DETECTOR",
|
|
},
|
|
},
|
|
}
|
|
|
|
for k, v := range testData {
|
|
v := v
|
|
t.Run(fmt.Sprintf("run %v", k), func(t *testing.T) {
|
|
t.Parallel()
|
|
got, err := addDetectArgs(v.args, v.options, newDetectTestUtilsBundle())
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, v.expected, got)
|
|
})
|
|
}
|
|
}
|