@datadog/datadog-ci 3.7.0 → 3.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +1 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/aas/cli.d.ts +1 -0
- package/dist/commands/aas/cli.js +5 -0
- package/dist/commands/aas/cli.js.map +1 -0
- package/dist/commands/aas/common.d.ts +24 -0
- package/dist/commands/aas/common.js +128 -0
- package/dist/commands/aas/common.js.map +1 -0
- package/dist/commands/aas/instrument.d.ts +11 -0
- package/dist/commands/aas/instrument.js +146 -0
- package/dist/commands/aas/instrument.js.map +1 -0
- package/dist/commands/aas/interfaces.d.ts +16 -0
- package/dist/commands/aas/interfaces.js +3 -0
- package/dist/commands/aas/interfaces.js.map +1 -0
- package/dist/commands/cloud-run/constants.js +12 -12
- package/dist/commands/cloud-run/constants.js.map +1 -1
- package/dist/commands/coverage/renderer.d.ts +2 -0
- package/dist/commands/coverage/renderer.js +9 -1
- package/dist/commands/coverage/renderer.js.map +1 -1
- package/dist/commands/coverage/upload.d.ts +6 -0
- package/dist/commands/coverage/upload.js +76 -16
- package/dist/commands/coverage/upload.js.map +1 -1
- package/dist/commands/gate/evaluate.js +1 -1
- package/dist/commands/gate/evaluate.js.map +1 -1
- package/dist/commands/git-metadata/git.d.ts +1 -0
- package/dist/commands/git-metadata/git.js +19 -5
- package/dist/commands/git-metadata/git.js.map +1 -1
- package/dist/commands/lambda/functions/instrument.js +1 -1
- package/dist/commands/lambda/functions/instrument.js.map +1 -1
- package/dist/commands/sbom/payload.js +9 -6
- package/dist/commands/sbom/payload.js.map +1 -1
- package/dist/commands/synthetics/deploy-tests-command.d.ts +1 -0
- package/dist/commands/synthetics/deploy-tests-command.js +7 -4
- package/dist/commands/synthetics/deploy-tests-command.js.map +1 -1
- package/dist/commands/synthetics/deploy-tests-lib.js +23 -3
- package/dist/commands/synthetics/deploy-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +3 -2
- package/dist/commands/synthetics/multilocator.js +1 -1
- package/dist/commands/synthetics/multilocator.js.map +1 -1
- package/dist/commands/synthetics/tunnel/tunnel.js +3 -4
- package/dist/commands/synthetics/tunnel/tunnel.js.map +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +3 -1
- package/dist/constants.js.map +1 -1
- package/dist/helpers/ci.d.ts +0 -1
- package/dist/helpers/ci.js +85 -36
- package/dist/helpers/ci.js.map +1 -1
- package/dist/helpers/git/format-git-span-data.js +2 -2
- package/dist/helpers/git/format-git-span-data.js.map +1 -1
- package/dist/helpers/git/get-git-data.js +7 -1
- package/dist/helpers/git/get-git-data.js.map +1 -1
- package/dist/helpers/interfaces.d.ts +10 -2
- package/dist/helpers/tags.d.ts +0 -1
- package/dist/helpers/tags.js +1 -2
- package/dist/helpers/tags.js.map +1 -1
- package/dist/helpers/user-provided-git.js +5 -1
- package/dist/helpers/user-provided-git.js.map +1 -1
- package/dist/helpers/utils.d.ts +2 -1
- package/package.json +8 -1
|
@@ -48,14 +48,21 @@ const file_finder_1 = require("../../helpers/file-finder");
|
|
|
48
48
|
const fips_1 = require("../../helpers/fips");
|
|
49
49
|
const format_git_span_data_1 = require("../../helpers/git/format-git-span-data");
|
|
50
50
|
const glob_1 = require("../../helpers/glob");
|
|
51
|
+
const id_1 = __importDefault(require("../../helpers/id"));
|
|
51
52
|
const logger_1 = require("../../helpers/logger");
|
|
52
53
|
const retry_1 = require("../../helpers/retry");
|
|
53
54
|
const tags_1 = require("../../helpers/tags");
|
|
54
55
|
const user_provided_git_1 = require("../../helpers/user-provided-git");
|
|
56
|
+
const utils_1 = require("../../helpers/utils");
|
|
57
|
+
const git_metadata_1 = require("../git-metadata");
|
|
55
58
|
const git_1 = require("../git-metadata/git");
|
|
56
|
-
const
|
|
59
|
+
const gitdb_1 = require("../git-metadata/gitdb");
|
|
60
|
+
const api_1 = require("../junit/api");
|
|
61
|
+
const api_2 = require("./api");
|
|
57
62
|
const renderer_1 = require("./renderer");
|
|
58
|
-
const
|
|
63
|
+
const utils_2 = require("./utils");
|
|
64
|
+
const TRACE_ID_HTTP_HEADER = 'x-datadog-trace-id';
|
|
65
|
+
const PARENT_ID_HTTP_HEADER = 'x-datadog-parent-id';
|
|
59
66
|
const errorCodesStopUpload = [400, 403];
|
|
60
67
|
const MAX_REPORTS_PER_REQUEST = 8; // backend supports 10 attachments, to keep the logic simple we subtract 2: for PR diff and commit diff
|
|
61
68
|
const isCoverageReport = (file) => {
|
|
@@ -67,16 +74,16 @@ const isCoverageReport = (file) => {
|
|
|
67
74
|
);
|
|
68
75
|
};
|
|
69
76
|
const validateReport = (explicitFormat, file) => {
|
|
70
|
-
const format = explicitFormat || (0,
|
|
77
|
+
const format = explicitFormat || (0, utils_2.detectFormat)(file);
|
|
71
78
|
if (format === undefined) {
|
|
72
79
|
return `Could not detect format of ${file}, please specify the format manually using the --format option`;
|
|
73
80
|
}
|
|
74
|
-
return (0,
|
|
81
|
+
return (0, utils_2.validateCoverageReport)(file, format);
|
|
75
82
|
};
|
|
76
83
|
class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
77
84
|
constructor() {
|
|
78
85
|
var _a, _b;
|
|
79
|
-
super(
|
|
86
|
+
super();
|
|
80
87
|
this.basePaths = clipanion_1.Option.Rest({ required: 1 });
|
|
81
88
|
this.verbose = clipanion_1.Option.Boolean('--verbose', false);
|
|
82
89
|
this.dryRun = clipanion_1.Option.Boolean('--dry-run', false);
|
|
@@ -84,6 +91,8 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
84
91
|
this.tags = clipanion_1.Option.Array('--tags');
|
|
85
92
|
this.format = clipanion_1.Option.String('--format');
|
|
86
93
|
this.uploadGitDiff = clipanion_1.Option.Boolean('--upload-git-diff', true);
|
|
94
|
+
this.skipGitMetadataUpload = clipanion_1.Option.Boolean('--skip-git-metadata-upload', false);
|
|
95
|
+
this.gitRepositoryURL = clipanion_1.Option.String('--git-repository-url');
|
|
87
96
|
this.automaticReportsDiscovery = clipanion_1.Option.String('--auto-discovery', 'true', {
|
|
88
97
|
validator: t.isBoolean(),
|
|
89
98
|
tolerateBoolean: true,
|
|
@@ -100,6 +109,7 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
100
109
|
fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
|
|
101
110
|
};
|
|
102
111
|
this.logger = new logger_1.Logger((s) => this.context.stdout.write(s), logger_1.LogLevel.INFO);
|
|
112
|
+
this.git = (0, git_1.newSimpleGit)();
|
|
103
113
|
}
|
|
104
114
|
execute() {
|
|
105
115
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -110,12 +120,47 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
110
120
|
this.context.stderr.write('Positional arguments must be provided\n');
|
|
111
121
|
return 1;
|
|
112
122
|
}
|
|
123
|
+
if (!this.skipGitMetadataUpload) {
|
|
124
|
+
if (yield (0, git_metadata_1.isGitRepo)()) {
|
|
125
|
+
const traceId = (0, id_1.default)();
|
|
126
|
+
const requestBuilder = (0, utils_1.getRequestBuilder)({
|
|
127
|
+
baseUrl: api_1.apiUrl,
|
|
128
|
+
apiKey: this.config.apiKey,
|
|
129
|
+
headers: new Map([
|
|
130
|
+
[TRACE_ID_HTTP_HEADER, traceId],
|
|
131
|
+
[PARENT_ID_HTTP_HEADER, traceId],
|
|
132
|
+
]),
|
|
133
|
+
});
|
|
134
|
+
try {
|
|
135
|
+
this.logger.info(`${this.dryRun ? '[DRYRUN] ' : ''}Syncing git metadata...`);
|
|
136
|
+
let elapsed = 0;
|
|
137
|
+
if (!this.dryRun) {
|
|
138
|
+
elapsed = yield (0, utils_1.timedExecAsync)(this.uploadToGitDB.bind(this), { requestBuilder });
|
|
139
|
+
}
|
|
140
|
+
this.logger.info((0, renderer_1.renderSuccessfulGitDBSync)(this.dryRun, elapsed));
|
|
141
|
+
}
|
|
142
|
+
catch (err) {
|
|
143
|
+
this.logger.info((0, renderer_1.renderFailedGitDBSync)(err));
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
this.logger.info(`${this.dryRun ? '[DRYRUN] ' : ''}Not syncing git metadata (not a git repo)`);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
this.logger.debug('Not syncing git metadata (skip git upload flag detected)');
|
|
152
|
+
}
|
|
113
153
|
yield this.uploadCodeCoverageReports();
|
|
114
154
|
if (!this.dryRun) {
|
|
115
155
|
this.context.stdout.write((0, renderer_1.renderSuccessfulUploadCommand)());
|
|
116
156
|
}
|
|
117
157
|
});
|
|
118
158
|
}
|
|
159
|
+
uploadToGitDB(opts) {
|
|
160
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
161
|
+
yield (0, gitdb_1.uploadToGitDB)(this.logger, opts.requestBuilder, yield this.git, this.dryRun, this.gitRepositoryURL);
|
|
162
|
+
});
|
|
163
|
+
}
|
|
119
164
|
uploadCodeCoverageReports() {
|
|
120
165
|
return __awaiter(this, void 0, void 0, function* () {
|
|
121
166
|
// Normalizing the basePath to resolve .. and .
|
|
@@ -138,7 +183,7 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
138
183
|
this.logger.error(`Neither ${chalk_1.default.red.bold('DATADOG_API_KEY')} nor ${chalk_1.default.red.bold('DD_API_KEY')} is in your environment.`);
|
|
139
184
|
throw new Error('API key is missing');
|
|
140
185
|
}
|
|
141
|
-
return (0,
|
|
186
|
+
return (0, api_2.apiConstructor)(api_2.intakeUrl, this.config.apiKey);
|
|
142
187
|
}
|
|
143
188
|
generatePayloads() {
|
|
144
189
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -175,14 +220,12 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
175
220
|
if (!this.uploadGitDiff) {
|
|
176
221
|
return undefined;
|
|
177
222
|
}
|
|
178
|
-
const baseCommit = spanTags[tags_1.GIT_PULL_REQUEST_BASE_BRANCH_SHA];
|
|
179
|
-
const headCommit = spanTags[tags_1.GIT_HEAD_SHA] || spanTags[tags_1.GIT_SHA];
|
|
180
|
-
if (!baseCommit || !headCommit) {
|
|
181
|
-
return undefined;
|
|
182
|
-
}
|
|
183
223
|
try {
|
|
184
|
-
const
|
|
185
|
-
|
|
224
|
+
const pr = yield this.getHeadAndBase(spanTags);
|
|
225
|
+
if (!pr.headSha || !pr.baseSha) {
|
|
226
|
+
return undefined;
|
|
227
|
+
}
|
|
228
|
+
return yield (0, git_1.getGitDiff)(yield this.git, pr.baseSha, pr.headSha);
|
|
186
229
|
}
|
|
187
230
|
catch (e) {
|
|
188
231
|
this.logger.debug(`Error while trying to calculate PR diff: ${e}`);
|
|
@@ -190,6 +233,24 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
190
233
|
}
|
|
191
234
|
});
|
|
192
235
|
}
|
|
236
|
+
getHeadAndBase(spanTags) {
|
|
237
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
238
|
+
const headSha = spanTags[tags_1.GIT_HEAD_SHA] || spanTags[tags_1.GIT_SHA];
|
|
239
|
+
if (!headSha) {
|
|
240
|
+
return {};
|
|
241
|
+
}
|
|
242
|
+
const baseSha = spanTags[tags_1.GIT_PULL_REQUEST_BASE_BRANCH_SHA];
|
|
243
|
+
if (baseSha) {
|
|
244
|
+
return { headSha, baseSha };
|
|
245
|
+
}
|
|
246
|
+
const baseBranch = spanTags[tags_1.GIT_PULL_REQUEST_BASE_BRANCH];
|
|
247
|
+
if (baseBranch) {
|
|
248
|
+
const mergeBase = yield (0, git_1.getMergeBase)(yield this.git, baseBranch, headSha);
|
|
249
|
+
return { headSha, baseSha: mergeBase };
|
|
250
|
+
}
|
|
251
|
+
return {};
|
|
252
|
+
});
|
|
253
|
+
}
|
|
193
254
|
getCommitDiff(spanTags) {
|
|
194
255
|
return __awaiter(this, void 0, void 0, function* () {
|
|
195
256
|
if (!this.uploadGitDiff) {
|
|
@@ -200,8 +261,7 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
200
261
|
return undefined;
|
|
201
262
|
}
|
|
202
263
|
try {
|
|
203
|
-
|
|
204
|
-
return yield (0, git_1.getGitDiff)(git, commit + '^', commit);
|
|
264
|
+
return yield (0, git_1.getGitDiff)(yield this.git, commit + '^', commit);
|
|
205
265
|
}
|
|
206
266
|
catch (e) {
|
|
207
267
|
this.logger.debug(`Error while trying to calculate commit diff: ${e}`);
|
|
@@ -238,7 +298,7 @@ class UploadCodeCoverageReportCommand extends clipanion_1.Command {
|
|
|
238
298
|
const validUniqueFiles = (0, file_finder_1.findFiles)(this.basePaths || ['.'], this.automaticReportsDiscovery, (0, glob_1.parsePathsList)(this.ignoredPaths), isCoverageReport, (filePath) => validateReport(this.format, filePath), (filePath, errorMessage) => this.context.stdout.write((0, renderer_1.renderInvalidFile)(filePath, errorMessage)));
|
|
239
299
|
const pathsByFormat = {};
|
|
240
300
|
for (const file of validUniqueFiles) {
|
|
241
|
-
const format = this.format || (0,
|
|
301
|
+
const format = this.format || (0, utils_2.detectFormat)(file);
|
|
242
302
|
if (format === undefined) {
|
|
243
303
|
// should not be possible, such files will fail validation
|
|
244
304
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/coverage/upload.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/coverage/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,7 +88,7 @@ class GateEvaluateCommand extends clipanion_1.Command {
|
|
|
88
88
|
};
|
|
89
89
|
const api = this.getApiHelper();
|
|
90
90
|
const spanTags = yield this.getSpanTags();
|
|
91
|
-
const headRef = spanTags[tags_1.
|
|
91
|
+
const headRef = spanTags[tags_1.GIT_PULL_REQUEST_BASE_BRANCH];
|
|
92
92
|
if (headRef) {
|
|
93
93
|
const headSha = spanTags[tags_1.GIT_HEAD_SHA];
|
|
94
94
|
if (headSha) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/commands/gate/evaluate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,kDAAyB;AACzB,yCAAyC;AACzC,+BAAiC;AAEjC,+CAAuE;AACvE,yCAA8C;AAC9C,2CAA2C;AAC3C,6CAA6C;AAC7C,iFAAqE;AAErE,iDAAqD;AACrD,+CAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../../src/commands/gate/evaluate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,kDAAyB;AACzB,yCAAyC;AACzC,+BAAiC;AAEjC,+CAAuE;AACvE,yCAA8C;AAC9C,2CAA2C;AAC3C,6CAA6C;AAC7C,iFAAqE;AAErE,iDAAqD;AACrD,+CAAgD;AAChD,6CAAwF;AACxF,uEAAkE;AAClE,qEAAsD;AAEtD,+BAAoC;AACpC,yCAMmB;AACnB,mCAAuF;AAEvF,MAAa,mBAAoB,SAAQ,mBAAO;IAAhD;;;QAwCU,mBAAc,GAAG,IAAI,CAAA;QACrB,eAAU,GAAG,CAAC,CAAA;QACd,mBAAc,GAAG,GAAG,CAAA,CAAC,SAAS;QAE9B,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC3C,gBAAW,GAAG,kBAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAA;QACtD,sBAAiB,GAAG,kBAAM,CAAC,OAAO,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAA;QAClE,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC3C,qBAAgB,GAAG,kBAAM,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YACjF,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE;SAClC,CAAC,CAAA;QACM,cAAS,GAAG,kBAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QACnC,SAAI,GAAG,kBAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAE7B,WAAM,GAAW,IAAI,eAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,iBAAQ,CAAC,IAAI,CAAC,CAAA;QAEvF,SAAI,GAAG,kBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACtC,oBAAe,GAAG,kBAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;QAE9D,WAAM,GAAG;YACf,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;YAC9B,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;YAC9B,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;YAC/B,IAAI,EAAE,MAAA,IAAA,eAAS,EAAC,OAAO,CAAC,GAAG,CAAC,wBAAY,CAAC,CAAC,mCAAI,KAAK;YACnD,eAAe,EAAE,MAAA,IAAA,eAAS,EAAC,OAAO,CAAC,GAAG,CAAC,qCAAyB,CAAC,CAAC,mCAAI,KAAK;SAC5E,CAAA;IA4KH,CAAC;IA1Kc,OAAO;;YAClB,IAAA,iBAAU,EAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;YAE9F,MAAM,OAAO,GAAmB;gBAC9B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAA;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAA;YAC/B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;YACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,mCAA4B,CAAC,CAAA;YAEtD,IAAI,OAAO,EAAE;gBACX,MAAM,OAAO,GAAG,QAAQ,CAAC,mBAAY,CAAC,CAAA;gBACtC,IAAI,OAAO,EAAE;oBACX,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAA;iBACnC;qBAAM;oBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAA;iBAC5F;aACF;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,kBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YAElE,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;YACxC,MAAM,OAAO,GAAG;gBACd,SAAS,EAAE,IAAA,SAAM,GAAE;gBACnB,QAAQ;gBACR,SAAS;gBACT,WAAW;gBACX,OAAO;aACR,CAAA;YAED,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QACzC,CAAC;KAAA;IAEO,YAAY;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAA;YAC3F,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;SACtC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,CAAA;YAC3F,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;SACtC;QAED,OAAO,IAAA,oBAAc,EAAC,IAAA,wBAAgB,GAAE,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACnF,CAAC;IAEa,WAAW;;YACvB,MAAM,UAAU,GAAG,IAAA,kBAAa,GAAE,CAAA;YAClC,MAAM,WAAW,GAAG,MAAM,IAAA,qCAAc,GAAE,CAAA;YAC1C,MAAM,eAAe,GAAG,IAAA,sCAAkB,GAAE,CAAA;YAE5C,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,gBAAS,EAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YAC7F,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,gBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YAErD,iFACK,WAAW,GACX,UAAU,GACV,eAAe,GACf,OAAO,GACP,UAAU,EACd;QACH,CAAC;KAAA;IAEa,aAAa,CAAC,GAAc,EAAE,eAAwB;;YAClE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,oCAAyB,EAAC,eAAe,CAAC,CAAC,CAAA;YAErE;;;;;eAKG;YACH,OAAO,IAAA,oBAAY,EAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE;gBACtG,OAAO,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;oBACtB,4CAA4C;oBAC5C,IAAI,CAAC,CAAC,OAAO,KAAK,MAAM,EAAE;wBACxB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,gCAAqB,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAA;qBAC7D;gBACH,CAAC;gBACD,OAAO,EAAE,IAAI,CAAC,UAAU;gBACxB,UAAU,EAAE,CAAC;gBACb,UAAU,EAAE,CAAC;aACd,CAAC;iBACC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACjB,OAAO,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YACpE,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,OAAO,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAA;YAC1C,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAED;;;;;;;OAOG;IACW,qBAAqB,CACjC,GAAc,EACd,eAAwB,EACxB,OAAgB,EAChB,IAAyB;;YAEzB,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC,WAAW,CAAA;YACrE,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,UAAU,CAAA;YAE/D,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,MAAM,OAAO,mCAAO,eAAe,KAAE,OAAO,oBAAM,eAAe,CAAC,OAAO,IAAE,CAAA;gBAC3E,IAAI,aAAa,IAAI,CAAC,IAAI,OAAO,KAAK,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE;oBACzD,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAA;iBACnC;gBAED,GAAG;qBACA,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;qBAC/E,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;;oBACjB,IAAI,aAAa,IAAI,CAAC,EAAE;wBACtB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;wBAEzB,OAAM;qBACP;oBACD,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,MAAM,EAAE;wBACnD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,wBAAa,GAAE,CAAC,CAAA;wBAC1C,MAAM,QAAQ,GAAG,MAAA,MAAA,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,0CAAE,YAAY,mCAAI,CAAC,CAAA;wBAC1E,UAAU,CAAC,GAAG,EAAE;4BACd,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;wBAC3B,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAA;qBACtC;yBAAM;wBACL,OAAO,CAAC,QAAQ,CAAC,CAAA;qBAClB;gBACH,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACb,IAAI,aAAa,IAAI,CAAC,EAAE;wBACtB,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;wBAEzB,OAAM;qBACP;oBACD,UAAU,CAAC,GAAG,EAAE;wBACd,MAAM,CAAC,GAAG,CAAC,CAAA;oBACb,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC1D,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACJ,CAAC;KAAA;IAEO,QAAQ,CAAC,OAAe;QAC9B,OAAO,SAAA,CAAC,EAAI,OAAO,CAAA,GAAG,IAAI,CAAC,cAAc,CAAA;IAC3C,CAAC;IAEO,uBAAuB,CAAC,kBAAsC;QACpE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,mCAAwB,EAAC,kBAAkB,CAAC,CAAC,CAAA;QAEvE,IAAI,kBAAkB,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,kBAAkB,CAAC,MAAM,KAAK,OAAO,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE;YACzG,OAAO,CAAC,CAAA;SACT;QAED,OAAO,CAAC,CAAA;IACV,CAAC;IAEO,qBAAqB,CAAC,KAAU;QACtC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,oCAAyB,EAAC,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAA;QACnF,IAAI,IAAA,kBAAU,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAA,kBAAU,EAAC,KAAK,CAAC,IAAI,IAAA,iBAAS,EAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAE;YAC5F,OAAO,CAAC,CAAA;SACT;QAED,OAAO,CAAC,CAAA;IACV,CAAC;;AA5OH,kDA6OC;AA5Oe,yBAAK,GAAG,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,AAAzB,CAAyB;AAE9B,yBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,eAAe;IACzB,WAAW,EAAE,0CAA0C;IACvD,OAAO,EAAE;;;KAGR;IACD,QAAQ,EAAE;QACR,CAAC,iDAAiD,EAAE,0BAA0B,CAAC;QAC/E;YACE,iFAAiF;YACjF,0CAA0C;SAC3C;QACD;YACE,sFAAsF;YACtF,gDAAgD;SACjD;QACD;YACE,qEAAqE;YACrE,+CAA+C;SAChD;QACD;YACE,oEAAoE;YACpE,+CAA+C;SAChD;QACD;YACE,4EAA4E;YAC5E,+CAA+C;SAChD;QACD;YACE,+EAA+E;YAC/E,wCAAwC;SACzC;QACD,CAAC,iEAAiE,EAAE,oCAAoC,CAAC;KAC1G;CACF,CAAC,AAnCiB,CAmCjB"}
|
|
@@ -4,6 +4,7 @@ export declare const newSimpleGit: () => Promise<simpleGit.SimpleGit>;
|
|
|
4
4
|
export declare const stripCredentials: (remote: string) => string;
|
|
5
5
|
export declare const gitTrackedFiles: (git: simpleGit.SimpleGit) => Promise<string[]>;
|
|
6
6
|
export declare const getCommitInfo: (git: simpleGit.SimpleGit, repositoryURL?: string) => Promise<CommitInfo>;
|
|
7
|
+
export declare const getMergeBase: (git: simpleGit.SimpleGit, target: string, source: string) => Promise<string>;
|
|
7
8
|
export declare const getGitDiff: (git: simpleGit.SimpleGit, from: string, to: string) => Promise<DiffData>;
|
|
8
9
|
export interface DiffData {
|
|
9
10
|
head_sha: string;
|
|
@@ -32,21 +32,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.parseGitDiff = exports.getGitDiff = exports.getCommitInfo = exports.gitTrackedFiles = exports.stripCredentials = exports.newSimpleGit = void 0;
|
|
35
|
+
exports.parseGitDiff = exports.getGitDiff = exports.getMergeBase = exports.getCommitInfo = exports.gitTrackedFiles = exports.stripCredentials = exports.newSimpleGit = void 0;
|
|
36
36
|
const url_1 = require("url");
|
|
37
37
|
const simpleGit = __importStar(require("simple-git"));
|
|
38
|
+
const simple_git_1 = require("simple-git");
|
|
38
39
|
const get_git_data_1 = require("../../helpers/git/get-git-data");
|
|
39
40
|
const interfaces_1 = require("./interfaces");
|
|
40
41
|
// Returns a configured SimpleGit.
|
|
41
42
|
const newSimpleGit = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
43
|
+
const currentDir = process.cwd();
|
|
42
44
|
const options = {
|
|
43
|
-
baseDir:
|
|
45
|
+
baseDir: currentDir,
|
|
44
46
|
binary: 'git',
|
|
45
47
|
maxConcurrentProcesses: 1,
|
|
46
48
|
};
|
|
49
|
+
const git = simpleGit.simpleGit(options);
|
|
50
|
+
try {
|
|
51
|
+
// In some CI envs repo may be checked out as a different user than the one running the command.
|
|
52
|
+
// To be able to run git commands, we need to add the current directory as a safe directory.
|
|
53
|
+
yield git.addConfig('safe.directory', currentDir, true, simple_git_1.GitConfigScope.global);
|
|
54
|
+
}
|
|
55
|
+
catch (e) {
|
|
56
|
+
// Ignore the error
|
|
57
|
+
}
|
|
47
58
|
// Attempt to set the baseDir to the root of the repository so the 'git ls-files' command
|
|
48
59
|
// returns the tracked files paths relative to the root of the repository.
|
|
49
|
-
const git = simpleGit.simpleGit(options);
|
|
50
60
|
const root = yield git.revparse('--show-toplevel');
|
|
51
61
|
options.baseDir = root;
|
|
52
62
|
return simpleGit.simpleGit(options);
|
|
@@ -93,6 +103,11 @@ const getCommitInfo = (git, repositoryURL) => __awaiter(void 0, void 0, void 0,
|
|
|
93
103
|
return new interfaces_1.CommitInfo(hash, remote, trackedFiles);
|
|
94
104
|
});
|
|
95
105
|
exports.getCommitInfo = getCommitInfo;
|
|
106
|
+
const getMergeBase = (git, target, source) => __awaiter(void 0, void 0, void 0, function* () {
|
|
107
|
+
const result = yield git.raw(['merge-base', target, source]);
|
|
108
|
+
return result.trim();
|
|
109
|
+
});
|
|
110
|
+
exports.getMergeBase = getMergeBase;
|
|
96
111
|
const getGitDiff = (git, from, to) => __awaiter(void 0, void 0, void 0, function* () {
|
|
97
112
|
const fromResolved = yield git.revparse(from);
|
|
98
113
|
const toResolved = yield git.revparse(to);
|
|
@@ -165,9 +180,8 @@ const base64Encode = (set) => {
|
|
|
165
180
|
}
|
|
166
181
|
const bytes = new Uint8Array(Math.ceil(maxBit / 8));
|
|
167
182
|
for (const n of set) {
|
|
168
|
-
const idx = n - 1;
|
|
169
183
|
// eslint-disable-next-line no-bitwise
|
|
170
|
-
bytes[
|
|
184
|
+
bytes[n >> 3] |= 1 << (n & 7);
|
|
171
185
|
}
|
|
172
186
|
return Buffer.from(bytes).toString('base64');
|
|
173
187
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/git.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAuB;AAEvB,sDAAuC;
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/git.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAuB;AAEvB,sDAAuC;AACvC,2CAAyC;AAEzC,iEAAwD;AAExD,6CAAuC;AAEvC,kCAAkC;AAC3B,MAAM,YAAY,GAAG,GAAuC,EAAE;IACnE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAChC,MAAM,OAAO,GAAG;QACd,OAAO,EAAE,UAAU;QACnB,MAAM,EAAE,KAAK;QACb,sBAAsB,EAAE,CAAC;KAC1B,CAAA;IAED,MAAM,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IAExC,IAAI;QACF,gGAAgG;QAChG,4FAA4F;QAC5F,MAAM,GAAG,CAAC,SAAS,CAAC,gBAAgB,EAAE,UAAU,EAAE,IAAI,EAAE,2BAAc,CAAC,MAAM,CAAC,CAAA;KAC/E;IAAC,OAAO,CAAC,EAAE;QACV,mBAAmB;KACpB;IAED,yFAAyF;IACzF,0EAA0E;IAC1E,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA;IAClD,OAAO,CAAC,OAAO,GAAG,IAAI,CAAA;IAEtB,OAAO,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;AACrC,CAAC,CAAA,CAAA;AAxBY,QAAA,YAAY,gBAwBxB;AAED,+DAA+D;AACxD,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAE,EAAE;IACjD,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,SAAG,CAAC,MAAM,CAAC,CAAA;QAC3B,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;QACjB,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAA;QAEjB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;KACtB;IAAC,WAAM;QACN,OAAO,MAAM,CAAA;KACd;AACH,CAAC,CAAA;AAVY,QAAA,gBAAgB,oBAU5B;AAED,8CAA8C;AAC9C,MAAM,OAAO,GAAG,CAAO,GAAwB,EAAmB,EAAE,kDAAC,OAAA,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA,GAAA,CAAA;AAEzF,uDAAuD;AAChD,MAAM,eAAe,GAAG,CAAO,GAAwB,EAAqB,EAAE;IACnF,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAEvC,OAAO,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;AAC1D,CAAC,CAAA,CAAA;AAJY,QAAA,eAAe,mBAI3B;AAED,gEAAgE;AACzD,MAAM,aAAa,GAAG,CAAO,GAAwB,EAAE,aAAsB,EAAuB,EAAE;IAC3G,sEAAsE;IACtE,uFAAuF;IACvF,6BAA6B;IAC7B,IAAI,MAAc,CAAA;IAClB,IAAI,IAAY,CAAA;IAChB,IAAI,YAAsB,CAAA;IAC1B,IAAI,aAAa,EAAE;QACjB,CAAC;QAAA,CAAC,IAAI,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAA,uBAAe,EAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QAC/E,MAAM,GAAG,aAAa,CAAA;KACvB;SAAM;QACL,CAAC;QAAA,CAAC,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAA,wBAAS,EAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,IAAA,uBAAe,EAAC,GAAG,CAAC,CAAC,CAAC,CAAA;KACxG;IAED,OAAO,IAAI,uBAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;AACnD,CAAC,CAAA,CAAA;AAfY,QAAA,aAAa,iBAezB;AAEM,MAAM,YAAY,GAAG,CAAO,GAAwB,EAAE,MAAc,EAAE,MAAc,EAAmB,EAAE;IAC9G,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IAE5D,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;AACtB,CAAC,CAAA,CAAA;AAJY,QAAA,YAAY,gBAIxB;AAEM,MAAM,UAAU,GAAG,CAAO,GAAwB,EAAE,IAAY,EAAE,EAAU,EAAqB,EAAE;IACxG,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAC7C,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAEzC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC;QAC7B,aAAa;QACb,YAAY;QACZ,eAAe;QACf,cAAc;QACd,0BAA0B;QAC1B,GAAG,YAAY,KAAK,UAAU,EAAE;KACjC,CAAC,CAAA;IAEF,OAAO;QACL,QAAQ,EAAE,UAAU;QACpB,QAAQ,EAAE,YAAY;QACtB,KAAK,EAAE,IAAA,oBAAY,EAAC,OAAO,CAAC;KAC7B,CAAA;AACH,CAAC,CAAA,CAAA;AAlBY,QAAA,UAAU,cAkBtB;AAaD,MAAM,eAAe,GAAG,4BAA4B,CAAA;AACpD,MAAM,eAAe,GAAG,6CAA6C,CAAA;AAE9D,MAAM,YAAY,GAAG,CAAC,IAAY,EAA4B,EAAE;;IACrE,MAAM,IAAI,GAA6B,EAAE,CAAA;IAMzC,IAAI,WAA+B,CAAA;IACnC,IAAI,YAAgC,CAAA;IAEpC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACtC,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC7C,IAAI,UAAU,EAAE;YACd,IAAI,WAAW,IAAI,YAAY,EAAE;gBAC/B,IAAI,CAAC,WAAW,CAAC,GAAG;oBAClB,WAAW,EAAE,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC;oBAClD,aAAa,EAAE,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC;iBACvD,CAAA;aACF;YAED,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;YAC3B,YAAY,GAAG,EAAC,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE,YAAY,EAAE,IAAI,GAAG,EAAE,EAAC,CAAA;YAC/D,SAAQ;SACT;QAED,IAAI,CAAC,YAAY,EAAE;YACjB,iCAAiC;YACjC,SAAQ;SACT;QAED,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC7C,IAAI,UAAU,EAAE;YACd,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;YACtC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAA,UAAU,CAAC,CAAC,CAAC,mCAAI,CAAC,CAAC,CAAA;YACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;YACtC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAA,UAAU,CAAC,CAAC,CAAC,mCAAI,CAAC,CAAC,CAAA;YAEzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC/B,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAA;aAC5C;YACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC/B,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAA;aAC1C;SACF;KACF;IAED,IAAI,WAAW,IAAI,YAAY,EAAE;QAC/B,IAAI,CAAC,WAAW,CAAC,GAAG;YAClB,WAAW,EAAE,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC;YAClD,aAAa,EAAE,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC;SACvD,CAAA;KACF;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAtDY,QAAA,YAAY,gBAsDxB;AAED,MAAM,YAAY,GAAG,CAAC,GAAgB,EAAU,EAAE;IAChD,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9C,IAAI,MAAM,KAAK,CAAC,EAAE;QAChB,OAAO,EAAE,CAAA;KACV;IACD,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;IACnD,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;QACnB,sCAAsC;QACtC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;KAC9B;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AAC9C,CAAC,CAAA"}
|
|
@@ -128,7 +128,7 @@ const calculateUpdateRequest = (config, settings, region, runtime) => __awaiter(
|
|
|
128
128
|
changedEnvVars[constants_1.SITE_ENV_VAR] = site;
|
|
129
129
|
}
|
|
130
130
|
else {
|
|
131
|
-
throw new Error('Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, ap1.datadoghq.com, or ddog-gov.com.');
|
|
131
|
+
throw new Error('Warning: Invalid site URL. Must be either datadoghq.com, datadoghq.eu, us3.datadoghq.com, us5.datadoghq.com, ap1.datadoghq.com, ap2.datadoghq.com, or ddog-gov.com.');
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
134
|
if (site === undefined && oldEnvVars[constants_1.SITE_ENV_VAR] === undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../../src/commands/lambda/functions/instrument.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../../src/commands/lambda/functions/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -137,13 +137,16 @@ const generatePayload = (jsonContent, tags, service, env) => {
|
|
|
137
137
|
continue;
|
|
138
138
|
}
|
|
139
139
|
const affects = [];
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
140
|
+
// Iterate over the affects of the vulnerability when it exists
|
|
141
|
+
if (vulnerability['affects']) {
|
|
142
|
+
for (const affected of vulnerability['affects']) {
|
|
143
|
+
if (!affected['ref']) {
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
146
|
+
affects.push({
|
|
147
|
+
ref: affected['ref'],
|
|
148
|
+
});
|
|
143
149
|
}
|
|
144
|
-
affects.push({
|
|
145
|
-
ref: affected['ref'],
|
|
146
|
-
});
|
|
147
150
|
}
|
|
148
151
|
vulnerabilities.push({
|
|
149
152
|
id: vulnerability['id'],
|
|
@@ -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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"}
|
|
@@ -7,6 +7,7 @@ export declare class DeployTestsCommand extends BaseCommand {
|
|
|
7
7
|
private files;
|
|
8
8
|
private publicIds;
|
|
9
9
|
private subdomain;
|
|
10
|
+
private excludeFields;
|
|
10
11
|
static getDefaultConfig(): DeployTestsCommandConfig;
|
|
11
12
|
execute(): Promise<0 | 1>;
|
|
12
13
|
protected resolveConfigFromEnv(): RecursivePartial<DeployTestsCommandConfig>;
|
|
@@ -27,9 +27,12 @@ class DeployTestsCommand extends base_command_1.BaseCommand {
|
|
|
27
27
|
this.subdomain = clipanion_1.Option.String('--subdomain', {
|
|
28
28
|
description: 'The custom subdomain to access your Datadog organization. If your URL is `myorg.datadoghq.com`, the custom subdomain is `myorg`.',
|
|
29
29
|
});
|
|
30
|
+
this.excludeFields = clipanion_1.Option.Array('--exclude-field', {
|
|
31
|
+
description: 'Fields to exclude from partial updates, to avoid breaking Main Test Definitions with data specific to Local Test Definitions, like the Start URL. By default, all fields inside `config` are excluded.',
|
|
32
|
+
});
|
|
30
33
|
}
|
|
31
34
|
static getDefaultConfig() {
|
|
32
|
-
return Object.assign(Object.assign({}, super.getDefaultConfig()), { files: [], publicIds: [], subdomain: 'app' });
|
|
35
|
+
return Object.assign(Object.assign({}, super.getDefaultConfig()), { files: [], publicIds: [], subdomain: 'app', excludeFields: ['config'] });
|
|
33
36
|
}
|
|
34
37
|
execute() {
|
|
35
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -46,11 +49,11 @@ class DeployTestsCommand extends base_command_1.BaseCommand {
|
|
|
46
49
|
});
|
|
47
50
|
}
|
|
48
51
|
resolveConfigFromEnv() {
|
|
49
|
-
var _a, _b;
|
|
50
|
-
return Object.assign(Object.assign({}, super.resolveConfigFromEnv()), { files: (_a = process.env.DATADOG_SYNTHETICS_FILES) === null || _a === void 0 ? void 0 : _a.split(';'), publicIds: (_b = process.env.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _b === void 0 ? void 0 : _b.split(';'), subdomain: process.env.DATADOG_SUBDOMAIN });
|
|
52
|
+
var _a, _b, _c;
|
|
53
|
+
return Object.assign(Object.assign({}, super.resolveConfigFromEnv()), { files: (_a = process.env.DATADOG_SYNTHETICS_FILES) === null || _a === void 0 ? void 0 : _a.split(';'), publicIds: (_b = process.env.DATADOG_SYNTHETICS_PUBLIC_IDS) === null || _b === void 0 ? void 0 : _b.split(';'), subdomain: process.env.DATADOG_SUBDOMAIN, excludeFields: (_c = process.env.DATADOG_SYNTHETICS_EXCLUDE_FIELDS) === null || _c === void 0 ? void 0 : _c.split(';') });
|
|
51
54
|
}
|
|
52
55
|
resolveConfigFromCli() {
|
|
53
|
-
return Object.assign(Object.assign({}, super.resolveConfigFromCli()), { files: this.files, publicIds: this.publicIds, subdomain: this.subdomain });
|
|
56
|
+
return Object.assign(Object.assign({}, super.resolveConfigFromCli()), { files: this.files, publicIds: this.publicIds, subdomain: this.subdomain, excludeFields: this.excludeFields });
|
|
54
57
|
}
|
|
55
58
|
}
|
|
56
59
|
exports.DeployTestsCommand = DeployTestsCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/deploy-tests-command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,+CAAoD;AAEpD,iDAA4D;AAC5D,yDAA8C;AAG9C,MAAM,kBAAkB,GAAG,4BAA4B,CAAA;AAEvD,MAAM,EAAE,GAAG,IAAA,wBAAgB,EAAC,GAAG,kBAAkB,gEAAgE,CAAC,CAAA;AAElH,MAAa,kBAAmB,SAAQ,0BAAW;IAAnD;;QAqBY,WAAM,GAA6B,kBAAkB,CAAC,gBAAgB,EAAE,CAAA;QAE1E,UAAK,GAAG,kBAAM,CAAC,KAAK,CAAC,YAAY,EAAE;YACzC,WAAW,EAAE,qCAAqC,EAAE,CAAA,0BAA0B,IAAI;SACnF,CAAC,CAAA;QACM,cAAS,GAAG,kBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAC,WAAW,EAAE,0CAA0C,EAAC,CAAC,CAAA;QACrG,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YAC/C,WAAW,EACT,kIAAkI;SACrI,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"deploy-tests-command.js","sourceRoot":"","sources":["../../../src/commands/synthetics/deploy-tests-command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAyC;AAEzC,+CAAoD;AAEpD,iDAA4D;AAC5D,yDAA8C;AAG9C,MAAM,kBAAkB,GAAG,4BAA4B,CAAA;AAEvD,MAAM,EAAE,GAAG,IAAA,wBAAgB,EAAC,GAAG,kBAAkB,gEAAgE,CAAC,CAAA;AAElH,MAAa,kBAAmB,SAAQ,0BAAW;IAAnD;;QAqBY,WAAM,GAA6B,kBAAkB,CAAC,gBAAgB,EAAE,CAAA;QAE1E,UAAK,GAAG,kBAAM,CAAC,KAAK,CAAC,YAAY,EAAE;YACzC,WAAW,EAAE,qCAAqC,EAAE,CAAA,0BAA0B,IAAI;SACnF,CAAC,CAAA;QACM,cAAS,GAAG,kBAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAC,WAAW,EAAE,0CAA0C,EAAC,CAAC,CAAA;QACrG,cAAS,GAAG,kBAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YAC/C,WAAW,EACT,kIAAkI;SACrI,CAAC,CAAA;QACM,kBAAa,GAAG,kBAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE;YACtD,WAAW,EACT,wMAAwM;SAC3M,CAAC,CAAA;IA8CJ,CAAC;IA5CQ,MAAM,CAAC,gBAAgB;QAC5B,uCACK,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,EAAE,EACT,SAAS,EAAE,EAAE,EACb,SAAS,EAAE,KAAK,EAChB,aAAa,EAAE,CAAC,QAAQ,CAAC,IAC1B;IACH,CAAC;IAEY,OAAO;;YAClB,sBAAsB;YACtB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAElB,IAAI;gBACF,MAAM,IAAA,8BAAW,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;aAC9C;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;gBAE5C,OAAO,CAAC,CAAA;aACT;YAED,OAAO,CAAC,CAAA;QACV,CAAC;KAAA;IAES,oBAAoB;;QAC5B,uCACK,KAAK,CAAC,oBAAoB,EAAE,KAC/B,KAAK,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,wBAAwB,0CAAE,KAAK,CAAC,GAAG,CAAC,EACvD,SAAS,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,6BAA6B,0CAAE,KAAK,CAAC,GAAG,CAAC,EAChE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,EACxC,aAAa,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,iCAAiC,0CAAE,KAAK,CAAC,GAAG,CAAC,IACzE;IACH,CAAC;IAES,oBAAoB;QAC5B,uCACK,KAAK,CAAC,oBAAoB,EAAE,KAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,SAAS,EAAE,IAAI,CAAC,SAAS,EACzB,SAAS,EAAE,IAAI,CAAC,SAAS,EACzB,aAAa,EAAE,IAAI,CAAC,aAAa,IAClC;IACH,CAAC;;AA/EH,gDAgFC;AA/Ee,wBAAK,GAAG,CAAC,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,AAAnC,CAAmC;AAExC,wBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,YAAY;IACtB,WAAW,EAAE,oEAAoE;IACjF,OAAO,EAAE;;KAER;IACD,QAAQ,EAAE;QACR;YACE,yDAAyD;YACzD,oFAAoF;SACrF;QACD;YACE,mCAAmC;YACnC,gHAAgH;SACjH;KACF;CACF,CAAC,AAhBiB,CAgBjB"}
|
|
@@ -8,12 +8,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.deployTests = void 0;
|
|
16
|
+
const get_value_1 = __importDefault(require("get-value"));
|
|
17
|
+
const set_value_1 = __importDefault(require("set-value"));
|
|
13
18
|
const app_1 = require("../../helpers/app");
|
|
14
19
|
const api_1 = require("./api");
|
|
15
20
|
const test_1 = require("./test");
|
|
16
21
|
const internal_1 = require("./utils/internal");
|
|
22
|
+
const removeExcludedFields = (existingRemoteTest, excludeFields, test) => {
|
|
23
|
+
if (!excludeFields || excludeFields.length === 0) {
|
|
24
|
+
return test;
|
|
25
|
+
}
|
|
26
|
+
const newTest = Object.assign({}, test);
|
|
27
|
+
for (const path of excludeFields) {
|
|
28
|
+
const existingValue = (0, get_value_1.default)(existingRemoteTest, path);
|
|
29
|
+
if (existingValue) {
|
|
30
|
+
(0, set_value_1.default)(newTest, path, existingValue);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return newTest;
|
|
34
|
+
};
|
|
17
35
|
const deployTests = (reporter, config) => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
36
|
var _a;
|
|
19
37
|
const api = (0, api_1.getApiHelper)(config);
|
|
@@ -35,7 +53,7 @@ const deployTests = (reporter, config) => __awaiter(void 0, void 0, void 0, func
|
|
|
35
53
|
// SYNTH-18434: public ID should be made required
|
|
36
54
|
const publicId = localTestDefinition.localTestDefinition.public_id;
|
|
37
55
|
try {
|
|
38
|
-
yield deployLocalTestDefinition(api, localTestDefinition);
|
|
56
|
+
yield deployLocalTestDefinition(api, localTestDefinition, config.excludeFields);
|
|
39
57
|
// SYNTH-18527: the edit test endpoint should return a version in the response, so we can print it in the logs and see it in version history
|
|
40
58
|
const baseUrl = (0, app_1.getCommonAppBaseURL)(config.datadogSite, config.subdomain);
|
|
41
59
|
const testLink = `${baseUrl}synthetics/details/${publicId}`;
|
|
@@ -48,13 +66,15 @@ const deployTests = (reporter, config) => __awaiter(void 0, void 0, void 0, func
|
|
|
48
66
|
}
|
|
49
67
|
});
|
|
50
68
|
exports.deployTests = deployTests;
|
|
51
|
-
const deployLocalTestDefinition = (api, test) => __awaiter(void 0, void 0, void 0, function* () {
|
|
69
|
+
const deployLocalTestDefinition = (api, test, excludeFields) => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
70
|
// SYNTH-18434: public ID should be made required
|
|
53
71
|
const publicId = test.localTestDefinition.public_id;
|
|
54
72
|
const existingRemoteTest = yield api.getTest(publicId);
|
|
55
73
|
// SYNTH-18528: the client should not have to handle the merge for partial update
|
|
56
74
|
const newRemoteTest = removeUnsupportedEditTestFields(Object.assign(Object.assign(Object.assign({}, existingRemoteTest), test.localTestDefinition), { config: Object.assign(Object.assign({}, existingRemoteTest.config), test.localTestDefinition.config), options: Object.assign(Object.assign({}, existingRemoteTest.options), test.localTestDefinition.options) }));
|
|
57
|
-
|
|
75
|
+
// Replace excluded fields with values from the existing remote test
|
|
76
|
+
const finalTest = removeExcludedFields(existingRemoteTest, excludeFields || [], newRemoteTest);
|
|
77
|
+
yield api.editTest(publicId, finalTest);
|
|
58
78
|
});
|
|
59
79
|
const removeUnsupportedEditTestFields = (testConfig) => {
|
|
60
80
|
const editTestPayload = Object.assign({}, testConfig);
|