Skip to content

Commit 9bbaf62

Browse files
bastiandoetschbastiandoetsch
authored
Merge pull request #5747 from snyk/feat/automatic-upgrade-of-ls
feat(language-server): integrate LS
2 parents 75f1902 + ffb864b commit 9bbaf62

File tree

3 files changed

+52
-9
lines changed

3 files changed

+52
-9
lines changed

‎.circleci/config.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,10 @@ workflows:
554554

555555
- acceptance-tests:
556556
name: acceptance-tests linux amd64
557+
go_target_os: linux
558+
go_os: linux
559+
go_arch: amd64
560+
go_download_base_url: << pipeline.parameters.go_download_base_url >>
557561
context:
558562
- nodejs-install
559563
- team_hammerhead-cli
@@ -569,6 +573,10 @@ workflows:
569573

570574
- acceptance-tests:
571575
name: acceptance-tests linux arm64
576+
go_target_os: linux
577+
go_os: linux
578+
go_arch: arm64
579+
go_download_base_url: << pipeline.parameters.go_download_base_url >>
572580
context:
573581
- nodejs-install
574582
- team_hammerhead-cli
@@ -584,6 +592,10 @@ workflows:
584592

585593
- acceptance-tests:
586594
name: acceptance-tests fips linux arm64
595+
go_target_os: linux
596+
go_os: linux
597+
go_arch: arm64
598+
go_download_base_url: << pipeline.parameters.fips_go_download_base_url >>
587599
executor: docker-arm64
588600
test_snyk_command: ./binary-releases/fips/snyk-linux-arm64
589601
fips: 1
@@ -600,6 +612,10 @@ workflows:
600612

601613
- acceptance-tests:
602614
name: acceptance-tests alpine amd64
615+
go_target_os: alpine
616+
go_os: linux
617+
go_arch: amd64
618+
go_download_base_url: << pipeline.parameters.go_download_base_url >>
603619
context:
604620
- nodejs-install
605621
- team_hammerhead-cli
@@ -617,6 +633,10 @@ workflows:
617633

618634
- acceptance-tests:
619635
name: acceptance-tests alpine arm64
636+
go_target_os: alpine
637+
go_os: linux
638+
go_arch: arm64
639+
go_download_base_url: << pipeline.parameters.go_download_base_url >>
620640
context:
621641
- nodejs-install
622642
- team_hammerhead-cli
@@ -634,6 +654,10 @@ workflows:
634654

635655
- acceptance-tests:
636656
name: acceptance-tests macOS arm64
657+
go_target_os: darwin
658+
go_os: darwin
659+
go_arch: arm64
660+
go_download_base_url: << pipeline.parameters.go_download_base_url >>
637661
context:
638662
- nodejs-install
639663
- team_hammerhead-cli
@@ -650,6 +674,10 @@ workflows:
650674

651675
- acceptance-tests:
652676
name: acceptance-tests windows amd64
677+
go_target_os: windows
678+
go_os: windows
679+
go_arch: amd64
680+
go_download_base_url: << pipeline.parameters.go_download_base_url >>
653681
context:
654682
- nodejs-install
655683
- team_hammerhead-cli
@@ -1167,6 +1195,17 @@ jobs:
11671195

11681196
acceptance-tests:
11691197
parameters:
1198+
go_os:
1199+
type: string
1200+
go_target_os:
1201+
type: string
1202+
go_arch:
1203+
type: string
1204+
go_download_base_url:
1205+
type: string
1206+
install_path:
1207+
type: string
1208+
default: '.'
11701209
test_snyk_command:
11711210
type: string
11721211
executor:
@@ -1195,6 +1234,12 @@ jobs:
11951234
- install-deps-<< parameters.install_deps_extension >>
11961235
- run:
11971236
command: npm install
1237+
- install-go:
1238+
go_os: << parameters.go_os >>
1239+
go_target_os: << parameters.go_target_os >>
1240+
go_arch: << parameters.go_arch >>
1241+
base_url: << parameters.go_download_base_url >>
1242+
extraction_path: << parameters.install_path >>
11981243
- run:
11991244
name: Running acceptance tests
12001245
no_output_timeout: 30m

‎cliv2/go.mod

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/snyk/cli/cliv2
22

3-
go 1.23.0
4-
5-
toolchain go1.23.6
3+
go 1.23.6
64

