@datadog/datadog-ci 1.8.0 → 1.9.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/commands/dsyms/interfaces.d.ts +1 -0
- package/dist/commands/dsyms/interfaces.js +15 -4
- package/dist/commands/dsyms/interfaces.js.map +1 -1
- package/dist/commands/git-metadata/interfaces.d.ts +1 -0
- package/dist/commands/git-metadata/interfaces.js +15 -4
- package/dist/commands/git-metadata/interfaces.js.map +1 -1
- package/dist/commands/junit/__tests__/upload.test.js +15 -25
- package/dist/commands/junit/__tests__/upload.test.js.map +1 -1
- package/dist/commands/junit/renderer.d.ts +2 -1
- package/dist/commands/junit/renderer.js +19 -1
- package/dist/commands/junit/renderer.js.map +1 -1
- package/dist/commands/junit/upload.d.ts +1 -0
- package/dist/commands/junit/upload.js +15 -10
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/junit/utils.d.ts +4 -0
- package/dist/commands/junit/utils.js +45 -1
- package/dist/commands/junit/utils.js.map +1 -1
- package/dist/commands/{sourcemaps/__tests__/git.test.d.ts → react-native/__tests__/interfaces.test.d.ts} +0 -0
- package/dist/commands/react-native/__tests__/interfaces.test.js +27 -0
- package/dist/commands/react-native/__tests__/interfaces.test.js.map +1 -0
- package/dist/{helpers/__tests__/git.test.d.ts → commands/react-native/__tests__/upload.test.d.ts} +0 -0
- package/dist/commands/react-native/__tests__/upload.test.js +153 -0
- package/dist/commands/react-native/__tests__/upload.test.js.map +1 -0
- package/dist/commands/react-native/cli.d.ts +1 -0
- package/dist/commands/react-native/cli.js +5 -0
- package/dist/commands/react-native/cli.js.map +1 -0
- package/dist/commands/react-native/interfaces.d.ts +19 -0
- package/dist/commands/react-native/interfaces.js +70 -0
- package/dist/commands/react-native/interfaces.js.map +1 -0
- package/dist/commands/react-native/renderer.d.ts +18 -0
- package/dist/commands/react-native/renderer.js +95 -0
- package/dist/commands/react-native/renderer.js.map +1 -0
- package/dist/commands/react-native/upload.d.ts +25 -0
- package/dist/commands/react-native/upload.js +260 -0
- package/dist/commands/react-native/upload.js.map +1 -0
- package/dist/commands/react-native/validation.d.ts +6 -0
- package/dist/commands/react-native/validation.js +32 -0
- package/dist/commands/react-native/validation.js.map +1 -0
- package/dist/commands/sourcemaps/interfaces.d.ts +1 -0
- package/dist/commands/sourcemaps/interfaces.js +32 -20
- package/dist/commands/sourcemaps/interfaces.js.map +1 -1
- package/dist/commands/sourcemaps/renderer.js +1 -1
- package/dist/commands/sourcemaps/renderer.js.map +1 -1
- package/dist/commands/sourcemaps/upload.js +20 -14
- package/dist/commands/sourcemaps/upload.js.map +1 -1
- package/dist/commands/sourcemaps/utils.d.ts +0 -2
- package/dist/commands/sourcemaps/utils.js +1 -18
- package/dist/commands/sourcemaps/utils.js.map +1 -1
- package/dist/commands/sourcemaps/validation.js +3 -22
- package/dist/commands/sourcemaps/validation.js.map +1 -1
- package/dist/commands/trace/api.js +2 -2
- package/dist/commands/trace/api.js.map +1 -1
- package/dist/helpers/base-intake-url.d.ts +1 -0
- package/dist/helpers/base-intake-url.js +14 -0
- package/dist/helpers/base-intake-url.js.map +1 -0
- package/dist/helpers/git/__tests__/format-git-sourcemaps-data.test.d.ts +1 -0
- package/dist/{commands/sourcemaps/__tests__/git.test.js → helpers/git/__tests__/format-git-sourcemaps-data.test.js} +15 -71
- package/dist/helpers/git/__tests__/format-git-sourcemaps-data.test.js.map +1 -0
- package/dist/helpers/git/__tests__/format-git-span-data.test.d.ts +1 -0
- package/dist/helpers/{__tests__/git.test.js → git/__tests__/format-git-span-data.test.js} +5 -5
- package/dist/helpers/git/__tests__/format-git-span-data.test.js.map +1 -0
- package/dist/helpers/git/__tests__/get-git-data.test.d.ts +1 -0
- package/dist/helpers/git/__tests__/get-git-data.test.js +60 -0
- package/dist/helpers/git/__tests__/get-git-data.test.js.map +1 -0
- package/dist/{commands/sourcemaps/git.d.ts → helpers/git/format-git-sourcemaps-data.d.ts} +2 -7
- package/dist/{commands/sourcemaps/git.js → helpers/git/format-git-sourcemaps-data.js} +9 -48
- package/dist/helpers/git/format-git-sourcemaps-data.js.map +1 -0
- package/dist/helpers/{git.d.ts → git/format-git-span-data.d.ts} +1 -1
- package/dist/helpers/{git.js → git/format-git-span-data.js} +8 -7
- package/dist/helpers/git/format-git-span-data.js.map +1 -0
- package/dist/helpers/git/get-git-data.d.ts +10 -0
- package/dist/helpers/git/get-git-data.js +60 -0
- package/dist/helpers/git/get-git-data.js.map +1 -0
- package/dist/helpers/metrics.js +0 -1
- package/dist/helpers/metrics.js.map +1 -1
- package/dist/helpers/utils.d.ts +1 -0
- package/dist/helpers/utils.js +8 -1
- package/dist/helpers/utils.js.map +1 -1
- package/dist/helpers/validation.d.ts +4 -0
- package/dist/helpers/validation.js +25 -0
- package/dist/helpers/validation.js.map +1 -0
- package/package.json +2 -2
- package/dist/commands/sourcemaps/__tests__/git.test.js.map +0 -1
- package/dist/commands/sourcemaps/git.js.map +0 -1
- package/dist/helpers/__tests__/git.test.js.map +0 -1
- package/dist/helpers/git.js.map +0 -1
|
@@ -0,0 +1,260 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.UploadCommand = void 0;
|
|
16
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
17
|
+
const clipanion_1 = require("clipanion");
|
|
18
|
+
const tiny_async_pool_1 = __importDefault(require("tiny-async-pool"));
|
|
19
|
+
const apikey_1 = require("../../helpers/apikey");
|
|
20
|
+
const base_intake_url_1 = require("../../helpers/base-intake-url");
|
|
21
|
+
const errors_1 = require("../../helpers/errors");
|
|
22
|
+
const format_git_sourcemaps_data_1 = require("../../helpers/git/format-git-sourcemaps-data");
|
|
23
|
+
const metrics_1 = require("../../helpers/metrics");
|
|
24
|
+
const upload_1 = require("../../helpers/upload");
|
|
25
|
+
const utils_1 = require("../../helpers/utils");
|
|
26
|
+
const interfaces_1 = require("./interfaces");
|
|
27
|
+
const renderer_1 = require("./renderer");
|
|
28
|
+
const validation_1 = require("./validation");
|
|
29
|
+
class UploadCommand extends clipanion_1.Command {
|
|
30
|
+
constructor() {
|
|
31
|
+
super();
|
|
32
|
+
this.config = {
|
|
33
|
+
apiKey: process.env.DATADOG_API_KEY,
|
|
34
|
+
datadogSite: process.env.DATADOG_SITE || 'datadoghq.com',
|
|
35
|
+
};
|
|
36
|
+
this.dryRun = false;
|
|
37
|
+
this.maxConcurrency = 20;
|
|
38
|
+
this.projectPath = process.cwd() || '';
|
|
39
|
+
// Fills the 'repository' field of each payload with data gathered using git.
|
|
40
|
+
this.addRepositoryDataToPayloads = (payloads) => __awaiter(this, void 0, void 0, function* () {
|
|
41
|
+
try {
|
|
42
|
+
const repositoryData = yield format_git_sourcemaps_data_1.getRepositoryData(yield format_git_sourcemaps_data_1.newSimpleGit(), this.repositoryURL);
|
|
43
|
+
payloads.forEach((payload) => {
|
|
44
|
+
const repositoryPayload = this.getRepositoryPayload(repositoryData, payload.sourcemapPath);
|
|
45
|
+
payload.addRepositoryData({
|
|
46
|
+
gitCommitSha: repositoryData.hash,
|
|
47
|
+
gitRepositoryPayload: repositoryPayload,
|
|
48
|
+
gitRepositoryURL: repositoryData.remote,
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
catch (e) {
|
|
53
|
+
this.context.stdout.write(renderer_1.renderGitWarning(e));
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
// Looks for the sourcemaps and minified files on disk and returns
|
|
57
|
+
// the associated payloads.
|
|
58
|
+
this.getMatchingRNSourcemapFiles = () => [new interfaces_1.RNSourcemap(this.bundle, this.sourcemap)];
|
|
59
|
+
this.getPayloadsToUpload = (useGit) => __awaiter(this, void 0, void 0, function* () {
|
|
60
|
+
const payloads = this.getMatchingRNSourcemapFiles();
|
|
61
|
+
if (!useGit) {
|
|
62
|
+
return payloads;
|
|
63
|
+
}
|
|
64
|
+
yield this.addRepositoryDataToPayloads(payloads);
|
|
65
|
+
return payloads;
|
|
66
|
+
});
|
|
67
|
+
// GetRepositoryPayload generates the repository payload for a specific sourcemap.
|
|
68
|
+
// It specifically looks for the list of tracked files that are associated to the source paths
|
|
69
|
+
// declared inside the sourcemap.
|
|
70
|
+
this.getRepositoryPayload = (repositoryData, sourcemapPath) => {
|
|
71
|
+
const onSourcesNotFound = () => {
|
|
72
|
+
this.context.stdout.write(renderer_1.renderSourcesNotFoundWarning(sourcemapPath));
|
|
73
|
+
};
|
|
74
|
+
let repositoryPayload;
|
|
75
|
+
try {
|
|
76
|
+
const files = repositoryData.trackedFilesMatcher.matchSourcemap(sourcemapPath, onSourcesNotFound);
|
|
77
|
+
if (files) {
|
|
78
|
+
repositoryPayload = JSON.stringify({
|
|
79
|
+
data: [
|
|
80
|
+
{
|
|
81
|
+
files,
|
|
82
|
+
hash: repositoryData.hash,
|
|
83
|
+
repository_url: repositoryData.remote,
|
|
84
|
+
},
|
|
85
|
+
],
|
|
86
|
+
// Make sure to update the version if the format of the JSON payloads changes in any way.
|
|
87
|
+
version: 1,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
return repositoryPayload;
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
this.context.stdout.write(renderer_1.renderGitDataNotAttachedWarning(sourcemapPath, error.message));
|
|
94
|
+
return undefined;
|
|
95
|
+
}
|
|
96
|
+
};
|
|
97
|
+
this.cliVersion = require('../../../package.json').version;
|
|
98
|
+
}
|
|
99
|
+
execute() {
|
|
100
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
101
|
+
if (!this.releaseVersion) {
|
|
102
|
+
this.context.stderr.write('Missing release version\n');
|
|
103
|
+
return 1;
|
|
104
|
+
}
|
|
105
|
+
if (!this.buildVersion) {
|
|
106
|
+
this.context.stderr.write('Missing build version\n');
|
|
107
|
+
return 1;
|
|
108
|
+
}
|
|
109
|
+
if (!this.service) {
|
|
110
|
+
this.context.stderr.write('Missing service\n');
|
|
111
|
+
return 1;
|
|
112
|
+
}
|
|
113
|
+
if (!this.bundle) {
|
|
114
|
+
this.context.stderr.write('Missing bundle path\n');
|
|
115
|
+
return 1;
|
|
116
|
+
}
|
|
117
|
+
if (!this.platform) {
|
|
118
|
+
this.context.stderr.write('Missing platform\n');
|
|
119
|
+
return 1;
|
|
120
|
+
}
|
|
121
|
+
if (!interfaces_1.RN_SUPPORTED_PLATFORMS.includes(this.platform)) {
|
|
122
|
+
this.context.stderr.write(`Platform ${this.platform} is not supported.\nSupported platforms are ios and android.\n`);
|
|
123
|
+
return 1;
|
|
124
|
+
}
|
|
125
|
+
if (!this.sourcemap) {
|
|
126
|
+
this.context.stderr.write('Missing sourcemap file path\n');
|
|
127
|
+
return 1;
|
|
128
|
+
}
|
|
129
|
+
this.context.stdout.write(renderer_1.renderCommandInfo(this.bundle, this.sourcemap, this.platform, this.releaseVersion, this.service, this.maxConcurrency, this.dryRun, this.projectPath, this.buildVersion));
|
|
130
|
+
const metricsLogger = metrics_1.getMetricsLogger({
|
|
131
|
+
datadogSite: process.env.DATADOG_SITE,
|
|
132
|
+
defaultTags: [
|
|
133
|
+
`version:${this.releaseVersion}`,
|
|
134
|
+
`build:${this.buildVersion}`,
|
|
135
|
+
`service:${this.service}`,
|
|
136
|
+
`cli_version:${this.cliVersion}`,
|
|
137
|
+
'react-native:true',
|
|
138
|
+
`platform:${this.platform}`,
|
|
139
|
+
],
|
|
140
|
+
prefix: 'datadog.ci.sourcemaps.upload.',
|
|
141
|
+
});
|
|
142
|
+
const apiKeyValidator = apikey_1.newApiKeyValidator({
|
|
143
|
+
apiKey: this.config.apiKey,
|
|
144
|
+
datadogSite: this.config.datadogSite,
|
|
145
|
+
metricsLogger: metricsLogger.logger,
|
|
146
|
+
});
|
|
147
|
+
const useGit = this.disableGit === undefined || !this.disableGit;
|
|
148
|
+
const initialTime = Date.now();
|
|
149
|
+
const payloads = yield this.getPayloadsToUpload(useGit);
|
|
150
|
+
const requestBuilder = this.getRequestBuilder();
|
|
151
|
+
const uploadMultipart = this.upload(requestBuilder, metricsLogger, apiKeyValidator);
|
|
152
|
+
try {
|
|
153
|
+
const results = yield tiny_async_pool_1.default(this.maxConcurrency, payloads, uploadMultipart);
|
|
154
|
+
const totalTime = (Date.now() - initialTime) / 1000;
|
|
155
|
+
this.context.stdout.write(renderer_1.renderSuccessfulCommand(results, totalTime, this.dryRun));
|
|
156
|
+
metricsLogger.logger.gauge('duration', totalTime);
|
|
157
|
+
return 0;
|
|
158
|
+
}
|
|
159
|
+
catch (error) {
|
|
160
|
+
if (error instanceof errors_1.InvalidConfigurationError) {
|
|
161
|
+
this.context.stdout.write(renderer_1.renderConfigurationError(error));
|
|
162
|
+
return 1;
|
|
163
|
+
}
|
|
164
|
+
// Otherwise unknown error, let's propagate the exception
|
|
165
|
+
throw error;
|
|
166
|
+
}
|
|
167
|
+
finally {
|
|
168
|
+
try {
|
|
169
|
+
yield metricsLogger.flush();
|
|
170
|
+
}
|
|
171
|
+
catch (err) {
|
|
172
|
+
this.context.stdout.write(`WARN: ${err}\n`);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
getRequestBuilder() {
|
|
178
|
+
if (!this.config.apiKey) {
|
|
179
|
+
throw new errors_1.InvalidConfigurationError(`Missing ${chalk_1.default.bold('DATADOG_API_KEY')} in your environment.`);
|
|
180
|
+
}
|
|
181
|
+
return utils_1.getRequestBuilder({
|
|
182
|
+
apiKey: this.config.apiKey,
|
|
183
|
+
baseUrl: base_intake_url_1.getBaseSourcemapIntakeUrl(),
|
|
184
|
+
headers: new Map([
|
|
185
|
+
['DD-EVP-ORIGIN', 'datadog-ci react-native'],
|
|
186
|
+
['DD-EVP-ORIGIN-VERSION', this.cliVersion],
|
|
187
|
+
]),
|
|
188
|
+
overrideUrl: `v1/input/${this.config.apiKey}`,
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
upload(requestBuilder, metricsLogger, apiKeyValidator) {
|
|
192
|
+
return (sourcemap) => __awaiter(this, void 0, void 0, function* () {
|
|
193
|
+
try {
|
|
194
|
+
validation_1.validatePayload(sourcemap);
|
|
195
|
+
}
|
|
196
|
+
catch (error) {
|
|
197
|
+
if (error instanceof validation_1.InvalidPayload) {
|
|
198
|
+
this.context.stdout.write(renderer_1.renderFailedUpload(sourcemap, error.message));
|
|
199
|
+
metricsLogger.logger.increment('skipped_sourcemap', 1, [`reason:${error.reason}`]);
|
|
200
|
+
}
|
|
201
|
+
else {
|
|
202
|
+
this.context.stdout.write(renderer_1.renderFailedUpload(sourcemap, `Skipping sourcemap ${sourcemap.sourcemapPath} because of error: ${error.message}`));
|
|
203
|
+
metricsLogger.logger.increment('skipped_sourcemap', 1, ['reason:unknown']);
|
|
204
|
+
}
|
|
205
|
+
return upload_1.UploadStatus.Skipped;
|
|
206
|
+
}
|
|
207
|
+
const payload = sourcemap.asMultipartPayload(this.cliVersion, this.service, this.releaseVersion, this.projectPath, this.platform, this.buildVersion);
|
|
208
|
+
if (this.dryRun) {
|
|
209
|
+
this.context.stdout.write(`[DRYRUN] ${renderer_1.renderUpload(sourcemap)}`);
|
|
210
|
+
return upload_1.UploadStatus.Success;
|
|
211
|
+
}
|
|
212
|
+
return upload_1.upload(requestBuilder)(payload, {
|
|
213
|
+
apiKeyValidator,
|
|
214
|
+
onError: (e) => {
|
|
215
|
+
this.context.stdout.write(renderer_1.renderFailedUpload(sourcemap, e.message));
|
|
216
|
+
metricsLogger.logger.increment('failed', 1);
|
|
217
|
+
},
|
|
218
|
+
onRetry: (e, attempts) => {
|
|
219
|
+
this.context.stdout.write(renderer_1.renderRetriedUpload(sourcemap, e.message, attempts));
|
|
220
|
+
metricsLogger.logger.increment('retries', 1);
|
|
221
|
+
},
|
|
222
|
+
onUpload: () => {
|
|
223
|
+
this.context.stdout.write(renderer_1.renderUpload(sourcemap));
|
|
224
|
+
},
|
|
225
|
+
retries: 5,
|
|
226
|
+
});
|
|
227
|
+
});
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
exports.UploadCommand = UploadCommand;
|
|
231
|
+
UploadCommand.usage = clipanion_1.Command.Usage({
|
|
232
|
+
description: 'Upload React Native sourcemaps to Datadog.',
|
|
233
|
+
details: `
|
|
234
|
+
This command will upload React Native sourcemaps and their corresponding javascript bundle to Datadog in order to un-minify front-end stack traces received by Datadog.
|
|
235
|
+
See README for details.
|
|
236
|
+
`,
|
|
237
|
+
examples: [
|
|
238
|
+
[
|
|
239
|
+
'Upload ios sourcemaps',
|
|
240
|
+
'datadog-ci react-native upload --platform ios --service com.company.app --bundle ./main.jsbundle --sourcemap ./main.jsbundle.map --release-version 1.23.4 --build-version 1234',
|
|
241
|
+
],
|
|
242
|
+
[
|
|
243
|
+
'Upload android sourcemaps',
|
|
244
|
+
'datadog-ci react-native upload --platform android --service com.company.app --bundle ./index.android.bundle --sourcemap ./index.android.bundle.map --release-version 1.23.4 --build-version 1234',
|
|
245
|
+
],
|
|
246
|
+
],
|
|
247
|
+
});
|
|
248
|
+
UploadCommand.addPath('react-native', 'upload');
|
|
249
|
+
UploadCommand.addOption('releaseVersion', clipanion_1.Command.String('--release-version'));
|
|
250
|
+
UploadCommand.addOption('buildVersion', clipanion_1.Command.String('--build-version'));
|
|
251
|
+
UploadCommand.addOption('service', clipanion_1.Command.String('--service'));
|
|
252
|
+
UploadCommand.addOption('bundle', clipanion_1.Command.String('--bundle'));
|
|
253
|
+
UploadCommand.addOption('sourcemap', clipanion_1.Command.String('--sourcemap'));
|
|
254
|
+
UploadCommand.addOption('platform', clipanion_1.Command.String('--platform'));
|
|
255
|
+
UploadCommand.addOption('dryRun', clipanion_1.Command.Boolean('--dry-run'));
|
|
256
|
+
UploadCommand.addOption('repositoryURL', clipanion_1.Command.String('--repository-url'));
|
|
257
|
+
UploadCommand.addOption('disableGit', clipanion_1.Command.Boolean('--disable-git'));
|
|
258
|
+
UploadCommand.addOption('maxConcurrency', clipanion_1.Command.String('--max-concurrency'));
|
|
259
|
+
UploadCommand.addOption('projectPath', clipanion_1.Command.String('--project-path'));
|
|
260
|
+
//# sourceMappingURL=upload.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/react-native/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,yCAAiC;AACjC,sEAAuC;AAEvC,iDAAwE;AACxE,mEAAuE;AACvE,iDAA8D;AAC9D,6FAA4G;AAE5G,mDAAqE;AACrE,iDAAyD;AACzD,+CAAqD;AACrD,6CAA4E;AAC5E,yCAUmB;AACnB,6CAA4D;AAE5D,MAAa,aAAc,SAAQ,mBAAO;IAoCxC;QACE,KAAK,EAAE,CAAA;QAfD,WAAM,GAAG;YACf,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;YACnC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,eAAe;SACzD,CAAA;QAEO,WAAM,GAAG,KAAK,CAAA;QACd,mBAAc,GAAG,EAAE,CAAA;QAEnB,gBAAW,GAAW,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,CAAA;QAmHjD,6EAA6E;QACrE,gCAA2B,GAAG,CAAO,QAAuB,EAAE,EAAE;YACtE,IAAI;gBACF,MAAM,cAAc,GAAG,MAAM,8CAAiB,CAAC,MAAM,yCAAY,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;gBACxF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC3B,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,cAAe,EAAE,OAAO,CAAC,aAAa,CAAC,CAAA;oBAC3F,OAAO,CAAC,iBAAiB,CAAC;wBACxB,YAAY,EAAE,cAAc,CAAC,IAAI;wBACjC,oBAAoB,EAAE,iBAAiB;wBACvC,gBAAgB,EAAE,cAAc,CAAC,MAAM;qBACxC,CAAC,CAAA;gBACJ,CAAC,CAAC,CAAA;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2BAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;aAC/C;QACH,CAAC,CAAA,CAAA;QAED,kEAAkE;QAClE,2BAA2B;QACnB,gCAA2B,GAAG,GAAkB,EAAE,CAAC,CAAC,IAAI,wBAAW,CAAC,IAAI,CAAC,MAAO,EAAE,IAAI,CAAC,SAAU,CAAC,CAAC,CAAA;QAEnG,wBAAmB,GAAG,CAAO,MAAe,EAA0B,EAAE;YAC9E,MAAM,QAAQ,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAA;YACnD,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,QAAQ,CAAA;aAChB;YAED,MAAM,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAA;YAEhD,OAAO,QAAQ,CAAA;QACjB,CAAC,CAAA,CAAA;QAED,kFAAkF;QAClF,8FAA8F;QAC9F,iCAAiC;QACzB,yBAAoB,GAAG,CAAC,cAA8B,EAAE,aAAqB,EAAsB,EAAE;YAC3G,MAAM,iBAAiB,GAAG,GAAG,EAAE;gBAC7B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uCAA4B,CAAC,aAAa,CAAC,CAAC,CAAA;YACxE,CAAC,CAAA;YACD,IAAI,iBAAqC,CAAA;YACzC,IAAI;gBACF,MAAM,KAAK,GAAG,cAAc,CAAC,mBAAmB,CAAC,cAAc,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAA;gBACjG,IAAI,KAAK,EAAE;oBACT,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC;wBACjC,IAAI,EAAE;4BACJ;gCACE,KAAK;gCACL,IAAI,EAAE,cAAc,CAAC,IAAI;gCACzB,cAAc,EAAE,cAAc,CAAC,MAAM;6BACtC;yBACF;wBACD,yFAAyF;wBACzF,OAAO,EAAE,CAAC;qBACX,CAAC,CAAA;iBACH;gBAED,OAAO,iBAAiB,CAAA;aACzB;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA+B,CAAC,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;gBAExF,OAAO,SAAS,CAAA;aACjB;QACH,CAAC,CAAA;QAzKC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,OAAO,CAAA;IAC5D,CAAC;IAEY,OAAO;;YAClB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;gBACxB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAA;gBAEtD,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;gBACtB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAA;gBAEpD,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;gBAE9C,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAChB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;gBAElD,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;gBAE/C,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,mCAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;gBACnD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,YAAY,IAAI,CAAC,QAAQ,gEAAgE,CAC1F,CAAA;gBAED,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;gBAE1D,OAAO,CAAC,CAAA;aACT;YAED,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,4BAAiB,CACf,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,YAAY,CAClB,CACF,CAAA;YACD,MAAM,aAAa,GAAG,0BAAgB,CAAC;gBACrC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;gBACrC,WAAW,EAAE;oBACX,WAAW,IAAI,CAAC,cAAc,EAAE;oBAChC,SAAS,IAAI,CAAC,YAAY,EAAE;oBAC5B,WAAW,IAAI,CAAC,OAAO,EAAE;oBACzB,eAAe,IAAI,CAAC,UAAU,EAAE;oBAChC,mBAAmB;oBACnB,YAAY,IAAI,CAAC,QAAQ,EAAE;iBAC5B;gBACD,MAAM,EAAE,+BAA+B;aACxC,CAAC,CAAA;YACF,MAAM,eAAe,GAAG,2BAAkB,CAAC;gBACzC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;gBAC1B,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;gBACpC,aAAa,EAAE,aAAa,CAAC,MAAM;aACpC,CAAC,CAAA;YACF,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,UAAU,CAAA;YAChE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAA;YACvD,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;YAC/C,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,aAAa,EAAE,eAAe,CAAC,CAAA;YACnF,IAAI;gBACF,MAAM,OAAO,GAAG,MAAM,yBAAS,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAA;gBAC/E,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,GAAG,IAAI,CAAA;gBACnD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAuB,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;gBACnF,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;gBAEjD,OAAO,CAAC,CAAA;aACT;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,KAAK,YAAY,kCAAyB,EAAE;oBAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAwB,CAAC,KAAK,CAAC,CAAC,CAAA;oBAE1D,OAAO,CAAC,CAAA;iBACT;gBACD,yDAAyD;gBACzD,MAAM,KAAK,CAAA;aACZ;oBAAS;gBACR,IAAI;oBACF,MAAM,aAAa,CAAC,KAAK,EAAE,CAAA;iBAC5B;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;iBAC5C;aACF;QACH,CAAC;KAAA;IAkEO,iBAAiB;QACvB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACvB,MAAM,IAAI,kCAAyB,CAAC,WAAW,eAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAA;SACrG;QAED,OAAO,yBAAiB,CAAC;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAO;YAC3B,OAAO,EAAE,2CAAyB,EAAE;YACpC,OAAO,EAAE,IAAI,GAAG,CAAC;gBACf,CAAC,eAAe,EAAE,yBAAyB,CAAC;gBAC5C,CAAC,uBAAuB,EAAE,IAAI,CAAC,UAAU,CAAC;aAC3C,CAAC;YACF,WAAW,EAAE,YAAY,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;SAC9C,CAAC,CAAA;IACJ,CAAC;IAEO,MAAM,CACZ,cAA8B,EAC9B,aAA4B,EAC5B,eAAgC;QAEhC,OAAO,CAAO,SAAsB,EAAE,EAAE;YACtC,IAAI;gBACF,4BAAe,CAAC,SAAS,CAAC,CAAA;aAC3B;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,KAAK,YAAY,2BAAc,EAAE;oBACnC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;oBACvE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC,EAAE,CAAC,UAAU,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;iBACnF;qBAAM;oBACL,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,6BAAkB,CAChB,SAAS,EACT,sBAAsB,SAAS,CAAC,aAAa,sBAAsB,KAAK,CAAC,OAAO,EAAE,CACnF,CACF,CAAA;oBACD,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAA;iBAC3E;gBAED,OAAO,qBAAY,CAAC,OAAO,CAAA;aAC5B;YAED,MAAM,OAAO,GAAG,SAAS,CAAC,kBAAkB,CAC1C,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,OAAQ,EACb,IAAI,CAAC,cAAe,EACpB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAS,EACd,IAAI,CAAC,YAAa,CACnB,CAAA;YACD,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,uBAAY,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;gBAEhE,OAAO,qBAAY,CAAC,OAAO,CAAA;aAC5B;YAED,OAAO,eAAM,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE;gBACrC,eAAe;gBACf,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACb,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAAkB,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;oBACnE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;gBAC7C,CAAC;gBACD,OAAO,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE;oBACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,8BAAmB,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;oBAC9E,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;gBAC9C,CAAC;gBACD,QAAQ,EAAE,GAAG,EAAE;oBACb,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAY,CAAC,SAAS,CAAC,CAAC,CAAA;gBACpD,CAAC;gBACD,OAAO,EAAE,CAAC;aACX,CAAC,CAAA;QACJ,CAAC,CAAA,CAAA;IACH,CAAC;;AAxRH,sCAyRC;AAxRe,mBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,WAAW,EAAE,4CAA4C;IACzD,OAAO,EAAE;;;SAGJ;IACL,QAAQ,EAAE;QACR;YACE,uBAAuB;YACvB,gLAAgL;SACjL;QACD;YACE,2BAA2B;YAC3B,kMAAkM;SACnM;KACF;CACF,CAAC,CAAA;AA0QJ,aAAa,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;AAC/C,aAAa,CAAC,SAAS,CAAC,gBAAgB,EAAE,mBAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAA;AAC9E,aAAa,CAAC,SAAS,CAAC,cAAc,EAAE,mBAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAA;AAC1E,aAAa,CAAC,SAAS,CAAC,SAAS,EAAE,mBAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;AAC/D,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,mBAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;AAC7D,aAAa,CAAC,SAAS,CAAC,WAAW,EAAE,mBAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAA;AACnE,aAAa,CAAC,SAAS,CAAC,UAAU,EAAE,mBAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;AACjE,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,mBAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAA;AAC/D,aAAa,CAAC,SAAS,CAAC,eAAe,EAAE,mBAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAA;AAC5E,aAAa,CAAC,SAAS,CAAC,YAAY,EAAE,mBAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAA;AACvE,aAAa,CAAC,SAAS,CAAC,gBAAgB,EAAE,mBAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAA;AAC9E,aAAa,CAAC,SAAS,CAAC,aAAa,EAAE,mBAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAA"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validatePayload = exports.InvalidPayload = void 0;
|
|
4
|
+
const validation_1 = require("../../helpers/validation");
|
|
5
|
+
class InvalidPayload extends Error {
|
|
6
|
+
constructor(reason, message) {
|
|
7
|
+
super(message);
|
|
8
|
+
this.reason = reason;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
exports.InvalidPayload = InvalidPayload;
|
|
12
|
+
const validatePayload = (sourcemap) => {
|
|
13
|
+
// Check existence of sourcemap file
|
|
14
|
+
const sourcemapCheck = validation_1.checkFile(sourcemap.sourcemapPath);
|
|
15
|
+
if (!sourcemapCheck.exists) {
|
|
16
|
+
// This case should not happen as all collected sourcemaps should point to correct files
|
|
17
|
+
throw new InvalidPayload('missing_sourcemap', `Skipping missing sourcemap (${sourcemap.sourcemapPath})`);
|
|
18
|
+
}
|
|
19
|
+
if (sourcemapCheck.empty) {
|
|
20
|
+
throw new InvalidPayload('empty_sourcemap', `Skipping empty sourcemap (${sourcemap.sourcemapPath})`);
|
|
21
|
+
}
|
|
22
|
+
// Check existence of bundle file
|
|
23
|
+
const bundleCheck = validation_1.checkFile(sourcemap.bundlePath);
|
|
24
|
+
if (!bundleCheck.exists) {
|
|
25
|
+
throw new InvalidPayload('missing_js', `Missing corresponding JS file for sourcemap (${sourcemap.bundlePath})`);
|
|
26
|
+
}
|
|
27
|
+
if (bundleCheck.empty) {
|
|
28
|
+
throw new InvalidPayload('empty_js', `Skipping sourcemap (${sourcemap.sourcemapPath}) due to ${sourcemap.bundlePath} being empty`);
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
exports.validatePayload = validatePayload;
|
|
32
|
+
//# sourceMappingURL=validation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/commands/react-native/validation.ts"],"names":[],"mappings":";;;AAAA,yDAAkD;AAGlD,MAAa,cAAe,SAAQ,KAAK;IAGvC,YAAY,MAAc,EAAE,OAAgB;QAC1C,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;CACF;AAPD,wCAOC;AAEM,MAAM,eAAe,GAAG,CAAC,SAAsB,EAAE,EAAE;IACxD,oCAAoC;IACpC,MAAM,cAAc,GAAG,sBAAS,CAAC,SAAS,CAAC,aAAa,CAAC,CAAA;IACzD,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE;QAC1B,wFAAwF;QACxF,MAAM,IAAI,cAAc,CAAC,mBAAmB,EAAE,+BAA+B,SAAS,CAAC,aAAa,GAAG,CAAC,CAAA;KACzG;IACD,IAAI,cAAc,CAAC,KAAK,EAAE;QACxB,MAAM,IAAI,cAAc,CAAC,iBAAiB,EAAE,6BAA6B,SAAS,CAAC,aAAa,GAAG,CAAC,CAAA;KACrG;IACD,iCAAiC;IACjC,MAAM,WAAW,GAAG,sBAAS,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;IACnD,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;QACvB,MAAM,IAAI,cAAc,CAAC,YAAY,EAAE,gDAAgD,SAAS,CAAC,UAAU,GAAG,CAAC,CAAA;KAChH;IACD,IAAI,WAAW,CAAC,KAAK,EAAE;QACrB,MAAM,IAAI,cAAc,CACtB,UAAU,EACV,uBAAuB,SAAS,CAAC,aAAa,YAAY,SAAS,CAAC,UAAU,cAAc,CAC7F,CAAA;KACF;AACH,CAAC,CAAA;AArBY,QAAA,eAAe,mBAqB3B"}
|
|
@@ -7,6 +7,7 @@ export declare class Sourcemap {
|
|
|
7
7
|
constructor(minifiedFilePath: string, minifiedUrl: string, sourcemapPath: string);
|
|
8
8
|
addRepositoryData(gitData: GitData): void;
|
|
9
9
|
asMultipartPayload(cliVersion: string, service: string, version: string, projectPath: string): MultipartPayload;
|
|
10
|
+
private getMetadataPayload;
|
|
10
11
|
}
|
|
11
12
|
export interface GitData {
|
|
12
13
|
gitCommitSha: string;
|
|
@@ -16,32 +16,44 @@ class Sourcemap {
|
|
|
16
16
|
}
|
|
17
17
|
asMultipartPayload(cliVersion, service, version, projectPath) {
|
|
18
18
|
const content = new Map([
|
|
19
|
-
['
|
|
20
|
-
['
|
|
21
|
-
['
|
|
22
|
-
['source_map', { value: fs_1.default.createReadStream(this.sourcemapPath) }],
|
|
23
|
-
['minified_file', { value: fs_1.default.createReadStream(this.minifiedFilePath) }],
|
|
24
|
-
['minified_url', { value: this.minifiedUrl }],
|
|
25
|
-
['project_path', { value: projectPath }],
|
|
26
|
-
['type', { value: 'js_sourcemap' }],
|
|
19
|
+
['event', this.getMetadataPayload(cliVersion, service, version, projectPath)],
|
|
20
|
+
['source_map', { value: fs_1.default.createReadStream(this.sourcemapPath), options: { filename: 'source_map' } }],
|
|
21
|
+
['minified_file', { value: fs_1.default.createReadStream(this.minifiedFilePath), options: { filename: 'minified_file' } }],
|
|
27
22
|
]);
|
|
28
|
-
if (this.gitData !== undefined) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
content.set('git_repository_url', { value: this.gitData.gitRepositoryURL });
|
|
39
|
-
content.set('git_commit_sha', { value: this.gitData.gitCommitSha });
|
|
23
|
+
if (this.gitData !== undefined && this.gitData.gitRepositoryPayload !== undefined) {
|
|
24
|
+
content.set('repository', {
|
|
25
|
+
options: {
|
|
26
|
+
contentType: 'application/json',
|
|
27
|
+
filename: 'repository',
|
|
28
|
+
},
|
|
29
|
+
value: this.gitData.gitRepositoryPayload,
|
|
30
|
+
});
|
|
40
31
|
}
|
|
41
32
|
return {
|
|
42
33
|
content,
|
|
43
34
|
};
|
|
44
35
|
}
|
|
36
|
+
getMetadataPayload(cliVersion, service, version, projectPath) {
|
|
37
|
+
const metadata = {
|
|
38
|
+
cli_version: cliVersion,
|
|
39
|
+
minified_url: this.minifiedUrl,
|
|
40
|
+
project_path: projectPath,
|
|
41
|
+
service,
|
|
42
|
+
type: 'js_sourcemap',
|
|
43
|
+
version,
|
|
44
|
+
};
|
|
45
|
+
if (this.gitData !== undefined) {
|
|
46
|
+
metadata.git_repository_url = this.gitData.gitRepositoryURL;
|
|
47
|
+
metadata.git_commit_sha = this.gitData.gitCommitSha;
|
|
48
|
+
}
|
|
49
|
+
return {
|
|
50
|
+
options: {
|
|
51
|
+
contentType: 'application/json',
|
|
52
|
+
filename: 'event',
|
|
53
|
+
},
|
|
54
|
+
value: JSON.stringify(metadata),
|
|
55
|
+
};
|
|
56
|
+
}
|
|
45
57
|
}
|
|
46
58
|
exports.Sourcemap = Sourcemap;
|
|
47
59
|
//# sourceMappingURL=interfaces.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/sourcemaps/interfaces.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAInB,MAAa,SAAS;IAMpB,YAAY,gBAAwB,EAAE,WAAmB,EAAE,aAAqB;QAC9E,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAEM,iBAAiB,CAAC,OAAgB;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEM,kBAAkB,CACvB,UAAkB,EAClB,OAAe,EACf,OAAe,EACf,WAAmB;QAEnB,MAAM,OAAO,GAAG,IAAI,GAAG,CAAyB;YAC9C,CAAC,
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/sourcemaps/interfaces.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAInB,MAAa,SAAS;IAMpB,YAAY,gBAAwB,EAAE,WAAmB,EAAE,aAAqB;QAC9E,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAEM,iBAAiB,CAAC,OAAgB;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEM,kBAAkB,CACvB,UAAkB,EAClB,OAAe,EACf,OAAe,EACf,WAAmB;QAEnB,MAAM,OAAO,GAAG,IAAI,GAAG,CAAyB;YAC9C,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YAC7E,CAAC,YAAY,EAAE,EAAC,KAAK,EAAE,YAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,EAAC,QAAQ,EAAE,YAAY,EAAC,EAAC,CAAC;YACnG,CAAC,eAAe,EAAE,EAAC,KAAK,EAAE,YAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,EAAC,QAAQ,EAAE,eAAe,EAAC,EAAC,CAAC;SAC7G,CAAC,CAAA;QACF,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,OAAQ,CAAC,oBAAoB,KAAK,SAAS,EAAE;YAClF,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;gBACxB,OAAO,EAAE;oBACP,WAAW,EAAE,kBAAkB;oBAC/B,QAAQ,EAAE,YAAY;iBACvB;gBACD,KAAK,EAAE,IAAI,CAAC,OAAQ,CAAC,oBAAoB;aAC1C,CAAC,CAAA;SACH;QAED,OAAO;YACL,OAAO;SACR,CAAA;IACH,CAAC;IAEO,kBAAkB,CACxB,UAAkB,EAClB,OAAe,EACf,OAAe,EACf,WAAmB;QAEnB,MAAM,QAAQ,GAAuB;YACnC,WAAW,EAAE,UAAU;YACvB,YAAY,EAAE,IAAI,CAAC,WAAW;YAC9B,YAAY,EAAE,WAAW;YACzB,OAAO;YACP,IAAI,EAAE,cAAc;YACpB,OAAO;SACR,CAAA;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;YAC9B,QAAQ,CAAC,kBAAkB,GAAG,IAAI,CAAC,OAAQ,CAAC,gBAAgB,CAAA;YAC5D,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC,OAAQ,CAAC,YAAY,CAAA;SACrD;QAED,OAAO;YACL,OAAO,EAAE;gBACP,WAAW,EAAE,kBAAkB;gBAC/B,QAAQ,EAAE,OAAO;aAClB;YACD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;SAChC,CAAA;IACH,CAAC;CACF;AArED,8BAqEC"}
|
|
@@ -7,7 +7,7 @@ exports.renderUpload = exports.renderCommandInfo = exports.renderSuccessfulComma
|
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const formatting_1 = require("../../helpers/formatting");
|
|
9
9
|
const upload_1 = require("../../helpers/upload");
|
|
10
|
-
const utils_1 = require("
|
|
10
|
+
const utils_1 = require("../../helpers/utils");
|
|
11
11
|
const renderGitWarning = (errorMessage) => chalk_1.default.yellow(`${formatting_1.ICONS.WARNING} An error occured while invoking git: ${errorMessage}
|
|
12
12
|
Make sure the command is running within your git repository to fully leverage Datadog's git integration.
|
|
13
13
|
To ignore this warning use the --disable-git flag.\n`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sourcemaps/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AAEzB,yDAA8C;AAC9C,iDAAiD;
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/sourcemaps/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,11 +20,12 @@ const path_1 = __importDefault(require("path"));
|
|
|
20
20
|
const tiny_async_pool_1 = __importDefault(require("tiny-async-pool"));
|
|
21
21
|
const url_1 = require("url");
|
|
22
22
|
const apikey_1 = require("../../helpers/apikey");
|
|
23
|
+
const base_intake_url_1 = require("../../helpers/base-intake-url");
|
|
23
24
|
const errors_1 = require("../../helpers/errors");
|
|
25
|
+
const format_git_sourcemaps_data_1 = require("../../helpers/git/format-git-sourcemaps-data");
|
|
24
26
|
const metrics_1 = require("../../helpers/metrics");
|
|
25
27
|
const upload_1 = require("../../helpers/upload");
|
|
26
28
|
const utils_1 = require("../../helpers/utils");
|
|
27
|
-
const git_1 = require("./git");
|
|
28
29
|
const interfaces_1 = require("./interfaces");
|
|
29
30
|
const renderer_1 = require("./renderer");
|
|
30
31
|
const utils_2 = require("./utils");
|
|
@@ -42,18 +43,20 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
42
43
|
this.projectPath = '';
|
|
43
44
|
// Fills the 'repository' field of each payload with data gathered using git.
|
|
44
45
|
this.addRepositoryDataToPayloads = (payloads) => __awaiter(this, void 0, void 0, function* () {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
try {
|
|
47
|
+
const repositoryData = yield format_git_sourcemaps_data_1.getRepositoryData(yield format_git_sourcemaps_data_1.newSimpleGit(), this.repositoryURL);
|
|
48
|
+
yield Promise.all(payloads.map((payload) => __awaiter(this, void 0, void 0, function* () {
|
|
49
|
+
const repositoryPayload = this.getRepositoryPayload(repositoryData, payload.sourcemapPath);
|
|
50
|
+
payload.addRepositoryData({
|
|
51
|
+
gitCommitSha: repositoryData.hash,
|
|
52
|
+
gitRepositoryPayload: repositoryPayload,
|
|
53
|
+
gitRepositoryURL: repositoryData.remote,
|
|
54
|
+
});
|
|
55
|
+
})));
|
|
56
|
+
}
|
|
57
|
+
catch (e) {
|
|
58
|
+
this.context.stdout.write(renderer_1.renderGitWarning(e));
|
|
48
59
|
}
|
|
49
|
-
yield Promise.all(payloads.map((payload) => __awaiter(this, void 0, void 0, function* () {
|
|
50
|
-
const repositoryPayload = this.getRepositoryPayload(repositoryData, payload.sourcemapPath);
|
|
51
|
-
payload.addRepositoryData({
|
|
52
|
-
gitCommitSha: repositoryData.hash,
|
|
53
|
-
gitRepositoryPayload: repositoryPayload,
|
|
54
|
-
gitRepositoryURL: repositoryData.remote,
|
|
55
|
-
});
|
|
56
|
-
})));
|
|
57
60
|
});
|
|
58
61
|
// Looks for the sourcemaps and minified files on disk and returns
|
|
59
62
|
// the associated payloads.
|
|
@@ -77,9 +80,12 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
77
80
|
// It specifically looks for the list of tracked files that are associated to the source paths
|
|
78
81
|
// declared inside the sourcemap.
|
|
79
82
|
this.getRepositoryPayload = (repositoryData, sourcemapPath) => {
|
|
83
|
+
const onSourcesNotFound = () => {
|
|
84
|
+
this.context.stdout.write(renderer_1.renderSourcesNotFoundWarning(sourcemapPath));
|
|
85
|
+
};
|
|
80
86
|
let repositoryPayload;
|
|
81
87
|
try {
|
|
82
|
-
const files = repositoryData.trackedFilesMatcher.matchSourcemap(
|
|
88
|
+
const files = repositoryData.trackedFilesMatcher.matchSourcemap(sourcemapPath, onSourcesNotFound);
|
|
83
89
|
if (files) {
|
|
84
90
|
repositoryPayload = JSON.stringify({
|
|
85
91
|
data: [
|
|
@@ -174,7 +180,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
174
180
|
}
|
|
175
181
|
return utils_1.getRequestBuilder({
|
|
176
182
|
apiKey: this.config.apiKey,
|
|
177
|
-
baseUrl:
|
|
183
|
+
baseUrl: base_intake_url_1.getBaseSourcemapIntakeUrl(),
|
|
178
184
|
headers: new Map([
|
|
179
185
|
['DD-EVP-ORIGIN', 'datadog-ci sourcemaps'],
|
|
180
186
|
['DD-EVP-ORIGIN-VERSION', this.cliVersion],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sourcemaps/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,yCAAiC;AACjC,gDAAuB;AACvB,gDAAuB;AACvB,sEAAuC;AACvC,6BAAuB;AAEvB,iDAAwE;AACxE,iDAA8D;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/sourcemaps/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.getMinifiedFilePath = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const getMinifiedFilePath = (sourcemapPath) => {
|
|
9
9
|
if (path_1.default.extname(sourcemapPath) !== '.map') {
|
|
@@ -12,21 +12,4 @@ const getMinifiedFilePath = (sourcemapPath) => {
|
|
|
12
12
|
return sourcemapPath.replace(new RegExp('\\.map$'), '');
|
|
13
13
|
};
|
|
14
14
|
exports.getMinifiedFilePath = getMinifiedFilePath;
|
|
15
|
-
const getBaseIntakeUrl = () => {
|
|
16
|
-
if (process.env.DATADOG_SOURCEMAP_INTAKE_URL) {
|
|
17
|
-
return process.env.DATADOG_SOURCEMAP_INTAKE_URL;
|
|
18
|
-
}
|
|
19
|
-
else if (process.env.DATADOG_SITE) {
|
|
20
|
-
return 'https://sourcemap-intake.' + process.env.DATADOG_SITE;
|
|
21
|
-
}
|
|
22
|
-
return 'https://sourcemap-intake.datadoghq.com';
|
|
23
|
-
};
|
|
24
|
-
exports.getBaseIntakeUrl = getBaseIntakeUrl;
|
|
25
|
-
const pluralize = (nb, singular, plural) => {
|
|
26
|
-
if (nb >= 2) {
|
|
27
|
-
return `${nb} ${plural}`;
|
|
28
|
-
}
|
|
29
|
-
return `${nb} ${singular}`;
|
|
30
|
-
};
|
|
31
|
-
exports.pluralize = pluralize;
|
|
32
15
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/sourcemaps/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAEhB,MAAM,mBAAmB,GAAG,CAAC,aAAqB,EAAE,EAAE;IAC3D,IAAI,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,MAAM,EAAE;QAC1C,MAAM,KAAK,CAAC,oEAAoE,CAAC,CAAA;KAClF;IAED,OAAO,aAAa,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAA;AACzD,CAAC,CAAA;AANY,QAAA,mBAAmB,uBAM/B
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/sourcemaps/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAEhB,MAAM,mBAAmB,GAAG,CAAC,aAAqB,EAAE,EAAE;IAC3D,IAAI,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,MAAM,EAAE;QAC1C,MAAM,KAAK,CAAC,oEAAoE,CAAC,CAAA;KAClF;IAED,OAAO,aAAa,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAA;AACzD,CAAC,CAAA;AANY,QAAA,mBAAmB,uBAM/B"}
|