@datadog/datadog-ci 2.42.0 → 2.44.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.
Files changed (78) hide show
  1. package/README.md +2 -2
  2. package/dist/commands/deployment/correlate.d.ts +2 -0
  3. package/dist/commands/deployment/correlate.js +42 -20
  4. package/dist/commands/deployment/correlate.js.map +1 -1
  5. package/dist/commands/lambda/flare.js.map +1 -1
  6. package/dist/commands/lambda/functions/commons.d.ts +1 -0
  7. package/dist/commands/lambda/functions/commons.js +1 -0
  8. package/dist/commands/lambda/functions/commons.js.map +1 -1
  9. package/dist/commands/lambda/functions/instrument.js.map +1 -1
  10. package/dist/commands/lambda/functions/uninstrument.js.map +1 -1
  11. package/dist/commands/lambda/loggroup.d.ts +2 -2
  12. package/dist/commands/lambda/loggroup.js.map +1 -1
  13. package/dist/commands/lambda/prompt.js.map +1 -1
  14. package/dist/commands/lambda/tags.js.map +1 -1
  15. package/dist/commands/measure/measure.d.ts +1 -0
  16. package/dist/commands/measure/measure.js +17 -4
  17. package/dist/commands/measure/measure.js.map +1 -1
  18. package/dist/commands/sarif/validation.js +12 -0
  19. package/dist/commands/sarif/validation.js.map +1 -1
  20. package/dist/commands/sbom/constants.d.ts +3 -0
  21. package/dist/commands/sbom/constants.js +4 -1
  22. package/dist/commands/sbom/constants.js.map +1 -1
  23. package/dist/commands/sbom/payload.js +94 -37
  24. package/dist/commands/sbom/payload.js.map +1 -1
  25. package/dist/commands/sbom/renderer.d.ts +2 -1
  26. package/dist/commands/sbom/renderer.js +17 -4
  27. package/dist/commands/sbom/renderer.js.map +1 -1
  28. package/dist/commands/sbom/types.d.ts +18 -0
  29. package/dist/commands/sbom/upload.d.ts +1 -1
  30. package/dist/commands/sbom/upload.js +41 -37
  31. package/dist/commands/sbom/upload.js.map +1 -1
  32. package/dist/commands/stepfunctions/awsCommands.js +6 -1
  33. package/dist/commands/stepfunctions/awsCommands.js.map +1 -1
  34. package/dist/commands/stepfunctions/helpers.d.ts +12 -5
  35. package/dist/commands/stepfunctions/helpers.js +140 -66
  36. package/dist/commands/stepfunctions/helpers.js.map +1 -1
  37. package/dist/commands/synthetics/api.d.ts +1 -0
  38. package/dist/commands/synthetics/api.js +6 -5
  39. package/dist/commands/synthetics/api.js.map +1 -1
  40. package/dist/commands/synthetics/batch.d.ts +3 -1
  41. package/dist/commands/synthetics/batch.js +85 -26
  42. package/dist/commands/synthetics/batch.js.map +1 -1
  43. package/dist/commands/synthetics/compatibility.d.ts +1 -1
  44. package/dist/commands/synthetics/compatibility.js +7 -2
  45. package/dist/commands/synthetics/compatibility.js.map +1 -1
  46. package/dist/commands/synthetics/interfaces.d.ts +22 -11
  47. package/dist/commands/synthetics/interfaces.js.map +1 -1
  48. package/dist/commands/synthetics/reporters/default.d.ts +1 -0
  49. package/dist/commands/synthetics/reporters/default.js +42 -20
  50. package/dist/commands/synthetics/reporters/default.js.map +1 -1
  51. package/dist/commands/synthetics/reporters/junit.d.ts +2 -2
  52. package/dist/commands/synthetics/reporters/junit.js +31 -18
  53. package/dist/commands/synthetics/reporters/junit.js.map +1 -1
  54. package/dist/commands/synthetics/run-tests-command.d.ts +1 -1
  55. package/dist/commands/synthetics/run-tests-command.js +41 -26
  56. package/dist/commands/synthetics/run-tests-command.js.map +1 -1
  57. package/dist/commands/synthetics/run-tests-lib.js +1 -1
  58. package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
  59. package/dist/commands/synthetics/utils/internal.d.ts +21 -8
  60. package/dist/commands/synthetics/utils/internal.js +35 -16
  61. package/dist/commands/synthetics/utils/internal.js.map +1 -1
  62. package/dist/commands/synthetics/utils/public.d.ts +4 -1
  63. package/dist/commands/synthetics/utils/public.js +8 -4
  64. package/dist/commands/synthetics/utils/public.js.map +1 -1
  65. package/dist/commands/tag/tag.d.ts +2 -0
  66. package/dist/commands/tag/tag.js +17 -3
  67. package/dist/commands/tag/tag.js.map +1 -1
  68. package/dist/helpers/ci.d.ts +2 -0
  69. package/dist/helpers/ci.js +10 -5
  70. package/dist/helpers/ci.js.map +1 -1
  71. package/dist/helpers/interfaces.d.ts +2 -2
  72. package/dist/helpers/tags.d.ts +23 -1
  73. package/dist/helpers/tags.js +101 -2
  74. package/dist/helpers/tags.js.map +1 -1
  75. package/dist/helpers/utils.d.ts +11 -1
  76. package/dist/helpers/utils.js +5 -11
  77. package/dist/helpers/utils.js.map +1 -1
  78. package/package.json +3 -8
