@datadog/datadog-ci 1.17.0 → 2.1.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/LICENSE-3rdparty.csv +0 -1
- package/README.md +1 -1
- package/dist/commands/junit/__tests__/upload.test.js +55 -19
- package/dist/commands/junit/__tests__/upload.test.js.map +1 -1
- package/dist/commands/junit/api.js +11 -8
- package/dist/commands/junit/api.js.map +1 -1
- package/dist/commands/junit/interfaces.d.ts +1 -0
- package/dist/commands/junit/upload.d.ts +3 -0
- package/dist/commands/junit/upload.js +34 -4
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/lambda/__tests__/prompt.test.js +23 -0
- package/dist/commands/lambda/__tests__/prompt.test.js.map +1 -1
- package/dist/commands/lambda/constants.d.ts +1 -0
- package/dist/commands/lambda/constants.js +2 -1
- package/dist/commands/lambda/constants.js.map +1 -1
- package/dist/commands/lambda/prompt.js +10 -2
- package/dist/commands/lambda/prompt.js.map +1 -1
- package/dist/commands/metric/metric.js +3 -3
- package/dist/commands/metric/metric.js.map +1 -1
- package/dist/commands/react-native/__tests__/xcode.test.js +116 -2
- package/dist/commands/react-native/__tests__/xcode.test.js.map +1 -1
- package/dist/commands/react-native/utils.d.ts +1 -0
- package/dist/commands/react-native/utils.js +17 -0
- package/dist/commands/react-native/utils.js.map +1 -0
- package/dist/commands/react-native/xcode.d.ts +6 -1
- package/dist/commands/react-native/xcode.js +108 -25
- package/dist/commands/react-native/xcode.js.map +1 -1
- package/dist/commands/synthetics/__tests__/{crypto.test.d.ts → tunnel/crypto.test.d.ts} +0 -0
- package/dist/commands/synthetics/__tests__/{crypto.test.js → tunnel/crypto.test.js} +1 -1
- package/dist/commands/synthetics/__tests__/tunnel/crypto.test.js.map +1 -0
- package/dist/commands/synthetics/__tests__/{tunnel.test.d.ts → tunnel/tunnel.test.d.ts} +0 -0
- package/dist/commands/synthetics/__tests__/{tunnel.test.js → tunnel/tunnel.test.js} +16 -15
- package/dist/commands/synthetics/__tests__/tunnel/tunnel.test.js.map +1 -0
- package/dist/commands/synthetics/__tests__/{websocket.test.d.ts → tunnel/websocket.test.d.ts} +0 -0
- package/dist/commands/synthetics/__tests__/{websocket.test.js → tunnel/websocket.test.js} +5 -5
- package/dist/commands/synthetics/__tests__/tunnel/websocket.test.js.map +1 -0
- package/dist/commands/synthetics/__tests__/utils.test.js +2 -41
- package/dist/commands/synthetics/__tests__/utils.test.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +0 -16
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/reporters/default.d.ts +2 -0
- package/dist/commands/synthetics/reporters/default.js +9 -3
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/run-test.js +10 -6
- package/dist/commands/synthetics/run-test.js.map +1 -1
- package/dist/commands/synthetics/{crypto.d.ts → tunnel/crypto.d.ts} +0 -0
- package/dist/commands/synthetics/{crypto.js → tunnel/crypto.js} +0 -0
- package/dist/commands/synthetics/tunnel/crypto.js.map +1 -0
- package/dist/commands/synthetics/tunnel/index.d.ts +1 -0
- package/dist/commands/synthetics/tunnel/index.js +6 -0
- package/dist/commands/synthetics/tunnel/index.js.map +1 -0
- package/dist/commands/synthetics/{tunnel.d.ts → tunnel/tunnel.d.ts} +12 -10
- package/dist/commands/synthetics/{tunnel.js → tunnel/tunnel.js} +30 -26
- package/dist/commands/synthetics/tunnel/tunnel.js.map +1 -0
- package/dist/commands/synthetics/{websocket.d.ts → tunnel/websocket.d.ts} +3 -3
- package/dist/commands/synthetics/{websocket.js → tunnel/websocket.js} +5 -8
- package/dist/commands/synthetics/tunnel/websocket.js.map +1 -0
- package/dist/commands/synthetics/utils.js +1 -57
- package/dist/commands/synthetics/utils.js.map +1 -1
- package/dist/commands/tag/tag.js +3 -3
- package/dist/commands/tag/tag.js.map +1 -1
- package/dist/helpers/__tests__/ci.test.js.map +1 -1
- package/dist/helpers/__tests__/plist.test.d.ts +1 -0
- package/dist/helpers/__tests__/plist.test.js +31 -0
- package/dist/helpers/__tests__/plist.test.js.map +1 -0
- package/dist/helpers/__tests__/validation.test.js +3 -0
- package/dist/helpers/__tests__/validation.test.js.map +1 -1
- package/dist/helpers/ci.d.ts +4 -0
- package/dist/helpers/ci.js +18 -4
- package/dist/helpers/ci.js.map +1 -1
- package/dist/helpers/plist.d.ts +44 -0
- package/dist/helpers/plist.js +75 -0
- package/dist/helpers/plist.js.map +1 -0
- package/dist/helpers/validation.js +3 -1
- package/dist/helpers/validation.js.map +1 -1
- package/package.json +9 -10
- package/dist/commands/synthetics/__tests__/crypto.test.js.map +0 -1
- package/dist/commands/synthetics/__tests__/tunnel.test.js.map +0 -1
- package/dist/commands/synthetics/__tests__/websocket.test.js.map +0 -1
- package/dist/commands/synthetics/crypto.js.map +0 -1
- package/dist/commands/synthetics/tunnel.js.map +0 -1
- package/dist/commands/synthetics/websocket.js.map +0 -1
package/LICENSE-3rdparty.csv
CHANGED
|
@@ -33,7 +33,6 @@ glob,import,ISC,Copyright (c) Isaac Z. Schlueter and Contributors
|
|
|
33
33
|
inquirer,import,MIT,Copyright (c) 2012 Simon Boudrias
|
|
34
34
|
inquirer-checkbox-plus-prompt,import,MIT,Copyright (c) 2018 Mohammad Anas Fares
|
|
35
35
|
jest,dev,MIT,"Copyright (c) Facebook, Inc. and its affiliates."
|
|
36
|
-
jest-environment-node,dev,MIT,"Copyright (c) Facebook, Inc. and its affiliates."
|
|
37
36
|
jest-matcher-specific-error,dev,MIT,Copyright (c) 2020 Daniel Hreben
|
|
38
37
|
js-yaml,import,MIT,Copyright (C) 2011-2015 by Vitaly Puzrin
|
|
39
38
|
ora,import,MIT,Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
|
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# Datadog CI
|
|
2
2
|
|
|
3
|
-
[](https://www.npmjs.com/package/@datadog/datadog-ci)  [](https://opensource.org/licenses/Apache-2.0) ](https://www.npmjs.com/package/@datadog/datadog-ci)  [](https://opensource.org/licenses/Apache-2.0) 
|
|
4
4
|
|
|
5
5
|
Execute commands with Datadog from within your Continuous Integration/Continuous Deployment scripts. A good way to perform end to end tests of your application before applying your changes or deploying. It currently features running synthetics tests and waiting for the results.
|
|
6
6
|
|
|
@@ -30,6 +30,12 @@ const createMockContext = () => {
|
|
|
30
30
|
data += input;
|
|
31
31
|
},
|
|
32
32
|
},
|
|
33
|
+
stderr: {
|
|
34
|
+
toString: () => data,
|
|
35
|
+
write: (input) => {
|
|
36
|
+
data += input;
|
|
37
|
+
},
|
|
38
|
+
},
|
|
33
39
|
};
|
|
34
40
|
};
|
|
35
41
|
describe('upload', () => {
|
|
@@ -130,6 +136,34 @@ describe('upload', () => {
|
|
|
130
136
|
}, {});
|
|
131
137
|
expect(files.length).toEqual(2);
|
|
132
138
|
}));
|
|
139
|
+
test('should set hostname', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
140
|
+
const context = createMockContext();
|
|
141
|
+
const command = new upload_1.UploadJUnitXMLCommand();
|
|
142
|
+
const [firstFile, secondFile] = yield command['getMatchingJUnitXMLFiles'].call({
|
|
143
|
+
basePaths: ['./src/commands/junit/__tests__/fixtures'],
|
|
144
|
+
config: {},
|
|
145
|
+
context,
|
|
146
|
+
service: 'service',
|
|
147
|
+
}, {});
|
|
148
|
+
expect(firstFile.hostname).toEqual(os_1.default.hostname());
|
|
149
|
+
expect(secondFile.hostname).toEqual(os_1.default.hostname());
|
|
150
|
+
}));
|
|
151
|
+
test('should set logsEnabled for each file', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
152
|
+
process.env.DD_CIVISIBILITY_LOGS_ENABLED = 'true';
|
|
153
|
+
const context = createMockContext();
|
|
154
|
+
const command = new upload_1.UploadJUnitXMLCommand();
|
|
155
|
+
const [firstFile, secondFile] = yield command['getMatchingJUnitXMLFiles'].call({
|
|
156
|
+
basePaths: ['./src/commands/junit/__tests__/fixtures'],
|
|
157
|
+
config: {},
|
|
158
|
+
context,
|
|
159
|
+
logs: true,
|
|
160
|
+
service: 'service',
|
|
161
|
+
}, {});
|
|
162
|
+
expect(firstFile.logsEnabled).toBe(true);
|
|
163
|
+
expect(secondFile.logsEnabled).toBe(true);
|
|
164
|
+
}));
|
|
165
|
+
});
|
|
166
|
+
describe('getSpanTags', () => {
|
|
133
167
|
test('should parse DD_TAGS and DD_ENV environment variables', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
134
168
|
process.env.DD_TAGS = 'key1:https://google.com,key2:value2';
|
|
135
169
|
process.env.DD_ENV = 'ci';
|
|
@@ -148,18 +182,6 @@ describe('upload', () => {
|
|
|
148
182
|
key2: 'value2',
|
|
149
183
|
});
|
|
150
184
|
}));
|
|
151
|
-
test('should set hostname', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
152
|
-
const context = createMockContext();
|
|
153
|
-
const command = new upload_1.UploadJUnitXMLCommand();
|
|
154
|
-
const [firstFile, secondFile] = yield command['getMatchingJUnitXMLFiles'].call({
|
|
155
|
-
basePaths: ['./src/commands/junit/__tests__/fixtures'],
|
|
156
|
-
config: {},
|
|
157
|
-
context,
|
|
158
|
-
service: 'service',
|
|
159
|
-
}, {});
|
|
160
|
-
expect(firstFile.hostname).toEqual(os_1.default.hostname());
|
|
161
|
-
expect(secondFile.hostname).toEqual(os_1.default.hostname());
|
|
162
|
-
}));
|
|
163
185
|
test('should parse tags argument', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
164
186
|
const context = createMockContext();
|
|
165
187
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
@@ -173,19 +195,33 @@ describe('upload', () => {
|
|
|
173
195
|
key2: 'value2',
|
|
174
196
|
});
|
|
175
197
|
}));
|
|
176
|
-
|
|
177
|
-
|
|
198
|
+
});
|
|
199
|
+
describe('parseXPathTags', () => {
|
|
200
|
+
test('should parse xpath assigments', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
178
201
|
const context = createMockContext();
|
|
179
202
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
180
|
-
const
|
|
203
|
+
const xPathTags = command['parseXPathTags'].call({
|
|
181
204
|
basePaths: ['./src/commands/junit/__tests__/fixtures'],
|
|
182
205
|
config: {},
|
|
183
206
|
context,
|
|
184
|
-
logs: true,
|
|
185
207
|
service: 'service',
|
|
186
|
-
},
|
|
187
|
-
expect(
|
|
188
|
-
|
|
208
|
+
}, ['test.suite=/testcase/@classname', "custom_tag=/testcase/..//property[@name='property-name']"]);
|
|
209
|
+
expect(xPathTags).toMatchObject({
|
|
210
|
+
'test.suite': '/testcase/@classname',
|
|
211
|
+
custom_tag: "/testcase/..//property[@name='property-name']",
|
|
212
|
+
});
|
|
213
|
+
}));
|
|
214
|
+
test('should alert of invalid values', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
215
|
+
const context = createMockContext();
|
|
216
|
+
const command = new upload_1.UploadJUnitXMLCommand();
|
|
217
|
+
command['parseXPathTags'].call({
|
|
218
|
+
basePaths: ['./src/commands/junit/__tests__/fixtures'],
|
|
219
|
+
config: {},
|
|
220
|
+
context,
|
|
221
|
+
service: 'service',
|
|
222
|
+
}, ['test.suite=/testcase/@classname', 'invalid']);
|
|
223
|
+
const errOutput = context.stderr.toString().split(os_1.default.EOL);
|
|
224
|
+
expect(errOutput[0]).toContain('Invalid xpath');
|
|
189
225
|
}));
|
|
190
226
|
});
|
|
191
227
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.test.js","sourceRoot":"","sources":["../../../../src/commands/junit/__tests__/upload.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"upload.test.js","sourceRoot":"","sources":["../../../../src/commands/junit/__tests__/upload.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,17 +38,20 @@ const uploadJUnitXML = (request) => (jUnitXML, write) => __awaiter(void 0, void
|
|
|
38
38
|
catch (e) {
|
|
39
39
|
fileName = 'default_file_name';
|
|
40
40
|
}
|
|
41
|
-
const
|
|
41
|
+
const metadata = Object.assign(Object.assign({ service: jUnitXML.service }, jUnitXML.spanTags), { '_dd.cireport_version': '2', '_dd.hostname': jUnitXML.hostname });
|
|
42
42
|
if (jUnitXML.logsEnabled) {
|
|
43
|
-
|
|
43
|
+
metadata['_dd.junitxml_logs'] = true;
|
|
44
44
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
if (spanTags[tags_1.CI_PIPELINE_URL]) {
|
|
48
|
-
uniqueFileName = `${uniqueFileName}-${spanTags[tags_1.CI_PIPELINE_URL]}`;
|
|
45
|
+
if (jUnitXML.xpathTags) {
|
|
46
|
+
metadata['_dd.junitxml_xpath_tags'] = jUnitXML.xpathTags;
|
|
49
47
|
}
|
|
50
|
-
|
|
51
|
-
|
|
48
|
+
form.append('event', JSON.stringify(metadata), { filename: 'event.json' });
|
|
49
|
+
let uniqueFileName = `${fileName}-${jUnitXML.service}-${metadata[tags_1.GIT_SHA]}`;
|
|
50
|
+
if (metadata[tags_1.CI_PIPELINE_URL]) {
|
|
51
|
+
uniqueFileName = `${uniqueFileName}-${metadata[tags_1.CI_PIPELINE_URL]}`;
|
|
52
|
+
}
|
|
53
|
+
if (metadata[tags_1.CI_JOB_URL]) {
|
|
54
|
+
uniqueFileName = `${uniqueFileName}-${metadata[tags_1.CI_JOB_URL]}`;
|
|
52
55
|
}
|
|
53
56
|
form.append('junit_xml_report_file', fs_1.default.createReadStream(jUnitXML.xmlPath).pipe(zlib_1.createGzip()), {
|
|
54
57
|
filename: `${exports.getSafeFileName(uniqueFileName)}.xml.gz`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/junit/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AAEvB,+BAA+B;AAI/B,0DAAgC;AAEhC,6CAAuE;AACvE,+CAAqD;AAGrD,yCAAuC;AAEvC,wEAAwE;AACxE,oEAAoE;AACpE,2BAA2B;AACpB,MAAM,eAAe,GAAG,CAAC,cAAsB,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAA;AAAxF,QAAA,eAAe,mBAAyE;AAErG,sLAAsL;AACtL,iHAAiH;AACjH,MAAM,aAAa,GAAG,QAAQ,CAAA;AAEvB,MAAM,cAAc,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CACpG,QAAiB,EACjB,KAAwB,EACxB,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAC3B,KAAK,CAAC,uBAAY,CAAC,QAAQ,CAAC,CAAC,CAAA;IAE7B,IAAI,QAAQ,CAAA;IACZ,IAAI;QACF,QAAQ,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,QAAQ,GAAG,mBAAmB,CAAA;KAC/B;IAED,MAAM,QAAQ,iCACZ,OAAO,EAAE,QAAQ,CAAC,OAAO,IACtB,QAAQ,CAAC,QAAQ,KACpB,sBAAsB,EAAE,GAAG,EAC3B,cAAc,EAAE,QAAQ,CAAC,QAAQ,GAClC,CAAA;IAED,IAAI,QAAQ,CAAC,WAAW,EAAE;QACxB,QAAQ,CAAC,mBAAmB,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/junit/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AAEvB,+BAA+B;AAI/B,0DAAgC;AAEhC,6CAAuE;AACvE,+CAAqD;AAGrD,yCAAuC;AAEvC,wEAAwE;AACxE,oEAAoE;AACpE,2BAA2B;AACpB,MAAM,eAAe,GAAG,CAAC,cAAsB,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAA;AAAxF,QAAA,eAAe,mBAAyE;AAErG,sLAAsL;AACtL,iHAAiH;AACjH,MAAM,aAAa,GAAG,QAAQ,CAAA;AAEvB,MAAM,cAAc,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CACpG,QAAiB,EACjB,KAAwB,EACxB,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAC3B,KAAK,CAAC,uBAAY,CAAC,QAAQ,CAAC,CAAC,CAAA;IAE7B,IAAI,QAAQ,CAAA;IACZ,IAAI;QACF,QAAQ,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,QAAQ,GAAG,mBAAmB,CAAA;KAC/B;IAED,MAAM,QAAQ,iCACZ,OAAO,EAAE,QAAQ,CAAC,OAAO,IACtB,QAAQ,CAAC,QAAQ,KACpB,sBAAsB,EAAE,GAAG,EAC3B,cAAc,EAAE,QAAQ,CAAC,QAAQ,GAClC,CAAA;IAED,IAAI,QAAQ,CAAC,WAAW,EAAE;QACxB,QAAQ,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAA;KACrC;IAED,IAAI,QAAQ,CAAC,SAAS,EAAE;QACtB,QAAQ,CAAC,yBAAyB,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAA;KACzD;IAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC,CAAA;IAExE,IAAI,cAAc,GAAG,GAAG,QAAQ,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,cAAO,CAAC,EAAE,CAAA;IAE3E,IAAI,QAAQ,CAAC,sBAAe,CAAC,EAAE;QAC7B,cAAc,GAAG,GAAG,cAAc,IAAI,QAAQ,CAAC,sBAAe,CAAC,EAAE,CAAA;KAClE;IACD,IAAI,QAAQ,CAAC,iBAAU,CAAC,EAAE;QACxB,cAAc,GAAG,GAAG,cAAc,IAAI,QAAQ,CAAC,iBAAU,CAAC,EAAE,CAAA;KAC7D;IAED,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,YAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iBAAU,EAAE,CAAC,EAAE;QAC7F,QAAQ,EAAE,GAAG,uBAAe,CAAC,cAAc,CAAC,SAAS;KACtD,CAAC,CAAA;IAEF,OAAO,OAAO,CAAC;QACb,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;QAC1B,aAAa;QACb,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,iBAAiB;KACvB,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AAnDY,QAAA,cAAc,kBAmD1B;AAEM,MAAM,cAAc,GAAG,CAAC,aAAqB,EAAE,MAAc,EAAE,EAAE;IACtE,MAAM,aAAa,GAAG,yBAAiB,CAAC,EAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAC,CAAC,CAAA;IAEzE,OAAO;QACL,cAAc,EAAE,sBAAc,CAAC,aAAa,CAAC;KAC9C,CAAA;AACH,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B"}
|
|
@@ -9,7 +9,10 @@ export declare class UploadJUnitXMLCommand extends Command {
|
|
|
9
9
|
private maxConcurrency;
|
|
10
10
|
private service?;
|
|
11
11
|
private tags?;
|
|
12
|
+
private rawXPathTags?;
|
|
13
|
+
private xpathTags?;
|
|
12
14
|
execute(): Promise<1 | undefined>;
|
|
15
|
+
private parseXPathTags;
|
|
13
16
|
private getApiHelper;
|
|
14
17
|
private getMatchingJUnitXMLFiles;
|
|
15
18
|
private getSpanTags;
|
|
@@ -18,7 +18,7 @@ const os_1 = __importDefault(require("os"));
|
|
|
18
18
|
const path_1 = __importDefault(require("path"));
|
|
19
19
|
const chalk_1 = __importDefault(require("chalk"));
|
|
20
20
|
const clipanion_1 = require("clipanion");
|
|
21
|
-
const fast_xml_parser_1 =
|
|
21
|
+
const fast_xml_parser_1 = require("fast-xml-parser");
|
|
22
22
|
const glob_1 = __importDefault(require("glob"));
|
|
23
23
|
const tiny_async_pool_1 = __importDefault(require("tiny-async-pool"));
|
|
24
24
|
const ci_1 = require("../../helpers/ci");
|
|
@@ -33,11 +33,12 @@ const utils_2 = require("./utils");
|
|
|
33
33
|
const errorCodesStopUpload = [400, 403];
|
|
34
34
|
const validateXml = (xmlFilePath) => {
|
|
35
35
|
const xmlFileContentString = String(fs_1.default.readFileSync(xmlFilePath));
|
|
36
|
-
const validationOutput = fast_xml_parser_1.
|
|
36
|
+
const validationOutput = fast_xml_parser_1.XMLValidator.validate(xmlFileContentString);
|
|
37
37
|
if (validationOutput !== true) {
|
|
38
38
|
return validationOutput.err.msg;
|
|
39
39
|
}
|
|
40
|
-
const
|
|
40
|
+
const xmlParser = new fast_xml_parser_1.XMLParser();
|
|
41
|
+
const xmlFileJSON = xmlParser.parse(String(xmlFileContentString));
|
|
41
42
|
if (!xmlFileJSON.testsuites && !xmlFileJSON.testsuite) {
|
|
42
43
|
return 'Neither <testsuites> nor <testsuite> are the root tag.';
|
|
43
44
|
}
|
|
@@ -76,6 +77,12 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
76
77
|
!['false', '0'].includes(process.env.DD_CIVISIBILITY_LOGS_ENABLED.toLowerCase())) {
|
|
77
78
|
this.logs = true;
|
|
78
79
|
}
|
|
80
|
+
if (this.rawXPathTags) {
|
|
81
|
+
this.xpathTags = this.parseXPathTags(this.rawXPathTags);
|
|
82
|
+
if (Object.keys(this.xpathTags).length !== this.rawXPathTags.length) {
|
|
83
|
+
return 1;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
79
86
|
const api = this.getApiHelper();
|
|
80
87
|
// Normalizing the basePath to resolve .. and .
|
|
81
88
|
// Always using the posix version to avoid \ on Windows.
|
|
@@ -90,6 +97,19 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
90
97
|
this.context.stdout.write(renderer_1.renderSuccessfulCommand(payloads.length, totalTimeSeconds, spanTags, this.service, this.config.env));
|
|
91
98
|
});
|
|
92
99
|
}
|
|
100
|
+
parseXPathTags(rawXPathTags) {
|
|
101
|
+
return rawXPathTags.reduce((xpathTags, rawExpression) => {
|
|
102
|
+
const index = rawExpression.indexOf('=');
|
|
103
|
+
if (index === -1) {
|
|
104
|
+
this.context.stderr.write('Invalid xpath-tag: missing =. Value must be <tag>=<xpath-expression>\n');
|
|
105
|
+
return xpathTags;
|
|
106
|
+
}
|
|
107
|
+
const tagName = rawExpression.substring(0, index);
|
|
108
|
+
const xPath = rawExpression.substring(index + 1);
|
|
109
|
+
xpathTags[tagName] = xPath;
|
|
110
|
+
return xpathTags;
|
|
111
|
+
}, {});
|
|
112
|
+
}
|
|
93
113
|
getApiHelper() {
|
|
94
114
|
if (!this.config.apiKey) {
|
|
95
115
|
this.context.stdout.write(`Neither ${chalk_1.default.red.bold('DATADOG_API_KEY')} nor ${chalk_1.default.red.bold('DD_API_KEY')} is in your environment.\n`);
|
|
@@ -117,6 +137,7 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
117
137
|
return validUniqueFiles.map((jUnitXMLFilePath) => ({
|
|
118
138
|
hostname: os_1.default.hostname(),
|
|
119
139
|
logsEnabled: this.logs,
|
|
140
|
+
xpathTags: this.xpathTags,
|
|
120
141
|
service: this.service,
|
|
121
142
|
spanTags,
|
|
122
143
|
xmlPath: jUnitXMLFilePath,
|
|
@@ -175,7 +196,7 @@ UploadJUnitXMLCommand.usage = clipanion_1.Command.Usage({
|
|
|
175
196
|
'datadog-ci junit upload --service my-service src/unit-test-reports src/acceptance-test-reports',
|
|
176
197
|
],
|
|
177
198
|
[
|
|
178
|
-
'Upload all jUnit XML test report files in current directory and add extra tags',
|
|
199
|
+
'Upload all jUnit XML test report files in current directory and add extra tags globally',
|
|
179
200
|
'datadog-ci junit upload --service my-service --tags key1:value1 --tags key2:value2 .',
|
|
180
201
|
],
|
|
181
202
|
[
|
|
@@ -186,6 +207,14 @@ UploadJUnitXMLCommand.usage = clipanion_1.Command.Usage({
|
|
|
186
207
|
'Upload all jUnit XML test report files in current directory while also collecting logs',
|
|
187
208
|
'datadog-ci junit upload --service my-service --logs .',
|
|
188
209
|
],
|
|
210
|
+
[
|
|
211
|
+
'Upload all jUnit XML test report files in current directory customizing test suite with xpath',
|
|
212
|
+
'datadog-ci junit upload --service my-service --xpath-tag test.suite=/testcase/@classname .',
|
|
213
|
+
],
|
|
214
|
+
[
|
|
215
|
+
'Upload all jUnit XML test report files in current directory adding a custom tag from property with xpath',
|
|
216
|
+
"datadog-ci junit upload --service my-service --xpath-tag custom_tag=/testcase/..//property[@name='property-name'] .",
|
|
217
|
+
],
|
|
189
218
|
],
|
|
190
219
|
});
|
|
191
220
|
UploadJUnitXMLCommand.addPath('junit', 'upload');
|
|
@@ -196,4 +225,5 @@ UploadJUnitXMLCommand.addOption('tags', clipanion_1.Command.Array('--tags'));
|
|
|
196
225
|
UploadJUnitXMLCommand.addOption('basePaths', clipanion_1.Command.Rest({ required: 1 }));
|
|
197
226
|
UploadJUnitXMLCommand.addOption('maxConcurrency', clipanion_1.Command.String('--max-concurrency'));
|
|
198
227
|
UploadJUnitXMLCommand.addOption('logs', clipanion_1.Command.Boolean('--logs'));
|
|
228
|
+
UploadJUnitXMLCommand.addOption('rawXPathTags', clipanion_1.Command.Array('--xpath-tag'));
|
|
199
229
|
//# sourceMappingURL=upload.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,4CAAmB;AACnB,gDAAuB;AAEvB,kDAAyB;AACzB,yCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,17 @@ describe('prompt', () => {
|
|
|
39
39
|
expect(yield question.message).toBe('API Key:');
|
|
40
40
|
expect(question.name).toBe(constants_1.CI_API_KEY_ENV_VAR);
|
|
41
41
|
}));
|
|
42
|
+
test('validates DATADOG_API_KEY correctly', () => {
|
|
43
|
+
const datadogApiKeyType = {
|
|
44
|
+
envVar: constants_1.CI_API_KEY_ENV_VAR,
|
|
45
|
+
message: 'API Key:',
|
|
46
|
+
};
|
|
47
|
+
const question = prompt_1.datadogEnvVarsQuestions(datadogApiKeyType);
|
|
48
|
+
expect(question.validate).not.toBeUndefined();
|
|
49
|
+
expect(question.validate('')).not.toBe(true);
|
|
50
|
+
expect(question.validate('123abc')).not.toBe(true);
|
|
51
|
+
expect(question.validate('1234567890abcdef1200791a6a0de187')).toBe(true);
|
|
52
|
+
});
|
|
42
53
|
test('returns correct message when user selects DATADOG_KMS_API_KEY', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
43
54
|
const datadogApiKeyType = {
|
|
44
55
|
envVar: constants_1.CI_KMS_API_KEY_ENV_VAR,
|
|
@@ -57,6 +68,18 @@ describe('prompt', () => {
|
|
|
57
68
|
expect(yield question.message).toBe('API Key Secret ARN:');
|
|
58
69
|
expect(question.name).toBe(constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR);
|
|
59
70
|
}));
|
|
71
|
+
test('validates DATADOG_API_KEY_SECRET_ARN correctly', () => {
|
|
72
|
+
const datadogApiKeyType = {
|
|
73
|
+
envVar: constants_1.CI_API_KEY_SECRET_ARN_ENV_VAR,
|
|
74
|
+
message: 'API Key Secret ARN:',
|
|
75
|
+
};
|
|
76
|
+
const question = prompt_1.datadogEnvVarsQuestions(datadogApiKeyType);
|
|
77
|
+
expect(question.validate).not.toBeUndefined();
|
|
78
|
+
expect(question.validate('')).not.toBe(true);
|
|
79
|
+
expect(question.validate('123abc')).not.toBe(true);
|
|
80
|
+
expect(question.validate('1234567890abcdef1200791a6a0de187')).not.toBe(true);
|
|
81
|
+
expect(question.validate('arn:aws:secretsmanager:sa-east-1:123456789012:secret:dd-api-key')).toBe(true);
|
|
82
|
+
});
|
|
60
83
|
});
|
|
61
84
|
describe('functionSelectionQuestion', () => {
|
|
62
85
|
test('returns question with the provided function names being its choices', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.test.js","sourceRoot":"","sources":["../../../../src/commands/lambda/__tests__/prompt.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prompt.test.js","sourceRoot":"","sources":["../../../../src/commands/lambda/__tests__/prompt.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,5 +87,6 @@ export declare const MAX_LAMBDA_STATE_CHECK_ATTEMPTS = 3;
|
|
|
87
87
|
export declare const EXTRA_TAGS_REG_EXP: RegExp;
|
|
88
88
|
export declare const AWS_ACCESS_KEY_ID_REG_EXP: RegExp;
|
|
89
89
|
export declare const AWS_SECRET_ACCESS_KEY_REG_EXP: RegExp;
|
|
90
|
+
export declare const AWS_SECRET_ARN_REG_EXP: RegExp;
|
|
90
91
|
export declare const DATADOG_API_KEY_REG_EXP: RegExp;
|
|
91
92
|
export declare const DATADOG_APP_KEY_REG_EXP: RegExp;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EXTRA_TAGS_REG_EXP = exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = exports.LIST_FUNCTIONS_MAX_RETRY_COUNT = exports.AWS_SESSION_TOKEN_ENV_VAR = exports.AWS_DEFAULT_REGION_ENV_VAR = exports.AWS_SECRET_ACCESS_KEY_ENV_VAR = exports.AWS_ACCESS_KEY_ID_ENV_VAR = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_SECRET_ARN_ENV_VAR = exports.CI_API_KEY_ENV_VAR = exports.CI_SITE_ENV_VAR = exports.DOTNET_TRACER_HOME_ENV_VAR = exports.PROFILER_PATH_ENV_VAR = exports.PROFILER_ENV_VAR = exports.ENABLE_PROFILING_ENV_VAR = exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = exports.EXTRA_TAGS_ENV_VAR = exports.ENVIRONMENT_ENV_VAR = exports.VERSION_ENV_VAR = exports.SERVICE_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_LEVEL_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.TRACE_ENABLED_ENV_VAR = exports.SITE_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.API_KEY_ENV_VAR = exports.DD_DOTNET_TRACER_HOME = exports.CORECLR_PROFILER_PATH = exports.CORECLR_PROFILER = exports.CORECLR_ENABLE_PROFILING = exports.AWS_LAMBDA_EXEC_WRAPPER = exports.AWS_LAMBDA_EXEC_WRAPPER_VAR = exports.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.NODE_HANDLER_LOCATION = exports.PYTHON_HANDLER_LOCATION = exports.ARM_LAYER_SUFFIX = exports.ARM64_ARCHITECTURE = exports.ARM_LAYERS = exports.RUNTIME_LOOKUP = exports.RuntimeType = exports.LAYER_LOOKUP = exports.DOTNET_RUNTIME = exports.EXTENSION_LAYER_KEY = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = void 0;
|
|
4
|
-
exports.DATADOG_APP_KEY_REG_EXP = exports.DATADOG_API_KEY_REG_EXP = exports.AWS_SECRET_ACCESS_KEY_REG_EXP = exports.AWS_ACCESS_KEY_ID_REG_EXP = void 0;
|
|
4
|
+
exports.DATADOG_APP_KEY_REG_EXP = exports.DATADOG_API_KEY_REG_EXP = exports.AWS_SECRET_ARN_REG_EXP = exports.AWS_SECRET_ACCESS_KEY_REG_EXP = exports.AWS_ACCESS_KEY_ID_REG_EXP = void 0;
|
|
5
5
|
exports.DD_LAMBDA_EXTENSION_LAYER_NAME = 'Datadog-Extension';
|
|
6
6
|
exports.EXTENSION_LAYER_KEY = 'extension';
|
|
7
7
|
exports.DOTNET_RUNTIME = 'dotnetcore3.1';
|
|
@@ -98,6 +98,7 @@ exports.MAX_LAMBDA_STATE_CHECK_ATTEMPTS = 3;
|
|
|
98
98
|
exports.EXTRA_TAGS_REG_EXP = /^(([a-zA-Z]+)\w+:[\w\-/\.]+)+((\,)([a-zA-Z]+)\w+:[\w\-/\.]+)*$/g;
|
|
99
99
|
exports.AWS_ACCESS_KEY_ID_REG_EXP = /(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])/g;
|
|
100
100
|
exports.AWS_SECRET_ACCESS_KEY_REG_EXP = /(?<![A-Za-z0-9/+=])[A-Za-z0-9/+=]{40}(?![A-Za-z0-9/+=])/g;
|
|
101
|
+
exports.AWS_SECRET_ARN_REG_EXP = /arn:aws:secretsmanager:[\w-]+:\d{12}:secret:.+/;
|
|
101
102
|
exports.DATADOG_API_KEY_REG_EXP = /(?<![a-f0-9])[a-f0-9]{32}(?![a-f0-9])/g;
|
|
102
103
|
exports.DATADOG_APP_KEY_REG_EXP = /(?<![a-f0-9])[a-f0-9]{40}(?![a-f0-9])/g;
|
|
103
104
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/lambda/constants.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/lambda/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -116,6 +116,7 @@ const versionQuestion = {
|
|
|
116
116
|
name: constants_2.VERSION_ENV_VAR,
|
|
117
117
|
type: 'input',
|
|
118
118
|
};
|
|
119
|
+
const INVALID_KEY_MESSAGE = 'Enter a valid Datadog API Key.';
|
|
119
120
|
const datadogEnvVarsQuestions = (datadogApiKeyType) => ({
|
|
120
121
|
// DATADOG API KEY given type
|
|
121
122
|
default: process.env[datadogApiKeyType.envVar],
|
|
@@ -123,8 +124,15 @@ const datadogEnvVarsQuestions = (datadogApiKeyType) => ({
|
|
|
123
124
|
name: datadogApiKeyType.envVar,
|
|
124
125
|
type: 'input',
|
|
125
126
|
validate: (value) => {
|
|
126
|
-
if (!value
|
|
127
|
-
return
|
|
127
|
+
if (!value) {
|
|
128
|
+
return INVALID_KEY_MESSAGE;
|
|
129
|
+
}
|
|
130
|
+
if (datadogApiKeyType.envVar === constants_2.CI_API_KEY_ENV_VAR && !commons_1.sentenceMatchesRegEx(value, constants_2.DATADOG_API_KEY_REG_EXP)) {
|
|
131
|
+
return INVALID_KEY_MESSAGE;
|
|
132
|
+
}
|
|
133
|
+
if (datadogApiKeyType.envVar === constants_2.CI_API_KEY_SECRET_ARN_ENV_VAR &&
|
|
134
|
+
!commons_1.sentenceMatchesRegEx(value, constants_2.AWS_SECRET_ARN_REG_EXP)) {
|
|
135
|
+
return INVALID_KEY_MESSAGE;
|
|
128
136
|
}
|
|
129
137
|
return true;
|
|
130
138
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/commands/lambda/prompt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iCAAsC;AACtC,iCAA4B;AAC5B,wDAA+B;AAE/B,+CAA6C;AAE7C,
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/commands/lambda/prompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,9 +50,9 @@ class MetricCommand extends clipanion_1.Command {
|
|
|
50
50
|
try {
|
|
51
51
|
const metrics = exports.parseMetrics(this.metrics);
|
|
52
52
|
const { provider, ciEnv } = ci_1.getCIEnv();
|
|
53
|
-
// For GitHub only the pipeline level is supported as there is no way to identify the job from the runner.
|
|
54
|
-
if (provider === 'github' && this.level === 'job') {
|
|
55
|
-
this.context.stderr.write(`${chalk_1.default.red.bold('[ERROR]')} Cannot use level "job" for
|
|
53
|
+
// For GitHub and Buddy only the pipeline level is supported as there is no way to identify the job from the runner.
|
|
54
|
+
if ((provider === 'github' || provider === 'buddy') && this.level === 'job') {
|
|
55
|
+
this.context.stderr.write(`${chalk_1.default.red.bold('[ERROR]')} Cannot use level "job" for ${ci_1.PROVIDER_TO_DISPLAY_NAME[provider]}.`);
|
|
56
56
|
return 1;
|
|
57
57
|
}
|
|
58
58
|
const exitStatus = yield this.sendMetrics(ciEnv, this.level === 'pipeline' ? 0 : 1, provider, metrics);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metric.js","sourceRoot":"","sources":["../../../src/commands/metric/metric.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,yCAAiC;AAEjC,
|
|
1
|
+
{"version":3,"file":"metric.js","sourceRoot":"","sources":["../../../src/commands/metric/metric.ts"],"names":[],"mappings":"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"}
|