feat: use code-client-go to create and extend bundle [IDE-175]

.github/workflows/build.yaml

@@ -71,6 +71,7 @@ jobs:
         env:
           DEEPROXY_API_URL: ${{secrets.DEEPROXY_API_URL}}
           SNYK_TOKEN: ${{secrets.SNYK_TOKEN }}
+          SNYK_TOKEN_CONSISTENT_IGNORES: ${{secrets.SNYK_TOKEN_CONSISTENT_IGNORES }}
         run: |
           export PATH=$PATH:~/pact/bin
 

.github/workflows/instance-tests.yaml

@@ -50,6 +50,7 @@ jobs:
       - name: Run Instance Tests
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+          SNYK_TOKEN_CONSISTENT_IGNORES: ${{secrets.SNYK_TOKEN_CONSISTENT_IGNORES }}
           SNYK_API: ${{ secrets.SNYK_API }}
         run: |
           make instance-test

.github/workflows/release.yaml

@@ -95,6 +95,7 @@ jobs:
         env:
           DEEPROXY_API_URL: ${{secrets.DEEPROXY_API_URL}}
           SNYK_TOKEN: ${{secrets.SNYK_TOKEN }}
+          SNYK_TOKEN_CONSISTENT_IGNORES: ${{secrets.SNYK_TOKEN_CONSISTENT_IGNORES }}
           INTEG_TESTS: 'true'
           SMOKE_TESTS: 'true'
         run: |

Makefile

@@ -83,7 +83,7 @@ proxy-test:
 
 instance-test:
 	@echo "==> Running instance tests"
-	@export SMOKE_TESTS=1 && cd application/server && go test -run Test_SmokeWorkspaceScanOssAndCode && cd -
+	@export SMOKE_TESTS=1 && cd application/server && go test -run Test_SmokeWorkspaceScan && cd -
 
 instance-standard-test:
 	@echo "==> Running instance tests for the standard environment"

application/di/init.go

@@ -21,6 +21,10 @@ import (
 	"runtime"
 	"sync"
 
+	codeClient "github.com/snyk/code-client-go"
+	codeClientBundle "github.com/snyk/code-client-go/bundle"
+	codeClientDeepCode "github.com/snyk/code-client-go/deepcode"
+	codeClientHTTP "github.com/snyk/code-client-go/http"
 	codeClientObservability "github.com/snyk/code-client-go/observability"
 
 	"github.com/snyk/snyk-ls/infrastructure/cli/cli_constants"
@@ -75,6 +79,7 @@ var fileWatcher *watcher.FileWatcher
 var initMutex = &sync.Mutex{}
 var notifier notification.Notifier
 var codeInstrumentor codeClientObservability.Instrumentor
+var codeErrorReporter codeClientObservability.ErrorReporter
 
 func Init() {
 	initMutex.Lock()
@@ -121,8 +126,9 @@ func initInfrastructure() {
 			})
 	}
 
+	engine := c.Engine()
 	// init NetworkAccess
-	networkAccess := c.Engine().GetNetworkAccess()
+	networkAccess := engine.GetNetworkAccess()
 
 	notifier = domainNotify.NewNotifier()
 	errorReporter = sentry.NewSentryErrorReporter(notifier)
@@ -140,12 +146,28 @@ func initInfrastructure() {
 	}
 
 	codeInstrumentor = code.NewCodeInstrumentor()
-	snykCodeClient = code.NewSnykCodeHTTPClient(codeInstrumentor, errorReporter, networkAccess.GetHttpClient)
+	codeErrorReporter = code.NewCodeErrorReporter(errorReporter)
+
+	snykCodeClient = code.NewSnykCodeHTTPClient(codeInstrumentor, codeErrorReporter, networkAccess.GetHttpClient)
 	snykCodeBundleUploader = code.NewBundler(snykCodeClient, codeInstrumentor)
+
+	httpClient := codeClientHTTP.NewHTTPClient(engine.GetLogger(), config.CurrentConfig(),
+		networkAccess.GetHttpClient, codeInstrumentor,
+		codeErrorReporter)
+	snykCode := codeClientDeepCode.NewSnykCodeClient(engine.GetLogger(), httpClient, codeInstrumentor)
+	bundleManager := codeClientBundle.NewBundleManager(engine.GetLogger(), snykCode, codeInstrumentor, codeErrorReporter)
+	codeClientScanner := codeClient.NewCodeScanner(
+		bundleManager,
+		codeInstrumentor,
+		codeErrorReporter,
+		engine.GetLogger(),
+	)
+
 	infrastructureAsCodeScanner = iac.New(instrumentor, errorReporter, analytics, snykCli)
 	openSourceScanner = oss.NewCLIScanner(instrumentor, errorReporter, analytics, snykCli, learnService, notifier, c)
 	scanNotifier, _ = appNotification.NewScanNotifier(notifier)
-	snykCodeScanner = code.New(snykCodeBundleUploader, snykApiClient, errorReporter, analytics, learnService, notifier)
+	snykCodeScanner = code.New(snykCodeBundleUploader, snykApiClient, codeErrorReporter, analytics, learnService, notifier,
+		codeClientScanner)
 	cliInitializer = cli.NewInitializer(errorReporter, installer, notifier, snykCli)
 	authInitializer := cliauth.NewInitializer(authenticationService, errorReporter, analytics, notifier)
 	scanInitializer = initialize.NewDelegatingInitializer(

application/di/test_init.go

@@ -80,7 +80,10 @@ func TestInit(t *testing.T) {
 		GetLesson(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
 		Return(&learn.Lesson{}, nil).AnyTimes()
 	learnService = learnMock
-	snykCodeScanner = code.New(snykCodeBundleUploader, snykApiClient, errorReporter, analytics, learnService, notifier)
+	codeClientScanner := &code.FakeCodeScannerClient{}
+	codeErrorReporter = code.NewCodeErrorReporter(errorReporter)
+	snykCodeScanner = code.New(snykCodeBundleUploader, snykApiClient, codeErrorReporter, analytics, learnService,
+		notifier, codeClientScanner)
 	openSourceScanner = oss.NewCLIScanner(instrumentor, errorReporter, analytics, snykCli, learnService, notifier, c)
 	infrastructureAsCodeScanner = iac.New(instrumentor, errorReporter, analytics, snykCli)
 	scanner = snyk.NewDelegatingScanner(