@@ -57,6 +57,18 @@ const checkForError = (filePath) => {
57
57
  }
58
58
  }
59
59
  }
60
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
61
+ if ('tool' in run && 'extensions' in run['tool']) {
62
+ for (const extension of run['tool']['extensions']) {
63
+ if ('rules' in extension) {
64
+ for (const rule of extension['rules']) {
65
+ if ('id' in rule) {
66
+ rules.push(rule['id']);
67
+ }
68
+ }
69
+ }
70
+ }
71
+ }
60
72
  if ('results' in run) {
61
73
  for (const result of run['results']) {
62
74
  if (!('ruleId' in result)) {
@@ -1 +1 @@
1
- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sarif/validation.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAInB,8CAAqB;AACrB,8DAAoC;AAEpC,oGAAmE;AAEnE;;;;GAIG;AACI,MAAM,aAAa,GAAG,CAAC,eAAuB,EAAE,EAAE;IACvD,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAA;IACtC,IAAA,qBAAU,EAAC,GAAG,CAAC,CAAA;IACf,MAAM,uBAAuB,GAAG,GAAG,CAAC,OAAO,CAAC,iCAAe,CAAC,CAAA;IAC5D,IAAI;QACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAE,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QAC/E,MAAM,KAAK,GAAG,uBAAuB,CAAC,kBAAkB,CAAC,CAAA;QACzD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,MAAM,GAAG,uBAAuB,CAAC,MAAM,IAAI,EAAE,CAAA;YACnD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAkB,EAAE,EAAE;gBACtD,OAAO,GAAG,KAAK,CAAC,YAAY,KAAK,KAAK,CAAC,OAAO,EAAE,CAAA;YAClD,CAAC,CAAC,CAAA;YAEF,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAChC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,KAAK,CAAC,OAAO,CAAA;KACrB;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AApBY,QAAA,aAAa,iBAoBzB;AAED;;;;;;;GAOG;AACI,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAY,EAAE;IAC1D,MAAM,MAAM,GAAQ,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;IACjE,MAAM,GAAG,GAAa,EAAE,CAAA;IAExB,IAAI,MAAM,IAAI,MAAM,EAAE;QACpB,sEAAsE;QACtE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE;YAChC,MAAM,KAAK,GAAa,EAAE,CAAA;YAC1B,sEAAsE;YACtE,IAAI,MAAM,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE;gBAChF,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE;oBACjD,IAAI,IAAI,IAAI,IAAI,EAAE;wBAChB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;qBACvB;iBACF;aACF;YAED,IAAI,SAAS,IAAI,GAAG,EAAE;gBACpB,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,SAAS,CAAC,EAAE;oBACnC,IAAI,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,EAAE;wBACzB,GAAG,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAA;wBACzC,SAAQ;qBACT;oBACD,8GAA8G;oBAC9G,MAAM,MAAM,GAAW,MAAM,CAAC,QAAQ,CAAC,CAAA;oBACvC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;wBAChC,GAAG,CAAC,IAAI,CAAC,0BAA0B,MAAM,yCAAyC,CAAC,CAAA;qBACpF;iBACF;aACF;SACF;KACF;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAlCY,QAAA,aAAa,iBAkCzB"}
1
+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/sarif/validation.ts"],"names":[],"mappings":"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"}
@@ -1 +1,4 @@
1
1
  export declare const API_ENDPOINT = "api/v2/static-analysis-sca/dependencies";
2
+ export declare const PACKAGE_MANAGER_PROPERTY_KEY = "osv-scanner:package-manager";
3
+ export declare const IS_DEPENDENCY_DIRECT_PROPERTY_KEY = "osv-scanner:is-direct";
4
+ export declare const FILE_PACKAGE_PROPERTY_KEY = "osv-scanner:package";
@@ -1,5 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.API_ENDPOINT = void 0;
3
+ exports.FILE_PACKAGE_PROPERTY_KEY = exports.IS_DEPENDENCY_DIRECT_PROPERTY_KEY = exports.PACKAGE_MANAGER_PROPERTY_KEY = exports.API_ENDPOINT = void 0;
4
4
  exports.API_ENDPOINT = 'api/v2/static-analysis-sca/dependencies';
5
+ exports.PACKAGE_MANAGER_PROPERTY_KEY = 'osv-scanner:package-manager';
6
+ exports.IS_DEPENDENCY_DIRECT_PROPERTY_KEY = 'osv-scanner:is-direct';
7
+ exports.FILE_PACKAGE_PROPERTY_KEY = 'osv-scanner:package';
5
8
  //# sourceMappingURL=constants.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/sbom/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,yCAAyC,CAAA"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/sbom/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,yCAAyC,CAAA;AAExD,QAAA,4BAA4B,GAAG,6BAA6B,CAAA;AAC5D,QAAA,iCAAiC,GAAG,uBAAuB,CAAA;AAC3D,QAAA,yBAAyB,GAAG,qBAAqB,CAAA"}
@@ -30,6 +30,7 @@ exports.generatePayload = void 0;
30
30
  const console = __importStar(require("console"));
31
31
  const crypto_1 = __importDefault(require("crypto"));
32
32
  const tags_1 = require("../../helpers/tags");
33
+ const constants_1 = require("./constants");
33
34
  const language_1 = require("./language");
34
35
  // Parse a location from the file generated by osv-scanner into a location that can be
35
36
  // sent to our API.
@@ -93,59 +94,39 @@ const parseLocationsString = (locations) => {
93
94
  const generatePayload = (jsonContent, tags, service, env) => {
94
95
  if (!tags[tags_1.GIT_COMMIT_AUTHOR_EMAIL] ||
95
96
  !tags[tags_1.GIT_COMMIT_AUTHOR_NAME] ||
97
+ !tags[tags_1.GIT_COMMIT_COMMITTER_EMAIL] ||
98
+ !tags[tags_1.GIT_COMMIT_COMMITTER_NAME] ||
96
99
  !tags[tags_1.GIT_SHA] ||
97
100
  !tags[tags_1.GIT_BRANCH] ||
98
101
  !tags[tags_1.GIT_REPOSITORY_URL]) {
99
102
  return undefined;
100
103
  }
101
104
  const dependencies = [];
105
+ const files = [];
106
+ const relations = [];
102
107
  if (jsonContent) {
103
108
  if (jsonContent['components']) {
104
109
  for (const component of jsonContent['components']) {
105
110
  if (!component['type'] || !component['name']) {
106
111
  continue;
107
112
  }
108
- if (component['type'] !== 'library') {
109
- continue;
113
+ if (component['type'] === 'library') {
114
+ const dependency = extractingDependency(component);
115
+ if (dependency !== undefined) {
116
+ dependencies.push(dependency);
117
+ }
110
118
  }
111
- const lang = (0, language_1.getLanguageFromComponent)(component);
112
- if (!lang) {
113
- continue;
119
+ else if (component['type'] === 'file') {
120
+ files.push(extractingFile(component));
114
121
  }
115
- const purl = component['purl'];
116
- if (!purl) {
117
- console.error(`cannot find purl for component ${component['name']}`);
122
+ }
123
+ }
124
+ if (jsonContent['dependencies']) {
125
+ for (const dependency of jsonContent['dependencies']) {
126
+ if (!dependency['ref'] || !dependency['dependsOn']) {
118
127
  continue;
119
128
  }
120
- const locations = [];
121
- // Extract the unique location strings from the file.
122
- const locationsStrings = new Set();
123
- if (component['evidence'] && component['evidence']['occurrences']) {
124
- for (const occ of component['evidence']['occurrences']) {
125
- if (occ['location']) {
126
- const loc = occ['location'];
127
- if (!locationsStrings.has(loc)) {
128
- locationsStrings.add(loc);
129
- }
130
- }
131
- }
132
- }
133
- for (const l of locationsStrings) {
134
- const loc = parseLocationsString(l);
135
- if (loc) {
136
- locations.push(loc);
137
- }
138
- }
139
- const dependency = {
140
- name: component['name'],
141
- group: component['group'] || undefined,
142
- version: component['version'] || undefined,
143
- language: lang,
144
- licenses: [],
145
- purl,
146
- locations,
147
- };
148
- dependencies.push(dependency);
129
+ relations.push(extractingRelations(dependency));
149
130
  }
150
131
  }
151
132
  }
@@ -154,6 +135,8 @@ const generatePayload = (jsonContent, tags, service, env) => {
154
135
  commit: {
155
136
  author_name: tags[tags_1.GIT_COMMIT_AUTHOR_NAME],
156
137
  author_email: tags[tags_1.GIT_COMMIT_AUTHOR_EMAIL],
138
+ committer_name: tags[tags_1.GIT_COMMIT_COMMITTER_NAME],
139
+ committer_email: tags[tags_1.GIT_COMMIT_COMMITTER_EMAIL],
157
140
  sha: tags[tags_1.GIT_SHA],
158
141
  branch: tags[tags_1.GIT_BRANCH],
159
142
  },
@@ -162,9 +145,83 @@ const generatePayload = (jsonContent, tags, service, env) => {
162
145
  },
163
146
  tags,
164
147
  dependencies,
148
+ files,
149
+ relations,
165
150
  service,
166
151
  env,
167
152
  };
168
153
  };
169
154
  exports.generatePayload = generatePayload;
155
+ const extractingDependency = (component) => {
156
+ var _a;
157
+ const lang = (0, language_1.getLanguageFromComponent)(component);
158
+ if (!lang) {
159
+ return;
160
+ }
161
+ const purl = component['purl'];
162
+ if (!purl) {
163
+ console.error(`cannot find purl for component ${component['name']}`);
164
+ return;
165
+ }
166
+ const locations = [];
167
+ // Extract the unique location strings from the file.
168
+ const locationsStrings = new Set();
169
+ if (component['evidence'] && component['evidence']['occurrences']) {
170
+ for (const occ of component['evidence']['occurrences']) {
171
+ if (occ['location']) {
172
+ const loc = occ['location'];
173
+ if (!locationsStrings.has(loc)) {
174
+ locationsStrings.add(loc);
175
+ }
176
+ }
177
+ }
178
+ }
179
+ for (const l of locationsStrings) {
180
+ const loc = parseLocationsString(l);
181
+ if (loc) {
182
+ locations.push(loc);
183
+ }
184
+ }
185
+ let packageManager = '';
186
+ let isDirect;
187
+ for (const property of (_a = component['properties']) !== null && _a !== void 0 ? _a : []) {
188
+ if (property['name'] === constants_1.PACKAGE_MANAGER_PROPERTY_KEY) {
189
+ packageManager = property['value'];
190
+ }
191
+ else if (property['name'] === constants_1.IS_DEPENDENCY_DIRECT_PROPERTY_KEY) {
192
+ isDirect = property['value'].toLowerCase() === 'true' ? true : undefined;
193
+ }
194
+ }
195
+ const dependency = {
196
+ name: component['name'],
197
+ group: component['group'] || undefined,
198
+ version: component['version'] || undefined,
199
+ language: lang,
200
+ licenses: [],
201
+ purl,
202
+ locations,
203
+ is_direct: isDirect,
204
+ package_manager: packageManager,
205
+ };
206
+ return dependency;
207
+ };
208
+ const extractingFile = (component) => {
209
+ var _a;
210
+ let purl;
211
+ for (const property of (_a = component['properties']) !== null && _a !== void 0 ? _a : []) {
212
+ if (property['name'] === constants_1.FILE_PACKAGE_PROPERTY_KEY) {
213
+ purl = property['value'];
214
+ }
215
+ }
216
+ return {
217
+ name: component['name'],
218
+ purl,
219
+ };
220
+ };
221
+ const extractingRelations = (dependency) => {
222
+ return {
223
+ component_ref: dependency['ref'],
224
+ depends_on: dependency['dependsOn'],
225
+ };
226
+ };
170
227
  //# sourceMappingURL=payload.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/commands/sbom/payload.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ export declare const renderInvalidFile: (sbomReport: string) => string;
2
2
  export declare const renderInvalidPayload: (sbomReport: string) => string;
3
3
  export declare const renderMissingSpan: (errorMessage: string) => string;
4
4
  export declare const renderDuplicateUpload: (sha: string, env: string, service: string) => string;
5
+ export declare const renderNoDefaultBranch: (repositoryUrl: string) => string;
5
6
  export declare const renderFailedUpload: (sbomReport: string, error: any) => string;
6
7
  export declare const renderUploading: (sbomReport: string) => string;
7
- export declare const renderSuccessfulCommand: (fileCount: number, duration: number) => string;
8
+ export declare const renderSuccessfulCommand: (duration: number) => string;
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.renderSuccessfulCommand = exports.renderUploading = exports.renderFailedUpload = exports.renderDuplicateUpload = exports.renderMissingSpan = exports.renderInvalidPayload = exports.renderInvalidFile = void 0;
6
+ exports.renderSuccessfulCommand = exports.renderUploading = exports.renderFailedUpload = exports.renderNoDefaultBranch = exports.renderDuplicateUpload = exports.renderMissingSpan = exports.renderInvalidPayload = exports.renderInvalidFile = void 0;
7
7
  const chalk_1 = __importDefault(require("chalk"));
8
8
  const utils_1 = require("../junit/utils");
9
9
  const ICONS = {
@@ -22,7 +22,10 @@ const renderInvalidFile = (sbomReport) => {
22
22
  exports.renderInvalidFile = renderInvalidFile;
23
23
  const renderInvalidPayload = (sbomReport) => {
24
24
  const reportPath = `[${chalk_1.default.bold.dim(sbomReport)}]`;
25
- return chalk_1.default.red(`Cannot generate payload for file ${reportPath}.\n`);
25
+ let fullStr = '';
26
+ fullStr += chalk_1.default.red(`Cannot generate payload for file ${reportPath}.\n`);
27
+ fullStr += chalk_1.default.red(`Make sure you run the command inside a git repository and the SBOM file is valid\n`);
28
+ return fullStr;
26
29
  };
27
30
  exports.renderInvalidPayload = renderInvalidPayload;
28
31
  const renderMissingSpan = (errorMessage) => {
@@ -43,6 +46,16 @@ const renderDuplicateUpload = (sha, env, service) => {
43
46
  return fullStr;
44
47
  };
45
48
  exports.renderDuplicateUpload = renderDuplicateUpload;
49
+ const renderNoDefaultBranch = (repositoryUrl) => {
50
+ let fullStr = '';
51
+ fullStr += chalk_1.default.red(`Default branch not found for repository ${repositoryUrl}\n`);
52
+ fullStr += chalk_1.default.red(`Fix this issue by either:\n`);
53
+ fullStr += chalk_1.default.red(` - define a default branch in the repository settings on Datadog\n`);
54
+ fullStr += chalk_1.default.red(` - push result from your default branch first\n\n`);
55
+ fullStr += chalk_1.default.red(`Run an analysis once the issue is resolved\n`);
56
+ return fullStr;
57
+ };
58
+ exports.renderNoDefaultBranch = renderNoDefaultBranch;
46
59
  const renderFailedUpload = (sbomReport, error) => {
47
60
  var _a;
48
61
  const reportPath = `[${chalk_1.default.bold.dim(sbomReport)}]`;
@@ -56,9 +69,9 @@ const renderFailedUpload = (sbomReport, error) => {
56
69
  exports.renderFailedUpload = renderFailedUpload;
57
70
  const renderUploading = (sbomReport) => `Uploading SBOM report in ${sbomReport}\n`;
58
71
  exports.renderUploading = renderUploading;
59
- const renderSuccessfulCommand = (fileCount, duration) => {
72
+ const renderSuccessfulCommand = (duration) => {
60
73
  let fullStr = '';
61
- fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded ${fileCount} files in ${duration} seconds.\n`);
74
+ fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded file in ${duration} seconds.\n`);
62
75
  fullStr += chalk_1.default.green(`${ICONS.INFO} Results available on ${(0, utils_1.getBaseUrl)()}ci/code-analysis\n`);
63
76
  fullStr += chalk_1.default.green('=================================================================================================\n');
64
77
  return fullStr;
@@ -1 +1 @@
1
- {"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,0CAAyC;AAEzC,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,IAAI;CACX,CAAA;AAEM,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACtD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,6BAA6B,UAAU,KAAK,CAAC,CAAA;IACjF,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAA;IAElG,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AARY,QAAA,iBAAiB,qBAQ7B;AAEM,MAAM,oBAAoB,GAAG,CAAC,UAAkB,EAAE,EAAE;IACzD,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,OAAO,eAAK,CAAC,GAAG,CAAC,oCAAoC,UAAU,KAAK,CAAC,CAAA;AACvE,CAAC,CAAA;AAJY,QAAA,oBAAoB,wBAIhC;AAEM,MAAM,iBAAiB,GAAG,CAAC,YAAoB,EAAE,EAAE;IACxD,MAAM,WAAW,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAA;IAExD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,wBAAwB,YAAY,KAAK,CAAC,CAAA;IAClF,OAAO,IAAI,eAAK,CAAC,MAAM,CACrB,yBAAyB,WAAW,4DAA4D,CACjG,CAAA;IACD,OAAO,IAAI,eAAK,CAAC,MAAM,CAAC,kEAAkE,CAAC,CAAA;IAE3F,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAXY,QAAA,iBAAiB,qBAW7B;AAEM,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,OAAe,EAAE,EAAE;IACjF,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,oCAAoC,CAAC,CAAA;IAC1E,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,kDAAkD,GAAG,QAAQ,GAAG,YAAY,OAAO,IAAI,CAAC,CAAA;IAC7G,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAA;IAC1F,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;IAE7C,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AARY,QAAA,qBAAqB,yBAQjC;AAEM,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,KAAU,EAAE,EAAE;;IACnE,MAAM,UAAU,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAA;IAEpD,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,6BAA6B,UAAU,KAAK,KAAK,CAAC,OAAO,IAAI,CAAC,CAAA;IAClG,IAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,MAAM,EAAE;QAC3B,OAAO,IAAI,eAAK,CAAC,GAAG,CAAC,oBAAoB,KAAK,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAA;KACpE;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAVY,QAAA,kBAAkB,sBAU9B;AAEM,MAAM,eAAe,GAAG,CAAC,UAAkB,EAAU,EAAE,CAAC,4BAA4B,UAAU,IAAI,CAAA;AAA5F,QAAA,eAAe,mBAA6E;AAElG,MAAM,uBAAuB,GAAG,CAAC,SAAiB,EAAE,QAAgB,EAAE,EAAE;IAC7E,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,aAAa,SAAS,aAAa,QAAQ,aAAa,CAAC,CAAA;IAChG,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,0BAA0B,IAAA,kBAAU,GAAE,oBAAoB,CAAC,CAAA;IAC/F,OAAO,IAAI,eAAK,CAAC,KAAK,CACpB,qGAAqG,CACtG,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AATY,QAAA,uBAAuB,2BASnC"}
1
+ {"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sbom/renderer.ts"],"names":[],"mappings":"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"}
@@ -68,6 +68,10 @@ export interface Locations {
68
68
  name: undefined | Location;
69
69
  version: undefined | Location;
70
70
  }
71
+ export interface Property {
72
+ name: string;
73
+ value: string;
74
+ }
71
75
  export interface Dependency {
72
76
  name: string;
73
77
  version: undefined | string;
@@ -76,21 +80,35 @@ export interface Dependency {
76
80
  licenses: DependencyLicense[];
77
81
  purl: string;
78
82
  locations: undefined | Locations[];
83
+ is_direct: undefined | boolean;
84
+ package_manager: string;
79
85
  }
80
86
  export interface CommitInformation {
81
87
  author_name: string;
82
88
  author_email: string;
89
+ committer_name: string;
90
+ committer_email: string;
83
91
  sha: string;
84
92
  branch: string;
85
93
  }
86
94
  export interface RepositoryInformation {
87
95
  url: string;
88
96
  }
97
+ export interface File {
98
+ name: string;
99
+ purl: string | undefined;
100
+ }
101
+ export interface Relations {
102
+ component_ref: string;
103
+ depends_on: string[];
104
+ }
89
105
  export interface ScaRequest {
90
106
  id: string;
91
107
  commit: CommitInformation;
92
108
  repository: RepositoryInformation;
93
109
  dependencies: Dependency[];
110
+ files: File[];
111
+ relations: Relations[];
94
112
  service: string;
95
113
  env: string;
96
114
  tags: Record<string, string>;
@@ -2,7 +2,7 @@ import { Command } from 'clipanion';
2
2
  export declare class UploadSbomCommand extends Command {
3
3
  static paths: string[][];
4
4
  static usage: import("clipanion").Usage;
5
- private basePaths;
5
+ private basePath;
6
6
  private service;
7
7
  private env;
8
8
  private tags;
@@ -25,7 +25,7 @@ const validation_1 = require("./validation");
25
25
  class UploadSbomCommand extends clipanion_1.Command {
26
26
  constructor() {
27
27
  super(...arguments);
28
- this.basePaths = clipanion_1.Option.Rest({ required: 1 });
28
+ this.basePath = clipanion_1.Option.String();
29
29
  this.service = clipanion_1.Option.String('--service', 'datadog-ci');
30
30
  this.env = clipanion_1.Option.String('--env', 'ci');
31
31
  this.tags = clipanion_1.Option.Array('--tags');
@@ -43,11 +43,11 @@ class UploadSbomCommand extends clipanion_1.Command {
43
43
  * compliant with their schema and upload them to datadog.
44
44
  */
45
45
  execute() {
46
- var _a;
46
+ var _a, _b;
47
47
  return __awaiter(this, void 0, void 0, function* () {
48
48
  const service = this.service;
49
49
  const environment = this.env;
50
- if (!this.basePaths || !this.basePaths.length) {
50
+ if (!this.basePath || !this.basePath.length) {
51
51
  this.context.stderr.write('Missing basePath\n');
52
52
  return 1;
53
53
  }
@@ -71,47 +71,51 @@ class UploadSbomCommand extends clipanion_1.Command {
71
71
  }
72
72
  const validator = (0, validation_1.getValidator)();
73
73
  const startTimeMs = Date.now();
74
- for (const basePath of this.basePaths) {
75
- if (this.debug) {
76
- this.context.stdout.write(`Processing file ${basePath}\n`);
74
+ const basePath = this.basePath;
75
+ if (this.debug) {
76
+ this.context.stdout.write(`Processing file ${basePath}\n`);
77
+ }
78
+ if (!(0, validation_1.validateSbomFileAgainstSchema)(basePath, validator, !!this.debug)) {
79
+ if (!(0, validation_1.validateFileAgainstToolRequirements)(basePath, !!this.debug)) {
80
+ this.context.stdout.write((0, renderer_1.renderInvalidFile)(basePath));
81
+ return 1;
77
82
  }
78
- if (!(0, validation_1.validateSbomFileAgainstSchema)(basePath, validator, !!this.debug)) {
79
- if (!(0, validation_1.validateFileAgainstToolRequirements)(basePath, !!this.debug)) {
80
- this.context.stdout.write((0, renderer_1.renderInvalidFile)(basePath));
81
- return 1;
82
- }
83
- else {
84
- this.context.stdout.write('Invalid SBOM file but enough data to be processed (use --debug to get validation error)\n');
85
- }
83
+ else {
84
+ this.context.stdout.write('Invalid SBOM file but enough data to be processed (use --debug to get validation error)\n');
86
85
  }
87
- const jsonContent = JSON.parse(fs_1.default.readFileSync(basePath).toString('utf8'));
88
- // Upload content
89
- try {
90
- const scaPayload = (0, payload_1.generatePayload)(jsonContent, tags, service, environment);
91
- if (!scaPayload) {
92
- this.context.stdout.write((0, renderer_1.renderInvalidPayload)(basePath));
93
- continue;
94
- }
95
- this.context.stdout.write((0, renderer_1.renderUploading)(basePath));
96
- yield api(scaPayload);
97
- if (this.debug) {
98
- this.context.stdout.write(`Upload done for ${basePath}.\n`);
99
- }
86
+ }
87
+ const jsonContent = JSON.parse(fs_1.default.readFileSync(basePath).toString('utf8'));
88
+ // Upload content
89
+ try {
90
+ const scaPayload = (0, payload_1.generatePayload)(jsonContent, tags, service, environment);
91
+ if (!scaPayload) {
92
+ this.context.stdout.write((0, renderer_1.renderInvalidPayload)(basePath));
93
+ return 1;
94
+ }
95
+ this.context.stdout.write((0, renderer_1.renderUploading)(basePath));
96
+ yield api(scaPayload);
97
+ if (this.debug) {
98
+ this.context.stdout.write(`Upload done for ${basePath}.\n`);
100
99
  }
101
- catch (error) {
102
- if ((0, axios_1.isAxiosError)(error)) {
103
- if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 409) {
104
- const sha = tags[tags_1.GIT_SHA] || 'sha-not-found';
105
- this.context.stderr.write((0, renderer_1.renderDuplicateUpload)(sha, environment, service));
106
- return 0;
107
- }
100
+ }
101
+ catch (error) {
102
+ if ((0, axios_1.isAxiosError)(error)) {
103
+ if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 409) {
104
+ const sha = tags[tags_1.GIT_SHA] || 'sha-not-found';
105
+ this.context.stderr.write((0, renderer_1.renderDuplicateUpload)(sha, environment, service));
106
+ return 0;
107
+ }
108
+ if (((_b = error.response) === null || _b === void 0 ? void 0 : _b.status) === 412) {
109
+ const repositoryUrl = tags[tags_1.GIT_REPOSITORY_URL] || 'url-not-found';
110
+ this.context.stderr.write((0, renderer_1.renderNoDefaultBranch)(repositoryUrl));
111
+ return 1;
108
112
  }
109
- this.context.stderr.write((0, renderer_1.renderFailedUpload)(basePath, error));
110
- return 1;
111
113
  }
114
+ this.context.stderr.write((0, renderer_1.renderFailedUpload)(basePath, error));
115
+ return 1;
112
116
  }
113
117
  const uploadTimeMs = (Date.now() - startTimeMs) / 1000;
114
- this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(this.basePaths.length, uploadTimeMs));
118
+ this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(uploadTimeMs));
115
119
  return 0;
116
120
  });
117
121
  }
@@ -1 +1 @@
1
- {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
@@ -133,7 +133,12 @@ const createLogsAccessPolicy = (iamClient, describeStateMachineCommandOutput, st
133
133
  exports.createLogsAccessPolicy = createLogsAccessPolicy;
134
134
  const attachPolicyToStateMachineIamRole = (iamClient, describeStateMachineCommandOutput, accountId, stepFunctionArn, context, dryRun) => __awaiter(void 0, void 0, void 0, function* () {
135
135
  var _a;
136
- const roleName = (_a = describeStateMachineCommandOutput === null || describeStateMachineCommandOutput === void 0 ? void 0 : describeStateMachineCommandOutput.roleArn) === null || _a === void 0 ? void 0 : _a.split('/')[1];
136
+ const splitRoleArnList = (_a = describeStateMachineCommandOutput === null || describeStateMachineCommandOutput === void 0 ? void 0 : describeStateMachineCommandOutput.roleArn) === null || _a === void 0 ? void 0 : _a.split('/');
137
+ if (splitRoleArnList === undefined) {
138
+ throw Error(`Unexpected roleArn ${describeStateMachineCommandOutput === null || describeStateMachineCommandOutput === void 0 ? void 0 : describeStateMachineCommandOutput.roleArn} for the describeStateMachineCommandOutput ${describeStateMachineCommandOutput}`);
139
+ }
140
+ // `arn:aws:iam::<accountId>:role/<name>` or `arn:aws:iam::<accountId>:role/service-role/<name>`
141
+ const roleName = splitRoleArnList[splitRoleArnList.length - 1];
137
142
  const policyArn = `arn:aws:iam::${accountId}:policy/${(0, helpers_1.buildLogAccessPolicyName)(describeStateMachineCommandOutput)}`;
138
143
  const input = {
139
144
  PolicyArn: policyArn,
@@ -1 +1 @@
1
- {"version":3,"file":"awsCommands.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/awsCommands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"awsCommands.js","sourceRoot":"","sources":["../../../src/commands/stepfunctions/awsCommands.ts"],"names":[],"mappings":"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"}
@@ -15,10 +15,6 @@ export declare const parseArn: (arn: string) => {
15
15
  };
16
16
  export declare const buildLogAccessPolicyName: (stepFunction: DescribeStateMachineCommandOutput) => string;
17
17
  export declare const injectContextIntoTasks: (describeStateMachineCommandOutput: DescribeStateMachineCommandOutput, stepFunctionsClient: SFNClient, context: BaseContext, dryRun: boolean) => Promise<void>;
18
- export declare const addTraceContextToLambdaParameters: ({ Parameters }: StepType) => void;
19
- export declare const addTraceContextToStepFunctionParameters: ({ Parameters }: StepType) => void;
20
- export declare const shouldUpdateStepForTracesMerging: (step: StepType) => boolean;
21
- export declare const shouldUpdateStepForStepFunctionContextInjection: (step: StepType) => boolean;
22
18
  export type StateMachineDefinitionType = {
23
19
  Comment?: string;
24
20
  StartAt?: string;
@@ -32,13 +28,24 @@ export type StepType = {
32
28
  Next?: string;
33
29
  End?: boolean;
34
30
  };
31
+ export type PayloadObject = {
32
+ 'Execution.$'?: any;
33
+ Execution?: any;
34
+ 'State.$'?: any;
35
+ State?: any;
36
+ 'StateMachine.$'?: any;
37
+ StateMachine?: any;
38
+ };
35
39
  export type ParametersType = {
36
40
  'Payload.$'?: string;
41
+ Payload?: string | PayloadObject;
37
42
  FunctionName?: string;
38
43
  StateMachineArn?: string;
39
44
  TableName?: string;
40
45
  Input?: {
41
46
  'CONTEXT.$'?: string;
47
+ CONTEXT?: string;
42
48
  };
43
49
  };
44
- export declare const injectContextForStepFunctions: (step: StepType) => boolean;
50
+ export declare const injectContextForLambdaFunctions: (step: StepType, context: BaseContext, stepName: string) => boolean;
51
+ export declare const injectContextForStepFunctions: (step: StepType, context: BaseContext, stepName: string) => boolean;