@datadog/datadog-ci 3.1.0 → 3.3.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 (168) hide show
  1. package/README.md +3 -0
  2. package/dist/__tests__/cli.test.js +1 -0
  3. package/dist/__tests__/cli.test.js.map +1 -1
  4. package/dist/commands/coverage/__tests__/upload.test.js +48 -80
  5. package/dist/commands/coverage/__tests__/upload.test.js.map +1 -1
  6. package/dist/commands/coverage/__tests__/utils.test.js +4 -14
  7. package/dist/commands/coverage/__tests__/utils.test.js.map +1 -1
  8. package/dist/commands/coverage/renderer.d.ts +0 -2
  9. package/dist/commands/coverage/renderer.js +1 -9
  10. package/dist/commands/coverage/renderer.js.map +1 -1
  11. package/dist/commands/coverage/upload.d.ts +2 -3
  12. package/dist/commands/coverage/upload.js +29 -88
  13. package/dist/commands/coverage/upload.js.map +1 -1
  14. package/dist/commands/coverage/utils.d.ts +0 -1
  15. package/dist/commands/coverage/utils.js +11 -35
  16. package/dist/commands/coverage/utils.js.map +1 -1
  17. package/dist/commands/elf-symbols/__tests__/elf.test.js +12 -9
  18. package/dist/commands/elf-symbols/__tests__/elf.test.js.map +1 -1
  19. package/dist/commands/elf-symbols/__tests__/upload.test.js +9 -5
  20. package/dist/commands/elf-symbols/__tests__/upload.test.js.map +1 -1
  21. package/dist/commands/elf-symbols/elf.d.ts +2 -11
  22. package/dist/commands/elf-symbols/elf.js +52 -68
  23. package/dist/commands/elf-symbols/elf.js.map +1 -1
  24. package/dist/commands/elf-symbols/upload.js +3 -3
  25. package/dist/commands/elf-symbols/upload.js.map +1 -1
  26. package/dist/commands/junit/__tests__/upload.test.js +114 -65
  27. package/dist/commands/junit/__tests__/upload.test.js.map +1 -1
  28. package/dist/commands/junit/renderer.d.ts +2 -2
  29. package/dist/commands/junit/renderer.js +3 -1
  30. package/dist/commands/junit/renderer.js.map +1 -1
  31. package/dist/commands/junit/upload.d.ts +2 -0
  32. package/dist/commands/junit/upload.js +41 -37
  33. package/dist/commands/junit/upload.js.map +1 -1
  34. package/dist/commands/junit/utils.d.ts +0 -1
  35. package/dist/commands/junit/utils.js +1 -11
  36. package/dist/commands/junit/utils.js.map +1 -1
  37. package/dist/commands/pe-symbols/__tests__/pe.test.d.ts +1 -0
  38. package/dist/commands/pe-symbols/__tests__/pe.test.js +81 -0
  39. package/dist/commands/pe-symbols/__tests__/pe.test.js.map +1 -0
  40. package/dist/commands/pe-symbols/cli.d.ts +1 -0
  41. package/dist/commands/pe-symbols/cli.js +5 -0
  42. package/dist/commands/pe-symbols/cli.js.map +1 -0
  43. package/dist/commands/pe-symbols/helpers.d.ts +4 -0
  44. package/dist/commands/pe-symbols/helpers.js +30 -0
  45. package/dist/commands/pe-symbols/helpers.js.map +1 -0
  46. package/dist/commands/pe-symbols/interfaces.d.ts +17 -0
  47. package/dist/commands/pe-symbols/interfaces.js +7 -0
  48. package/dist/commands/pe-symbols/interfaces.js.map +1 -0
  49. package/dist/commands/pe-symbols/pe-constants.d.ts +51 -0
  50. package/dist/commands/pe-symbols/pe-constants.js +160 -0
  51. package/dist/commands/pe-symbols/pe-constants.js.map +1 -0
  52. package/dist/commands/pe-symbols/pe.d.ts +35 -0
  53. package/dist/commands/pe-symbols/pe.js +248 -0
  54. package/dist/commands/pe-symbols/pe.js.map +1 -0
  55. package/dist/commands/pe-symbols/renderer.d.ts +19 -0
  56. package/dist/commands/pe-symbols/renderer.js +87 -0
  57. package/dist/commands/pe-symbols/renderer.js.map +1 -0
  58. package/dist/commands/pe-symbols/upload.d.ts +32 -0
  59. package/dist/commands/pe-symbols/upload.js +412 -0
  60. package/dist/commands/pe-symbols/upload.js.map +1 -0
  61. package/dist/commands/sarif/__tests__/upload.test.js +79 -6
  62. package/dist/commands/sarif/__tests__/upload.test.js.map +1 -1
  63. package/dist/commands/sarif/renderer.d.ts +1 -0
  64. package/dist/commands/sarif/renderer.js +4 -2
  65. package/dist/commands/sarif/renderer.js.map +1 -1
  66. package/dist/commands/sarif/upload.d.ts +1 -0
  67. package/dist/commands/sarif/upload.js +3 -2
  68. package/dist/commands/sarif/upload.js.map +1 -1
  69. package/dist/commands/sbom/__tests__/payload.test.js +157 -26
  70. package/dist/commands/sbom/__tests__/payload.test.js.map +1 -1
  71. package/dist/commands/sbom/constants.d.ts +2 -0
  72. package/dist/commands/sbom/constants.js +4 -1
  73. package/dist/commands/sbom/constants.js.map +1 -1
  74. package/dist/commands/sbom/payload.js +44 -0
  75. package/dist/commands/sbom/payload.js.map +1 -1
  76. package/dist/commands/sbom/types.d.ts +4 -0
  77. package/dist/commands/sbom/upload.d.ts +1 -0
  78. package/dist/commands/sbom/upload.js +3 -2
  79. package/dist/commands/sbom/upload.js.map +1 -1
  80. package/dist/commands/synthetics/__tests__/api.test.js +2 -2
  81. package/dist/commands/synthetics/__tests__/api.test.js.map +1 -1
  82. package/dist/commands/synthetics/__tests__/batch.test.js +38 -37
  83. package/dist/commands/synthetics/__tests__/batch.test.js.map +1 -1
  84. package/dist/commands/synthetics/__tests__/build-and-test.test.d.ts +1 -0
  85. package/dist/commands/synthetics/__tests__/build-and-test.test.js +133 -0
  86. package/dist/commands/synthetics/__tests__/build-and-test.test.js.map +1 -0
  87. package/dist/commands/synthetics/__tests__/cli.test.js +83 -47
  88. package/dist/commands/synthetics/__tests__/cli.test.js.map +1 -1
  89. package/dist/commands/synthetics/__tests__/deploy-tests-lib.test.js +2 -2
  90. package/dist/commands/synthetics/__tests__/deploy-tests-lib.test.js.map +1 -1
  91. package/dist/commands/synthetics/__tests__/import-tests-lib.test.js +4 -4
  92. package/dist/commands/synthetics/__tests__/import-tests-lib.test.js.map +1 -1
  93. package/dist/commands/synthetics/__tests__/multilocator.test.js +13 -3
  94. package/dist/commands/synthetics/__tests__/multilocator.test.js.map +1 -1
  95. package/dist/commands/synthetics/__tests__/test.test.js +6 -7
  96. package/dist/commands/synthetics/__tests__/test.test.js.map +1 -1
  97. package/dist/commands/synthetics/__tests__/tunnel/websocket.test.js +1 -1
  98. package/dist/commands/synthetics/__tests__/tunnel/websocket.test.js.map +1 -1
  99. package/dist/commands/synthetics/__tests__/utils/public.test.js +10 -9
  100. package/dist/commands/synthetics/__tests__/utils/public.test.js.map +1 -1
  101. package/dist/commands/synthetics/api.js +2 -2
  102. package/dist/commands/synthetics/api.js.map +1 -1
  103. package/dist/commands/synthetics/base-command.d.ts +29 -0
  104. package/dist/commands/synthetics/base-command.js +125 -0
  105. package/dist/commands/synthetics/base-command.js.map +1 -0
  106. package/dist/commands/synthetics/batch.d.ts +1 -0
  107. package/dist/commands/synthetics/batch.js +3 -3
  108. package/dist/commands/synthetics/batch.js.map +1 -1
  109. package/dist/commands/synthetics/build-and-test.d.ts +8 -0
  110. package/dist/commands/synthetics/build-and-test.js +102 -0
  111. package/dist/commands/synthetics/build-and-test.js.map +1 -0
  112. package/dist/commands/synthetics/deploy-tests-command.d.ts +8 -16
  113. package/dist/commands/synthetics/deploy-tests-command.js +19 -91
  114. package/dist/commands/synthetics/deploy-tests-command.js.map +1 -1
  115. package/dist/commands/synthetics/import-tests-command.d.ts +6 -14
  116. package/dist/commands/synthetics/import-tests-command.js +15 -83
  117. package/dist/commands/synthetics/import-tests-command.js.map +1 -1
  118. package/dist/commands/synthetics/index.d.ts +1 -1
  119. package/dist/commands/synthetics/index.js +6 -6
  120. package/dist/commands/synthetics/index.js.map +1 -1
  121. package/dist/commands/synthetics/interfaces.d.ts +5 -2
  122. package/dist/commands/synthetics/multilocator.d.ts +0 -1
  123. package/dist/commands/synthetics/multilocator.js +7 -17
  124. package/dist/commands/synthetics/multilocator.js.map +1 -1
  125. package/dist/commands/synthetics/run-tests-command.d.ts +12 -17
  126. package/dist/commands/synthetics/run-tests-command.js +133 -190
  127. package/dist/commands/synthetics/run-tests-command.js.map +1 -1
  128. package/dist/commands/synthetics/run-tests-lib.d.ts +1 -0
  129. package/dist/commands/synthetics/run-tests-lib.js +8 -4
  130. package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
  131. package/dist/commands/synthetics/test.d.ts +2 -0
  132. package/dist/commands/synthetics/test.js +9 -8
  133. package/dist/commands/synthetics/test.js.map +1 -1
  134. package/dist/commands/synthetics/upload-application-command.d.ts +6 -13
  135. package/dist/commands/synthetics/upload-application-command.js +22 -87
  136. package/dist/commands/synthetics/upload-application-command.js.map +1 -1
  137. package/dist/commands/synthetics/utils/internal.d.ts +2 -0
  138. package/dist/commands/synthetics/utils/internal.js +15 -1
  139. package/dist/commands/synthetics/utils/internal.js.map +1 -1
  140. package/dist/commands/synthetics/utils/public.js +1 -1
  141. package/dist/commands/synthetics/utils/public.js.map +1 -1
  142. package/dist/helpers/__tests__/ci.test.js +49 -0
  143. package/dist/helpers/__tests__/ci.test.js.map +1 -1
  144. package/dist/helpers/__tests__/tags.test.js +59 -0
  145. package/dist/helpers/__tests__/tags.test.js.map +1 -1
  146. package/dist/helpers/ci.d.ts +13 -0
  147. package/dist/helpers/ci.js +23 -1
  148. package/dist/helpers/ci.js.map +1 -1
  149. package/dist/helpers/file-finder.d.ts +17 -0
  150. package/dist/helpers/file-finder.js +138 -0
  151. package/dist/helpers/file-finder.js.map +1 -0
  152. package/dist/helpers/filereader.d.ts +21 -0
  153. package/dist/helpers/filereader.js +59 -0
  154. package/dist/helpers/filereader.js.map +1 -0
  155. package/dist/helpers/git/format-git-span-data.d.ts +1 -1
  156. package/dist/helpers/git/format-git-span-data.js +2 -2
  157. package/dist/helpers/git/format-git-span-data.js.map +1 -1
  158. package/dist/helpers/interfaces.d.ts +2 -1
  159. package/dist/helpers/prompt.d.ts +5 -3
  160. package/dist/helpers/prompt.js +14 -13
  161. package/dist/helpers/prompt.js.map +1 -1
  162. package/dist/helpers/tags.d.ts +1 -1
  163. package/dist/helpers/tags.js +4 -4
  164. package/dist/helpers/tags.js.map +1 -1
  165. package/dist/helpers/utils.d.ts +3 -0
  166. package/dist/helpers/utils.js +34 -1
  167. package/dist/helpers/utils.js.map +1 -1
  168. package/package.json +4 -3
