@datadog/datadog-ci 2.46.1 → 2.46.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/sarif/upload.js +1 -6
- package/dist/commands/sarif/upload.js.map +1 -1
- package/dist/commands/sbom/upload.js +1 -6
- package/dist/commands/sbom/upload.js.map +1 -1
- package/dist/helpers/tags.d.ts +8 -2
- package/dist/helpers/tags.js +24 -9
- package/dist/helpers/tags.js.map +1 -1
- package/package.json +1 -1
|
@@ -93,12 +93,7 @@ class UploadSarifReportCommand extends clipanion_1.Command {
|
|
|
93
93
|
this.basePaths = this.basePaths.map((basePath) => path_1.default.posix.normalize(basePath));
|
|
94
94
|
const spanTags = yield (0, tags_1.getSpanTags)(this.config, this.tags, !this.noCiTags);
|
|
95
95
|
// Gather any missing mandatory git fields to display to the user
|
|
96
|
-
const missingGitFields =
|
|
97
|
-
if (tags_1.REQUIRED_GIT_TAGS[tag] && !value) {
|
|
98
|
-
acc.push(tag);
|
|
99
|
-
}
|
|
100
|
-
return acc;
|
|
101
|
-
}, []);
|
|
96
|
+
const missingGitFields = (0, tags_1.getMissingRequiredGitTags)(spanTags);
|
|
102
97
|
if (missingGitFields.length > 0) {
|
|
103
98
|
this.context.stdout.write((0, renderer_1.renderMissingTags)(missingGitFields));
|
|
104
99
|
return 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sarif/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AAEvB,kDAAyB;AACzB,yCAAyC;AACzC,gDAAuB;AAEvB,+CAAuE;AACvE,2DAA8D;AAE9D,2CAA2C;AAC3C,6CAA6C;AAE7C,+CAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sarif/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,12 +76,7 @@ class UploadSbomCommand extends clipanion_1.Command {
|
|
|
76
76
|
const api = (0, api_1.getApiHelper)(this.config.apiKey, this.config.appKey);
|
|
77
77
|
const tags = yield (0, tags_1.getSpanTags)(this.config, this.tags, !this.noCiTags);
|
|
78
78
|
// Gather any missing mandatory git fields to display to the user
|
|
79
|
-
const missingGitFields =
|
|
80
|
-
if (tags_1.REQUIRED_GIT_TAGS[tag] && !value) {
|
|
81
|
-
acc.push(tag);
|
|
82
|
-
}
|
|
83
|
-
return acc;
|
|
84
|
-
}, []);
|
|
79
|
+
const missingGitFields = (0, tags_1.getMissingRequiredGitTags)(tags);
|
|
85
80
|
if (missingGitFields.length > 0) {
|
|
86
81
|
this.context.stdout.write((0, renderer_1.renderMissingTags)(missingGitFields));
|
|
87
82
|
return 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,sDAA6B;AAG7B,iCAA+D;AAC/D,yCAAyC;AAEzC,+CAAuE;AACvE,2CAA2C;AAC3C,6CAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sbom/upload.ts"],"names":[],"mappings":"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"}
|
package/dist/helpers/tags.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BaseContext } from 'clipanion';
|
|
2
2
|
import { DatadogCiConfig } from './config';
|
|
3
|
-
import { SpanTags } from './interfaces';
|
|
3
|
+
import { SpanTag, SpanTags } from './interfaces';
|
|
4
4
|
export declare const CI_PIPELINE_URL = "ci.pipeline.url";
|
|
5
5
|
export declare const CI_PROVIDER_NAME = "ci.provider.name";
|
|
6
6
|
export declare const CI_PIPELINE_ID = "ci.pipeline.id";
|
|
@@ -65,7 +65,13 @@ export declare const parseMeasuresFile: (context: BaseContext, measuresFile: str
|
|
|
65
65
|
/**
|
|
66
66
|
* These are required git tags for the following commands: sarif and sbom.
|
|
67
67
|
*/
|
|
68
|
-
export declare const REQUIRED_GIT_TAGS:
|
|
68
|
+
export declare const REQUIRED_GIT_TAGS: SpanTag[];
|
|
69
|
+
/**
|
|
70
|
+
* A utility to determine which required git tags are missing.
|
|
71
|
+
* @param tags - the tags to check
|
|
72
|
+
* @returns an array of the missing required git tags (ex. ['git.repository_url', 'git.branch'])
|
|
73
|
+
*/
|
|
74
|
+
export declare const getMissingRequiredGitTags: (tags: SpanTags) => string[];
|
|
69
75
|
/**
|
|
70
76
|
* Get the tags to upload results in CI for the following commands: sarif and sbom.
|
|
71
77
|
* @param config - the configuration of the CLI
|
package/dist/helpers/tags.js
CHANGED
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.getSpanTags = exports.REQUIRED_GIT_TAGS = exports.parseMeasuresFile = exports.parseTagsFile = exports.parseMetrics = exports.parseTags = exports.SERVICE = exports.SPAN_TYPE = exports.GIT_PULL_REQUEST_BASE_BRANCH = exports.GIT_PULL_REQUEST_BASE_BRANCH_SHA = exports.GIT_BASE_REF = exports.GIT_HEAD_SHA = exports.GIT_TAG = exports.GIT_SHA = exports.GIT_COMMIT_MESSAGE = exports.GIT_COMMIT_COMMITTER_NAME = exports.GIT_COMMIT_COMMITTER_EMAIL = exports.GIT_COMMIT_COMMITTER_DATE = exports.GIT_COMMIT_AUTHOR_NAME = exports.GIT_COMMIT_AUTHOR_EMAIL = exports.GIT_COMMIT_AUTHOR_DATE = exports.GIT_BRANCH = exports.CI_NODE_LABELS = exports.CI_NODE_NAME = exports.CI_ENV_VARS = exports.CI_BUILD_LEVEL = exports.CI_LEVEL = exports.CI_STAGE_NAME = exports.CI_JOB_NAME = exports.CI_JOB_URL = exports.GIT_REPOSITORY_URL = exports.CI_WORKSPACE_PATH = exports.CI_PIPELINE_NUMBER = exports.CI_PIPELINE_NAME = exports.CI_PIPELINE_ID = exports.CI_PROVIDER_NAME = exports.CI_PIPELINE_URL = void 0;
|
|
15
|
+
exports.getSpanTags = exports.getMissingRequiredGitTags = exports.REQUIRED_GIT_TAGS = exports.parseMeasuresFile = exports.parseTagsFile = exports.parseMetrics = exports.parseTags = exports.SERVICE = exports.SPAN_TYPE = exports.GIT_PULL_REQUEST_BASE_BRANCH = exports.GIT_PULL_REQUEST_BASE_BRANCH_SHA = exports.GIT_BASE_REF = exports.GIT_HEAD_SHA = exports.GIT_TAG = exports.GIT_SHA = exports.GIT_COMMIT_MESSAGE = exports.GIT_COMMIT_COMMITTER_NAME = exports.GIT_COMMIT_COMMITTER_EMAIL = exports.GIT_COMMIT_COMMITTER_DATE = exports.GIT_COMMIT_AUTHOR_NAME = exports.GIT_COMMIT_AUTHOR_EMAIL = exports.GIT_COMMIT_AUTHOR_DATE = exports.GIT_BRANCH = exports.CI_NODE_LABELS = exports.CI_NODE_NAME = exports.CI_ENV_VARS = exports.CI_BUILD_LEVEL = exports.CI_LEVEL = exports.CI_STAGE_NAME = exports.CI_JOB_NAME = exports.CI_JOB_URL = exports.GIT_REPOSITORY_URL = exports.CI_WORKSPACE_PATH = exports.CI_PIPELINE_NUMBER = exports.CI_PIPELINE_NAME = exports.CI_PIPELINE_ID = exports.CI_PROVIDER_NAME = exports.CI_PIPELINE_URL = void 0;
|
|
16
16
|
// Build
|
|
17
17
|
const fs_1 = __importDefault(require("fs"));
|
|
18
18
|
const path_1 = __importDefault(require("path"));
|
|
@@ -184,15 +184,30 @@ exports.parseMeasuresFile = parseMeasuresFile;
|
|
|
184
184
|
/**
|
|
185
185
|
* These are required git tags for the following commands: sarif and sbom.
|
|
186
186
|
*/
|
|
187
|
-
exports.REQUIRED_GIT_TAGS =
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
187
|
+
exports.REQUIRED_GIT_TAGS = [
|
|
188
|
+
exports.GIT_REPOSITORY_URL,
|
|
189
|
+
exports.GIT_BRANCH,
|
|
190
|
+
exports.GIT_SHA,
|
|
191
|
+
exports.GIT_COMMIT_AUTHOR_EMAIL,
|
|
192
|
+
exports.GIT_COMMIT_AUTHOR_NAME,
|
|
193
|
+
exports.GIT_COMMIT_COMMITTER_EMAIL,
|
|
194
|
+
exports.GIT_COMMIT_COMMITTER_NAME,
|
|
195
|
+
];
|
|
196
|
+
/**
|
|
197
|
+
* A utility to determine which required git tags are missing.
|
|
198
|
+
* @param tags - the tags to check
|
|
199
|
+
* @returns an array of the missing required git tags (ex. ['git.repository_url', 'git.branch'])
|
|
200
|
+
*/
|
|
201
|
+
const getMissingRequiredGitTags = (tags) => {
|
|
202
|
+
const missingTags = exports.REQUIRED_GIT_TAGS.reduce((acc, tag) => {
|
|
203
|
+
if (!tags[tag] || tags[tag].trim() === '') {
|
|
204
|
+
acc.push(tag);
|
|
205
|
+
}
|
|
206
|
+
return acc;
|
|
207
|
+
}, []);
|
|
208
|
+
return missingTags;
|
|
195
209
|
};
|
|
210
|
+
exports.getMissingRequiredGitTags = getMissingRequiredGitTags;
|
|
196
211
|
/**
|
|
197
212
|
* Get the tags to upload results in CI for the following commands: sarif and sbom.
|
|
198
213
|
* @param config - the configuration of the CLI
|
package/dist/helpers/tags.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/helpers/tags.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/helpers/tags.ts"],"names":[],"mappings":"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"}
|