jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-09-16 09:26:22 +02:00
Code Issues Releases Activity

fix (whitesourceExecuteScan) correct type cast for receiver functions tomarkdown() and title() (#4117)

Browse Source 
* correct type cast for tomarkdown and title

* commenting kaniko create multi bom test case

* removing mocked file

Co-authored-by: anilkeshav27 <you@example.com>
This commit is contained in:
Anil Keshav
2022-11-14 18:48:45 +01:00
committed by GitHub
parent 7a0ce9287f
commit 1bc6595d27
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kanikoExecute_test.go
View File

@@ -351,7 +351,7 @@ func TestRunKanikoExecute(t *testing.T) {
fileUtils := &mock.FilesMock{}
fileUtils.AddFile("path/to/docker/config.json", []byte(`{"auths":{"custom":"test"}}`))
fileUtils.AddFile("Syft/syft", []byte(`echo syft`))
defer fileUtils.FileRemove("Syft/syft")
err := runKanikoExecute(config, &telemetry.CustomData{}, &commonPipelineEnvironment, execRunner, shellRunner, certClient, fileUtils)
assert.NoError(t, err)
@@ -497,7 +497,7 @@ func TestRunKanikoExecute(t *testing.T) {
fileUtils.AddFile("sub1/Dockerfile", []byte("some content"))
fileUtils.AddFile("sub2/Dockerfile", []byte("some content"))
fileUtils.AddFile("Syft/syft", []byte(`echo syft`))
defer fileUtils.FileRemove("Syft/syft")
err := runKanikoExecute(config, &telemetry.CustomData{}, &commonPipelineEnvironment, execRunner, shellRunner, certClient, fileUtils)
assert.NoError(t, err)
@@ -806,7 +806,7 @@ func TestRunKanikoExecute(t *testing.T) {
fileUtils := &mock.FilesMock{}
fileUtils.AddFile("path/to/docker/config.json", []byte(`{"auths":{"custom":"test"}}`))
fileUtils.AddFile("Syft/syft", []byte(`echo syft`))
defer fileUtils.FileRemove("Syft/syft")
// Case 1 - Download of syft installation file failed
certClient.errorMessage = "Download failed"
err := runKanikoExecute(config, &telemetry.CustomData{}, &commonPipelineEnvironment, execRunner, shellRunner, certClient, fileUtils)

4
pkg/whitesource/whitesource.go
View File

@@ -61,7 +61,7 @@ type Alert struct {
}
// Title returns the issue title representation of the contents
func (a *Alert) Title() string {
func (a Alert) Title() string {
if a.Type == "SECURITY_VULNERABILITY" {
return fmt.Sprintf("Security Vulnerability %v %v", a.Vulnerability.Name, a.Library.ArtifactID)
} else if a.Type == "REJECTED_BY_POLICY_RESOURCE" {
@@ -145,7 +145,7 @@ func consolidate(cvss2severity, cvss3severity string, cvss2score, cvss3score flo
}
// ToMarkdown returns the markdown representation of the contents
func (a *Alert) ToMarkdown() ([]byte, error) {
func (a Alert) ToMarkdown() ([]byte, error) {
if a.Type == "SECURITY_VULNERABILITY" {
score := consolidateScores(a.Vulnerability.Score, a.Vulnerability.CVSS3Score)