package/dist/commands/sarif/renderer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sarif/renderer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sarif/renderer.ts"],"names":[],"mappings":"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"}
package/dist/commands/sarif/upload.d.ts CHANGED
@@ -8,6 +8,7 @@ export declare class UploadSarifReportCommand extends Command {
8
8
  private maxConcurrency;
9
9
  private serviceFromCli;
10
10
  private tags;
11
+ private gitPath;
11
12
  private noVerify;
12
13
  private noCiTags;
13
14
  private config;
package/dist/commands/sarif/upload.js CHANGED
@@ -63,6 +63,7 @@ class UploadSarifReportCommand extends clipanion_1.Command {
63
63
  this.maxConcurrency = clipanion_1.Option.String('--max-concurrency', '20', { validator: validation.isInteger() });
64
64
  this.serviceFromCli = clipanion_1.Option.String('--service');
65
65
  this.tags = clipanion_1.Option.Array('--tags');
66
+ this.gitPath = clipanion_1.Option.String('--git-repository');
66
67
  this.noVerify = clipanion_1.Option.Boolean('--no-verify', false);
67
68
  this.noCiTags = clipanion_1.Option.Boolean('--no-ci-tags', false);
68
69
  this.config = {
@@ -97,7 +98,7 @@ class UploadSarifReportCommand extends clipanion_1.Command {
97
98
  // Normalizing the basePath to resolve .. and .
98
99
  // Always using the posix version to avoid \ on Windows.
99
100
  this.basePaths = this.basePaths.map((basePath) => path_1.default.posix.normalize(basePath));
100
- const spanTags = yield (0, tags_1.getSpanTags)(this.config, this.tags, !this.noCiTags);
101
+ const spanTags = yield (0, tags_1.getSpanTags)(this.config, this.tags, !this.noCiTags, this.gitPath);
101
102
  // Gather any missing mandatory git fields to display to the user
102
103
  const missingGitFields = (0, tags_1.getMissingRequiredGitTags)(spanTags);
103
104
  if (missingGitFields.length > 0) {
@@ -112,7 +113,7 @@ class UploadSarifReportCommand extends clipanion_1.Command {
112
113
  const sha = spanTags[tags_1.GIT_SHA] || 'sha-not-found';
113
114
  const env = this.config.env || 'env-not-set';
114
115
  this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.basePaths, env, sha, this.maxConcurrency, this.dryRun, this.noVerify));
115
- const upload = (p) => this.uploadSarifReport(api, p);
116
+ const upload = (payload) => this.uploadSarifReport(api, payload);
116
117
  const initialTime = new Date().getTime();
117
118
  yield (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, payloads, upload);
118
119
  const totalTimeSeconds = (Date.now() - initialTime) / 1000;
package/dist/commands/sarif/upload.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sarif/upload.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sarif/upload.ts"],"names":[],"mappings":"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"}
package/dist/commands/sbom/__tests__/payload.test.js CHANGED
@@ -13,7 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const fs_1 = __importDefault(require("fs"));
16
+ const os_1 = __importDefault(require("os"));
17
+ const path_1 = __importDefault(require("path"));
18
+ const simple_git_1 = __importDefault(require("simple-git"));
16
19
  const tags_1 = require("../../../helpers/tags");
20
+ const constants_1 = require("../constants");
17
21
  const payload_1 = require("../payload");
18
22
  const types_1 = require("../types");
19
23
  describe('generation of payload', () => {
@@ -46,9 +50,11 @@ describe('generation of payload', () => {
46
50
  expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].version).toBe('1.3.0');
47
51
  expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].licenses.length).toBe(0);
48
52
  expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].language).toBe(types_1.DependencyLanguage.PHP);
53
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_NAME]).toBe('cyclonedx-php-composer');
54
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_VERSION]).toBe('in-dev');
49
55
  }));