75
require (
86
github.com/elazarl/goproxy v1.7.2
@@ -20,7 +18,7 @@ require (
2018
github.com/snyk/go-application-framework v0.0.0-20250228141123-ae19bde3449f
2119
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65
2220
github.com/snyk/snyk-iac-capture v0.6.5
23-
github.com/snyk/snyk-ls v0.0.0-20250213084108-c87400c00e06
21+
github.com/snyk/snyk-ls v0.0.0-20250228110715-1f69850f5daa
2422
github.com/spf13/cobra v1.9.1
2523
github.com/spf13/pflag v1.0.6
2624
github.com/stretchr/testify v1.10.0
@@ -133,6 +131,7 @@ require (
133131
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
134132
github.com/magiconair/properties v1.8.7 // indirect
135133
github.com/mailru/easyjson v0.9.0 // indirect
134+
github.com/mark3labs/mcp-go v0.8.4 // indirect
136135
github.com/mattn/go-colorable v0.1.14 // indirect
137136
github.com/mattn/go-isatty v0.0.20 // indirect
138137
github.com/mattn/go-localereader v0.0.1 // indirect
@@ -201,7 +200,6 @@ require (
201200
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
202201
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
203202
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
204-
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
205203
github.com/yashtewari/glob-intersection v0.2.0 // indirect
206204
github.com/yusufpapurcu/wmi v1.2.4 // indirect
207205
github.com/zclconf/go-cty v1.12.1 // indirect

‎cliv2/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,8 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V
638638
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
639639
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
640640
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
641+
github.com/mark3labs/mcp-go v0.8.4 h1:/VxjJ0+4oN2eYLuAgVzixrYNfrmwJnV38EfPIX3VbPE=
642+
github.com/mark3labs/mcp-go v0.8.4/go.mod h1:cjMlBU0cv/cj9kjlgmRhoJ5JREdS7YX83xeIG9Ko/jE=
641643
github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=
642644
github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
643645
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -814,8 +816,8 @@ github.com/snyk/policy-engine v0.33.2 h1:ZxD6/RQ4vqUAXa64V72SsGjZ8vmnBgZNGYQxMIq
814816
github.com/snyk/policy-engine v0.33.2/go.mod h1:YTZq3GMRbXcHOXQQrFRVEg+MQiIGCGZ1met6KlpruNo=
815817
github.com/snyk/snyk-iac-capture v0.6.5 h1:992DXCAJSN97KtUh8T5ndaWwd/6ZCal2bDkRXqM1u/E=
816818
github.com/snyk/snyk-iac-capture v0.6.5/go.mod h1:e47i55EmM0F69ZxyFHC4sCi7vyaJW6DLoaamJJCzWGk=
817-
github.com/snyk/snyk-ls v0.0.0-20250213084108-c87400c00e06 h1:t5qRbzSVBHKAKkzz/ADNQmANtgE/Bw7J5tYg8zxyLcA=
818-
github.com/snyk/snyk-ls v0.0.0-20250213084108-c87400c00e06/go.mod h1:8yRGJn7+k3vSbDDdK+qbDRSNN/0UEXL9Ed7dESCuch4=
819+
github.com/snyk/snyk-ls v0.0.0-20250228110715-1f69850f5daa h1:9y2jmdIZbgSUPCUl5JoLY9bxxZTTCDkKWeHrcUqp+Wc=
820+
github.com/snyk/snyk-ls v0.0.0-20250228110715-1f69850f5daa/go.mod h1:yUpaZgqx72xmcXklsaBl4NEhWkBngcOnOlKaaEdnjeA=
819821
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
820822
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
821823
github.com/sourcegraph/go-lsp v0.0.0-20240223163137-f80c5dd31dfd h1:Dq5WSzWsP1TbVi10zPWBI5LKEBDg4Y1OhWEph1wr5WQ=
@@ -891,8 +893,6 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
891893
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
892894
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
893895
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
894-
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g=
895-
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM=
896896
github.com/yashtewari/glob-intersection v0.2.0 h1:8iuHdN88yYuCzCdjt0gDe+6bAhUwBeEWqThExu54RFg=
897897
github.com/yashtewari/glob-intersection v0.2.0/go.mod h1:LK7pIC3piUjovexikBbJ26Yml7g8xa5bsjfx2v1fwok=
898898
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

0 commit comments

Comments
 (0)