@@ -19,6 +19,7 @@ package bundle_test
19
19
import (
20
20
"bytes"
21
21
"context"
22
+ bundle2 "github.com/snyk/code-client-go/internal/bundle"
22
23
"os"
23
24
"path/filepath"
24
25
"strings"
@@ -29,7 +30,6 @@ import (
29
30
"github.com/stretchr/testify/assert"
30
31
"github.com/stretchr/testify/require"
31
32
32
- "github.com/snyk/code-client-go/bundle"
33
33
deepcode2 "github.com/snyk/code-client-go/deepcode"
34
34
mocks2 "github.com/snyk/code-client-go/deepcode/mocks"
35
35
"github.com/snyk/code-client-go/internal/util"
@@ -61,7 +61,7 @@ func Test_Create(t *testing.T) {
61
61
err := os .WriteFile (file , []byte (data ), 0600 )
62
62
require .NoError (t , err )
63
63
64
- var bundleManager = bundle .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
64
+ var bundleManager = bundle2 .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
65
65
bundle , err := bundleManager .Create (context .Background (),
66
66
"testRequestId" ,
67
67
dir ,
@@ -93,7 +93,7 @@ func Test_Create(t *testing.T) {
93
93
err := os .WriteFile (file , []byte (data ), 0600 )
94
94
require .NoError (t , err )
95
95
96
- var bundleManager = bundle .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
96
+ var bundleManager = bundle2 .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
97
97
bundle , err := bundleManager .Create (context .Background (),
98
98
"testRequestId" ,
99
99
dir ,
@@ -130,7 +130,7 @@ func Test_Create(t *testing.T) {
130
130
)
131
131
require .NoError (t , err )
132
132
133
- var bundleManager = bundle .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
133
+ var bundleManager = bundle2 .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
134
134
bundle , err := bundleManager .Create (context .Background (),
135
135
"testRequestId" ,
136
136
dir ,
@@ -166,7 +166,7 @@ func Test_Create(t *testing.T) {
166
166
},
167
167
)
168
168
require .NoError (t , err )
169
- var bundleManager = bundle .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
169
+ var bundleManager = bundle2 .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
170
170
bundle , err := bundleManager .Create (context .Background (),
171
171
"testRequestId" ,
172
172
dir ,
@@ -199,7 +199,7 @@ func Test_Create(t *testing.T) {
199
199
err := os .WriteFile (file , []byte ("some content so the file won't be skipped" ), 0600 )
200
200
assert .Nil (t , err )
201
201
202
- var bundleManager = bundle .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
202
+ var bundleManager = bundle2 .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
203
203
bundle , err := bundleManager .Create (context .Background (),
204
204
"testRequestId" ,
205
205
tempDir ,
@@ -247,7 +247,7 @@ func Test_Create(t *testing.T) {
247
247
require .NoError (t , err )
248
248
}
249
249
250
- var bundleManager = bundle .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
250
+ var bundleManager = bundle2 .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
251
251
bundle , err := bundleManager .Create (context .Background (),
252
252
"testRequestId" ,
253
253
tempDir ,
@@ -279,15 +279,15 @@ func Test_Upload(t *testing.T) {
279
279
mockInstrumentor .EXPECT ().Finish (gomock .Any ()).Times (2 )
280
280
mockErrorReporter := mocks .NewMockErrorReporter (ctrl )
281
281
282
- var bundleManager = bundle .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
282
+ var bundleManager = bundle2 .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
283
283
documentURI , bundleFile := createTempFileInDir (t , "bundleDoc.java" , 10 , temporaryDir )
284
284
bundleFileMap := map [string ]deepcode2.BundleFile {}
285
285
bundleFileMap [documentURI ] = bundleFile
286
286
287
287
_ , err := bundleManager .Upload (
288
288
context .Background (),
289
289
"testRequestId" ,
290
- bundle .NewBundle (mockSnykCodeClient , mockInstrumentor , mockErrorReporter , & logger , "bundleHash" , bundleFileMap , []string {}, []string {documentURI }),
290
+ bundle2 .NewBundle (mockSnykCodeClient , mockInstrumentor , mockErrorReporter , & logger , "bundleHash" , bundleFileMap , []string {}, []string {documentURI }),
291
291
bundleFileMap )
292
292
assert .NoError (t , err )
293
293
})
@@ -303,7 +303,7 @@ func Test_Upload(t *testing.T) {
303
303
mockInstrumentor .EXPECT ().StartSpan (gomock .Any (), gomock .Any ()).Return (mockSpan ).Times (2 )
304
304
mockInstrumentor .EXPECT ().Finish (gomock .Any ()).Times (2 )
305
305
mockErrorReporter := mocks .NewMockErrorReporter (ctrl )
306
- var bundleManager = bundle .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
306
+ var bundleManager = bundle2 .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
307
307
308
308
bundleFileMap := map [string ]deepcode2.BundleFile {}
309
309
var missingFiles []string
@@ -326,7 +326,7 @@ func Test_Upload(t *testing.T) {
326
326
_ , err := bundleManager .Upload (
327
327
context .Background (),
328
328
"testRequestId" ,
329
- bundle .NewBundle (mockSnykCodeClient , mockInstrumentor , mockErrorReporter , & logger , "bundleHash" , bundleFileMap , []string {}, missingFiles ),
329
+ bundle2 .NewBundle (mockSnykCodeClient , mockInstrumentor , mockErrorReporter , & logger , "bundleHash" , bundleFileMap , []string {}, missingFiles ),
330
330
bundleFileMap )
331
331
assert .Nil (t , err )
332
332
})
@@ -348,7 +348,7 @@ func Test_IsSupported_Extensions(t *testing.T) {
348
348
}, nil )
349
349
mockInstrumentor := mocks .NewMockInstrumentor (ctrl )
350
350
mockErrorReporter := mocks .NewMockErrorReporter (ctrl )
351
- bundler := bundle .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
351
+ bundler := bundle2 .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
352
352
353
353
t .Run ("should return true for supported languages" , func (t * testing.T ) {
354
354
supported , _ := bundler .IsSupported (context .Background (), "C:\\ some\\ path\\ Test.java" )
@@ -387,7 +387,7 @@ func Test_IsSupported_ConfigFiles(t *testing.T) {
387
387
}, nil )
388
388
mockInstrumentor := mocks .NewMockInstrumentor (ctrl )
389
389
mockErrorReporter := mocks .NewMockErrorReporter (ctrl )
390
- bundler := bundle .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
390
+ bundler := bundle2 .NewBundleManager (newLogger (t ), mockSnykCodeClient , mockInstrumentor , mockErrorReporter )
391
391
dir , _ := os .Getwd ()
392
392
393
393
t .Run ("should return true for supported config files" , func (t * testing.T ) {
0 commit comments