50
- test('should correctly work with a CycloneDX 1.6 file', () => __awaiter(void 0, void 0, void 0, function* () {
51
- const sbomFile = './src/commands/sbom/__tests__/fixtures/cdxgen-cyclonedx1.6.json';
56
+ test('should succeed when called on a valid SBOM file for CycloneDX 1.5', () => __awaiter(void 0, void 0, void 0, function* () {
57
+ const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom.1.5.ok.json';
52
58
  const sbomContent = JSON.parse(fs_1.default.readFileSync(sbomFile).toString('utf8'));
53
59
  const config = {
54
60
  apiKey: undefined,
@@ -67,18 +73,44 @@ describe('generation of payload', () => {
67
73
  expect(payload === null || payload === void 0 ? void 0 : payload.commit.branch).toStrictEqual(expect.any(String));
68
74
  expect(payload === null || payload === void 0 ? void 0 : payload.repository.url).toContain('github.com');
69
75
  expect(payload === null || payload === void 0 ? void 0 : payload.repository.url).toContain('DataDog/datadog-ci');
70
- expect(payload === null || payload === void 0 ? void 0 : payload.dependencies).toHaveLength(2);
71
- expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].name).toBe('Flask');
72
- expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].version).toBe('3.0.0');
73
- expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].licenses).toHaveLength(0);
74
- expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].language).toBe(types_1.DependencyLanguage.PYTHON);
75
- expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].name).toBe('requests');
76
- expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].version).toBe('2.31.0');
77
- expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].licenses).toHaveLength(0);
78
- expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].language).toBe(types_1.DependencyLanguage.PYTHON);
76
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies.length).toBe(147);
77
+ expect(payload === null || payload === void 0 ? void 0 : payload.files.length).toBe(2);
78
+ expect(payload === null || payload === void 0 ? void 0 : payload.relations.length).toBe(154);
79
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_NAME]).toBe('trivy');
80
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_VERSION]).toBe('0.44.1');
81
+ const dependenciesWithoutLicense = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.licenses.length === 0);
82
+ expect(dependenciesWithoutLicense === null || dependenciesWithoutLicense === void 0 ? void 0 : dependenciesWithoutLicense.length).toBe(147);
83
+ const directDependencies = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.is_direct);
84
+ expect(directDependencies === null || directDependencies === void 0 ? void 0 : directDependencies.length).toBe(1);
85
+ const devDependencies = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.is_dev);
86
+ expect(devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies.length).toBe(1);
87
+ const dependenciesWithPackageManager = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.package_manager.length > 0);
88
+ expect(dependenciesWithPackageManager === null || dependenciesWithPackageManager === void 0 ? void 0 : dependenciesWithPackageManager.length).toBe(1);
89
+ const filesWithPURL = payload === null || payload === void 0 ? void 0 : payload.files.filter((d) => d.purl);
90
+ expect(filesWithPURL === null || filesWithPURL === void 0 ? void 0 : filesWithPURL.length).toBe(2);
79
91
  }));
