snyk 1.650.0 → 1.651.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/feature-flags.js +2 -2
- package/dist/lib/feature-flags.js.map +1 -1
- package/dist/lib/plugins/sast/{settings.d.ts → checks.d.ts} +5 -0
- package/dist/lib/plugins/sast/checks.js +36 -0
- package/dist/lib/plugins/sast/checks.js.map +1 -0
- package/dist/lib/plugins/sast/validate.js +5 -1
- package/dist/lib/plugins/sast/validate.js.map +1 -1
- package/package.json +2 -2
- package/dist/lib/plugins/sast/settings.js +0 -22
- package/dist/lib/plugins/sast/settings.js.map +0 -1
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isFeatureFlagSupportedForOrg = void 0;
|
|
4
4
|
const request = require("./request");
|
|
5
|
-
const
|
|
5
|
+
const api_token_1 = require("./api-token");
|
|
6
6
|
const config = require("./config");
|
|
7
7
|
const common_1 = require("./snyk-test/common");
|
|
8
8
|
async function isFeatureFlagSupportedForOrg(featureFlag, org) {
|
|
9
9
|
const response = await request({
|
|
10
10
|
method: 'GET',
|
|
11
11
|
headers: {
|
|
12
|
-
Authorization: `token ${
|
|
12
|
+
Authorization: `token ${api_token_1.api()}`,
|
|
13
13
|
},
|
|
14
14
|
qs: common_1.assembleQueryString({ org }),
|
|
15
15
|
url: `${config.API}/cli-config/feature-flags/${featureFlag}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature-flags.js","sourceRoot":"","sources":["../../src/lib/feature-flags.ts"],"names":[],"mappings":";;;AAAA,qCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"feature-flags.js","sourceRoot":"","sources":["../../src/lib/feature-flags.ts"],"names":[],"mappings":";;;AAAA,qCAAsC;AACtC,2CAAiD;AACjD,mCAAmC;AACnC,+CAAyD;AASlD,KAAK,UAAU,4BAA4B,CAChD,WAAmB,EACnB,GAAG;IAEH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;QAC7B,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,aAAa,EAAE,SAAS,eAAW,EAAE,EAAE;SACxC;QACD,EAAE,EAAE,4BAAmB,CAAC,EAAE,GAAG,EAAE,CAAC;QAChC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,6BAA6B,WAAW,EAAE;QAC5D,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IAEH,OAAQ,QAAgB,CAAC,IAAI,CAAC;AAChC,CAAC;AAhBD,oEAgBC"}
|
|
@@ -3,5 +3,10 @@ interface SastSettings {
|
|
|
3
3
|
code?: number;
|
|
4
4
|
error?: string;
|
|
5
5
|
}
|
|
6
|
+
interface TrackUsageResponse {
|
|
7
|
+
code?: number;
|
|
8
|
+
userMessage?: string;
|
|
9
|
+
}
|
|
6
10
|
export declare function getSastSettingsForOrg(org: any): Promise<SastSettings>;
|
|
11
|
+
export declare function trackUsage(org: any): Promise<TrackUsageResponse>;
|
|
7
12
|
export {};
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.trackUsage = exports.getSastSettingsForOrg = void 0;
|
|
4
|
+
const request = require("../../request");
|
|
5
|
+
const api_token_1 = require("../../api-token");
|
|
6
|
+
const config = require("../../config");
|
|
7
|
+
const common_1 = require("../../snyk-test/common");
|
|
8
|
+
async function getSastSettingsForOrg(org) {
|
|
9
|
+
const response = await request({
|
|
10
|
+
method: 'GET',
|
|
11
|
+
headers: {
|
|
12
|
+
Authorization: `token ${api_token_1.api()}`,
|
|
13
|
+
},
|
|
14
|
+
qs: common_1.assembleQueryString({ org }),
|
|
15
|
+
url: `${config.API}/cli-config/settings/sast`,
|
|
16
|
+
gzip: true,
|
|
17
|
+
json: true,
|
|
18
|
+
});
|
|
19
|
+
return response.body;
|
|
20
|
+
}
|
|
21
|
+
exports.getSastSettingsForOrg = getSastSettingsForOrg;
|
|
22
|
+
async function trackUsage(org) {
|
|
23
|
+
const response = await request({
|
|
24
|
+
method: 'POST',
|
|
25
|
+
headers: {
|
|
26
|
+
Authorization: `token ${api_token_1.api()}`,
|
|
27
|
+
},
|
|
28
|
+
qs: common_1.assembleQueryString({ org }),
|
|
29
|
+
url: `${config.API}/track-sast-usage/cli`,
|
|
30
|
+
gzip: true,
|
|
31
|
+
json: true,
|
|
32
|
+
});
|
|
33
|
+
return response.body;
|
|
34
|
+
}
|
|
35
|
+
exports.trackUsage = trackUsage;
|
|
36
|
+
//# sourceMappingURL=checks.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checks.js","sourceRoot":"","sources":["../../../../src/lib/plugins/sast/checks.ts"],"names":[],"mappings":";;;AAAA,yCAA0C;AAC1C,+CAAqD;AACrD,uCAAuC;AACvC,mDAA6D;AAatD,KAAK,UAAU,qBAAqB,CAAC,GAAG;IAC7C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;QAC7B,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,aAAa,EAAE,SAAS,eAAW,EAAE,EAAE;SACxC;QACD,EAAE,EAAE,4BAAmB,CAAC,EAAE,GAAG,EAAE,CAAC;QAChC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,2BAA2B;QAC7C,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC,IAAoB,CAAC;AACvC,CAAC;AAbD,sDAaC;AAEM,KAAK,UAAU,UAAU,CAAC,GAAG;IAClC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;QAC7B,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,SAAS,eAAW,EAAE,EAAE;SACxC;QACD,EAAE,EAAE,4BAAmB,CAAC,EAAE,GAAG,EAAE,CAAC;QAChC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,uBAAuB;QACzC,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC,IAA0B,CAAC;AAC7C,CAAC;AAbD,gCAaC"}
|
|
@@ -10,7 +10,7 @@ async function validateCodeTest(options) {
|
|
|
10
10
|
throw new errors_1.FeatureNotSupportedForOrgError(org);
|
|
11
11
|
}
|
|
12
12
|
// TODO: We would need to remove this once we fix circular import issue
|
|
13
|
-
const { getSastSettingsForOrg } = require('./
|
|
13
|
+
const { getSastSettingsForOrg, trackUsage } = require('./checks');
|
|
14
14
|
const { isFeatureFlagSupportedForOrg } = require('../../feature-flags');
|
|
15
15
|
const [sastSettingsResponse, snykCodeEnabledResponse, snykCodeCliEnabledResponse,] = await Promise.all([
|
|
16
16
|
getSastSettingsForOrg(org),
|
|
@@ -31,6 +31,10 @@ async function validateCodeTest(options) {
|
|
|
31
31
|
if (!sastSettingsResponse.sastEnabled) {
|
|
32
32
|
throw new errors_1.FeatureNotSupportedForOrgError(org, 'Snyk Code', 'enable in Settings > Snyk Code');
|
|
33
33
|
}
|
|
34
|
+
const trackUsageResponse = await trackUsage(org);
|
|
35
|
+
if (trackUsageResponse.code === 429) {
|
|
36
|
+
throw new errors_1.FailedToRunTestError(trackUsageResponse.userMessage, trackUsageResponse.code);
|
|
37
|
+
}
|
|
34
38
|
}
|
|
35
39
|
exports.validateCodeTest = validateCodeTest;
|
|
36
40
|
//# sourceMappingURL=validate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/lib/plugins/sast/validate.ts"],"names":[],"mappings":";;;AACA,uCAAuC;AAEvC,
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/lib/plugins/sast/validate.ts"],"names":[],"mappings":";;;AACA,uCAAuC;AAEvC,yCAIsB;AAEf,KAAK,UAAU,gBAAgB,CAAC,OAAgB;IACrD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC;IAEtC,yEAAyE;IACzE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,MAAM,IAAI,uCAA8B,CAAC,GAAG,CAAC,CAAC;KAC/C;IAED,uEAAuE;IACvE,MAAM,EAAE,qBAAqB,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAClE,MAAM,EAAE,4BAA4B,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAExE,MAAM,CACJ,oBAAoB,EACpB,uBAAuB,EACvB,0BAA0B,EAC3B,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpB,qBAAqB,CAAC,GAAG,CAAC;QAC1B,4BAA4B,CAAC,UAAU,EAAE,GAAG,CAAC;QAC7C,4BAA4B,CAAC,aAAa,EAAE,GAAG,CAAC;KACjD,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG;QAChB,oBAAoB;QACpB,uBAAuB;QACvB,0BAA0B;KAC3B,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,GAAG,IAAI,QAAQ,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;IAErE,IAAI,SAAS,EAAE;QACb,MAAM,wBAAe,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;KACxD;IAED,IAAI,CAAC,uBAAuB,CAAC,EAAE,IAAI,CAAC,0BAA0B,CAAC,EAAE,EAAE;QACjE,MAAM,IAAI,uCAA8B,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;KAC5D;IAED,IAAI,CAAC,oBAAoB,CAAC,WAAW,EAAE;QACrC,MAAM,IAAI,uCAA8B,CACtC,GAAG,EACH,WAAW,EACX,gCAAgC,CACjC,CAAC;KACH;IAED,MAAM,kBAAkB,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,kBAAkB,CAAC,IAAI,KAAK,GAAG,EAAE;QACnC,MAAM,IAAI,6BAAoB,CAC5B,kBAAkB,CAAC,WAAW,EAC9B,kBAAkB,CAAC,IAAI,CACxB,CAAC;KACH;AACH,CAAC;AAnDD,4CAmDC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "snyk",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.651.0",
|
|
4
4
|
"description": "snyk library and cli utility",
|
|
5
5
|
"main": "dist/lib/index.js",
|
|
6
6
|
"files": [
|
|
@@ -199,5 +199,5 @@
|
|
|
199
199
|
"registry": "https://registry.npmjs.org/",
|
|
200
200
|
"access": "public"
|
|
201
201
|
},
|
|
202
|
-
"gitHead": "
|
|
202
|
+
"gitHead": "6fa4826e007abb557804e8ca2cc6a1e1a51ed056"
|
|
203
203
|
}
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getSastSettingsForOrg = void 0;
|
|
4
|
-
const request = require("../../request");
|
|
5
|
-
const snyk = require("../..");
|
|
6
|
-
const config = require("../../config");
|
|
7
|
-
const common_1 = require("../../snyk-test/common");
|
|
8
|
-
async function getSastSettingsForOrg(org) {
|
|
9
|
-
const response = await request({
|
|
10
|
-
method: 'GET',
|
|
11
|
-
headers: {
|
|
12
|
-
Authorization: `token ${snyk.api}`,
|
|
13
|
-
},
|
|
14
|
-
qs: common_1.assembleQueryString({ org }),
|
|
15
|
-
url: `${config.API}/cli-config/settings/sast`,
|
|
16
|
-
gzip: true,
|
|
17
|
-
json: true,
|
|
18
|
-
});
|
|
19
|
-
return response.body;
|
|
20
|
-
}
|
|
21
|
-
exports.getSastSettingsForOrg = getSastSettingsForOrg;
|
|
22
|
-
//# sourceMappingURL=settings.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/lib/plugins/sast/settings.ts"],"names":[],"mappings":";;;AAAA,yCAA0C;AAC1C,8BAA+B;AAC/B,uCAAuC;AACvC,mDAA6D;AAQtD,KAAK,UAAU,qBAAqB,CAAC,GAAG;IAC7C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;QAC7B,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,aAAa,EAAE,SAAS,IAAI,CAAC,GAAG,EAAE;SACnC;QACD,EAAE,EAAE,4BAAmB,CAAC,EAAE,GAAG,EAAE,CAAC;QAChC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,2BAA2B;QAC7C,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IAEH,OAAQ,QAAgB,CAAC,IAAI,CAAC;AAChC,CAAC;AAbD,sDAaC"}
|