From 3150adcbb0320baefb860428b5bc56b9e025e930 Mon Sep 17 00:00:00 2001 From: jozsef-armin-hamos Date: Mon, 18 Sep 2023 10:16:33 +0300 Subject: [PATCH 1/6] feat: use gw routing for code --- package-lock.json | 14 +++++++------- package.json | 2 +- src/lib/code-config.ts | 7 ++++++- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 10377ac4a6..da4db758cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@sentry/node": "^7.34.0", "@snyk/cli-interface": "2.12.0", "@snyk/cloud-config-parser": "^1.14.5", - "@snyk/code-client": "^4.19.1", + "@snyk/code-client": "^4.22.0", "@snyk/dep-graph": "^2.7.4", "@snyk/docker-registry-v2-client": "^2.10.0", "@snyk/fix": "file:packages/snyk-fix", @@ -2122,9 +2122,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/@snyk/code-client": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.21.0.tgz", - "integrity": "sha512-1aXPokDDccTdzDH2SSMXFSPrbWYrTlHy5d+NhjcpWHb+BIo7qcIjs7Dd5rqHN5hNokfZwYnD/kmAkwYlcT1RtQ==", + "version": "4.22.0", + "resolved": "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.22.0.tgz", + "integrity": "sha512-6mEt4BwsZYAX8Zm7goWpZOavzWy+l7NVaTuPC7JDwLdovS0b3qYanTlRF4Jxtd37JO8+2DhkyAzqqOTTO2lunQ==", "dependencies": { "@deepcode/dcignore": "^1.0.4", "@types/flat-cache": "^2.0.0", @@ -22438,9 +22438,9 @@ } }, "@snyk/code-client": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.21.0.tgz", - "integrity": "sha512-1aXPokDDccTdzDH2SSMXFSPrbWYrTlHy5d+NhjcpWHb+BIo7qcIjs7Dd5rqHN5hNokfZwYnD/kmAkwYlcT1RtQ==", + "version": "4.22.0", + "resolved": "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.22.0.tgz", + "integrity": "sha512-6mEt4BwsZYAX8Zm7goWpZOavzWy+l7NVaTuPC7JDwLdovS0b3qYanTlRF4Jxtd37JO8+2DhkyAzqqOTTO2lunQ==", "requires": { "@deepcode/dcignore": "^1.0.4", "@types/flat-cache": "^2.0.0", diff --git a/package.json b/package.json index c354565dfd..5804538957 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "@sentry/node": "^7.34.0", "@snyk/cli-interface": "2.12.0", "@snyk/cloud-config-parser": "^1.14.5", - "@snyk/code-client": "^4.19.1", + "@snyk/code-client": "^4.22.0", "@snyk/dep-graph": "^2.7.4", "@snyk/docker-registry-v2-client": "^2.10.0", "@snyk/fix": "file:packages/snyk-fix", diff --git a/src/lib/code-config.ts b/src/lib/code-config.ts index cd6c6195c7..a834695303 100644 --- a/src/lib/code-config.ts +++ b/src/lib/code-config.ts @@ -3,8 +3,13 @@ import config from './config'; export function getCodeClientProxyUrl(): string { const url = new URL(config.API); const domain = url.origin; + const routeToAPI = isFedramp(domain) return ( config.CODE_CLIENT_PROXY_URL || - domain.replace(/\/\/(ap[pi]\.)?/, '//deeproxy.') + domain.replace(/\/\/(ap[pi]\.)?/, routeToAPI ? '//api.' :'//deeproxy.') ); } + +function isFedramp(domain: string): boolean { + return domain.includes('snykgov.io'); +} \ No newline at end of file From 20b0978c1ac55301ef07d4fac2feb5bf034869b8 Mon Sep 17 00:00:00 2001 From: jozsef-armin-hamos Date: Mon, 18 Sep 2023 10:13:01 +0300 Subject: [PATCH 2/6] fix: update codeowners --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c255a022dd..0798a299ab 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -55,7 +55,7 @@ test/jest/acceptance/iac/ @snyk/cloud-dev-ex test/jest/acceptance/iac/describe.spec.ts @snyk/cloud-dev-ex test/jest/acceptance/iac/capture.spec.ts @snyk/cloud-dev-ex test/jest/acceptance/snyk-apps @snyk/moose -src/lib/code-config.ts @snyk/nebula +src/lib/code-config.ts @snyk/pulsar src/lib/errors/describe-required-argument-error.ts @snyk/cloud-dev-ex src/lib/errors/describe-exclusive-argument-error.ts @snyk/cloud-dev-ex src/lib/errors/no-supported-sast-files-found.ts @snyk/zenith From 3c72d9e5723586bbca1fd0cebbd72ed5e47b236e Mon Sep 17 00:00:00 2001 From: jozsef-armin-hamos Date: Mon, 18 Sep 2023 10:34:38 +0300 Subject: [PATCH 3/6] fix: formatting --- src/lib/code-config.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/code-config.ts b/src/lib/code-config.ts index a834695303..b586a91db7 100644 --- a/src/lib/code-config.ts +++ b/src/lib/code-config.ts @@ -3,13 +3,13 @@ import config from './config'; export function getCodeClientProxyUrl(): string { const url = new URL(config.API); const domain = url.origin; - const routeToAPI = isFedramp(domain) + const routeToAPI = isFedramp(domain); return ( config.CODE_CLIENT_PROXY_URL || - domain.replace(/\/\/(ap[pi]\.)?/, routeToAPI ? '//api.' :'//deeproxy.') + domain.replace(/\/\/(ap[pi]\.)?/, routeToAPI ? '//api.' : '//deeproxy.') ); } function isFedramp(domain: string): boolean { return domain.includes('snykgov.io'); -} \ No newline at end of file +} From 320ba839543bb7ec21e3e9567bdeff56baa09640 Mon Sep 17 00:00:00 2001 From: jozsef-armin-hamos Date: Wed, 11 Oct 2023 09:40:54 +0300 Subject: [PATCH 4/6] fix: update code-client --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index da4db758cb..b08b193714 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@sentry/node": "^7.34.0", "@snyk/cli-interface": "2.12.0", "@snyk/cloud-config-parser": "^1.14.5", - "@snyk/code-client": "^4.22.0", + "@snyk/code-client": "^4.22.3", "@snyk/dep-graph": "^2.7.4", "@snyk/docker-registry-v2-client": "^2.10.0", "@snyk/fix": "file:packages/snyk-fix", @@ -2122,9 +2122,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/@snyk/code-client": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.22.0.tgz", - "integrity": "sha512-6mEt4BwsZYAX8Zm7goWpZOavzWy+l7NVaTuPC7JDwLdovS0b3qYanTlRF4Jxtd37JO8+2DhkyAzqqOTTO2lunQ==", + "version": "4.22.3", + "resolved": "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.22.3.tgz", + "integrity": "sha512-rOa51ol5sMfm5eDtN/p0LhpnRWXrHqIF6vmRZsxN88p5B3d1YpZJOiZ/SYSv7yYB4Iubt1Cky7LD53Tj4ohCvg==", "dependencies": { "@deepcode/dcignore": "^1.0.4", "@types/flat-cache": "^2.0.0", @@ -22438,9 +22438,9 @@ } }, "@snyk/code-client": { - "version": "4.22.0", - "resolved": "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.22.0.tgz", - "integrity": "sha512-6mEt4BwsZYAX8Zm7goWpZOavzWy+l7NVaTuPC7JDwLdovS0b3qYanTlRF4Jxtd37JO8+2DhkyAzqqOTTO2lunQ==", + "version": "4.22.3", + "resolved": "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.22.3.tgz", + "integrity": "sha512-rOa51ol5sMfm5eDtN/p0LhpnRWXrHqIF6vmRZsxN88p5B3d1YpZJOiZ/SYSv7yYB4Iubt1Cky7LD53Tj4ohCvg==", "requires": { "@deepcode/dcignore": "^1.0.4", "@types/flat-cache": "^2.0.0", diff --git a/package.json b/package.json index 5804538957..6510011521 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "@sentry/node": "^7.34.0", "@snyk/cli-interface": "2.12.0", "@snyk/cloud-config-parser": "^1.14.5", - "@snyk/code-client": "^4.22.0", + "@snyk/code-client": "^4.22.3", "@snyk/dep-graph": "^2.7.4", "@snyk/docker-registry-v2-client": "^2.10.0", "@snyk/fix": "file:packages/snyk-fix", From e6e358dfbe61747671e8950fd9da6e8d15eb6b0e Mon Sep 17 00:00:00 2001 From: jozsef-armin-hamos Date: Wed, 11 Oct 2023 09:50:19 +0300 Subject: [PATCH 5/6] fix: add orgId to connection options --- src/lib/plugins/sast/analysis.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/plugins/sast/analysis.ts b/src/lib/plugins/sast/analysis.ts index 799fa5bf89..d6b4472693 100644 --- a/src/lib/plugins/sast/analysis.ts +++ b/src/lib/plugins/sast/analysis.ts @@ -39,6 +39,7 @@ type GetCodeAnalysisArgs = { }; connectionOptions: { org?: string; + orgId?: string; source: string; baseURL: string; requestId: string; @@ -102,6 +103,7 @@ export async function getCodeTestResults( source: 'snyk-cli', requestId, org: sastSettings.org, + orgId: config.orgId, }, analysisOptions: { severity: options.severityThreshold From 3c8c8e3d0d885b9a8cf82ed5fa8b2bbf2a12cd90 Mon Sep 17 00:00:00 2001 From: jozsef-armin-hamos Date: Wed, 11 Oct 2023 10:19:56 +0300 Subject: [PATCH 6/6] fix: unit tests for snyk-code --- test/jest/unit/snyk-code/snyk-code-test.spec.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/jest/unit/snyk-code/snyk-code-test.spec.ts b/test/jest/unit/snyk-code/snyk-code-test.spec.ts index de626b469e..274deb747e 100644 --- a/test/jest/unit/snyk-code/snyk-code-test.spec.ts +++ b/test/jest/unit/snyk-code/snyk-code-test.spec.ts @@ -747,6 +747,7 @@ describe('Test snyk code', () => { sessionToken, source, requestId: 'test-id', + orgId: '', }, analysisOptions: { severity, @@ -850,6 +851,7 @@ describe('Test snyk code', () => { sessionToken, source, requestId: 'test-id', + orgId: '', }, analysisOptions: { severity,