@datadog/datadog-ci 3.12.0 → 3.14.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/README.md +1 -1
- package/dist/commands/aas/common.d.ts +3 -4
- package/dist/commands/aas/common.js +28 -10
- package/dist/commands/aas/common.js.map +1 -1
- package/dist/commands/aas/instrument.d.ts +7 -2
- package/dist/commands/aas/instrument.js +51 -10
- package/dist/commands/aas/instrument.js.map +1 -1
- package/dist/commands/aas/interfaces.d.ts +3 -0
- package/dist/commands/cloud-run/constants.d.ts +2 -0
- package/dist/commands/cloud-run/constants.js +3 -1
- package/dist/commands/cloud-run/constants.js.map +1 -1
- package/dist/commands/cloud-run/flare.js +2 -1
- package/dist/commands/cloud-run/flare.js.map +1 -1
- package/dist/commands/cloud-run/instrument.d.ts +15 -8
- package/dist/commands/cloud-run/instrument.js +260 -138
- package/dist/commands/cloud-run/instrument.js.map +1 -1
- package/dist/commands/cloud-run/interfaces.d.ts +0 -19
- package/dist/commands/cloud-run/prompt.d.ts +5 -0
- package/dist/commands/cloud-run/prompt.js +86 -0
- package/dist/commands/cloud-run/prompt.js.map +1 -0
- package/dist/commands/cloud-run/renderer.d.ts +1 -2
- package/dist/commands/cloud-run/renderer.js +3 -11
- package/dist/commands/cloud-run/renderer.js.map +1 -1
- package/dist/commands/cloud-run/types.d.ts +3 -2
- package/dist/commands/cloud-run/uninstrument.d.ts +21 -0
- package/dist/commands/cloud-run/uninstrument.js +187 -0
- package/dist/commands/cloud-run/uninstrument.js.map +1 -0
- package/dist/commands/cloud-run/utils.d.ts +10 -0
- package/dist/commands/cloud-run/utils.js +81 -1
- package/dist/commands/cloud-run/utils.js.map +1 -1
- package/dist/commands/coverage/renderer.d.ts +2 -1
- package/dist/commands/coverage/renderer.js +12 -7
- package/dist/commands/coverage/renderer.js.map +1 -1
- package/dist/commands/coverage/upload.js +15 -10
- package/dist/commands/coverage/upload.js.map +1 -1
- package/dist/commands/coverage/utils.d.ts +8 -2
- package/dist/commands/coverage/utils.js +119 -4
- package/dist/commands/coverage/utils.js.map +1 -1
- package/dist/commands/dsyms/interfaces.d.ts +5 -5
- package/dist/commands/dsyms/interfaces.js +1 -1
- package/dist/commands/dsyms/interfaces.js.map +1 -1
- package/dist/commands/dsyms/renderer.d.ts +2 -2
- package/dist/commands/dsyms/renderer.js +6 -6
- package/dist/commands/dsyms/renderer.js.map +1 -1
- package/dist/commands/dsyms/upload.d.ts +17 -12
- package/dist/commands/dsyms/upload.js +181 -149
- package/dist/commands/dsyms/upload.js.map +1 -1
- package/dist/commands/elf-symbols/upload.js +3 -3
- package/dist/commands/elf-symbols/upload.js.map +1 -1
- package/dist/commands/flutter-symbols/upload.js +3 -3
- package/dist/commands/flutter-symbols/upload.js.map +1 -1
- package/dist/commands/git-metadata/upload.js +1 -1
- package/dist/commands/git-metadata/upload.js.map +1 -1
- package/dist/commands/junit/utils.d.ts +2 -2
- package/dist/commands/junit/utils.js +9 -11
- package/dist/commands/junit/utils.js.map +1 -1
- package/dist/commands/lambda/constants.d.ts +0 -7
- package/dist/commands/lambda/constants.js +3 -15
- package/dist/commands/lambda/constants.js.map +1 -1
- package/dist/commands/lambda/flare.js +2 -1
- package/dist/commands/lambda/flare.js.map +1 -1
- package/dist/commands/lambda/functions/instrument.js +9 -9
- package/dist/commands/lambda/functions/instrument.js.map +1 -1
- package/dist/commands/lambda/functions/uninstrument.js +6 -6
- package/dist/commands/lambda/functions/uninstrument.js.map +1 -1
- package/dist/commands/lambda/instrument.d.ts +0 -3
- package/dist/commands/lambda/instrument.js +4 -51
- package/dist/commands/lambda/instrument.js.map +1 -1
- package/dist/commands/lambda/renderers/instrument-uninstrument-renderer.d.ts +0 -8
- package/dist/commands/lambda/renderers/instrument-uninstrument-renderer.js +1 -10
- package/dist/commands/lambda/renderers/instrument-uninstrument-renderer.js.map +1 -1
- package/dist/commands/pe-symbols/upload.js +3 -3
- package/dist/commands/pe-symbols/upload.js.map +1 -1
- package/dist/commands/react-native/upload.js +4 -4
- package/dist/commands/react-native/upload.js.map +1 -1
- package/dist/commands/react-native/xcode.d.ts +23 -0
- package/dist/commands/react-native/xcode.js +166 -10
- package/dist/commands/react-native/xcode.js.map +1 -1
- package/dist/commands/sarif/renderer.js +2 -2
- package/dist/commands/sarif/renderer.js.map +1 -1
- package/dist/commands/sbom/api.js +2 -2
- package/dist/commands/sbom/api.js.map +1 -1
- package/dist/commands/sbom/renderer.js +3 -3
- package/dist/commands/sbom/renderer.js.map +1 -1
- package/dist/commands/sourcemaps/upload.js +4 -4
- package/dist/commands/sourcemaps/upload.js.map +1 -1
- package/dist/commands/synthetics/api.d.ts +7 -3
- package/dist/commands/synthetics/api.js +20 -3
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/base-command.d.ts +8 -2
- package/dist/commands/synthetics/base-command.js +34 -32
- package/dist/commands/synthetics/base-command.js.map +1 -1
- package/dist/commands/synthetics/batch.d.ts +4 -3
- package/dist/commands/synthetics/batch.js +27 -14
- package/dist/commands/synthetics/batch.js.map +1 -1
- package/dist/commands/synthetics/errors.d.ts +1 -1
- package/dist/commands/synthetics/errors.js +1 -1
- package/dist/commands/synthetics/errors.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +13 -2
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/reporters/default.js +16 -2
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/junit.d.ts +1 -0
- package/dist/commands/synthetics/reporters/junit.js +2 -0
- package/dist/commands/synthetics/reporters/junit.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +17 -3
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/test.d.ts +2 -2
- package/dist/commands/synthetics/test.js +15 -2
- package/dist/commands/synthetics/test.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +2 -2
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.js +11 -4
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/commands/unity-symbols/upload.js +3 -3
- package/dist/commands/unity-symbols/upload.js.map +1 -1
- package/dist/constants.d.ts +7 -0
- package/dist/constants.js +14 -1
- package/dist/constants.js.map +1 -1
- package/dist/helpers/apikey.js +1 -1
- package/dist/helpers/apikey.js.map +1 -1
- package/dist/helpers/app.d.ts +1 -0
- package/dist/helpers/app.js +7 -1
- package/dist/helpers/app.js.map +1 -1
- package/dist/helpers/file-finder.js +25 -7
- package/dist/helpers/file-finder.js.map +1 -1
- package/dist/helpers/flare.d.ts +2 -0
- package/dist/helpers/flare.js +13 -1
- package/dist/helpers/flare.js.map +1 -1
- package/dist/helpers/git/instrument-helpers.d.ts +13 -0
- package/dist/helpers/git/instrument-helpers.js +60 -0
- package/dist/helpers/git/instrument-helpers.js.map +1 -0
- package/dist/helpers/version.d.ts +1 -0
- package/dist/helpers/version.js +17 -1
- package/dist/helpers/version.js.map +1 -1
- package/package.json +4 -1
|
@@ -74,181 +74,213 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
74
74
|
this.config = {
|
|
75
75
|
datadogSite: 'datadoghq.com',
|
|
76
76
|
};
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
77
|
+
}
|
|
78
|
+
execute() {
|
|
79
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
80
|
+
(0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
|
|
81
|
+
this.basePath = upath_1.default.normalize(this.basePath);
|
|
82
|
+
this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.basePath, this.maxConcurrency, this.dryRun));
|
|
83
|
+
yield this.loadConfig();
|
|
84
|
+
const { metricsLogger, apiKeyValidator } = this.createServices();
|
|
85
|
+
const initialTime = Date.now();
|
|
86
|
+
try {
|
|
87
|
+
const tmpDirectory = yield (0, utils_2.createUniqueTmpDirectory)();
|
|
88
88
|
try {
|
|
89
|
-
const
|
|
90
|
-
const
|
|
91
|
-
|
|
89
|
+
const results = yield this.processAndUploadDsyms(tmpDirectory, metricsLogger, apiKeyValidator);
|
|
90
|
+
const totalTime = (Date.now() - initialTime) / 1000;
|
|
91
|
+
this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(results, totalTime, this.dryRun));
|
|
92
|
+
metricsLogger.logger.gauge('duration', totalTime);
|
|
93
|
+
return 0;
|
|
92
94
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
+
finally {
|
|
96
|
+
yield (0, utils_2.deleteDirectory)(tmpDirectory);
|
|
95
97
|
}
|
|
96
98
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
* It returns one or many arch slices read from the output.
|
|
102
|
-
*
|
|
103
|
-
* Example `dwarfdump --uuid` output:
|
|
104
|
-
* ```
|
|
105
|
-
* $ dwarfdump --uuid DDTest.framework.dSYM
|
|
106
|
-
* UUID: C8469F85-B060-3085-B69D-E46C645560EA (armv7) DDTest.framework.dSYM/Contents/Resources/DWARF/DDTest
|
|
107
|
-
* UUID: 06EE3D68-D605-3E92-B92D-2F48C02A505E (arm64) DDTest.framework.dSYM/Contents/Resources/DWARF/DDTest
|
|
108
|
-
* ```
|
|
109
|
-
*/
|
|
110
|
-
this.parseDwarfdumpOutput = (output) => {
|
|
111
|
-
const lineRegexp = /UUID: ([0-9A-F]{8}-(?:[0-9A-F]{4}-){3}[0-9A-F]{12}) \(([a-z0-9_]+)\) (.+)/;
|
|
112
|
-
return output
|
|
113
|
-
.split('\n')
|
|
114
|
-
.map((line) => {
|
|
115
|
-
const match = line.match(lineRegexp);
|
|
116
|
-
return match ? [{ arch: match[2], objectPath: match[3], uuid: match[1] }] : [];
|
|
117
|
-
})
|
|
118
|
-
.reduce((acc, nextSlice) => acc.concat(nextSlice), []);
|
|
119
|
-
};
|
|
120
|
-
/**
|
|
121
|
-
* It takes fat dSYM as input and returns multiple dSYMs by extracting **each arch**
|
|
122
|
-
* to separate dSYM file. New files are saved to `intermediatePath` and named by their object uuid (`<uuid>.dSYM`).
|
|
123
|
-
*
|
|
124
|
-
* For example, given `<source path>/Foo.dSYM/Contents/Resources/DWARF/Foo` dSYM with two arch slices: `arm64` (uuid1)
|
|
125
|
-
* and `x86_64` (uuid2), it will:
|
|
126
|
-
* - create `<intermediate path>/<uuid1>.dSYM/Contents/Resources/DWARF/Foo` for `arm64`,
|
|
127
|
-
* - create `<intermediate path>/<uuid2>.dSYM/Contents/Resources/DWARF/Foo` for `x86_64`.
|
|
128
|
-
*/
|
|
129
|
-
this.thinDSYM = (dsym, intermediatePath) => __awaiter(this, void 0, void 0, function* () {
|
|
130
|
-
const slimmedDSYMs = [];
|
|
131
|
-
for (const slice of dsym.slices) {
|
|
132
|
-
try {
|
|
133
|
-
const newDSYMBundleName = `${slice.uuid}.dSYM`;
|
|
134
|
-
const newDSYMBundlePath = (0, utils_1.buildPath)(intermediatePath, newDSYMBundleName);
|
|
135
|
-
const newObjectPath = (0, utils_1.buildPath)(newDSYMBundlePath, upath_1.default.relative(dsym.bundlePath, slice.objectPath));
|
|
136
|
-
// Extract arch slice:
|
|
137
|
-
yield fs_1.promises.mkdir(upath_1.default.dirname(newObjectPath), { recursive: true });
|
|
138
|
-
yield (0, utils_2.executeLipo)(slice.objectPath, slice.arch, newObjectPath);
|
|
139
|
-
// The original dSYM bundle can also include `Info.plist` file, so copy it to the `<uuid>.dSYM` as well.
|
|
140
|
-
// Ref.: https://opensource.apple.com/source/lldb/lldb-179.1/www/symbols.html
|
|
141
|
-
const infoPlistPath = (0, glob_1.globSync)((0, utils_1.buildPath)(dsym.bundlePath, '**/Info.plist'))[0];
|
|
142
|
-
if (infoPlistPath) {
|
|
143
|
-
const newInfoPlistPath = (0, utils_1.buildPath)(newDSYMBundlePath, upath_1.default.relative(dsym.bundlePath, infoPlistPath));
|
|
144
|
-
yield fs_1.promises.mkdir(upath_1.default.dirname(newInfoPlistPath), { recursive: true });
|
|
145
|
-
yield fs_1.promises.copyFile(infoPlistPath, newInfoPlistPath);
|
|
146
|
-
}
|
|
147
|
-
slimmedDSYMs.push({
|
|
148
|
-
bundlePath: newDSYMBundlePath,
|
|
149
|
-
slices: [{ arch: slice.arch, uuid: slice.uuid, objectPath: newObjectPath }],
|
|
150
|
-
});
|
|
151
|
-
}
|
|
152
|
-
catch (_d) {
|
|
153
|
-
this.context.stdout.write((0, renderer_1.renderDSYMSlimmingFailure)(dsym, slice));
|
|
99
|
+
catch (error) {
|
|
100
|
+
if (error instanceof errors_1.InvalidConfigurationError) {
|
|
101
|
+
this.context.stdout.write((0, renderer_1.renderConfigurationError)(error));
|
|
102
|
+
return 1;
|
|
154
103
|
}
|
|
104
|
+
throw error;
|
|
155
105
|
}
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
* It takes `N` dSYMs and returns `N` or more dSYMs. If a dSYM includes more than one arch slice,
|
|
160
|
-
* it will be thinned by extracting each arch to a new dSYM in `intermediatePath`.
|
|
161
|
-
*/
|
|
162
|
-
this.thinDSYMs = (dsyms, intermediatePath) => __awaiter(this, void 0, void 0, function* () {
|
|
163
|
-
yield fs_1.promises.mkdir(intermediatePath, { recursive: true });
|
|
164
|
-
let slimDSYMs = [];
|
|
165
|
-
for (const dsym of dsyms) {
|
|
166
|
-
if (dsym.slices.length > 1) {
|
|
167
|
-
slimDSYMs = slimDSYMs.concat(yield this.thinDSYM(dsym, intermediatePath));
|
|
106
|
+
finally {
|
|
107
|
+
try {
|
|
108
|
+
yield metricsLogger.flush();
|
|
168
109
|
}
|
|
169
|
-
|
|
170
|
-
|
|
110
|
+
catch (err) {
|
|
111
|
+
this.context.stdout.write(`WARN: ${err}\n`);
|
|
171
112
|
}
|
|
172
113
|
}
|
|
173
|
-
return Promise.all(slimDSYMs);
|
|
174
114
|
});
|
|
175
115
|
}
|
|
176
|
-
|
|
116
|
+
loadConfig() {
|
|
177
117
|
return __awaiter(this, void 0, void 0, function* () {
|
|
178
|
-
(0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
|
|
179
|
-
// Normalizing the basePath to resolve .. and .
|
|
180
|
-
this.basePath = upath_1.default.normalize(this.basePath);
|
|
181
|
-
this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.basePath, this.maxConcurrency, this.dryRun));
|
|
182
118
|
this.config = yield (0, utils_1.resolveConfigFromFileAndEnvironment)(this.config, {
|
|
183
|
-
apiKey: process.env.DATADOG_API_KEY,
|
|
184
|
-
datadogSite: process.env.DATADOG_SITE,
|
|
119
|
+
apiKey: process.env.DATADOG_API_KEY || process.env.DD_API_KEY,
|
|
120
|
+
datadogSite: process.env.DATADOG_SITE || process.env.DD_SITE,
|
|
185
121
|
}, {
|
|
186
122
|
configPath: this.configPath,
|
|
187
123
|
defaultConfigPaths: ['datadog-ci.json', '../datadog-ci.json'],
|
|
188
124
|
configFromFileCallback: (configFromFile) => {
|
|
189
|
-
(0, validation_1.checkAPIKeyOverride)(process.env.DATADOG_API_KEY, configFromFile.apiKey, this.context.stdout);
|
|
125
|
+
(0, validation_1.checkAPIKeyOverride)(process.env.DATADOG_API_KEY || process.env.DD_API_KEY, configFromFile.apiKey, this.context.stdout);
|
|
190
126
|
},
|
|
191
127
|
});
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
createServices() {
|
|
131
|
+
const metricsLogger = (0, metrics_1.getMetricsLogger)({
|
|
132
|
+
apiKey: this.config.apiKey,
|
|
133
|
+
datadogSite: this.config.datadogSite,
|
|
134
|
+
defaultTags: [`cli_version:${this.cliVersion}`],
|
|
135
|
+
prefix: 'datadog.ci.dsyms.',
|
|
136
|
+
});
|
|
137
|
+
const apiKeyValidator = (0, apikey_1.newApiKeyValidator)({
|
|
138
|
+
apiKey: this.config.apiKey,
|
|
139
|
+
datadogSite: this.config.datadogSite,
|
|
140
|
+
metricsLogger: metricsLogger.logger,
|
|
141
|
+
});
|
|
142
|
+
return { metricsLogger, apiKeyValidator };
|
|
143
|
+
}
|
|
144
|
+
processAndUploadDsyms(tmpDirectory, metricsLogger, apiKeyValidator) {
|
|
145
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
205
146
|
const intermediateDirectory = (0, utils_1.buildPath)(tmpDirectory, 'datadog-ci', 'dsyms', 'intermediate');
|
|
206
147
|
const uploadDirectory = (0, utils_1.buildPath)(tmpDirectory, 'datadog-ci', 'dsyms', 'upload');
|
|
207
148
|
this.context.stdout.write((0, renderer_1.renderCommandDetail)(intermediateDirectory, uploadDirectory));
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
149
|
+
const searchDirectory = yield this.prepareSearchDirectory(tmpDirectory);
|
|
150
|
+
const dsyms = yield this.findDsyms(searchDirectory);
|
|
151
|
+
const thinDsyms = yield this.processDsyms(dsyms, intermediateDirectory);
|
|
152
|
+
const compressedDsyms = yield this.compressDsyms(thinDsyms, uploadDirectory);
|
|
153
|
+
const requestBuilder = this.createRequestBuilder();
|
|
154
|
+
const uploadFunction = this.createUploadFunction(requestBuilder, metricsLogger, apiKeyValidator);
|
|
155
|
+
return (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, compressedDsyms, uploadFunction);
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
prepareSearchDirectory(tmpDirectory) {
|
|
159
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
211
160
|
if (yield (0, utils_2.isZipFile)(this.basePath)) {
|
|
212
161
|
yield (0, utils_2.unzipArchiveToDirectory)(this.basePath, tmpDirectory);
|
|
213
|
-
|
|
214
|
-
}
|
|
215
|
-
const dsyms = yield this.findDSYMsInDirectory(dSYMsSearchDirectory);
|
|
216
|
-
// Reduce dSYMs size by extracting arch slices from fat dSYMs to separate single-arch dSYMs in intermediate location.
|
|
217
|
-
// This is to avoid exceeding intake limit whenever possible.
|
|
218
|
-
const slimDSYMs = yield this.thinDSYMs(dsyms, intermediateDirectory);
|
|
219
|
-
// Compress each dSYM into single `.zip` archive.
|
|
220
|
-
const compressedDSYMs = yield this.compressDSYMsToDirectory(slimDSYMs, uploadDirectory);
|
|
221
|
-
const requestBuilder = this.getRequestBuilder();
|
|
222
|
-
const uploadDSYM = this.uploadDSYM(requestBuilder, metricsLogger, apiKeyValidator);
|
|
223
|
-
try {
|
|
224
|
-
const results = yield (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, compressedDSYMs, uploadDSYM);
|
|
225
|
-
const totalTime = (Date.now() - initialTime) / 1000;
|
|
226
|
-
this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(results, totalTime, this.dryRun));
|
|
227
|
-
metricsLogger.logger.gauge('duration', totalTime);
|
|
228
|
-
return 0;
|
|
162
|
+
return tmpDirectory;
|
|
229
163
|
}
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
164
|
+
return this.basePath;
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
findDsyms(directoryPath) {
|
|
168
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
169
|
+
const dsymPaths = (0, glob_1.globSync)((0, utils_1.buildPath)(directoryPath, '**/*.dSYM'));
|
|
170
|
+
const results = yield Promise.all(dsymPaths.map((bundle) => __awaiter(this, void 0, void 0, function* () {
|
|
171
|
+
try {
|
|
172
|
+
const { stdout } = yield (0, utils_2.executeDwarfdump)(bundle);
|
|
173
|
+
const dwarf = this.parseDwarfdumpOutput(stdout);
|
|
174
|
+
return [{ bundle, dwarf }];
|
|
234
175
|
}
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
176
|
+
catch (_a) {
|
|
177
|
+
this.context.stdout.write((0, renderer_1.renderInvalidDsymWarning)(bundle));
|
|
178
|
+
return [];
|
|
179
|
+
}
|
|
180
|
+
})));
|
|
181
|
+
return results.flat();
|
|
182
|
+
});
|
|
183
|
+
}
|
|
184
|
+
/**
|
|
185
|
+
* Parses the output of `dwarfdump --uuid` command (ref.: https://www.unix.com/man-page/osx/1/dwarfdump/).
|
|
186
|
+
* It returns one or many DWARF UUID and arch read from the output.
|
|
187
|
+
*
|
|
188
|
+
* Example `dwarfdump --uuid` output:
|
|
189
|
+
* ```
|
|
190
|
+
* $ dwarfdump --uuid DDTest.framework.dSYM
|
|
191
|
+
* UUID: C8469F85-B060-3085-B69D-E46C645560EA (armv7) DDTest.framework.dSYM/Contents/Resources/DWARF/DDTest
|
|
192
|
+
* UUID: 06EE3D68-D605-3E92-B92D-2F48C02A505E (arm64) DDTest.framework.dSYM/Contents/Resources/DWARF/DDTest
|
|
193
|
+
* ```
|
|
194
|
+
*/
|
|
195
|
+
parseDwarfdumpOutput(output) {
|
|
196
|
+
const lineRegexp = /UUID: ([0-9A-F]{8}-(?:[0-9A-F]{4}-){3}[0-9A-F]{12}) \(([a-z0-9_]+)\) (.+)/;
|
|
197
|
+
return output
|
|
198
|
+
.split('\n')
|
|
199
|
+
.map((line) => {
|
|
200
|
+
const match = line.match(lineRegexp);
|
|
201
|
+
return match ? [{ uuid: match[1], arch: match[2], object: match[3] }] : [];
|
|
202
|
+
})
|
|
203
|
+
.flat();
|
|
204
|
+
}
|
|
205
|
+
/**
|
|
206
|
+
* It takes `N` dSYMs and returns `N` or more dSYMs. If a dSYM includes more than one arch slice,
|
|
207
|
+
* it will be thinned by extracting each arch to a new dSYM in `output`.
|
|
208
|
+
*/
|
|
209
|
+
processDsyms(dsyms, output) {
|
|
210
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
211
|
+
yield fs_1.promises.mkdir(output, { recursive: true });
|
|
212
|
+
const results = yield Promise.all(dsyms.map((dsym) => __awaiter(this, void 0, void 0, function* () {
|
|
213
|
+
// Reduce dSYMs size by extracting single UUIDs and arch slices from fat dSYMs to separate
|
|
214
|
+
// single-arch dSYMs in intermediate location. This is to avoid exceeding intake limit whenever possible.
|
|
215
|
+
return dsym.dwarf.length > 1 ? this.thinDsym(dsym, output) : [dsym];
|
|
216
|
+
})));
|
|
217
|
+
return results.flat();
|
|
218
|
+
});
|
|
219
|
+
}
|
|
220
|
+
/**
|
|
221
|
+
* It takes fat dSYM as input and returns multiple dSYMs by extracting **each arch**
|
|
222
|
+
* to separate dSYM file. New files are saved to `output` and named by their object uuid (`<uuid>.dSYM`).
|
|
223
|
+
*
|
|
224
|
+
* For example, given `<source path>/Foo.dSYM/Contents/Resources/DWARF/Foo` dSYM with two arch slices: `arm64` (uuid1)
|
|
225
|
+
* and `x86_64` (uuid2), it will:
|
|
226
|
+
* - create `<intermediate path>/<uuid1>.dSYM/Contents/Resources/DWARF/Foo` for `arm64`,
|
|
227
|
+
* - create `<intermediate path>/<uuid2>.dSYM/Contents/Resources/DWARF/Foo` for `x86_64`.
|
|
228
|
+
*/
|
|
229
|
+
thinDsym(dsym, output) {
|
|
230
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
231
|
+
const results = yield Promise.all(dsym.dwarf.map((dwarf) => __awaiter(this, void 0, void 0, function* () {
|
|
240
232
|
try {
|
|
241
|
-
|
|
233
|
+
const bundle = (0, utils_1.buildPath)(output, `${dwarf.uuid}.dSYM`);
|
|
234
|
+
const object = (0, utils_1.buildPath)(bundle, upath_1.default.relative(dsym.bundle, dwarf.object));
|
|
235
|
+
yield fs_1.promises.mkdir(upath_1.default.dirname(object), { recursive: true });
|
|
236
|
+
try {
|
|
237
|
+
// Attempt to extract the single arch object file.
|
|
238
|
+
// We could use the `lipo -archs` command to get the list of archs,
|
|
239
|
+
// but it's more straightforward to just attempt to extract
|
|
240
|
+
// the single arch.
|
|
241
|
+
yield (0, utils_2.executeLipo)(dwarf.object, dwarf.arch, object);
|
|
242
|
+
}
|
|
243
|
+
catch (_a) {
|
|
244
|
+
// The thinning using `lipo` failed, meaning the dSYM is already
|
|
245
|
+
// a single arch dSYM. Copy the object file to the new dSYM.
|
|
246
|
+
yield fs_1.promises.copyFile(dwarf.object, object);
|
|
247
|
+
}
|
|
248
|
+
yield this.copyInfoPlist(dsym.bundle, bundle);
|
|
249
|
+
return [{ bundle, dwarf: [Object.assign(Object.assign({}, dwarf), { object })] }];
|
|
242
250
|
}
|
|
243
|
-
catch (
|
|
244
|
-
this.context.stdout.write(
|
|
251
|
+
catch (error) {
|
|
252
|
+
this.context.stdout.write((0, renderer_1.renderDSYMSlimmingFailure)(dsym, dwarf, error));
|
|
253
|
+
return [];
|
|
245
254
|
}
|
|
255
|
+
})));
|
|
256
|
+
return results.flat();
|
|
257
|
+
});
|
|
258
|
+
}
|
|
259
|
+
copyInfoPlist(src, dst) {
|
|
260
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
261
|
+
const infoPlistPaths = (0, glob_1.globSync)((0, utils_1.buildPath)(src, '**/Info.plist'));
|
|
262
|
+
if (infoPlistPaths.length === 0) {
|
|
263
|
+
return;
|
|
246
264
|
}
|
|
265
|
+
const infoPlistPath = infoPlistPaths[0];
|
|
266
|
+
const newInfoPlistPath = (0, utils_1.buildPath)(dst, upath_1.default.relative(src, infoPlistPath));
|
|
267
|
+
yield fs_1.promises.mkdir(upath_1.default.dirname(newInfoPlistPath), { recursive: true });
|
|
268
|
+
yield fs_1.promises.copyFile(infoPlistPath, newInfoPlistPath);
|
|
269
|
+
});
|
|
270
|
+
}
|
|
271
|
+
compressDsyms(dsyms, output) {
|
|
272
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
273
|
+
yield fs_1.promises.mkdir(output, { recursive: true });
|
|
274
|
+
return Promise.all(dsyms.map((dsym) => __awaiter(this, void 0, void 0, function* () {
|
|
275
|
+
const archivePath = (0, utils_1.buildPath)(output, `${dsym.dwarf[0].uuid}.zip`);
|
|
276
|
+
yield (0, utils_2.zipDirectoryToArchive)(dsym.bundle, archivePath);
|
|
277
|
+
return new interfaces_1.CompressedDsym(archivePath, dsym);
|
|
278
|
+
})));
|
|
247
279
|
});
|
|
248
280
|
}
|
|
249
|
-
|
|
281
|
+
createRequestBuilder() {
|
|
250
282
|
if (!this.config.apiKey) {
|
|
251
|
-
throw new errors_1.InvalidConfigurationError(`Missing ${chalk_1.default.bold('DATADOG_API_KEY')} in your environment.`);
|
|
283
|
+
throw new errors_1.InvalidConfigurationError(`Missing ${chalk_1.default.bold('DATADOG_API_KEY')} or ${chalk_1.default.bold('DD_API_KEY')} in your environment.`);
|
|
252
284
|
}
|
|
253
285
|
return (0, utils_1.getRequestBuilder)({
|
|
254
286
|
apiKey: this.config.apiKey,
|
|
@@ -260,25 +292,25 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
260
292
|
overrideUrl: 'api/v2/srcmap',
|
|
261
293
|
});
|
|
262
294
|
}
|
|
263
|
-
|
|
264
|
-
return (
|
|
265
|
-
const payload =
|
|
295
|
+
createUploadFunction(requestBuilder, metricsLogger, apiKeyValidator) {
|
|
296
|
+
return (dsym) => __awaiter(this, void 0, void 0, function* () {
|
|
297
|
+
const payload = dsym.asMultipartPayload();
|
|
266
298
|
if (this.dryRun) {
|
|
267
|
-
this.context.stdout.write(`[DRYRUN] ${(0, renderer_1.renderUpload)(
|
|
299
|
+
this.context.stdout.write(`[DRYRUN] ${(0, renderer_1.renderUpload)(dsym)}`);
|
|
268
300
|
return upload_1.UploadStatus.Success;
|
|
269
301
|
}
|
|
270
302
|
return (0, upload_1.upload)(requestBuilder)(payload, {
|
|
271
303
|
apiKeyValidator,
|
|
272
304
|
onError: (e) => {
|
|
273
|
-
this.context.stdout.write((0, renderer_1.renderFailedUpload)(
|
|
305
|
+
this.context.stdout.write((0, renderer_1.renderFailedUpload)(dsym, e.message));
|
|
274
306
|
metricsLogger.logger.increment('failed', 1);
|
|
275
307
|
},
|
|
276
308
|
onRetry: (e, attempts) => {
|
|
277
|
-
this.context.stdout.write((0, renderer_1.renderRetriedUpload)(
|
|
309
|
+
this.context.stdout.write((0, renderer_1.renderRetriedUpload)(dsym, e.message, attempts));
|
|
278
310
|
metricsLogger.logger.increment('retries', 1);
|
|
279
311
|
},
|
|
280
312
|
onUpload: () => {
|
|
281
|
-
this.context.stdout.write((0, renderer_1.renderUpload)(
|
|
313
|
+
this.context.stdout.write((0, renderer_1.renderUpload)(dsym));
|
|
282
314
|
},
|
|
283
315
|
retries: 5,
|
|
284
316
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/dsyms/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAA2B;AAE3B,kDAAyB;AACzB,yCAAyC;AACzC,kDAAyB;AAEzB,+CAAuE;AACvE,iDAAwE;AACxE,2DAA8D;AAC9D,2CAA2C;AAC3C,iDAA8D;AAC9D,6CAA6C;AAC7C,6CAA2C;AAE3C,mDAAqE;AACrE,iDAAyD;AACzD,+CAAqG;AACrG,qEAAsD;AACtD,yDAA4D;AAC5D,mDAA6C;AAE7C,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/dsyms/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,13 +89,13 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
89
89
|
const initialTime = Date.now();
|
|
90
90
|
this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.dryRun, this.symbolsLocations));
|
|
91
91
|
this.config = yield (0, utils_1.resolveConfigFromFileAndEnvironment)(this.config, {
|
|
92
|
-
apiKey: process.env.DATADOG_API_KEY,
|
|
93
|
-
datadogSite: process.env.DATADOG_SITE,
|
|
92
|
+
apiKey: process.env.DATADOG_API_KEY || process.env.DD_API_KEY,
|
|
93
|
+
datadogSite: process.env.DATADOG_SITE || process.env.DD_SITE,
|
|
94
94
|
}, {
|
|
95
95
|
configPath: this.configPath,
|
|
96
96
|
defaultConfigPaths: utils_1.DEFAULT_CONFIG_PATHS,
|
|
97
97
|
configFromFileCallback: (configFromFile) => {
|
|
98
|
-
(0, validation_1.checkAPIKeyOverride)(process.env.DATADOG_API_KEY, configFromFile.apiKey, this.context.stdout);
|
|
98
|
+
(0, validation_1.checkAPIKeyOverride)(process.env.DATADOG_API_KEY || process.env.DD_API_KEY, configFromFile.apiKey, this.context.stdout);
|
|
99
99
|
},
|
|
100
100
|
});
|
|
101
101
|
if (!this.disableGit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/elf-symbols/upload.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/elf-symbols/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAmB;AAEnB,yCAAyC;AACzC,kDAAyB;AAEzB,+CAAuE;AACvE,iDAAuD;AACvD,2DAA8D;AAC9D,2CAA2C;AAC3C,6CAA6C;AAC7C,6FAA4G;AAC5G,6CAA4C;AAC5C,mDAAqE;AACrE,iDAAiE;AACjE,+CAAiH;AACjH,qEAAsD;AACtD,yDAA4D;AAC5D,mDAA6C;AAE7C,0CAAwE;AAExE,+BAQc;AACd,uCAAqE;AACrE,6CAAwH;AACxH,yCAYmB;AAEnB,MAAa,aAAc,SAAQ,mBAAO;IAA1C;;;QAYU,eAAU,GAAG,kBAAM,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;QACnD,WAAM,GAAG,kBAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;QAC3C,eAAU,GAAG,kBAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QACtC,mBAAc,GAAG,kBAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,IAAI,EAAE,EAAC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,EAAC,CAAC,CAAA;QAC9F,kBAAa,GAAG,kBAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;QACjD,2CAAsC,GAAG,kBAAM,CAAC,OAAO,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;QAC1F,oBAAe,GAAG,kBAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;QAC7D,qBAAgB,GAAG,kBAAM,CAAC,IAAI,CAAC,EAAC,QAAQ,EAAE,CAAC,EAAC,CAAC,CAAA;QAE7C,eAAU,GAAG,iBAAO,CAAA;QACpB,WAAM,GAA2B;YACvC,WAAW,EAAE,eAAe;SAC7B,CAAA;QAGO,SAAI,GAAG,kBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;QACtC,oBAAe,GAAG,kBAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;QAC9D,eAAU,GAAG;YACnB,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;IA2WH,CAAC;IAzWc,OAAO;;YAClB,IAAA,iBAAU,EAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;YAEtG,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,EAAE;gBACpC,OAAO,CAAC,CAAA;aACT;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAE9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,4BAAiB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAA;YAEhF,IAAI,CAAC,MAAM,GAAG,MAAM,IAAA,2CAAmC,EACrD,IAAI,CAAC,MAAM,EACX;gBACE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU;gBAC7D,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO;aAC7D,EACD;gBACE,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,kBAAkB,EAAE,4BAAoB;gBACxC,sBAAsB,EAAE,CAAC,cAAmB,EAAE,EAAE;oBAC9C,IAAA,gCAAmB,EACjB,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EACrD,cAAc,CAAC,MAAM,EACrB,IAAI,CAAC,OAAO,CAAC,MAAM,CACpB,CAAA;gBACH,CAAC;aACF,CACF,CAAA;YAED,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBACpB,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;aAC3C;YAED,MAAM,WAAW,GAAmB,EAAE,CAAA;YACtC,IAAI;gBACF,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAA;gBAE3D,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,GAAG,IAAI,CAAA;gBAEnD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,+BAAoB,EAAC,WAAW,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;aACrF;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,iCAAsB,EAAC,CAAC,CAAC,CAAC,CAAA;gBAEpD,OAAO,CAAC,CAAA;aACT;YAED,OAAO,CAAC,CAAA;QACV,CAAC;KAAA;IAEO,kBAAkB,CAAC,aAA4B;QACrD,OAAO,IAAA,2BAAkB,EAAC;YACxB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAC1B,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,aAAa,EAAE,aAAa,CAAC,MAAM;SACpC,CAAC,CAAA;IACJ,CAAC;IAEO,iBAAiB,CAAC,OAAuB;QAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,CAAA;QAC/D,MAAM,WAAW,GAAG;YAClB,IAAI,EAAE;gBACJ;oBACE,KAAK;oBACL,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,cAAc,EAAE,OAAO,CAAC,MAAM;iBAC/B;aACF;YACD,OAAO,EAAE,CAAC;SACX,CAAA;QAED,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,EAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,kBAAkB,EAAC;YAClE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;SACnC,CAAA;IACH,CAAC;IAEa,cAAc;;YAC1B,IAAI;gBACF,OAAO,MAAM,IAAA,8CAAiB,EAAC,MAAM,IAAA,yCAAY,GAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;aACzE;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,2BAAgB,EAAC,CAAC,CAAC,CAAC,CAAA;aAC/C;YAED,OAAO,SAAS,CAAA;QAClB,CAAC;KAAA;IAEO,kBAAkB,CAAC,eAAgC;QACzD,IAAI,eAAe,CAAC,YAAY,EAAE;YAChC,OAAO,YAAY,CAAA;SACpB;QACD,IAAI,eAAe,CAAC,cAAc,EAAE;YAClC,OAAO,cAAc,CAAA;SACtB;QACD,IAAI,eAAe,CAAC,qBAAqB,EAAE;YACzC,OAAO,sBAAsB,CAAA;SAC9B;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAEO,kBAAkB,CAAC,eAAgC;;QACzD,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,UAAU;YAC5B,cAAc,EAAE,IAAI,CAAC,UAAU;YAC/B,MAAM,EAAE,YAAY;YACpB,IAAI,EAAE,eAAe,CAAC,IAAI;YAC1B,YAAY,EAAE,eAAe,CAAC,UAAU;YACxC,WAAW,EAAE,eAAe,CAAC,SAAS;YACtC,SAAS,EAAE,eAAe,CAAC,QAAQ;YACnC,cAAc,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI;YAClC,kBAAkB,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM;YACxC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC;YACvD,QAAQ,EAAE,eAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC;YAClD,SAAS,EAAE,IAAI,CAAC,eAAe;YAC/B,IAAI,EAAE,iCAAoB;SAC3B,CAAA;IACH,CAAC;IAEO,gBAAgB;QACtB,MAAM,aAAa,GAAG,IAAA,0BAAgB,EAAC;YACrC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAC1B,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,WAAW,EAAE,CAAC,eAAe,IAAI,CAAC,UAAU,EAAE,EAAE,cAAc,CAAC;YAC/D,MAAM,EAAE,yBAAyB;SAClC,CAAC,CAAA;QAEF,OAAO,aAAa,CAAA;IACtB,CAAC;IAEa,iBAAiB,CAAC,eAAuB;;YACrD,IAAI,KAAK,GAAa,EAAE,CAAA;YACxB,IAAI,aAAwC,CAAA;YAE5C,MAAM,IAAI,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;YACpD,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;gBACtB,KAAK,GAAG,MAAM,IAAA,gBAAS,EAAC,IAAA,iBAAS,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE,EAAC,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC,CAAA;gBACzF,aAAa,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,wBAAa,EAAC,OAAO,CAAC,CAAC,CAAA;gBAEtF,wDAAwD;gBACxD,sCAAsC;gBACtC,MAAM,YAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,YAAE,CAAC,SAAS,CAAC,IAAI,GAAG,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;oBAC1F,MAAM,KAAK,CAAC,aAAa,eAAe,kBAAkB,CAAC,CAAA;gBAC7D,CAAC,CAAC,CAAA;aACH;iBAAM;gBACL,KAAK,GAAG,CAAC,eAAe,CAAC,CAAA;gBACzB,4DAA4D;gBAC5D,aAAa,GAAG,CAAC,OAAe,EAAE,EAAE;oBAClC,MAAM,KAAK,CAAC,OAAO,CAAC,CAAA;gBACtB,CAAC,CAAA;aACF;YAED,MAAM,aAAa,GAAsB,EAAE,CAAA;YAC3C,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;gBACrB,MAAM,QAAQ,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAC3C,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE;oBAC1B,2DAA2D;oBAC3D,sCAAsC;oBACtC,MAAM,YAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,YAAE,CAAC,SAAS,CAAC,IAAI,GAAG,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;wBAC5E,aAAa,CAAC,qBAAqB,CAAC,6BAA6B,CAAC,CAAA;oBACpE,CAAC,CAAC,CAAA;iBACH;qBAAM,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;oBAC5B,+CAA+C;oBAC/C,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAkB,EAAC,CAAC,CAAC,CAAA;oBAE5C,+BAA+B;oBAC/B,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;wBACnB,aAAa,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAA;wBACvD,SAAQ;qBACT;oBACD,IAAI,QAAQ,CAAC,KAAK,EAAE;wBAClB,aAAa,CAAC,0BAA0B,CAAC,KAAK,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;wBACvE,SAAQ;qBACT;oBACD,IAAI,CAAC,IAAA,wBAAkB,EAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBACzC,aAAa,CAAC,WAAW,CAAC,sDAAsD,CAAC,CAAA;wBACjF,SAAQ;qBACT;oBACD,IAAI,CAAC,IAAA,qBAAe,EAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;wBACnC,aAAa,CAAC,WAAW,CAAC,gDAAgD,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAA;wBAC3F,SAAQ;qBACT;oBACD,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE;wBACrE,aAAa,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAA;wBACxD,SAAQ;qBACT;oBACD,IACE,CAAC,QAAQ,CAAC,YAAY;wBACtB,CAAC,QAAQ,CAAC,cAAc;wBACxB,CAAC,CAAC,QAAQ,CAAC,qBAAqB,IAAI,CAAC,IAAI,CAAC,sCAAsC,CAAC,EACjF;wBACA,aAAa,CAAC,WAAW,CAAC,4CAA4C,CAAC,CAAA;wBACvE,SAAQ;qBACT;oBACD,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;iBAC7B;aACF;YAED,0CAA0C;YAC1C,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;YAElE,OAAO,aAAa,CAAA;QACtB,CAAC;KAAA;IAEO,uBAAuB,CAAC,aAAgC;QAC9D,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA2B,CAAA;QACnD,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE;YACpC,MAAM,OAAO,GAAG,IAAA,wBAAkB,EAAC,QAAQ,CAAC,CAAA;YAC5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACtC,IAAI,QAAQ,EAAE;gBACZ,IACE,CAAC,QAAQ,CAAC,YAAY,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;oBACjD,CAAC,QAAQ,CAAC,cAAc,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;oBACrD,CAAC,QAAQ,CAAC,qBAAqB,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,oCAAoC;kBACxG;oBACA,+EAA+E;oBAC/E,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,IAAA,wBAAa,EACX,6BAA6B,OAAO,OAAO,QAAQ,CAAC,QAAQ,QAAQ,QAAQ,CAAC,QAAQ,eAAe,QAAQ,CAAC,QAAQ,0CAA0C,CAChK,CACF,CAAA;oBACD,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;iBAChC;qBAAM;oBACL,mEAAmE;oBACnE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CACvB,IAAA,wBAAa,EACX,6BAA6B,OAAO,OAAO,QAAQ,CAAC,QAAQ,QAAQ,QAAQ,CAAC,QAAQ,eAAe,QAAQ,CAAC,QAAQ,EAAE,CACxH,CACF,CAAA;iBACF;aACF;iBAAM;gBACL,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;aAChC;SACF;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC3F,CAAC;IAEa,uBAAuB;;YACnC,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;YAC7C,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;YAE9D,IAAI,gBAAgB,GAAG,CACrB,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAC7F,CAAC,IAAI,EAAE,CAAA;YACR,gBAAgB,GAAG,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAA;YAEjE,MAAM,cAAc,GAAG,IAAA,8BAAoB,EAAC,IAAI,CAAC,MAAM,CAAC,MAAO,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC1G,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAwB,GAAE,CAAA;YAErD,IAAI;gBACF,MAAM,OAAO,GAAG,MAAM,IAAA,kCAAoB,EAAC,IAAI,CAAC,cAAc,EAAE,gBAAgB,EAAE,CAAO,YAAY,EAAE,EAAE;oBACvG,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAA;oBACtD,MAAM,cAAc,GAAG,IAAA,kCAA4B,EAAC,IAAA,wBAAkB,EAAC,YAAY,CAAC,CAAC,CAAA;oBACrF,MAAM,cAAc,GAAG,IAAA,iBAAS,EAAC,YAAY,EAAE,cAAc,CAAC,CAAA;oBAC9D,MAAM,IAAA,sBAAgB,EAAC,YAAY,CAAC,QAAQ,EAAE,cAAc,EAAE,YAAY,EAAE,IAAI,CAAC,CAAA;oBAEjF,IAAI,IAAI,CAAC,MAAM,EAAE;wBACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,IAAA,uBAAY,EAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAA;wBAEtF,OAAO,qBAAY,CAAC,OAAO,CAAA;qBAC5B;oBAED,MAAM,OAAO,GAAG;wBACd,OAAO,EAAE,IAAI,GAAG,CAAyB;4BACvC;gCACE,OAAO;gCACP;oCACE,IAAI,EAAE,QAAQ;oCACd,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;oCAC/B,OAAO,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAC;iCAC9D;6BACF;4BACD;gCACE,uCAA0B;gCAC1B;oCACE,IAAI,EAAE,MAAM;oCACZ,IAAI,EAAE,cAAc;oCACpB,OAAO,EAAE,EAAC,QAAQ,EAAE,qCAAwB,EAAC;iCAC9C;6BACF;yBACF,CAAC;qBACH,CAAA;oBAED,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;wBAC9B,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;qBACxE;oBAED,OAAO,IAAA,+BAAqB,EAAC,cAAc,EAAE,OAAO,EAAE;wBACpD,eAAe;wBACf,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;4BACb,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,6BAAkB,EAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;4BAC/E,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;wBAC7C,CAAC;wBACD,OAAO,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE;4BACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,8BAAmB,EAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;4BAC1F,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;wBAC9C,CAAC;wBACD,QAAQ,EAAE,GAAG,EAAE;4BACb,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,uBAAY,EAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAA;wBAC1E,CAAC;wBACD,OAAO,EAAE,CAAC;wBACV,OAAO,EAAE,IAAI;qBACd,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;wBACd,uCAAuC;wBACvC,YAAE,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;oBACjC,CAAC,CAAC,CAAA;gBACJ,CAAC,CAAA,CAAC,CAAA;gBAEF,OAAO,OAAO,CAAA;aACf;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,KAAK,CAAA;aACZ;oBAAS;gBACR,MAAM,IAAA,uBAAe,EAAC,YAAY,CAAC,CAAA;gBACnC,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;IAEa,aAAa;;YACzB,IAAI;gBACF,MAAM,IAAA,eAAO,EAAC,mBAAmB,CAAC,CAAA;gBAElC,OAAO,IAAI,CAAA;aACZ;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,KAAK,CAAA;aACb;QACH,CAAC;KAAA;IAEa,gBAAgB;;YAC5B,IAAI,cAAc,GAAG,IAAI,CAAA;YAEzB,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;gBAChE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,qCAA0B,EAAC,mBAAmB,CAAC,CAAC,CAAA;gBAC1E,cAAc,GAAG,KAAK,CAAA;aACvB;iBAAM;gBACL,KAAK,MAAM,eAAe,IAAI,IAAI,CAAC,gBAAgB,EAAE;oBACnD,IAAI,YAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;wBAClC,MAAM,KAAK,GAAG,YAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;wBAC1C,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE;4BAC3C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,uCAA4B,EAAC,eAAe,CAAC,CAAC,CAAA;4BACxE,cAAc,GAAG,KAAK,CAAA;yBACvB;qBACF;yBAAM;wBACL,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,uCAA4B,EAAC,eAAe,CAAC,CAAC,CAAA;wBACxE,cAAc,GAAG,KAAK,CAAA;qBACvB;iBACF;aACF;YAED,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC,EAAE;gBACjC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,gCAAqB,GAAE,CAAC,CAAA;gBAClD,cAAc,GAAG,KAAK,CAAA;aACvB;YAED,OAAO,cAAc,CAAA;QACvB,CAAC;KAAA;;AA1YH,sCA2YC;AA1Ye,mBAAK,GAAG,CAAC,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,AAA9B,CAA8B;AAEnC,mBAAK,GAAG,mBAAO,CAAC,KAAK,CAAC;IAClC,QAAQ,EAAE,WAAW;IACrB,WAAW,EAAE,yCAAyC;IACtD,OAAO,EAAE;;SAEJ;IACL,QAAQ,EAAE,CAAC,CAAC,+DAA+D,EAAE,iCAAiC,CAAC,CAAC;CACjH,CAAC,AAPiB,CAOjB"}
|
|
@@ -128,13 +128,13 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
128
128
|
}
|
|
129
129
|
this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.dryRun, this.version, this.serviceName, this.flavor, uploadInfo));
|
|
130
130
|
this.config = yield (0, utils_1.resolveConfigFromFileAndEnvironment)(this.config, {
|
|
131
|
-
apiKey: process.env.DATADOG_API_KEY,
|
|
132
|
-
datadogSite: process.env.DATADOG_SITE,
|
|
131
|
+
apiKey: process.env.DATADOG_API_KEY || process.env.DD_API_KEY,
|
|
132
|
+
datadogSite: process.env.DATADOG_SITE || process.env.DD_SITE,
|
|
133
133
|
}, {
|
|
134
134
|
configPath: this.configPath,
|
|
135
135
|
defaultConfigPaths: utils_1.DEFAULT_CONFIG_PATHS,
|
|
136
136
|
configFromFileCallback: (configFromFile) => {
|
|
137
|
-
(0, validation_1.checkAPIKeyOverride)(process.env.DATADOG_API_KEY, configFromFile.apiKey, this.context.stdout);
|
|
137
|
+
(0, validation_1.checkAPIKeyOverride)(process.env.DATADOG_API_KEY || process.env.DD_API_KEY, configFromFile.apiKey, this.context.stdout);
|
|
138
138
|
},
|
|
139
139
|
});
|
|
140
140
|
if (!this.disableGit) {
|