Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update code-client-go and include workspace API [IDE-195] #484

Merged
merged 2 commits into from
Apr 10, 2024
Merged

feat: update code-client-go and include workspace API [IDE-195] #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d040d64
feat: update code-client-go and include workspace API
teodora-sandu Apr 5, 2024
3bf37f9
docs: updated licenses
teodora-sandu Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions application/di/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ import (
"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"

Expand Down Expand Up @@ -151,13 +149,11 @@ func initInfrastructure() {
snykCodeClient = code.NewSnykCodeHTTPClient(codeInstrumentor, codeErrorReporter, networkAccess.GetHttpClient)
snykCodeBundleUploader = code.NewBundler(snykCodeClient, codeInstrumentor)

httpClient := codeClientHTTP.NewHTTPClient(engine.GetLogger(), config.CurrentConfig(),
networkAccess.GetHttpClient, codeInstrumentor,
httpClient := codeClientHTTP.NewHTTPClient(engine.GetLogger(), networkAccess.GetHttpClient, codeInstrumentor,
codeErrorReporter)
snykCode := codeClientDeepCode.NewSnykCodeClient(engine.GetLogger(), httpClient, codeInstrumentor)
bundleManager := codeClientBundle.NewBundleManager(engine.GetLogger(), snykCode, codeInstrumentor, codeErrorReporter)
codeClientScanner := codeClient.NewCodeScanner(
bundleManager,
httpClient,
config.CurrentConfig(),
codeInstrumentor,
codeErrorReporter,
engine.GetLogger(),
Expand Down
10 changes: 4 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
github.com/segmentio/analytics-go v3.1.0+incompatible
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/snyk/code-client-go v1.3.0
github.com/snyk/code-client-go v1.4.0
github.com/snyk/go-application-framework v0.0.0-20240111143643-fa847b8a9a3b
github.com/sourcegraph/go-lsp v0.0.0-20240223163137-f80c5dd31dfd
github.com/stretchr/testify v1.9.0
Expand All @@ -39,9 +39,10 @@ require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/deepmap/oapi-codegen v1.13.4 // indirect
github.com/deepmap/oapi-codegen v1.14.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/getkin/kin-openapi v0.118.0 // indirect
Expand All @@ -62,10 +63,9 @@ require (
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/labstack/echo/v4 v4.11.4 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/oapi-codegen/runtime v1.0.0 // indirect
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
Expand All @@ -74,8 +74,6 @@ require (
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
Expand Down
Loading
Loading