snyk 1.648.0 → 1.652.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.
@@ -3,6 +3,7 @@ const Debug = require("debug");
3
3
  const snykFix = require("@snyk/fix");
4
4
  const ora = require("ora");
5
5
  const snyk = require("../../../lib");
6
+ const analytics = require("../../../lib/analytics");
6
7
  const convert_legacy_tests_results_to_fix_entities_1 = require("./convert-legacy-tests-results-to-fix-entities");
7
8
  const format_test_error_1 = require("../test/format-test-error");
8
9
  const process_command_args_1 = require("../process-command-args");
@@ -28,6 +29,16 @@ async function fix(...args) {
28
29
  const vulnerableResults = results.filter((res) => Object.keys(res.testResult.issues).length);
29
30
  const { dryRun, quiet } = options;
30
31
  const { fixSummary, meta } = await snykFix.fix(results, { dryRun, quiet });
32
+ // Analytics # of projects
33
+ analytics.add('snykFixFailedProjects', meta.failed);
34
+ analytics.add('snykFixFixedProjects', meta.fixed);
35
+ analytics.add('snykFixTotalProjects', results.length);
36
+ analytics.add('snykFixVulnerableProjects', vulnerableResults.length);
37
+ // Analytics # of issues
38
+ analytics.add('snykFixFixableIssues', meta.fixableIssues);
39
+ analytics.add('snykFixFixedIssues', meta.fixedIssues);
40
+ analytics.add('snykFixTotalIssues', meta.totalIssues);
41
+ analytics.add('snykFixSummary', fixSummary);
31
42
  // `snyk test` did not return any test results
32
43
  if (results.length === 0) {
33
44
  throw new Error(fixSummary);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/commands/fix/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/commands/fix/index.ts"],"names":[],"mappings":"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"}
@@ -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 snyk = require("."); // TODO(kyegupov): fix import
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 ${snyk.api}`,
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,0BAA2B,CAAC,6BAA6B;AACzD,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,IAAI,CAAC,GAAG,EAAE;SACnC;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"}
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('./settings');
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,yCAA+E;AAExE,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,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACxD,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;AACH,CAAC;AA3CD,4CA2CC"}
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.648.0",
3
+ "version": "1.652.0",
4
4
  "description": "snyk library and cli utility",
5
5
  "main": "dist/lib/index.js",
6
6
  "files": [
@@ -76,7 +76,7 @@
76
76
  "@snyk/cloud-config-parser": "^1.9.2",
77
77
  "@snyk/code-client": "3.9.0",
78
78
  "@snyk/dep-graph": "^1.27.1",
79
- "@snyk/fix": "1.641.0",
79
+ "@snyk/fix": "1.650.0",
80
80
  "@snyk/gemfile": "1.2.0",
81
81
  "@snyk/graphlib": "^2.1.9-patch.3",
82
82
  "@snyk/inquirer": "^7.3.3-patch",
@@ -199,5 +199,5 @@
199
199
  "registry": "https://registry.npmjs.org/",
200
200
  "access": "public"
201
201
  },
202
- "gitHead": "659d7e11fdb95f076c631d074f00a4e5cab235fa"
202
+ "gitHead": "9d27296fcb782e0a6116aa3b176f2ccd03d48fef"
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"}