80
- test('should succeed when called on a valid SBOM file for CycloneDX 1.5', () => __awaiter(void 0, void 0, void 0, function* () {
81
- const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom.1.5.ok.json';
92
+ test('should succeed when called on a valid SBOM file for CycloneDX 1.5 with tools declared in components', () => __awaiter(void 0, void 0, void 0, function* () {
93
+ const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom.1.5.ok-with-tools-as-components.json';
94
+ const sbomContent = JSON.parse(fs_1.default.readFileSync(sbomFile).toString('utf8'));
95
+ const config = {
96
+ apiKey: undefined,
97
+ env: undefined,
98
+ envVarTags: undefined,
99
+ };
100
+ const tags = yield (0, tags_1.getSpanTags)(config, [], true);
101
+ const payload = (0, payload_1.generatePayload)(sbomContent, tags, 'service', 'env');
102
+ expect(payload).not.toBeNull();
103
+ expect(payload === null || payload === void 0 ? void 0 : payload.id).toStrictEqual(expect.any(String));
104
+ expect(payload === null || payload === void 0 ? void 0 : payload.commit.sha).toStrictEqual(expect.any(String));
105
+ expect(payload === null || payload === void 0 ? void 0 : payload.repository.url).toContain('github.com');
106
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies.length).toBe(147);
107
+ expect(payload === null || payload === void 0 ? void 0 : payload.files.length).toBe(2);
108
+ expect(payload === null || payload === void 0 ? void 0 : payload.relations.length).toBe(154);
109
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_NAME]).toBe('grype');
110
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_VERSION]).toBe('0.87.0');
111
+ }));
112
+ test('should correctly work with a CycloneDX 1.6 file', () => __awaiter(void 0, void 0, void 0, function* () {
113
+ const sbomFile = './src/commands/sbom/__tests__/fixtures/cdxgen-cyclonedx1.6.json';
82
114
  const sbomContent = JSON.parse(fs_1.default.readFileSync(sbomFile).toString('utf8'));
83
115
  const config = {
84
116
  apiKey: undefined,
@@ -97,19 +129,17 @@ describe('generation of payload', () => {
97
129
  expect(payload === null || payload === void 0 ? void 0 : payload.commit.branch).toStrictEqual(expect.any(String));
98
130
  expect(payload === null || payload === void 0 ? void 0 : payload.repository.url).toContain('github.com');
99
131
  expect(payload === null || payload === void 0 ? void 0 : payload.repository.url).toContain('DataDog/datadog-ci');
100
- expect(payload === null || payload === void 0 ? void 0 : payload.dependencies.length).toBe(147);
101
- expect(payload === null || payload === void 0 ? void 0 : payload.files.length).toBe(2);
102
- expect(payload === null || payload === void 0 ? void 0 : payload.relations.length).toBe(154);
103
- const dependenciesWithoutLicense = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.licenses.length === 0);
104
- expect(dependenciesWithoutLicense === null || dependenciesWithoutLicense === void 0 ? void 0 : dependenciesWithoutLicense.length).toBe(147);
105
- const directDependencies = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.is_direct);
106
- expect(directDependencies === null || directDependencies === void 0 ? void 0 : directDependencies.length).toBe(1);
107
- const devDependencies = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.is_dev);
108
- expect(devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies.length).toBe(1);
109
- const dependenciesWithPackageManager = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.package_manager.length > 0);
110
- expect(dependenciesWithPackageManager === null || dependenciesWithPackageManager === void 0 ? void 0 : dependenciesWithPackageManager.length).toBe(1);
111
- const filesWithPURL = payload === null || payload === void 0 ? void 0 : payload.files.filter((d) => d.purl);
112
- expect(filesWithPURL === null || filesWithPURL === void 0 ? void 0 : filesWithPURL.length).toBe(2);
132
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies).toHaveLength(2);
133
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].name).toBe('Flask');
134
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].version).toBe('3.0.0');
135
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].licenses).toHaveLength(0);
136
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].language).toBe(types_1.DependencyLanguage.PYTHON);
137
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].name).toBe('requests');
138
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].version).toBe('2.31.0');
139
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].licenses).toHaveLength(0);
140
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].language).toBe(types_1.DependencyLanguage.PYTHON);
141
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_NAME]).toBe('cdxgen');
142
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_VERSION]).toBe('11.0.7');
113
143
  }));
