Skip to content

Commit eefe3f0

Browse files
teodora-sanduteodora-sandu
committed
refactor: move the bundle package
1 parent bbea03c commit eefe3f0

File tree

9 files changed

+23
-22
lines changed

9 files changed

+23
-22
lines changed

‎bundle/bundle.go renamed to ‎internal/bundle/bundle.go

File renamed without changes.

‎bundle/bundle_manager.go renamed to ‎internal/bundle/bundle_manager.go

File renamed without changes.

‎bundle/bundle_manager_test.go renamed to ‎internal/bundle/bundle_manager_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package bundle_test
1919
import (
2020
"bytes"
2121
"context"
22+
bundle2 "github.com/snyk/code-client-go/internal/bundle"
2223
"os"
2324
"path/filepath"
2425
"strings"
@@ -29,7 +30,6 @@ import (
2930
"github.com/stretchr/testify/assert"
3031
"github.com/stretchr/testify/require"
3132

32-
"github.com/snyk/code-client-go/bundle"
3333
deepcode2 "github.com/snyk/code-client-go/deepcode"
3434
mocks2 "github.com/snyk/code-client-go/deepcode/mocks"
3535
"github.com/snyk/code-client-go/internal/util"
@@ -61,7 +61,7 @@ func Test_Create(t *testing.T) {
6161
err := os.WriteFile(file, []byte(data), 0600)
6262
require.NoError(t, err)
6363

64-
var bundleManager = bundle.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
64+
var bundleManager = bundle2.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
6565
bundle, err := bundleManager.Create(context.Background(),
6666
"testRequestId",
6767
dir,
@@ -93,7 +93,7 @@ func Test_Create(t *testing.T) {
9393
err := os.WriteFile(file, []byte(data), 0600)
9494
require.NoError(t, err)
9595

96-
var bundleManager = bundle.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
96+
var bundleManager = bundle2.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
9797
bundle, err := bundleManager.Create(context.Background(),
9898
"testRequestId",
9999
dir,
@@ -130,7 +130,7 @@ func Test_Create(t *testing.T) {
130130
)
131131
require.NoError(t, err)
132132

133-
var bundleManager = bundle.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
133+
var bundleManager = bundle2.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
134134
bundle, err := bundleManager.Create(context.Background(),
135135
"testRequestId",
136136
dir,
@@ -166,7 +166,7 @@ func Test_Create(t *testing.T) {
166166
},
167167
)
168168
require.NoError(t, err)
169-
var bundleManager = bundle.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
169+
var bundleManager = bundle2.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
170170
bundle, err := bundleManager.Create(context.Background(),
171171
"testRequestId",
172172
dir,
@@ -199,7 +199,7 @@ func Test_Create(t *testing.T) {
199199
err := os.WriteFile(file, []byte("some content so the file won't be skipped"), 0600)
200200
assert.Nil(t, err)
201201

202-
var bundleManager = bundle.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
202+
var bundleManager = bundle2.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
203203
bundle, err := bundleManager.Create(context.Background(),
204204
"testRequestId",
205205
tempDir,
@@ -247,7 +247,7 @@ func Test_Create(t *testing.T) {
247247
require.NoError(t, err)
248248
}
249249

250-
var bundleManager = bundle.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
250+
var bundleManager = bundle2.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
251251
bundle, err := bundleManager.Create(context.Background(),
252252
"testRequestId",
253253
tempDir,
@@ -279,15 +279,15 @@ func Test_Upload(t *testing.T) {
279279
mockInstrumentor.EXPECT().Finish(gomock.Any()).Times(2)
280280
mockErrorReporter := mocks.NewMockErrorReporter(ctrl)
281281

282-
var bundleManager = bundle.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
282+
var bundleManager = bundle2.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
283283
documentURI, bundleFile := createTempFileInDir(t, "bundleDoc.java", 10, temporaryDir)
284284
bundleFileMap := map[string]deepcode2.BundleFile{}
285285
bundleFileMap[documentURI] = bundleFile
286286

287287
_, err := bundleManager.Upload(
288288
context.Background(),
289289
"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}),
291291
bundleFileMap)
292292
assert.NoError(t, err)
293293
})
@@ -303,7 +303,7 @@ func Test_Upload(t *testing.T) {
303303
mockInstrumentor.EXPECT().StartSpan(gomock.Any(), gomock.Any()).Return(mockSpan).Times(2)
304304
mockInstrumentor.EXPECT().Finish(gomock.Any()).Times(2)
305305
mockErrorReporter := mocks.NewMockErrorReporter(ctrl)
306-
var bundleManager = bundle.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
306+
var bundleManager = bundle2.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
307307

308308
bundleFileMap := map[string]deepcode2.BundleFile{}
309309
var missingFiles []string
@@ -326,7 +326,7 @@ func Test_Upload(t *testing.T) {
326326
_, err := bundleManager.Upload(
327327
context.Background(),
328328
"testRequestId",
329-
bundle.NewBundle(mockSnykCodeClient, mockInstrumentor, mockErrorReporter, &logger, "bundleHash", bundleFileMap, []string{}, missingFiles),
329+
bundle2.NewBundle(mockSnykCodeClient, mockInstrumentor, mockErrorReporter, &logger, "bundleHash", bundleFileMap, []string{}, missingFiles),
330330
bundleFileMap)
331331
assert.Nil(t, err)
332332
})
@@ -348,7 +348,7 @@ func Test_IsSupported_Extensions(t *testing.T) {
348348
}, nil)
349349
mockInstrumentor := mocks.NewMockInstrumentor(ctrl)
350350
mockErrorReporter := mocks.NewMockErrorReporter(ctrl)
351-
bundler := bundle.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
351+
bundler := bundle2.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
352352

353353
t.Run("should return true for supported languages", func(t *testing.T) {
354354
supported, _ := bundler.IsSupported(context.Background(), "C:\\some\\path\\Test.java")
@@ -387,7 +387,7 @@ func Test_IsSupported_ConfigFiles(t *testing.T) {
387387
}, nil)
388388
mockInstrumentor := mocks.NewMockInstrumentor(ctrl)
389389
mockErrorReporter := mocks.NewMockErrorReporter(ctrl)
390-
bundler := bundle.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
390+
bundler := bundle2.NewBundleManager(newLogger(t), mockSnykCodeClient, mockInstrumentor, mockErrorReporter)
391391
dir, _ := os.Getwd()
392392

393393
t.Run("should return true for supported config files", func(t *testing.T) {

‎bundle/bundle_test.go renamed to ‎internal/bundle/bundle_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ package bundle_test
1818

1919
import (
2020
"context"
21-
"github.com/rs/zerolog"
2221
"testing"
2322

2423
"github.com/golang/mock/gomock"
24+
"github.com/rs/zerolog"
2525
"github.com/stretchr/testify/assert"
2626
"github.com/stretchr/testify/require"
2727

28-
"github.com/snyk/code-client-go/bundle"
2928
"github.com/snyk/code-client-go/deepcode"
3029
deepcodeMocks "github.com/snyk/code-client-go/deepcode/mocks"
30+
"github.com/snyk/code-client-go/internal/bundle"
3131
"github.com/snyk/code-client-go/observability/mocks"
3232
)
3333

‎bundle/errors.go renamed to ‎internal/bundle/errors.go

File renamed without changes.

‎bundle/mocks/bundle.go renamed to ‎internal/bundle/mocks/bundle.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bundle/mocks/bundle_manager.go renamed to ‎internal/bundle/mocks/bundle_manager.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scan.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ package codeclient
1919

2020
import (
2121
"context"
22+
2223
"github.com/pkg/errors"
2324
"github.com/rs/zerolog"
2425
"github.com/rs/zerolog/log"
26+
2527
"github.com/snyk/code-client-go/config"
2628
"github.com/snyk/code-client-go/deepcode"
2729
codeClientHTTP "github.com/snyk/code-client-go/http"
28-
29-
"github.com/snyk/code-client-go/bundle"
3030
"github.com/snyk/code-client-go/internal/analysis"
31+
"github.com/snyk/code-client-go/internal/bundle"
3132
"github.com/snyk/code-client-go/observability"
3233
"github.com/snyk/code-client-go/sarif"
3334
)
@@ -56,7 +57,7 @@ func NewCodeScanner(
5657
errorReporter observability.ErrorReporter,
5758
logger *zerolog.Logger,
5859
) *codeScanner {
59-
snykCode := deepcode.NewSnykCodeClient(logger, httpClient, instrumentor, config)
60+
snykCode := deepcode.NewSnykCodeClient(logger, httpClient, instrumentor, errorReporter, config)
6061
bundleManager := bundle.NewBundleManager(logger, snykCode, instrumentor, errorReporter)
6162
return &codeScanner{
6263
bundleManager: bundleManager,

‎scan_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ package codeclient_test
1717

1818
import (
1919
"context"
20+
"github.com/snyk/code-client-go/internal/bundle"
21+
bundleMocks "github.com/snyk/code-client-go/internal/bundle/mocks"
2022
"os"
2123
"path/filepath"
2224
"testing"
@@ -27,8 +29,6 @@ import (
2729
"github.com/stretchr/testify/require"
2830

2931
codeclient "github.com/snyk/code-client-go"
30-
"github.com/snyk/code-client-go/bundle"
31-
bundleMocks "github.com/snyk/code-client-go/bundle/mocks"
3232
confMocks "github.com/snyk/code-client-go/config/mocks"
3333
"github.com/snyk/code-client-go/deepcode"
3434
deepcodeMocks "github.com/snyk/code-client-go/deepcode/mocks"

0 commit comments

Comments
 (0)