Skip to content

Commit ab145f9

Browse files
CatalinSnykCatalinSnyk
authored
Merge pull request #5886 from snyk/chore/pick-rc-changes
chore: cherry-pick changes for RC
2 parents b525000 + 3cb7e89 commit ab145f9

File tree

8 files changed

+68
-40
lines changed

8 files changed

+68
-40
lines changed

‎binary-releases/RELEASE_NOTES.md

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
1-
## [1.1297.0](https://github.com/snyk/snyk/compare/v1.1296.2...v1.1297.0) (2025-05-14)
1+
## [1.1297.0](https://github.com/snyk/cli/compare/v1.1296.2...v1.1297.0) (2025-05-14)
22

33
The Snyk CLI is being deployed to different deployment channels, users can select the stability level according to their needs. For details please see [this documentation](https://docs.snyk.io/snyk-cli/releases-and-channels-for-the-snyk-cli)
44

55
### Features
66

7-
* **container:** Support scanning container images from tar files without specifying a type ([58b0861](https://github.com/snyk/snyk/commit/58b0861f8ff6577b281de49619f711b8842e096a))
8-
* **iac:** Improve IaC deployment to avoid on the fly downloads ([5108f58](https://github.com/snyk/snyk/commit/5108f58954b22de962cc3125f643e5823a439a20))
9-
* **sbom:** Introduce sbom monitor command ([24e96c3](https://github.com/snyk/snyk/commit/24e96c33f153071fe798ed1b7a3ec78e5cc35733))
10-
* **test:** Improve gradle module resolution ([7991133](https://github.com/snyk/snyk/commit/79911337912082454e4362d9473c40699e059425))
11-
* **language-server:** Introduce explanation of AI fixes in IDEs
7+
* **container:** Support scanning container images from tar files without specifying a type ([58b0861](https://github.com/snyk/cli/commit/58b0861f8ff6577b281de49619f711b8842e096a))
8+
* **iac:** Improve IaC deployment to avoid on the fly downloads ([5108f58](https://github.com/snyk/cli/commit/5108f58954b22de962cc3125f643e5823a439a20))
9+
* **sbom:** Introduce sbom monitor command ([24e96c3](https://github.com/snyk/cli/commit/24e96c33f153071fe798ed1b7a3ec78e5cc35733))
10+
* **test:** Improve gradle module resolution ([7991133](https://github.com/snyk/cli/commit/79911337912082454e4362d9473c40699e059425))
11+
* **language-server:** Introduce explanation of AI fixes in IDEs ([74fa322](https://github.com/snyk/cli/commit/74fa3224aef6ba68b7f55006b7d0ced92c6d7e57))
1212

1313
### Bug Fixes
1414

15-
* **container:** Fix issue when scanning invalid node manifest files ([ceb8020](https://github.com/snyk/snyk/commit/ceb8020284db2b76abc42637caaa94d227c422ef))
16-
* **iac:** Ensure to use the correct org id when sharing results for v2 ([1c4094a](https://github.com/snyk/snyk/commit/1c4094aff5a21b08eefed47508d33668940af003))
17-
* **iac:** Ensure to use target-name ([2201f0a](https://github.com/snyk/snyk/commit/2201f0a46ac5747b4c58ed01990d1e9ae13f4eb7))
18-
* **sbom:** Fix issues when generating sboms based on NuGet .sln ([80c43d9](https://github.com/snyk/snyk/commit/80c43d9a6f9f3a29f5f0df679d75d82fed48a7f5))
19-
* **test:** Fix issues when scanning gradle projects on Windows ([11586cc](https://github.com/snyk/snyk/commit/11586cc587b3a05c2e7d279a3f40857f8c752068))
20-
* **test:** Improve error messages when using fail-fast, all-projects and json ([a396bd6](https://github.com/snyk/snyk/commit/a396bd6ea4abd443a0ffce2a29b3f7e6154859ac))
21-
* **test:** Fix yarn 2 out of sync issues ([18aee45](https://github.com/snyk/snyk/commit/18aee454a87fbeed480839fc91a04123840c6ff5))
22-
* **test:** Fix pnpm out of sync issue for duplicated peer and dev dependencies ([2581e16](https://github.com/snyk/snyk/commit/2581e169ac813df49e8eccce8ae4bfd85f01378e))
23-
* **test:** Ensure internal dependencies are represented correctly when normalizing Gradle dependencies ([c7e2713](https://github.com/snyk/snyk/commit/c7e2713a4d1d961857b95038c186085e14d8f415))
24-
* **language-server:** Fix and improve issue filtering in IDEs
15+
* **container:** Fix issue when scanning invalid node manifest files ([ceb8020](https://github.com/snyk/cli/commit/ceb8020284db2b76abc42637caaa94d227c422ef))
16+
* **code:** Fix hash mismatches for files containing non-UTF-8 content ([33d33e9](https://github.com/snyk/cli/commit/33d33e92bba76cff694cc5ee9e9b2e4b9274a673))
17+
* **iac:** Ensure to use the correct org id when sharing results for v2 ([1c4094a](https://github.com/snyk/cli/commit/1c4094aff5a21b08eefed47508d33668940af003))
18+
* **iac:** Ensure to use target-name ([2201f0a](https://github.com/snyk/cli/commit/2201f0a46ac5747b4c58ed01990d1e9ae13f4eb7))
19+
* **sbom:** Fix issues when generating sboms based on NuGet .sln ([80c43d9](https://github.com/snyk/cli/commit/80c43d9a6f9f3a29f5f0df679d75d82fed48a7f5))
20+
* **test:** Fix issues when scanning gradle projects on Windows ([11586cc](https://github.com/snyk/cli/commit/11586cc587b3a05c2e7d279a3f40857f8c752068))
21+
* **test:** Improve error messages when using fail-fast, all-projects and json ([a396bd6](https://github.com/snyk/cli/commit/a396bd6ea4abd443a0ffce2a29b3f7e6154859ac))
22+
* **test:** Fix yarn 2 out of sync issues ([18aee45](https://github.com/snyk/cli/commit/18aee454a87fbeed480839fc91a04123840c6ff5))
23+
* **test:** Fix pnpm out of sync issue for duplicated peer and dev dependencies ([2581e16](https://github.com/snyk/cli/commit/2581e169ac813df49e8eccce8ae4bfd85f01378e))
24+
* **test:** Ensure internal dependencies are represented correctly when normalizing Gradle dependencies ([c7e2713](https://github.com/snyk/cli/commit/c7e2713a4d1d961857b95038c186085e14d8f415))
25+
* **test:** Fix testing composer-based PHP projects ([39e3379](https://github.com/snyk/cli/commit/39e337965740f6242a22f998cc433d7842468490))
26+
* **language-server:** Fix and improve issue filtering in IDEs ([a474d67](https://github.com/snyk/cli/commit/a474d67a55c5b0684462b867fba1acf5dabcb000))
27+
* **language-server:** Fix unmanaged C/C++ scans with '—unmanaged' flag in additional parameters ([01f53e3](https://github.com/snyk/cli/commit/01f53e39c7d05c33aba9f219de958262202b5545))
28+
* **language-server:** Fix applying Snyk Code AI fixes on the wrong lines ([01f53e3](https://github.com/snyk/cli/commit/01f53e39c7d05c33aba9f219de958262202b5545))
2529

‎cliv2/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ require (
1616
github.com/snyk/cli-extension-sbom v0.0.0-20250422133603-a5ae6fdf0934
1717
github.com/snyk/container-cli v0.0.0-20250321132345-1e2e01681dd7
1818
github.com/snyk/error-catalog-golang-public v0.0.0-20250429130542-564b0605020e
19-
github.com/snyk/go-application-framework v0.0.0-20250430064233-182d2c5dc53a
19+
github.com/snyk/go-application-framework v0.0.0-20250505092137-65a591adf20f
2020
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65
2121
github.com/snyk/snyk-iac-capture v0.6.5
22-
github.com/snyk/snyk-ls v0.0.0-20250430123225-137c0037fe26
22+
github.com/snyk/snyk-ls v0.0.0-20250512123322-655181e23a17
2323
github.com/spf13/cobra v1.9.1
2424
github.com/spf13/pflag v1.0.6
2525
github.com/stretchr/testify v1.10.0
@@ -179,7 +179,7 @@ require (
179179
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
180180
github.com/sirupsen/logrus v1.9.3 // indirect
181181
github.com/skeema/knownhosts v1.3.1 // indirect
182-
github.com/snyk/code-client-go v1.21.2 // indirect
182+
github.com/snyk/code-client-go v1.21.3 // indirect
183183
github.com/snyk/policy-engine v0.33.2 // indirect
184184
github.com/sourcegraph/conc v0.3.0 // indirect
185185
github.com/sourcegraph/go-lsp v0.0.0-20240223163137-f80c5dd31dfd // indirect

‎cliv2/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -802,22 +802,22 @@ github.com/snyk/cli-extension-iac-rules v0.0.0-20250227121450-6e14346dbd1a h1:SJ
802802
github.com/snyk/cli-extension-iac-rules v0.0.0-20250227121450-6e14346dbd1a/go.mod h1:IqfQCIkyC26mkwa+aM6d6yxIh5+tCm4fSQG+Ogq3Qbc=
803803
github.com/snyk/cli-extension-sbom v0.0.0-20250422133603-a5ae6fdf0934 h1:0RCTH9C0zaTrnqpKLaLXTmP7suwWEHBNVwQSaR8Aifo=
804804
github.com/snyk/cli-extension-sbom v0.0.0-20250422133603-a5ae6fdf0934/go.mod h1:Q8dmRgcpHTk711dkLVtpkTF5RvLkQVcExGuv1cyx/zU=
805-
github.com/snyk/code-client-go v1.21.2 h1:6SnfB/abNyzbgs3A7RhZHOfx0Ng3FKTdS9NrUsBGUUs=
806-
github.com/snyk/code-client-go v1.21.2/go.mod h1:WH6lNkJc785hfXmwhixxWHix3O6z+1zwz40oK8vl/zg=
805+
github.com/snyk/code-client-go v1.21.3 h1:2+HPXCA9FGn3gaI1Jw1C4Ifn/NRAbSnmohFUvz4GC4I=
806+
github.com/snyk/code-client-go v1.21.3/go.mod h1:WH6lNkJc785hfXmwhixxWHix3O6z+1zwz40oK8vl/zg=
807807
github.com/snyk/container-cli v0.0.0-20250321132345-1e2e01681dd7 h1:/2+2piwQtB9fEJCkXEOjboZjY+77lQfnvqBZ/60xNHk=
808808
github.com/snyk/container-cli v0.0.0-20250321132345-1e2e01681dd7/go.mod h1:38w+dcAQp9eG3P5t2eNS9eG0reut10AeJjLv5lJ5lpM=
809809
github.com/snyk/error-catalog-golang-public v0.0.0-20250429130542-564b0605020e h1:XFGkHDWA8JTPLr82QzoKVqGytofEYBf68VqoUq8yvXk=
810810
github.com/snyk/error-catalog-golang-public v0.0.0-20250429130542-564b0605020e/go.mod h1:Ytttq7Pw4vOCu9NtRQaOeDU2dhBYUyNBe6kX4+nIIQ4=
811-
github.com/snyk/go-application-framework v0.0.0-20250430064233-182d2c5dc53a h1:cxh5DtyXAFOyQVE+eQSDuv0iCswR3a+2TnSdM9So13g=
812-
github.com/snyk/go-application-framework v0.0.0-20250430064233-182d2c5dc53a/go.mod h1:1QAWcdnzXVz7OLZjtfuEwLFShJJyGA1H6fu63+RJyB4=
811+
github.com/snyk/go-application-framework v0.0.0-20250505092137-65a591adf20f h1:L3B/8mDqRayNAiWf2cx2nhirQQI9x9yMfxDqpA+SwcE=
812+
github.com/snyk/go-application-framework v0.0.0-20250505092137-65a591adf20f/go.mod h1:Hy8dugDhTPRPe99Bf4mG7zeh7+OobdWfX5dzhbeQQsU=
813813
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65 h1:CEQuYv0Go6MEyRCD3YjLYM2u3Oxkx8GpCpFBd4rUTUk=
814814
github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65/go.mod h1:88KbbvGYlmLgee4OcQ19yr0bNpXpOr2kciOthaSzCAg=
815815
github.com/snyk/policy-engine v0.33.2 h1:ZxD6/RQ4vqUAXa64V72SsGjZ8vmnBgZNGYQxMIqctYo=
816816
github.com/snyk/policy-engine v0.33.2/go.mod h1:YTZq3GMRbXcHOXQQrFRVEg+MQiIGCGZ1met6KlpruNo=
817817
github.com/snyk/snyk-iac-capture v0.6.5 h1:992DXCAJSN97KtUh8T5ndaWwd/6ZCal2bDkRXqM1u/E=
818818
github.com/snyk/snyk-iac-capture v0.6.5/go.mod h1:e47i55EmM0F69ZxyFHC4sCi7vyaJW6DLoaamJJCzWGk=
819-
github.com/snyk/snyk-ls v0.0.0-20250430123225-137c0037fe26 h1:0jIlFQ8sGXxOh8XboXmBfyHhooqflR2Mzdz3/2ofsj0=
820-
github.com/snyk/snyk-ls v0.0.0-20250430123225-137c0037fe26/go.mod h1:xbvwtDAjQuol2GI45d6awmmRQ3TYcC3jdHFGn+2bTjQ=
819+
github.com/snyk/snyk-ls v0.0.0-20250512123322-655181e23a17 h1:hXj6nw+bHawhOS4Dbo0fxk1+J5jN8BQaG5RNwavyYaA=
820+
github.com/snyk/snyk-ls v0.0.0-20250512123322-655181e23a17/go.mod h1:xbvwtDAjQuol2GI45d6awmmRQ3TYcC3jdHFGn+2bTjQ=
821821
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
822822
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
823823
github.com/sourcegraph/go-lsp v0.0.0-20240223163137-f80c5dd31dfd h1:Dq5WSzWsP1TbVi10zPWBI5LKEBDg4Y1OhWEph1wr5WQ=

‎help/cli-commands/sbom-monitor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## Usage
66

7-
`snyk monitor [<OPTIONS>]`
7+
`snyk sbom monitor --experimental [<OPTIONS>]`
88

99
## Description
1010

@@ -35,7 +35,7 @@ Use the `-d` option to output the debug logs.
3535

3636
### `--experimental`
3737

38-
Required. Use experimental command features. This option is currently required as the command is in its experimental phase.
38+
Required. Use experimental command features. This option is required because the command is in its experimental phase.
3939

4040
### `--file=<FILE_PATH>`
4141

‎help/cli-commands/sbom-test.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## Usage
66

7-
`snyk sbom test --experimental --file=<FILE_PATH> [<options>]`
7+
`snyk sbom test --experimental --file=<FILE_PATH> [<OPTIONS>]`
88

99
## Description
1010

‎package-lock.json

Lines changed: 32 additions & 10 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
"snyk-nodejs-lockfile-parser": "1.60.1",
126126
"snyk-nodejs-plugin": "1.4.4",
127127
"snyk-nuget-plugin": "2.7.15",
128-
"snyk-php-plugin": "1.10.0",
128+
"snyk-php-plugin": "1.12.1",
129129
"snyk-policy": "4.1.4",
130130
"snyk-python-plugin": "2.6.0",
131131
"snyk-resolve-deps": "4.8.0",

‎test/jest/acceptance/snyk-code/snyk-code-user-journey.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { execSync } from 'child_process';
77
import { runCommand } from '../../util/runCommand';
88
import * as fs from 'fs-extra';
99
import { makeTmpDirectory } from '../../../utils';
10+
import * as crypto from 'crypto';
1011

1112
expect.extend(matchers);
1213
jest.setTimeout(1000 * 120);
@@ -78,7 +79,8 @@ async function ensureUniqueBundleIsUsed(path: string): Promise<string> {
7879
}
7980

8081
// add a random file to ensure a new bundle is created
81-
fs.writeFileSync(`${newPath}/tmp.java`, `test${Math.random().toString(36)}`);
82+
const randomBytes: Buffer = crypto.randomBytes(100);
83+
fs.writeFileSync(`${newPath}/tmp.java`, randomBytes, { encoding: 'binary' });
8284
return newPath;
8385
}
8486

0 commit comments

Comments
 (0)