114
144
  test('SBOM for rust with multiple licenses', () => __awaiter(void 0, void 0, void 0, function* () {
115
145
  const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom-rust.json';
@@ -302,5 +332,106 @@ describe('generation of payload', () => {
302
332
  expect(dependencies[1].name).toEqual('jinja2');
303
333
  expect(dependencies[1].version).toEqual('3.1.5');
304
334
  }));
335
+ test('should correctly work with a CycloneDX 1.4 file and passing git repository', () => __awaiter(void 0, void 0, void 0, function* () {
336
+ const tmpdir = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'gitPath-'));
337
+ try {
338
+ // Configure local git repository
339
+ const git = (0, simple_git_1.default)(tmpdir);
340
+ setupLocalGitConfig(tmpdir);
341
+ yield git.init();
342
+ // eslint-disable-next-line no-null/no-null
343
+ yield git.commit('Initial commit', [], { '--allow-empty': null });
344
+ const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom.1.4.ok.json';
345
+ const sbomContent = JSON.parse(fs_1.default.readFileSync(sbomFile).toString('utf8'));
346
+ const config = {
347
+ apiKey: undefined,
348
+ env: undefined,
349
+ envVarTags: undefined,
350
+ };
351
+ // Pass git directory to load git context
352
+ const tags = yield (0, tags_1.getSpanTags)(config, [], true, tmpdir);
353
+ expect((0, tags_1.getMissingRequiredGitTags)(tags)).toHaveLength(0);
354
+ const payload = (0, payload_1.generatePayload)(sbomContent, tags, 'service', 'env');
355
+ expect(payload).not.toBeNull();
356
+ expect(payload === null || payload === void 0 ? void 0 : payload.id).toStrictEqual(expect.any(String));
357
+ // Local git repository should be reported
358
+ expect(payload === null || payload === void 0 ? void 0 : payload.commit.sha).toStrictEqual(expect.any(String));
359
+ expect(payload === null || payload === void 0 ? void 0 : payload.commit.author_name).toStrictEqual('MockUser123');
360
+ expect(payload === null || payload === void 0 ? void 0 : payload.commit.author_email).toStrictEqual('mock@fake.local');
361
+ expect(payload === null || payload === void 0 ? void 0 : payload.commit.committer_name).toStrictEqual('MockUser123');
362
+ expect(payload === null || payload === void 0 ? void 0 : payload.commit.committer_email).toStrictEqual('mock@fake.local');
363
+ expect(payload === null || payload === void 0 ? void 0 : payload.commit.branch).toStrictEqual('mock-branch');
364
+ expect(payload === null || payload === void 0 ? void 0 : payload.repository.url).toContain('https://mock-repo.local/fake.git');
365
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies.length).toBe(62);
366
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].name).toBe('stack-cors');
367
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].version).toBe('1.3.0');
368
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].licenses.length).toBe(0);
369
+ expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].language).toBe(types_1.DependencyLanguage.PHP);
370
+ }
371
+ finally {
372
+ // Removed temporary git file
373
+ fs_1.default.rmSync(tmpdir, { recursive: true, force: true });
374
+ }
375
+ }));
376
+ test('should not override provided tool.generator with value from SBOM', () => __awaiter(void 0, void 0, void 0, function* () {
377
+ const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom.1.4.ok.json';
378
+ const sbomContent = JSON.parse(fs_1.default.readFileSync(sbomFile).toString('utf8'));
379
+ const config = {
380
+ apiKey: undefined,
381
+ env: undefined,
382
+ envVarTags: undefined,
383
+ };
384
+ const tagsWithoutTool = yield (0, tags_1.getSpanTags)(config, [], true);
385
+ let payload = (0, payload_1.generatePayload)(sbomContent, tagsWithoutTool, 'service', 'env');
386
+ expect(payload).not.toBeNull();
387
+ expect(payload === null || payload === void 0 ? void 0 : payload.id).toStrictEqual(expect.any(String));
388
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_NAME]).toBe('cyclonedx-php-composer');
389
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_VERSION]).toBe('in-dev');
390
+ const tagsWithTool = yield (0, tags_1.getSpanTags)(config, ['tool.generator.name:foo', 'tool.generator.version:1.1.1.1'], true);
391
+ payload = (0, payload_1.generatePayload)(sbomContent, tagsWithTool, 'service', 'env');
392
+ expect(payload).not.toBeNull();
393
+ expect(payload === null || payload === void 0 ? void 0 : payload.id).toStrictEqual(expect.any(String));
394
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_NAME]).toBe('foo');
395
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_VERSION]).toBe('1.1.1.1');
396
+ }));
397
+ test('should not read tool.generator when missing from SBOM', () => __awaiter(void 0, void 0, void 0, function* () {
398
+ const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom.1.4.ok-without-metadata.json';
399
+ const sbomContent = JSON.parse(fs_1.default.readFileSync(sbomFile).toString('utf8'));
400
+ const config = {
401
+ apiKey: undefined,
402
+ env: undefined,
403
+ envVarTags: undefined,
404
+ };
405
+ const tags = yield (0, tags_1.getSpanTags)(config, [], true);
406
+ const payload = (0, payload_1.generatePayload)(sbomContent, tags, 'service', 'env');
407
+ expect(payload).not.toBeNull();
408
+ expect(payload === null || payload === void 0 ? void 0 : payload.id).toStrictEqual(expect.any(String));
409
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_NAME]).toBeUndefined();
410
+ expect(payload === null || payload === void 0 ? void 0 : payload.tags[constants_1.TOOL_GENERATOR_VERSION]).toBeUndefined();
411
+ }));
412
+ test('should fail to read git information', () => __awaiter(void 0, void 0, void 0, function* () {
413
+ const nonExistingGitRepository = '/you/cannot/find/me';
414
+ const config = {
415
+ apiKey: undefined,
416
+ env: undefined,
417
+ envVarTags: undefined,
418
+ };
419
+ // Pass non existing git directory to load git context
420
+ // It is missing all git tags.
421
+ const tags = yield (0, tags_1.getSpanTags)(config, [], true, nonExistingGitRepository);
422
+ expect((0, tags_1.getMissingRequiredGitTags)(tags).length).toBeGreaterThanOrEqual(1);
423
+ }));
305
424
  });
