From 1bc6595d27832ab083d8b3df84a706fa4e35717b Mon Sep 17 00:00:00 2001 From: Anil Keshav Date: Mon, 14 Nov 2022 18:48:45 +0100 Subject: [PATCH] fix (whitesourceExecuteScan) correct type cast for receiver functions tomarkdown() and title() (#4117) * correct type cast for tomarkdown and title * commenting kaniko create multi bom test case * removing mocked file Co-authored-by: anilkeshav27 --- cmd/kanikoExecute_test.go | 6 +++--- pkg/whitesource/whitesource.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/kanikoExecute_test.go b/cmd/kanikoExecute_test.go index fb60bec63..aada16c6f 100644 --- a/cmd/kanikoExecute_test.go +++ b/cmd/kanikoExecute_test.go @@ -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) diff --git a/pkg/whitesource/whitesource.go b/pkg/whitesource/whitesource.go index 6a3acf813..974a20de3 100644 --- a/pkg/whitesource/whitesource.go +++ b/pkg/whitesource/whitesource.go @@ -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)