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

chore: merge rc back to main #5641

Merged
merged 20 commits into from
Dec 20, 2024
+6 −6
Merged

chore: merge rc back to main #5641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a31eaec
fix: upgrade snyk-docker-plugin and snyk-policy
thisislawatts Nov 19, 2024
96d3ec9
chore(ci): ignore unreachable vuln
thisislawatts Nov 13, 2024
8597aab
Merge pull request #5587 from snyk/hot-fix-v1.1294.0
thisislawatts Nov 19, 2024
060da1b
chore(ci): remove EOL ubuntu from e2e test matrix
thisislawatts Nov 19, 2024
2182e5f
Merge pull request #5590 from snyk/chore/ci-remove-eol-ubuntu-from-e2…
thisislawatts Nov 19, 2024
cd36cab
Merge pull request #5593 from snyk/release-candidate
thisislawatts Nov 20, 2024
697ad25
fix: npm/yarn npm cache fix
adrobuta Nov 26, 2024
58b8557
Merge pull request #5600 from snyk/snyk/hotfix-v1.1294.1
sandor-trombitas Nov 26, 2024
ed805be
fix: npm/yarn npm cache fix
adrobuta Nov 26, 2024
486c3ff
Merge pull request #5603 from snyk/release-rc-1.1294.2
sandor-trombitas Nov 26, 2024
c5a3b23
fix: bump gaf+ls to upgrade xcrypto
sandor-trombitas Dec 12, 2024
ab1c7a3
Merge branch 'release-candidate' into hotfix/1.1294.3-x-crypto
sandor-trombitas Dec 12, 2024
bbe23bd
Merge pull request #5624 from snyk/hotfix/1.1294.3-x-crypto
sandor-trombitas Dec 12, 2024
f7dcc14
chore: update release notes
sandor-trombitas Dec 18, 2024
e7faab3
Merge branch 'release-candidate' into tmp/1734530976-release-candidate
sandor-trombitas Dec 18, 2024
28f0065
Merge branch 'release-candidate' into tmp/1734530976-release-candidate
sandor-trombitas Dec 18, 2024
f154d36
Merge pull request #5634 from snyk/tmp/1734530976-release-candidate
sandor-trombitas Dec 19, 2024
847fc2d
chore: update LS
ShawkyZ Dec 19, 2024
4672ece
Merge pull request #5639 from snyk/chore/update-ls
ShawkyZ Dec 19, 2024
488cbee
Merge branch main into chore/merge-rc-back-to-main
sandor-trombitas Dec 20, 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
4 changes: 2 additions & 2 deletions cliv2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/snyk/go-application-framework v0.0.0-20241218075424-470703ebd741
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65
github.com/snyk/snyk-iac-capture v0.6.5
github.com/snyk/snyk-ls v0.0.0-20241217120918-faa47b5debb3
github.com/snyk/snyk-ls v0.0.0-20241219141749-1fb24532eed8
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
Expand Down Expand Up @@ -198,7 +198,7 @@ require (
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions cliv2/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,8 +768,8 @@ github.com/snyk/policy-engine v0.31.3 h1:FepCg6QN/X8uvxYjF+WwB2aiBPJB+NENDgKQeI/
github.com/snyk/policy-engine v0.31.3/go.mod h1:Z9/hcngz+2txX4QfQRwfODk8F7w4mr/IQOvCtIosnLo=
github.com/snyk/snyk-iac-capture v0.6.5 h1:992DXCAJSN97KtUh8T5ndaWwd/6ZCal2bDkRXqM1u/E=
github.com/snyk/snyk-iac-capture v0.6.5/go.mod h1:e47i55EmM0F69ZxyFHC4sCi7vyaJW6DLoaamJJCzWGk=
github.com/snyk/snyk-ls v0.0.0-20241217120918-faa47b5debb3 h1:FzPQqAaxFel9rPPLYhlArduotH2kD/y8hEQ7V6VSduY=
github.com/snyk/snyk-ls v0.0.0-20241217120918-faa47b5debb3/go.mod h1:M6Mx5LLHzDThChYUkH7Ce5puv+Hhf1o6nC1To+RcgTI=
github.com/snyk/snyk-ls v0.0.0-20241219141749-1fb24532eed8 h1:0HKtutPGmc3Cp6v+l3ngwWRP29x8I1SuQxAtYN4b1do=
github.com/snyk/snyk-ls v0.0.0-20241219141749-1fb24532eed8/go.mod h1:b03ltsCNR3DCEoUdGcSxDAP8eQmav4f0WpNTgfJgwcU=
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
github.com/sourcegraph/go-lsp v0.0.0-20240223163137-f80c5dd31dfd h1:Dq5WSzWsP1TbVi10zPWBI5LKEBDg4Y1OhWEph1wr5WQ=
Expand Down Expand Up @@ -986,8 +986,8 @@ golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfS
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down
Loading