425
+ const getFixtures = (file) => {
426
+ return path_1.default.join('./src/commands/sbom/__tests__/fixtures', file);
427
+ };
428
+ const setupLocalGitConfig = (dir) => {
429
+ const gitDir = path_1.default.join(dir, '.git');
430
+ if (!fs_1.default.existsSync(gitDir)) {
431
+ fs_1.default.mkdirSync(gitDir, { recursive: true });
432
+ }
433
+ const configFixture = fs_1.default.readFileSync(getFixtures('gitconfig'), 'utf8');
434
+ const configPath = path_1.default.join(gitDir, '/config');
435
+ fs_1.default.writeFileSync(configPath, configFixture);
436
+ };
306
437
  //# sourceMappingURL=payload.test.js.map
package/dist/commands/sbom/__tests__/payload.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"payload.test.js","sourceRoot":"","sources":["../../../../src/commands/sbom/__tests__/payload.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,4CAAmB;AAGnB,gDAAiD;AAEjD,wCAA0C;AAC1C,oCAAqD;AAErD,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,kBAAkB,EAAE,CAAA;QACjD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,kBAAkB,EAAE,CAAA;IACjD,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,iDAAiD,EAAE,GAAS,EAAE;QACjE,MAAM,QAAQ,GAAG,yDAAyD,CAAA;QAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACpE,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAA;QAC9B,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAErD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAC7D,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,WAAW,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACrE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACtE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACxE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACzE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAChE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QACvD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAA;QAC/D,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC7C,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QACxD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACtD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACxD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,0BAAkB,CAAC,GAAG,CAAC,CAAA;IACxE,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,iDAAiD,EAAE,GAAS,EAAE;QACjE,MAAM,QAAQ,GAAG,iEAAiE,CAAA;QAClF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACpE,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAA;QAC9B,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAErD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAC7D,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,WAAW,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACrE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACtE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACxE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACzE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAChE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QACvD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAA;QAC/D,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QAC7C,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACnD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACtD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACzD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,0BAAkB,CAAC,MAAM,CAAC,CAAA;QACzE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACtD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACzD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,0BAAkB,CAAC,MAAM,CAAC,CAAA;IAC3E,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,mEAAmE,EAAE,GAAS,EAAE;QACnF,MAAM,QAAQ,GAAG,yDAAyD,CAAA;QAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACpE,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAA;QAC9B,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAErD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAC7D,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,WAAW,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACrE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACtE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACxE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACzE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QAChE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QACvD,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAA;QAC/D,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC9C,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACrC,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAE3C,MAAM,0BAA0B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAA;QAC/F,MAAM,CAAC,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEpD,MAAM,kBAAkB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAC3E,MAAM,CAAC,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE1C,MAAM,eAAe,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QACrE,MAAM,CAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAEvC,MAAM,8BAA8B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACxG,MAAM,CAAC,8BAA8B,aAA9B,8BAA8B,uBAA9B,8BAA8B,CAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAEtD,MAAM,aAAa,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAC1D,MAAM,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACvC,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,sCAAsC,EAAE,GAAS,EAAE;QACtD,MAAM,QAAQ,GAAG,uDAAuD,CAAA;QACxE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;QACvD,MAAM,0BAA0B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAA;QAC/F,MAAM,CAAC,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;QAE7D,6BAA6B;QAC7B,MAAM,2BAA2B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QACpF,MAAM,CAAC,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IAC9D,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,6CAA6C,EAAE,GAAS,EAAE;QAC7D,MAAM,QAAQ,GAAG,uDAAuD,CAAA;QACxE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QACtD,MAAM,0BAA0B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAA;QAC/F,MAAM,CAAC,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QAE5D,6BAA6B;QAC7B,MAAM,2BAA2B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QACpF,MAAM,CAAC,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IAC9D,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,gCAAgC,EAAE,GAAS,EAAE;QAChD,MAAM,QAAQ,GAAG,0DAA0D,CAAA;QAC3E,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QACtD,MAAM,0BAA0B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAA;QAC/F,MAAM,CAAC,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QAE5D,6BAA6B;QAC7B,MAAM,2BAA2B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QACpF,MAAM,CAAC,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAC5D,MAAM,oBAAoB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,0BAAkB,CAAC,GAAG,CAAC,CAAA;QACvG,MAAM,CAAC,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QACtD,MAAM,kBAAkB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,0BAAkB,CAAC,EAAE,CAAC,CAAA;QACpG,MAAM,CAAC,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IACtD,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,2BAA2B,EAAE,GAAS,EAAE;QAC3C,MAAM,QAAQ,GAAG,yDAAyD,CAAA;QAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QACtD,MAAM,0BAA0B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAA;QAC/F,MAAM,CAAC,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QAE5D,6BAA6B;QAC7B,MAAM,2BAA2B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QACpF,MAAM,CAAC,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAC5D,MAAM,sBAAsB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,0BAAkB,CAAC,MAAM,CAAC,CAAA;QAC5G,MAAM,CAAC,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IAC1D,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,0CAA0C,EAAE,GAAS,EAAE;QAC1D,MAAM,QAAQ,GAAG,uDAAuD,CAAA;QACxE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;QACvD,MAAM,YAAY,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAA;QAC1C,MAAM,0BAA0B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAA;QAC/F,MAAM,CAAC,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;QAE7D,6BAA6B;QAC7B,MAAM,2BAA2B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QACpF,MAAM,CAAC,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAC5D,MAAM,oBAAoB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,0BAAkB,CAAC,GAAG,CAAC,CAAA;QACvG,MAAM,CAAC,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;QACvD,MAAM,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,EAAE,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QACpF,MAAM,CAAC,YAAY,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;IAC1E,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,mCAAmC,EAAE,GAAS,EAAE;QACnD,MAAM,QAAQ,GAAG,2DAA2D,CAAA;QAC5E,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QAEtD,MAAM,0BAA0B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAA;QAC/F,MAAM,CAAC,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QAE5D,6BAA6B;QAC7B,MAAM,2BAA2B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;QACpF,MAAM,CAAC,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAC5D,MAAM,oBAAoB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,0BAAkB,CAAC,GAAG,CAAC,CAAA;QACvG,MAAM,CAAC,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IACxD,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,4CAA4C,EAAE,GAAS,EAAE;;QAC5D,MAAM,QAAQ,GAAG,+DAA+D,CAAA;QAChF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QACtD,MAAM,YAAY,GAAG,OAAQ,CAAC,YAAY,CAAA;QAE1C,6BAA6B;QAC7B,MAAM,2BAA2B,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QACrF,MAAM,CAAC,2BAA2B,aAA3B,2BAA2B,uBAA3B,2BAA2B,CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAE5D,4CAA4C;QAC5C,MAAM,CAAC,MAAA,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,0CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAC1D,MAAM,CAAC,MAAA,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,0CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAE1D,6BAA6B;QAC7B,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAA;QACtC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAU,CAAC,CAAC,CAAC,CAAC,KAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QACzE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAU,CAAC,CAAC,CAAC,CAAC,KAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QACvE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAU,CAAC,CAAC,CAAC,CAAC,KAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QACvE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAU,CAAC,CAAC,CAAC,CAAC,KAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QACtE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAU,CAAC,CAAC,CAAC,CAAC,KAAM,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,6CAA6C,CAAC,CAAA;QAEnH,+GAA+G;QAC/G,0GAA0G;QAC1G,MAAM,qBAAqB,GAAG,YAAY,CAAC,CAAC,CAAC,CAAA;QAC7C,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,0BAA0B,CAAC,CAAA;QAC5E,MAAM,CAAC,MAAA,qBAAqB,CAAC,SAAS,0CAAE,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QAEhE,4EAA4E;QAC5E,+EAA+E;QAC/E,MAAM,aAAa,GAAG,CAAC,QAA8B,EAAQ,EAAE;YAC7D,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAM;aACP;YACD,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACrE,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE;gBAC7C,sDAAsD;gBACtD,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,sBAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACpE;QACH,CAAC,CAAA;QAED,qCAAqC;QACrC,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE;YAC5B,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAA;YAClC,gCAAgC;YAChC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE;gBAChB,SAAQ;aACT;YACD,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE;gBAC3B,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;gBACtB,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;gBACrB,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;gBAC1B,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;aACzB;SACF;IACH,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,uDAAuD,EAAE,GAAS,EAAE;QACvE,MAAM,QAAQ,GAAG,kEAAkE,CAAA;QACnF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAoB;YAC9B,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,UAAU,EAAE,SAAS;SACtB,CAAA;QACD,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAW,EAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;QAEhD,MAAM,OAAO,GAAG,IAAA,yBAAe,EAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;QACrD,MAAM,YAAY,GAAG,OAAQ,CAAC,YAAY,CAAA;QAE1C,4CAA4C;QAC5C,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QAClD,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAA;QAC/C,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC9C,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAClD,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"payload.test.js","sourceRoot":"","sources":["../../../../src/commands/sbom/__tests__/payload.test.ts"],"names":[],"mappings":"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"}
package/dist/commands/sbom/constants.d.ts CHANGED
@@ -3,3 +3,5 @@ export declare const PACKAGE_MANAGER_PROPERTY_KEY = "osv-scanner:package-manager
3
3
  export declare const IS_DEPENDENCY_DIRECT_PROPERTY_KEY = "osv-scanner:is-direct";
4
4
  export declare const IS_DEPENDENCY_DEV_ENVIRONMENT_PROPERTY_KEY = "osv-scanner:is-dev";
5
5
  export declare const FILE_PACKAGE_PROPERTY_KEY = "osv-scanner:package";
6
+ export declare const TOOL_GENERATOR_NAME = "tool.generator.name";
7
+ export declare const TOOL_GENERATOR_VERSION = "tool.generator.version";
package/dist/commands/sbom/constants.js CHANGED
@@ -1,9 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.FILE_PACKAGE_PROPERTY_KEY = exports.IS_DEPENDENCY_DEV_ENVIRONMENT_PROPERTY_KEY = exports.IS_DEPENDENCY_DIRECT_PROPERTY_KEY = exports.PACKAGE_MANAGER_PROPERTY_KEY = exports.API_ENDPOINT = void 0;
3
+ exports.TOOL_GENERATOR_VERSION = exports.TOOL_GENERATOR_NAME = exports.FILE_PACKAGE_PROPERTY_KEY = exports.IS_DEPENDENCY_DEV_ENVIRONMENT_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
5
  exports.PACKAGE_MANAGER_PROPERTY_KEY = 'osv-scanner:package-manager';
6
6
  exports.IS_DEPENDENCY_DIRECT_PROPERTY_KEY = 'osv-scanner:is-direct';
7
7
  exports.IS_DEPENDENCY_DEV_ENVIRONMENT_PROPERTY_KEY = 'osv-scanner:is-dev';
8
8
  exports.FILE_PACKAGE_PROPERTY_KEY = 'osv-scanner:package';
9
+ // Tags
10
+ exports.TOOL_GENERATOR_NAME = 'tool.generator.name';
11
+ exports.TOOL_GENERATOR_VERSION = 'tool.generator.version';
9
12
  //# sourceMappingURL=constants.js.map
package/dist/commands/sbom/constants.js.map CHANGED
@@ -1 +1 @@
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,0CAA0C,GAAG,oBAAoB,CAAA;AACjE,QAAA,yBAAyB,GAAG,qBAAqB,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,0CAA0C,GAAG,oBAAoB,CAAA;AACjE,QAAA,yBAAyB,GAAG,qBAAqB,CAAA;AAE9D,OAAO;AACM,QAAA,mBAAmB,GAAG,qBAAqB,CAAA;AAC3C,QAAA,sBAAsB,GAAG,wBAAwB,CAAA"}
package/dist/commands/sbom/payload.js CHANGED
@@ -97,6 +97,15 @@ const generatePayload = (jsonContent, tags, service, env) => {
97
97
  const files = [];
98
98
  const relations = [];
99
99
  if (jsonContent) {
100
+ // If the tool generator for SBOM creation is not already defined by the user,
101
+ // attempt to determine it from the metadata attribute.
102
+ if (!tags[constants_1.TOOL_GENERATOR_NAME]) {
103
+ const generationTool = getGenerationTool(jsonContent);
104
+ if (generationTool) {
105
+ tags[constants_1.TOOL_GENERATOR_NAME] = generationTool.name;
106
+ tags[constants_1.TOOL_GENERATOR_VERSION] = generationTool.version;
107
+ }
108
+ }
100
109
  if (jsonContent['components']) {
101
110
  for (const component of jsonContent['components']) {
102
111
  if (!component['type'] || !component['name']) {
@@ -223,4 +232,39 @@ const extractingRelations = (dependency) => {
223
232
  depends_on: dependency['dependsOn'],
224
233
  };
225
234
  };
235
+ const getGenerationTool = (jsonContent) => {
236
+ var _a;
237
+ const tools = (_a = jsonContent === null || jsonContent === void 0 ? void 0 : jsonContent.metadata) === null || _a === void 0 ? void 0 : _a.tools;
238
+ // CycloneDX 1.4 defines tools as an array:
239
+ // https://cyclonedx.org/docs/1.4/json/#metadata_tools
240
+ if (Array.isArray(tools)) {
241
+ return extractGenerationTool(tools[0]);
242
+ // CycloneDX > 1.5 defines tools as an object
243
+ // https://cyclonedx.org/docs/1.5/json/#metadata_tools
244
+ }
245
+ else if (typeof tools === 'object') {
246
+ const preferredTool = findPreferredTool(tools);
247
+ return extractGenerationTool(preferredTool);
248
+ }
249
+ return undefined;
250
+ };
251
+ const findPreferredTool = (tool) => {
252
+ if (tool.components && Array.isArray(tool.components)) {
253
+ // Prefer components of type 'application', as from experience,
254
+ // that's where sbom generators report their name.
255
+ const applicationComponent = tool.components.find((component) => component.type === 'application');
256
+ if (applicationComponent) {
257
+ return applicationComponent;
258
+ }
259
+ // If no application component, return the first component
260
+ return tool.components[0];
261
+ }
262
+ return tool;
263
+ };
264
+ const extractGenerationTool = (tool) => {
265
+ return {
266
+ name: tool['name'],
267
+ version: tool['version'],
268
+ };
269
+ };
226
270
  //# sourceMappingURL=payload.js.map
package/dist/commands/sbom/payload.js.map CHANGED
@@ -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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"}
package/dist/commands/sbom/types.d.ts CHANGED
@@ -114,3 +114,7 @@ export interface ScaRequest {
114
114
  env: string;
115
115
  tags: Record<string, string>;
116
116
  }
117
+ export interface GenerationTool {
118
+ name: string;
119
+ version: string;
120
+ }
package/dist/commands/sbom/upload.d.ts CHANGED
@@ -6,6 +6,7 @@ export declare class UploadSbomCommand extends Command {
6
6
  private serviceFromCli;
7
7
  private env;
8
8
  private tags;
9
+ private gitPath;
9
10
  private debug;
10
11
  private noCiTags;
11
12
  private config;
package/dist/commands/sbom/upload.js CHANGED
@@ -34,6 +34,7 @@ class UploadSbomCommand extends clipanion_1.Command {
34
34
  this.serviceFromCli = clipanion_1.Option.String('--service');
35
35
  this.env = clipanion_1.Option.String('--env', 'ci');
36
36
  this.tags = clipanion_1.Option.Array('--tags');
37
+ this.gitPath = clipanion_1.Option.String('--git-repository');
37
38
  this.debug = clipanion_1.Option.Boolean('--debug');
38
39
  this.noCiTags = clipanion_1.Option.Boolean('--no-ci-tags', false);
39
40
  this.config = {
@@ -80,7 +81,7 @@ class UploadSbomCommand extends clipanion_1.Command {
80
81
  }
81
82
  // Get the API helper to send the payload
82
83
  const api = (0, api_1.getApiHelper)(this.config.apiKey, this.config.appKey);
83
- const tags = yield (0, tags_1.getSpanTags)(this.config, this.tags, !this.noCiTags);
84
+ const tags = yield (0, tags_1.getSpanTags)(this.config, this.tags, !this.noCiTags, this.gitPath);
84
85
  // Gather any missing mandatory git fields to display to the user
85
86
  const missingGitFields = (0, tags_1.getMissingRequiredGitTags)(tags);
86
87
  if (missingGitFields.length > 0) {
@@ -94,7 +95,7 @@ class UploadSbomCommand extends clipanion_1.Command {
94
95
  this.context.stdout.write(`Processing file ${basePath}\n`);
95
96
  }
96
97
  if (!(0, validation_1.validateSbomFileAgainstSchema)(basePath, validator, !!this.debug)) {
97
- this.context.stdout.write('SBOM file not fully compliant against CycloneDX 1.4 or 1.5 specifications (use --debug to get validation error)\n');
98
+ this.context.stdout.write('SBOM file not fully compliant against CycloneDX 1.4, 1.5 or 1.6 specifications (use --debug to get validation error)\n');
98
99
  }
99
100
  if (!(0, validation_1.validateFileAgainstToolRequirements)(basePath, !!this.debug)) {
100
101
  this.context.stdout.write((0, renderer_2.renderInvalidFile)(basePath));