Skip to content

Commit 192702e

Browse files
bgardinerbgardiner
authored
Merge branch 'main' into fix/container-monitor-json-projectname
2 parents f0e4352 + 65dfdb1 commit 192702e

15 files changed

Lines changed: 189 additions & 95 deletions

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ parameters:
1919
go_version:
2020
type: string
2121
# https://go.dev/doc/devel/release
22-
default: '1.24.10'
22+
default: '1.24.11'
2323
aws_version:
2424
type: string
2525
# https://github.com/aws/aws-cli/blob/v2/CHANGELOG.rst

‎cliv2/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/snyk/go-application-framework v0.0.0-20251126145139-d009e2fc9977
2222
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65
2323
github.com/snyk/snyk-iac-capture v0.6.5
24-
github.com/snyk/snyk-ls v0.0.0-20251126093614-d999dd468f2e
24+
github.com/snyk/snyk-ls v0.0.0-20251202122720-659b8a92f4cd
2525
github.com/snyk/studio-mcp v1.1.0
2626
github.com/spf13/cobra v1.9.1
2727
github.com/spf13/pflag v1.0.10
@@ -223,15 +223,15 @@ require (
223223
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
224224
go.opentelemetry.io/otel/trace v1.34.0 // indirect
225225
go.uber.org/multierr v1.11.0 // indirect
226-
golang.org/x/crypto v0.43.0 // indirect
226+
golang.org/x/crypto v0.45.0 // indirect
227227
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
228228
golang.org/x/mod v0.29.0 // indirect
229-
golang.org/x/net v0.45.0 // indirect
229+
golang.org/x/net v0.47.0 // indirect
230230
golang.org/x/oauth2 v0.33.0 // indirect
231-
golang.org/x/sync v0.17.0 // indirect
232-
golang.org/x/sys v0.37.0 // indirect
233-
golang.org/x/term v0.36.0 // indirect
234-
golang.org/x/text v0.30.0 // indirect
231+
golang.org/x/sync v0.18.0 // indirect
232+
golang.org/x/sys v0.38.0 // indirect
233+
golang.org/x/term v0.37.0 // indirect
234+
golang.org/x/text v0.31.0 // indirect
235235
golang.org/x/time v0.8.0 // indirect
236236
google.golang.org/api v0.215.0 // indirect
237237
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect

‎cliv2/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,8 +1320,8 @@ github.com/snyk/policy-engine v1.1.0 h1:vFbFZbs3B0Y3XuGSur5om2meo4JEcCaKfNzshZFG
13201320
github.com/snyk/policy-engine v1.1.0/go.mod h1:SSZiMz6TiggRAk33duOueWeSG0Xwl0QoZo8hfPcEAh0=
13211321
github.com/snyk/snyk-iac-capture v0.6.5 h1:992DXCAJSN97KtUh8T5ndaWwd/6ZCal2bDkRXqM1u/E=
13221322
github.com/snyk/snyk-iac-capture v0.6.5/go.mod h1:e47i55EmM0F69ZxyFHC4sCi7vyaJW6DLoaamJJCzWGk=
1323-
github.com/snyk/snyk-ls v0.0.0-20251126093614-d999dd468f2e h1:HkawkOJEGRj9HcbtiXVu2VEet0e/RrJNplWfeSW6fLg=
1324-
github.com/snyk/snyk-ls v0.0.0-20251126093614-d999dd468f2e/go.mod h1:WgxyI7pnavACJzAfVuigRiannqtmbtx+LyEI1qb5DpI=
1323+
github.com/snyk/snyk-ls v0.0.0-20251202122720-659b8a92f4cd h1:3UEC6kXfspbVch+soW2SwlFjV+DHivS1Jm1Qs7k4lhc=
1324+
github.com/snyk/snyk-ls v0.0.0-20251202122720-659b8a92f4cd/go.mod h1:mLHvDNJThkQpT35J6pCoYp4efM+pfqj8WdHP8I9gkd4=
13251325
github.com/snyk/studio-mcp v1.1.0 h1:1AtAZITJCWh8/dlcKEou7fs1yuRV1xZq2YK0LA4rHJc=
13261326
github.com/snyk/studio-mcp v1.1.0/go.mod h1:mc5SWeSCdrOW86DynzQV0iyBcDWNvmaNb7tfDCa7wUQ=
13271327
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
@@ -1482,8 +1482,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
14821482
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
14831483
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
14841484
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
1485-
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
1486-
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
1485+
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
1486+
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
14871487
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
14881488
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
14891489
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1611,8 +1611,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
16111611
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
16121612
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
16131613
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
1614-
golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
1615-
golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
1614+
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
1615+
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
16161616
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
16171617
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
16181618
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1664,8 +1664,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
16641664
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
16651665
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
16661666
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
1667-
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
1668-
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
1667+
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
1668+
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
16691669
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
16701670
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
16711671
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1756,8 +1756,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
17561756
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
17571757
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
17581758
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1759-
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
1760-
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
1759+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
1760+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
17611761
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
17621762
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
17631763
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -1772,8 +1772,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
17721772
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
17731773
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
17741774
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
1775-
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
1776-
golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
1775+
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
1776+
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
17771777
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
17781778
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
17791779
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1794,8 +1794,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
17941794
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
17951795
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
17961796
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
1797-
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
1798-
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
1797+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
1798+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
17991799
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
18001800
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
18011801
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎package-lock.json‎

Lines changed: 70 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@
172172
"node-loader": "^2.0.0",
173173
"npm-run-all": "^4.1.5",
174174
"patch-package": "^6.5.0",
175+
"portfinder": "^1.0.38",
175176
"prettier": "^3.3.3",
176177
"proxyquire": "^1.7.4",
177178
"sinon": "^4.0.0",

‎test/jest/acceptance/snyk-sbom/all-projects.spec.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import { createProjectFromWorkspace } from '../../util/createProject';
22
import { runSnykCLI } from '../../util/runSnykCLI';
33
import { fakeServer } from '../../../acceptance/fake-server';
4+
import { getAvailableServerPort } from '../../util/getServerPort';
45

56
jest.setTimeout(1000 * 60 * 5);
67

78
describe('snyk sbom --all-projects (mocked server only)', () => {
89
let server;
910
let env: Record<string, string>;
1011

11-
beforeAll((done) => {
12-
const port = process.env.PORT || process.env.SNYK_PORT || '58585';
12+
beforeAll(async () => {
13+
const port = await getAvailableServerPort(process);
1314
const baseApi = '/api/v1';
1415
env = {
1516
...process.env,
@@ -19,9 +20,7 @@ describe('snyk sbom --all-projects (mocked server only)', () => {
1920
SNYK_DISABLE_ANALYTICS: '1',
2021
};
2122
server = fakeServer(baseApi, env.SNYK_TOKEN);
22-
server.listen(port, () => {
23-
done();
24-
});
23+
await server.listenPromise(port);
2524
});
2625

2726
afterEach(() => {

‎test/jest/acceptance/snyk-sbom/golang-sboms.spec.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import { createProjectFromWorkspace } from '../../util/createProject';
22
import { runSnykCLI } from '../../util/runSnykCLI';
33
import { FakeServer, fakeServer } from '../../../acceptance/fake-server';
4+
import { getAvailableServerPort } from '../../util/getServerPort';
45

56
jest.setTimeout(1000 * 60 * 5);
67

78
describe('golang sboms (mocked server only)', () => {
89
let server: FakeServer;
910
let env: Record<string, string>;
1011

11-
beforeAll((done) => {
12-
const port = process.env.PORT || process.env.SNYK_PORT || '60213';
12+
beforeAll(async () => {
13+
const port = await getAvailableServerPort(process);
1314
const baseApi = '/api/v1';
1415
env = {
1516
...process.env,
@@ -19,9 +20,7 @@ describe('golang sboms (mocked server only)', () => {
1920
SNYK_DISABLE_ANALYTICS: '1',
2021
};
2122
server = fakeServer(baseApi, env.SNYK_TOKEN);
22-
server.listen(port, () => {
23-
done();
24-
});
23+
await server.listenPromise(port);
2524
});
2625

2726
afterEach(() => {

‎test/jest/acceptance/snyk-sbom/gradle-options.spec.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { fakeServer } from '../../../acceptance/fake-server';
22
import { isWindowsOperatingSystem, testIf } from '../../../utils';
3+
import { getAvailableServerPort } from '../../util/getServerPort';
34
import { runSnykSbomCliCycloneDxJsonForFixture } from './common';
45

56
jest.setTimeout(1000 * 60 * 5);
@@ -8,8 +9,8 @@ describe('snyk sbom: gradle options (mocked server only)', () => {
89
let server;
910
let env: Record<string, string>;
1011

11-
beforeAll((done) => {
12-
const port = process.env.PORT || process.env.SNYK_PORT || '58586';
12+
beforeAll(async () => {
13+
const port = await getAvailableServerPort(process);
1314
const baseApi = '/api/v1';
1415
env = {
1516
...process.env,
@@ -19,9 +20,7 @@ describe('snyk sbom: gradle options (mocked server only)', () => {
1920
SNYK_DISABLE_ANALYTICS: '1',
2021
};
2122
server = fakeServer(baseApi, env.SNYK_TOKEN);
22-
server.listen(port, () => {
23-
done();
24-
});
23+
await server.listenPromise(port);
2524
});
2625

2726
afterEach(() => {

‎test/jest/acceptance/snyk-sbom/maven-options.spec.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ import { fakeServer } from '../../../acceptance/fake-server';
22
import { runSnykSbomCliCycloneDxJsonForFixture } from './common';
33
import { createProjectFromFixture } from '../../util/createProject';
44
import { runSnykCLI } from '../../util/runSnykCLI';
5+
import { getAvailableServerPort } from '../../util/getServerPort';
56

67
jest.setTimeout(1000 * 60 * 5);
78

89
describe('snyk sbom: maven options (mocked server only)', () => {
910
let server;
1011
let env: Record<string, string>;
1112

12-
beforeAll((done) => {
13-
const port = process.env.PORT || process.env.SNYK_PORT || '58587';
13+
beforeAll(async () => {
14+
const port = await getAvailableServerPort(process);
1415
const baseApi = '/api/v1';
1516
env = {
1617
...process.env,
@@ -20,9 +21,7 @@ describe('snyk sbom: maven options (mocked server only)', () => {
2021
SNYK_DISABLE_ANALYTICS: '1',
2122
};
2223
server = fakeServer(baseApi, env.SNYK_TOKEN);
23-
server.listen(port, () => {
24-
done();
25-
});
24+
await server.listenPromise(port);
2625
});
2726

2827
afterEach(() => {

‎test/jest/acceptance/snyk-sbom/npm-options.spec.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { fakeServer } from '../../../acceptance/fake-server';
22
import { createProjectFromWorkspace } from '../../util/createProject';
3+
import { getAvailableServerPort } from '../../util/getServerPort';
34
import { runSnykCLI } from '../../util/runSnykCLI';
45

56
jest.setTimeout(1000 * 60 * 5);
@@ -8,8 +9,8 @@ describe('snyk sbom: npm options (mocked server only)', () => {
89
let server;
910
let env: Record<string, string>;
1011

11-
beforeAll((done) => {
12-
const port = process.env.PORT || process.env.SNYK_PORT || '58584';
12+
beforeAll(async () => {
13+
const port = await getAvailableServerPort(process);
1314
const baseApi = '/api/v1';
1415
env = {
1516
...process.env,
@@ -19,9 +20,7 @@ describe('snyk sbom: npm options (mocked server only)', () => {
1920
SNYK_DISABLE_ANALYTICS: '1',
2021
};
2122
server = fakeServer(baseApi, env.SNYK_TOKEN);
22-
server.listen(port, () => {
23-
done();
24-
});
23+
await server.listenPromise(port);
2524
});
2625

2726
afterEach(() => {

0 commit comments

Comments
 (0)