Skip to content

Commit 68f608f

Browse files
eranturgemaneranturgeman
committed
fixing breaks from 'go vet ./..' . TestDetectScansToPreform requires fix
1 parent 04596c4 commit 68f608f

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎commands/audit/audit_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"github.com/jfrog/jfrog-client-go/xsc/services"
3333
)
3434

35-
// TODO eran fix test
35+
// TODO eran fix test - test is compiling but not passing
3636
func TestDetectScansToPreform(t *testing.T) {
3737

3838
dir, cleanUp := createTestDir(t)
@@ -57,14 +57,14 @@ func TestDetectScansToPreform(t *testing.T) {
5757
ScanTarget: results.ScanTarget{
5858
Target: filepath.Join(dir, "Nuget"),
5959
},
60-
JasResults: &results.JasScansResults{},
60+
JasResultsNew: &results.JasScansResultsNew{},
6161
},
6262
{
6363
ScanTarget: results.ScanTarget{
6464
Technology: techutils.Go,
6565
Target: filepath.Join(dir, "dir", "go"),
6666
},
67-
JasResults: &results.JasScansResults{},
67+
JasResultsNew: &results.JasScansResultsNew{},
6868
ScaResults: &results.ScaScanResults{
6969
Descriptors: []string{filepath.Join(dir, "dir", "go", "go.mod")},
7070
},
@@ -74,7 +74,7 @@ func TestDetectScansToPreform(t *testing.T) {
7474
Technology: techutils.Maven,
7575
Target: filepath.Join(dir, "dir", "maven"),
7676
},
77-
JasResults: &results.JasScansResults{},
77+
JasResultsNew: &results.JasScansResultsNew{},
7878
ScaResults: &results.ScaScanResults{
7979
Descriptors: []string{
8080
filepath.Join(dir, "dir", "maven", "maven-sub", "pom.xml"),
@@ -88,7 +88,7 @@ func TestDetectScansToPreform(t *testing.T) {
8888
Technology: techutils.Npm,
8989
Target: filepath.Join(dir, "dir", "npm"),
9090
},
91-
JasResults: &results.JasScansResults{},
91+
JasResultsNew: &results.JasScansResultsNew{},
9292
ScaResults: &results.ScaScanResults{
9393
Descriptors: []string{filepath.Join(dir, "dir", "npm", "package.json")},
9494
},
@@ -98,7 +98,7 @@ func TestDetectScansToPreform(t *testing.T) {
9898
ScanTarget: results.ScanTarget{
9999
Target: filepath.Join(dir, "yarn"),
100100
},
101-
JasResults: &results.JasScansResults{},
101+
JasResultsNew: &results.JasScansResultsNew{},
102102
},
103103
},
104104
},
@@ -116,7 +116,7 @@ func TestDetectScansToPreform(t *testing.T) {
116116
Technology: techutils.Nuget,
117117
Target: filepath.Join(dir, "Nuget"),
118118
},
119-
JasResults: &results.JasScansResults{},
119+
JasResultsNew: &results.JasScansResultsNew{},
120120
ScaResults: &results.ScaScanResults{
121121
Descriptors: []string{filepath.Join(dir, "Nuget", "Nuget-sub", "project.csproj"), filepath.Join(dir, "Nuget", "project.sln")},
122122
},
@@ -126,7 +126,7 @@ func TestDetectScansToPreform(t *testing.T) {
126126
Technology: techutils.Go,
127127
Target: filepath.Join(dir, "dir", "go"),
128128
},
129-
JasResults: &results.JasScansResults{},
129+
JasResultsNew: &results.JasScansResultsNew{},
130130
ScaResults: &results.ScaScanResults{
131131
Descriptors: []string{filepath.Join(dir, "dir", "go", "go.mod")},
132132
},
@@ -136,7 +136,7 @@ func TestDetectScansToPreform(t *testing.T) {
136136
Technology: techutils.Maven,
137137
Target: filepath.Join(dir, "dir", "maven"),
138138
},
139-
JasResults: &results.JasScansResults{},
139+
JasResultsNew: &results.JasScansResultsNew{},
140140
ScaResults: &results.ScaScanResults{
141141
Descriptors: []string{
142142
filepath.Join(dir, "dir", "maven", "maven-sub", "pom.xml"),
@@ -150,7 +150,7 @@ func TestDetectScansToPreform(t *testing.T) {
150150
Technology: techutils.Npm,
151151
Target: filepath.Join(dir, "dir", "npm"),
152152
},
153-
JasResults: &results.JasScansResults{},
153+
JasResultsNew: &results.JasScansResultsNew{},
154154
ScaResults: &results.ScaScanResults{
155155
Descriptors: []string{filepath.Join(dir, "dir", "npm", "package.json")},
156156
},
@@ -160,7 +160,7 @@ func TestDetectScansToPreform(t *testing.T) {
160160
Technology: techutils.Yarn,
161161
Target: filepath.Join(dir, "yarn"),
162162
},
163-
JasResults: &results.JasScansResults{},
163+
JasResultsNew: &results.JasScansResultsNew{},
164164
ScaResults: &results.ScaScanResults{
165165
Descriptors: []string{filepath.Join(dir, "yarn", "package.json")},
166166
},
@@ -170,7 +170,7 @@ func TestDetectScansToPreform(t *testing.T) {
170170
Technology: techutils.Pip,
171171
Target: filepath.Join(dir, "yarn", "Pip"),
172172
},
173-
JasResults: &results.JasScansResults{},
173+
JasResultsNew: &results.JasScansResultsNew{},
174174
ScaResults: &results.ScaScanResults{
175175
Descriptors: []string{filepath.Join(dir, "yarn", "Pip", "requirements.txt")},
176176
},
@@ -180,7 +180,7 @@ func TestDetectScansToPreform(t *testing.T) {
180180
Technology: techutils.Pipenv,
181181
Target: filepath.Join(dir, "yarn", "Pipenv"),
182182
},
183-
JasResults: &results.JasScansResults{},
183+
JasResultsNew: &results.JasScansResultsNew{},
184184
ScaResults: &results.ScaScanResults{
185185
Descriptors: []string{filepath.Join(dir, "yarn", "Pipenv", "Pipfile")},
186186
},

‎jas/runner/jasrunner_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func TestJasRunner_AnalyzerManagerReturnsError(t *testing.T) {
6363

6464
jfrogAppsConfigForTest, _ := jas.CreateJFrogAppsConfig(nil)
6565
scanner, _ := jas.CreateJasScanner(&jas.FakeServerDetails, false, "", jas.GetAnalyzerManagerXscEnvVars(""))
66-
_, _, err := applicability.RunApplicabilityScan(jas.FakeBasicXrayResults, []string{"issueId_2_direct_dependency", "issueId_1_direct_dependency"}, scanner, false, applicability.ApplicabilityScannerType, jfrogAppsConfigForTest.Modules[0], 0)
66+
_, err := applicability.RunApplicabilityScan(jas.FakeBasicXrayResults, []string{"issueId_2_direct_dependency", "issueId_1_direct_dependency"}, scanner, false, applicability.ApplicabilityScannerType, jfrogAppsConfigForTest.Modules[0], 0)
6767
// Expect error:
6868
assert.ErrorContains(t, err, "failed to run Applicability scan")
6969
}

‎utils/xsc/analyticsmetrics_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,16 @@ func getDummyContentForGeneralEvent(withJas, withErr bool) *results.SecurityComm
117117
scanResults.NewScaScanResults(services.ScanResponse{Vulnerabilities: vulnerabilities})
118118

119119
if withJas {
120-
scanResults.JasResults.ApplicabilityScanResults = []*sarif.Run{sarifutils.CreateRunWithDummyResults(sarifutils.CreateDummyPassingResult("applic_CVE-123"))}
121-
scanResults.JasResults.SecretsScanResults = []*sarif.Run{
120+
scanResults.JasResultsNew.JasVulnerabilities.ApplicabilityScanResults = []*sarif.Run{sarifutils.CreateRunWithDummyResults(sarifutils.CreateDummyPassingResult("applic_CVE-123"))}
121+
scanResults.JasResultsNew.JasVulnerabilities.SecretsScanResults = []*sarif.Run{
122122
sarifutils.CreateRunWithDummyResults(sarifutils.CreateResultWithLocations("", "", "note", sarifutils.CreateLocation("", 0, 0, 0, 0, ""))),
123123
sarifutils.CreateRunWithDummyResults(sarifutils.CreateResultWithLocations("", "", "note", sarifutils.CreateLocation("", 1, 1, 1, 1, ""))),
124124
}
125-
scanResults.JasResults.IacScanResults = []*sarif.Run{
125+
scanResults.JasResultsNew.JasVulnerabilities.IacScanResults = []*sarif.Run{
126126
sarifutils.CreateRunWithDummyResults(sarifutils.CreateResultWithLocations("", "", "note", sarifutils.CreateLocation("", 0, 0, 0, 0, ""))),
127127
sarifutils.CreateRunWithDummyResults(sarifutils.CreateResultWithLocations("", "", "note", sarifutils.CreateLocation("", 1, 1, 1, 1, ""))),
128128
}
129-
scanResults.JasResults.SastScanResults = []*sarif.Run{
129+
scanResults.JasResultsNew.JasVulnerabilities.SastScanResults = []*sarif.Run{
130130
sarifutils.CreateRunWithDummyResults(sarifutils.CreateResultWithLocations("", "", "note", sarifutils.CreateLocation("", 0, 0, 0, 0, ""))),
131131
sarifutils.CreateRunWithDummyResults(sarifutils.CreateResultWithLocations("", "", "note", sarifutils.CreateLocation("", 1, 1, 1, 1, ""))),
132132
}

0 commit comments

Comments
 (0)