@datadog/datadog-ci 1.7.3-alpha → 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/junit/__tests__/upload.test.js +24 -22
- package/dist/commands/junit/__tests__/upload.test.js.map +1 -1
- package/dist/commands/junit/api.js +1 -1
- package/dist/commands/junit/api.js.map +1 -1
- package/dist/commands/junit/interfaces.d.ts +1 -0
- 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 +17 -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.js +1 -1
- 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/synthetics/__tests__/reporters/default.test.js +11 -2
- package/dist/commands/synthetics/__tests__/reporters/default.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/utils.test.js +24 -4
- package/dist/commands/synthetics/__tests__/utils.test.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +1 -1
- package/dist/commands/synthetics/utils.js +2 -2
- package/dist/commands/synthetics/utils.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
|
@@ -53,7 +53,7 @@ describe('upload', () => {
|
|
|
53
53
|
config: {},
|
|
54
54
|
context,
|
|
55
55
|
service: 'service',
|
|
56
|
-
});
|
|
56
|
+
}, {});
|
|
57
57
|
expect(firstFile).toMatchObject({
|
|
58
58
|
service: 'service',
|
|
59
59
|
xmlPath: './src/commands/junit/__tests__/fixtures/go-report.xml',
|
|
@@ -74,7 +74,7 @@ describe('upload', () => {
|
|
|
74
74
|
config: {},
|
|
75
75
|
context,
|
|
76
76
|
service: 'service',
|
|
77
|
-
});
|
|
77
|
+
}, {});
|
|
78
78
|
expect(files.length).toEqual(1);
|
|
79
79
|
expect(files[0]).toMatchObject({
|
|
80
80
|
service: 'service',
|
|
@@ -89,7 +89,7 @@ describe('upload', () => {
|
|
|
89
89
|
config: {},
|
|
90
90
|
context,
|
|
91
91
|
service: 'service',
|
|
92
|
-
});
|
|
92
|
+
}, {});
|
|
93
93
|
expect(files.length).toEqual(0);
|
|
94
94
|
}));
|
|
95
95
|
test('should allow folder and single unit paths', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -103,7 +103,7 @@ describe('upload', () => {
|
|
|
103
103
|
config: {},
|
|
104
104
|
context,
|
|
105
105
|
service: 'service',
|
|
106
|
-
});
|
|
106
|
+
}, {});
|
|
107
107
|
expect(firstFile).toMatchObject({
|
|
108
108
|
service: 'service',
|
|
109
109
|
xmlPath: './src/commands/junit/__tests__/fixtures/go-report.xml',
|
|
@@ -121,11 +121,14 @@ describe('upload', () => {
|
|
|
121
121
|
const context = createMockContext();
|
|
122
122
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
123
123
|
const files = yield command['getMatchingJUnitXMLFiles'].call({
|
|
124
|
-
basePaths: [
|
|
124
|
+
basePaths: [
|
|
125
|
+
'./src/commands/junit/__tests__/fixtures',
|
|
126
|
+
'./src/commands/junit/__tests__/fixtures/go-report.xml',
|
|
127
|
+
],
|
|
125
128
|
config: {},
|
|
126
129
|
context,
|
|
127
130
|
service: 'service',
|
|
128
|
-
});
|
|
131
|
+
}, {});
|
|
129
132
|
expect(files.length).toEqual(2);
|
|
130
133
|
}));
|
|
131
134
|
test('should parse DD_TAGS and DD_ENV environment variables', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -133,27 +136,20 @@ describe('upload', () => {
|
|
|
133
136
|
process.env.DD_ENV = 'ci';
|
|
134
137
|
const context = createMockContext();
|
|
135
138
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
136
|
-
const
|
|
137
|
-
basePaths: ['./src/commands/junit/__tests__/fixtures'],
|
|
139
|
+
const spanTags = yield command['getSpanTags'].call({
|
|
138
140
|
config: {
|
|
139
141
|
env: process.env.DD_ENV,
|
|
140
142
|
envVarTags: process.env.DD_TAGS,
|
|
141
143
|
},
|
|
142
144
|
context,
|
|
143
|
-
service: 'service',
|
|
144
|
-
});
|
|
145
|
-
expect(firstFile.spanTags).toMatchObject({
|
|
146
|
-
env: 'ci',
|
|
147
|
-
key1: 'https://google.com',
|
|
148
|
-
key2: 'value2',
|
|
149
145
|
});
|
|
150
|
-
expect(
|
|
146
|
+
expect(spanTags).toMatchObject({
|
|
151
147
|
env: 'ci',
|
|
152
148
|
key1: 'https://google.com',
|
|
153
149
|
key2: 'value2',
|
|
154
150
|
});
|
|
155
151
|
}));
|
|
156
|
-
test('should
|
|
152
|
+
test('should set hostname', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
157
153
|
const context = createMockContext();
|
|
158
154
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
159
155
|
const [firstFile, secondFile] = yield command['getMatchingJUnitXMLFiles'].call({
|
|
@@ -161,13 +157,19 @@ describe('upload', () => {
|
|
|
161
157
|
config: {},
|
|
162
158
|
context,
|
|
163
159
|
service: 'service',
|
|
160
|
+
}, {});
|
|
161
|
+
expect(firstFile.hostname).toEqual(os_1.default.hostname());
|
|
162
|
+
expect(secondFile.hostname).toEqual(os_1.default.hostname());
|
|
163
|
+
}));
|
|
164
|
+
test('should parse tags argument', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
165
|
+
const context = createMockContext();
|
|
166
|
+
const command = new upload_1.UploadJUnitXMLCommand();
|
|
167
|
+
const spanTags = yield command['getSpanTags'].call({
|
|
168
|
+
config: {},
|
|
169
|
+
context,
|
|
164
170
|
tags: ['key1:value1', 'key2:value2'],
|
|
165
171
|
});
|
|
166
|
-
expect(
|
|
167
|
-
key1: 'value1',
|
|
168
|
-
key2: 'value2',
|
|
169
|
-
});
|
|
170
|
-
expect(secondFile.spanTags).toMatchObject({
|
|
172
|
+
expect(spanTags).toMatchObject({
|
|
171
173
|
key1: 'value1',
|
|
172
174
|
key2: 'value2',
|
|
173
175
|
});
|
|
@@ -182,7 +184,7 @@ describe('upload', () => {
|
|
|
182
184
|
context,
|
|
183
185
|
logs: true,
|
|
184
186
|
service: 'service',
|
|
185
|
-
});
|
|
187
|
+
}, {});
|
|
186
188
|
expect(firstFile.logsEnabled).toBe(true);
|
|
187
189
|
expect(secondFile.logsEnabled).toBe(true);
|
|
188
190
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.test.js","sourceRoot":"","sources":["../../../../src/commands/junit/__tests__/upload.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oCAAoC;AACpC,qDAA0C;AAC1C,4CAAmB;
|
|
1
|
+
{"version":3,"file":"upload.test.js","sourceRoot":"","sources":["../../../../src/commands/junit/__tests__/upload.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ const uploadJUnitXML = (request) => (jUnitXML, write) => __awaiter(void 0, void
|
|
|
38
38
|
catch (e) {
|
|
39
39
|
fileName = 'default_file_name';
|
|
40
40
|
}
|
|
41
|
-
const spanTags = Object.assign(Object.assign({ service: jUnitXML.service }, jUnitXML.spanTags), { '_dd.cireport_version': '2' });
|
|
41
|
+
const spanTags = Object.assign(Object.assign({ service: jUnitXML.service }, jUnitXML.spanTags), { '_dd.cireport_version': '2', '_dd.hostname': jUnitXML.hostname });
|
|
42
42
|
if (jUnitXML.logsEnabled) {
|
|
43
43
|
spanTags['_dd.junitxml_logs'] = 'true';
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/junit/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,0DAAgC;AAChC,4CAAmB;AACnB,gDAAuB;AAEvB,+BAA+B;AAE/B,+CAAqD;AAErD,yCAAuC;AAEvC,6CAAuE;AAEvE,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,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/junit/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,0DAAgC;AAChC,4CAAmB;AACnB,gDAAuB;AAEvB,+BAA+B;AAE/B,+CAAqD;AAErD,yCAAuC;AAEvC,6CAAuE;AAEvE,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,MAAM,CAAA;KACvC;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;AA/CY,QAAA,cAAc,kBA+C1B;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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
+
import { SpanTags } from '../../helpers/interfaces';
|
|
1
2
|
import { Payload } from './interfaces';
|
|
2
3
|
export declare const renderInvalidFile: (xmlPath: string, errorMessage: string) => string;
|
|
3
4
|
export declare const renderFailedUpload: (payload: Payload, errorMessage: string) => string;
|
|
4
5
|
export declare const renderRetriedUpload: (payload: Payload, errorMessage: string, attempt: number) => string;
|
|
5
|
-
export declare const renderSuccessfulCommand: (fileCount: number, duration: number) => string;
|
|
6
|
+
export declare const renderSuccessfulCommand: (fileCount: number, duration: number, spanTags: SpanTags, service: string, env?: string | undefined) => string;
|
|
6
7
|
export declare const renderDryRunUpload: (payload: Payload) => string;
|
|
7
8
|
export declare const renderUpload: (payload: Payload) => string;
|
|
8
9
|
export declare const renderCommandInfo: (basePaths: string[], service: string, concurrency: number, dryRun: boolean) => string;
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.renderCommandInfo = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulCommand = exports.renderRetriedUpload = exports.renderFailedUpload = exports.renderInvalidFile = void 0;
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const utils_1 = require("./utils");
|
|
9
10
|
const ICONS = {
|
|
10
11
|
FAILED: '❌',
|
|
11
12
|
SUCCESS: '✅',
|
|
@@ -26,7 +27,24 @@ const renderRetriedUpload = (payload, errorMessage, attempt) => {
|
|
|
26
27
|
return chalk_1.default.yellow(`[attempt ${attempt}] Retrying jUnitXML upload ${jUnitXMLPath}: ${errorMessage}\n`);
|
|
27
28
|
};
|
|
28
29
|
exports.renderRetriedUpload = renderRetriedUpload;
|
|
29
|
-
const renderSuccessfulCommand = (fileCount, duration
|
|
30
|
+
const renderSuccessfulCommand = (fileCount, duration, spanTags, service, env) => {
|
|
31
|
+
let fullStr = '';
|
|
32
|
+
fullStr += chalk_1.default.green(`${ICONS.SUCCESS} Uploaded ${fileCount} files in ${duration} seconds.\n`);
|
|
33
|
+
fullStr += chalk_1.default.green('=================================================================================================\n');
|
|
34
|
+
fullStr += chalk_1.default.green('* View detailed reports on Datadog (they can take a few minutes to become available)\n');
|
|
35
|
+
const redirectTestCommitURL = utils_1.getTestCommitRedirectURL(spanTags, service, env);
|
|
36
|
+
if (redirectTestCommitURL) {
|
|
37
|
+
fullStr += chalk_1.default.green('* Commit report:\n');
|
|
38
|
+
fullStr += chalk_1.default.green(`* ${redirectTestCommitURL}\n\n`);
|
|
39
|
+
}
|
|
40
|
+
const testRunsUrl = utils_1.getTestRunsUrl(spanTags);
|
|
41
|
+
if (testRunsUrl) {
|
|
42
|
+
fullStr += chalk_1.default.green('* Test runs report:\n');
|
|
43
|
+
fullStr += chalk_1.default.green(`* ${testRunsUrl}\n`);
|
|
44
|
+
}
|
|
45
|
+
fullStr += chalk_1.default.green('=================================================================================================\n');
|
|
46
|
+
return fullStr;
|
|
47
|
+
};
|
|
30
48
|
exports.renderSuccessfulCommand = renderSuccessfulCommand;
|
|
31
49
|
const renderDryRunUpload = (payload) => `[DRYRUN] ${exports.renderUpload(payload)}`;
|
|
32
50
|
exports.renderDryRunUpload = renderDryRunUpload;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/junit/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AACzB,gDAAuB;AAIvB,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;CACd,CAAA;AAEM,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAE,YAAoB,EAAE,EAAE;IACzE,MAAM,YAAY,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAA;IAEnD,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,0BAA0B,YAAY,KAAK,YAAY,IAAI,CAAC,CAAA;AAC9F,CAAC,CAAA;AAJY,QAAA,iBAAiB,qBAI7B;AAEM,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,YAAoB,EAAE,EAAE;IAC3E,MAAM,YAAY,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAA;IAE3D,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,+BAA+B,YAAY,KAAK,YAAY,IAAI,CAAC,CAAA;AACnG,CAAC,CAAA;AAJY,QAAA,kBAAkB,sBAI9B;AAEM,MAAM,mBAAmB,GAAG,CAAC,OAAgB,EAAE,YAAoB,EAAE,OAAe,EAAE,EAAE;IAC7F,MAAM,YAAY,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAA;IAE3D,OAAO,eAAK,CAAC,MAAM,CAAC,YAAY,OAAO,8BAA8B,YAAY,KAAK,YAAY,IAAI,CAAC,CAAA;AACzG,CAAC,CAAA;AAJY,QAAA,mBAAmB,uBAI/B;AAEM,MAAM,uBAAuB,GAAG,
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/junit/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,13 +18,14 @@ const clipanion_1 = require("clipanion");
|
|
|
18
18
|
const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
|
|
19
19
|
const fs_1 = __importDefault(require("fs"));
|
|
20
20
|
const glob_1 = __importDefault(require("glob"));
|
|
21
|
+
const os_1 = __importDefault(require("os"));
|
|
21
22
|
const path_1 = __importDefault(require("path"));
|
|
22
23
|
const tiny_async_pool_1 = __importDefault(require("tiny-async-pool"));
|
|
23
24
|
const api_1 = require("./api");
|
|
24
25
|
const renderer_1 = require("./renderer");
|
|
25
26
|
const utils_1 = require("./utils");
|
|
26
27
|
const ci_1 = require("../../helpers/ci");
|
|
27
|
-
const
|
|
28
|
+
const format_git_span_data_1 = require("../../helpers/git/format-git-span-data");
|
|
28
29
|
const retry_1 = require("../../helpers/retry");
|
|
29
30
|
const tags_1 = require("../../helpers/tags");
|
|
30
31
|
const user_provided_git_1 = require("../../helpers/user-provided-git");
|
|
@@ -80,12 +81,13 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
80
81
|
// Always using the posix version to avoid \ on Windows.
|
|
81
82
|
this.basePaths = this.basePaths.map((basePath) => path_1.default.posix.normalize(basePath));
|
|
82
83
|
this.context.stdout.write(renderer_1.renderCommandInfo(this.basePaths, this.service, this.maxConcurrency, this.dryRun));
|
|
83
|
-
const
|
|
84
|
+
const spanTags = yield this.getSpanTags();
|
|
85
|
+
const payloads = yield this.getMatchingJUnitXMLFiles(spanTags);
|
|
84
86
|
const upload = (p) => this.uploadJUnitXML(api, p);
|
|
85
87
|
const initialTime = new Date().getTime();
|
|
86
88
|
yield tiny_async_pool_1.default(this.maxConcurrency, payloads, upload);
|
|
87
89
|
const totalTimeSeconds = (Date.now() - initialTime) / 1000;
|
|
88
|
-
this.context.stdout.write(renderer_1.renderSuccessfulCommand(payloads.length, totalTimeSeconds));
|
|
90
|
+
this.context.stdout.write(renderer_1.renderSuccessfulCommand(payloads.length, totalTimeSeconds, spanTags, this.service, this.config.env));
|
|
89
91
|
});
|
|
90
92
|
}
|
|
91
93
|
getApiHelper() {
|
|
@@ -95,7 +97,7 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
95
97
|
}
|
|
96
98
|
return api_1.apiConstructor(utils_1.getBaseIntakeUrl(), this.config.apiKey);
|
|
97
99
|
}
|
|
98
|
-
getMatchingJUnitXMLFiles() {
|
|
100
|
+
getMatchingJUnitXMLFiles(spanTags) {
|
|
99
101
|
return __awaiter(this, void 0, void 0, function* () {
|
|
100
102
|
const jUnitXMLFiles = (this.basePaths || []).reduce((acc, basePath) => {
|
|
101
103
|
const isFile = !!path_1.default.extname(basePath);
|
|
@@ -104,12 +106,6 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
104
106
|
}
|
|
105
107
|
return acc.concat(glob_1.default.sync(utils_2.buildPath(basePath, '*.xml')));
|
|
106
108
|
}, []);
|
|
107
|
-
const ciSpanTags = ci_1.getCISpanTags();
|
|
108
|
-
const gitSpanTags = yield git_1.getGitMetadata();
|
|
109
|
-
const userGitSpanTags = user_provided_git_1.getUserGitSpanTags();
|
|
110
|
-
const envVarTags = this.config.envVarTags ? tags_1.parseTags(this.config.envVarTags.split(',')) : {};
|
|
111
|
-
const cliTags = this.tags ? tags_1.parseTags(this.tags) : {};
|
|
112
|
-
const spanTags = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, gitSpanTags), ciSpanTags), userGitSpanTags), cliTags), envVarTags), (this.config.env ? { env: this.config.env } : {}));
|
|
113
109
|
const validUniqueFiles = [...new Set(jUnitXMLFiles)].filter((jUnitXMLFilePath) => {
|
|
114
110
|
const validationErrorMessage = validateXml(jUnitXMLFilePath);
|
|
115
111
|
if (validationErrorMessage) {
|
|
@@ -119,6 +115,7 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
119
115
|
return true;
|
|
120
116
|
});
|
|
121
117
|
return validUniqueFiles.map((jUnitXMLFilePath) => ({
|
|
118
|
+
hostname: os_1.default.hostname(),
|
|
122
119
|
logsEnabled: this.logs,
|
|
123
120
|
service: this.service,
|
|
124
121
|
spanTags,
|
|
@@ -126,6 +123,16 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
126
123
|
}));
|
|
127
124
|
});
|
|
128
125
|
}
|
|
126
|
+
getSpanTags() {
|
|
127
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
128
|
+
const ciSpanTags = ci_1.getCISpanTags();
|
|
129
|
+
const gitSpanTags = yield format_git_span_data_1.getGitMetadata();
|
|
130
|
+
const userGitSpanTags = user_provided_git_1.getUserGitSpanTags();
|
|
131
|
+
const envVarTags = this.config.envVarTags ? tags_1.parseTags(this.config.envVarTags.split(',')) : {};
|
|
132
|
+
const cliTags = this.tags ? tags_1.parseTags(this.tags) : {};
|
|
133
|
+
return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, gitSpanTags), ciSpanTags), userGitSpanTags), cliTags), envVarTags), (this.config.env ? { env: this.config.env } : {}));
|
|
134
|
+
});
|
|
135
|
+
}
|
|
129
136
|
uploadJUnitXML(api, jUnitXML) {
|
|
130
137
|
return __awaiter(this, void 0, void 0, function* () {
|
|
131
138
|
if (this.dryRun) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,yCAAiC;AACjC,sEAAuC;AACvC,4CAAmB;AACnB,gDAAuB;AACvB,gDAAuB;AACvB,sEAAuC;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,5 @@
|
|
|
1
|
+
import { SpanTags } from '../../helpers/interfaces';
|
|
1
2
|
export declare const getBaseIntakeUrl: () => string;
|
|
3
|
+
export declare const getBaseUrl: () => string;
|
|
4
|
+
export declare const getTestRunsUrl: (spanTags: SpanTags) => string;
|
|
5
|
+
export declare const getTestCommitRedirectURL: (spanTags: SpanTags, service?: string | undefined, env?: string | undefined) => string;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getBaseIntakeUrl = void 0;
|
|
3
|
+
exports.getTestCommitRedirectURL = exports.getTestRunsUrl = exports.getBaseUrl = exports.getBaseIntakeUrl = void 0;
|
|
4
|
+
const tags_1 = require("../../helpers/tags");
|
|
4
5
|
const getBaseIntakeUrl = () => {
|
|
5
6
|
if (process.env.DATADOG_SITE || process.env.DD_SITE) {
|
|
6
7
|
return `https://cireport-intake.${process.env.DATADOG_SITE || process.env.DD_SITE}`;
|
|
@@ -8,4 +9,47 @@ const getBaseIntakeUrl = () => {
|
|
|
8
9
|
return 'https://cireport-intake.datadoghq.com';
|
|
9
10
|
};
|
|
10
11
|
exports.getBaseIntakeUrl = getBaseIntakeUrl;
|
|
12
|
+
const getBaseUrl = () => {
|
|
13
|
+
if (process.env.DATADOG_SITE || process.env.DD_SITE) {
|
|
14
|
+
let site = process.env.DATADOG_SITE || process.env.DD_SITE;
|
|
15
|
+
if (site === 'datadoghq.com') {
|
|
16
|
+
site = 'app.datadoghq.com';
|
|
17
|
+
}
|
|
18
|
+
else if (site === 'datad0g.com') {
|
|
19
|
+
site = 'dd.datad0g.com';
|
|
20
|
+
}
|
|
21
|
+
return `https://${site}`;
|
|
22
|
+
}
|
|
23
|
+
return 'https://app.datadoghq.com';
|
|
24
|
+
};
|
|
25
|
+
exports.getBaseUrl = getBaseUrl;
|
|
26
|
+
const getTestRunsUrl = (spanTags) => {
|
|
27
|
+
if (!spanTags[tags_1.CI_PIPELINE_URL] && !spanTags[tags_1.CI_JOB_URL]) {
|
|
28
|
+
return '';
|
|
29
|
+
}
|
|
30
|
+
let query = '';
|
|
31
|
+
if (spanTags[tags_1.CI_JOB_URL]) {
|
|
32
|
+
query += ` @ci.job.url:"${spanTags[tags_1.CI_JOB_URL]}"`;
|
|
33
|
+
}
|
|
34
|
+
else if (spanTags[tags_1.CI_PIPELINE_URL]) {
|
|
35
|
+
query += ` @ci.pipeline.url:"${spanTags[tags_1.CI_PIPELINE_URL]}"`;
|
|
36
|
+
}
|
|
37
|
+
return `${exports.getBaseUrl()}/ci/test-runs?query=${encodeURIComponent(query)}`;
|
|
38
|
+
};
|
|
39
|
+
exports.getTestRunsUrl = getTestRunsUrl;
|
|
40
|
+
const getTestCommitRedirectURL = (spanTags, service, env) => {
|
|
41
|
+
if (!spanTags[tags_1.GIT_REPOSITORY_URL] || !spanTags[tags_1.GIT_BRANCH] || !spanTags[tags_1.GIT_SHA] || !service) {
|
|
42
|
+
return '';
|
|
43
|
+
}
|
|
44
|
+
const encodedRepoUrl = encodeURIComponent(`${spanTags[tags_1.GIT_REPOSITORY_URL]}`);
|
|
45
|
+
const encodedService = encodeURIComponent(service);
|
|
46
|
+
const encodedBranch = encodeURIComponent(`${spanTags[tags_1.GIT_BRANCH]}`);
|
|
47
|
+
const commitSha = `${spanTags[tags_1.GIT_SHA]}`;
|
|
48
|
+
let url = `${exports.getBaseUrl()}/ci/redirect/tests/${encodedRepoUrl}/-/${encodedService}/-/${encodedBranch}/-/${commitSha}`;
|
|
49
|
+
if (env) {
|
|
50
|
+
url += `?env=${encodeURIComponent(env)}`;
|
|
51
|
+
}
|
|
52
|
+
return url;
|
|
53
|
+
};
|
|
54
|
+
exports.getTestCommitRedirectURL = getTestCommitRedirectURL;
|
|
11
55
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/junit/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/junit/utils.ts"],"names":[],"mappings":";;;AACA,6CAAuG;AAEhG,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;QACnD,OAAO,2BAA2B,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;KACpF;IAED,OAAO,uCAAuC,CAAA;AAChD,CAAC,CAAA;AANY,QAAA,gBAAgB,oBAM5B;AAEM,MAAM,UAAU,GAAG,GAAG,EAAE;IAC7B,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE;QACnD,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAA;QAC1D,IAAI,IAAI,KAAK,eAAe,EAAE;YAC5B,IAAI,GAAG,mBAAmB,CAAA;SAC3B;aAAM,IAAI,IAAI,KAAK,aAAa,EAAE;YACjC,IAAI,GAAG,gBAAgB,CAAA;SACxB;QAED,OAAO,WAAW,IAAI,EAAE,CAAA;KACzB;IAED,OAAO,2BAA2B,CAAA;AACpC,CAAC,CAAA;AAbY,QAAA,UAAU,cAatB;AAEM,MAAM,cAAc,GAAG,CAAC,QAAkB,EAAU,EAAE;IAC3D,IAAI,CAAC,QAAQ,CAAC,sBAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAU,CAAC,EAAE;QACvD,OAAO,EAAE,CAAA;KACV;IAED,IAAI,KAAK,GAAG,EAAE,CAAA;IACd,IAAI,QAAQ,CAAC,iBAAU,CAAC,EAAE;QACxB,KAAK,IAAI,iBAAiB,QAAQ,CAAC,iBAAU,CAAC,GAAG,CAAA;KAClD;SAAM,IAAI,QAAQ,CAAC,sBAAe,CAAC,EAAE;QACpC,KAAK,IAAI,sBAAsB,QAAQ,CAAC,sBAAe,CAAC,GAAG,CAAA;KAC5D;IAED,OAAO,GAAG,kBAAU,EAAE,uBAAuB,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAA;AAC1E,CAAC,CAAA;AAbY,QAAA,cAAc,kBAa1B;AAEM,MAAM,wBAAwB,GAAG,CAAC,QAAkB,EAAE,OAAgB,EAAE,GAAY,EAAU,EAAE;IACrG,IAAI,CAAC,QAAQ,CAAC,yBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAO,CAAC,IAAI,CAAC,OAAO,EAAE;QAC5F,OAAO,EAAE,CAAA;KACV;IAED,MAAM,cAAc,GAAG,kBAAkB,CAAC,GAAG,QAAQ,CAAC,yBAAkB,CAAC,EAAE,CAAC,CAAA;IAC5E,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAClD,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,QAAQ,CAAC,iBAAU,CAAC,EAAE,CAAC,CAAA;IACnE,MAAM,SAAS,GAAG,GAAG,QAAQ,CAAC,cAAO,CAAC,EAAE,CAAA;IAExC,IAAI,GAAG,GAAG,GAAG,kBAAU,EAAE,sBAAsB,cAAc,MAAM,cAAc,MAAM,aAAa,MAAM,SAAS,EAAE,CAAA;IACrH,IAAI,GAAG,EAAE;QACP,GAAG,IAAI,QAAQ,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAA;KACzC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAhBY,QAAA,wBAAwB,4BAgBpC"}
|
|
File without changes
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const interfaces_1 = require("../interfaces");
|
|
4
|
+
jest.mock('fs', () => ({
|
|
5
|
+
createReadStream: jest.fn(),
|
|
6
|
+
}));
|
|
7
|
+
describe('interfaces', () => {
|
|
8
|
+
describe('getBundleName', () => {
|
|
9
|
+
test('should return the bundle name when specified', () => {
|
|
10
|
+
const sourcemap = new interfaces_1.RNSourcemap('./custom.bundle', './custom.bundle.map', 'index.android.bundle');
|
|
11
|
+
expect(getMetadataFromPayload(sourcemap.asMultipartPayload('1.0', 'com.myapp', '1.2.3', '', 'android', '102030'))
|
|
12
|
+
.bundle_name).toBe('index.android.bundle');
|
|
13
|
+
});
|
|
14
|
+
test('should extract the bundle name from the file when not specified', () => {
|
|
15
|
+
const sourcemap = new interfaces_1.RNSourcemap('./index.android.bundle', './index.android.bundle.map');
|
|
16
|
+
expect(getMetadataFromPayload(sourcemap.asMultipartPayload('1.0', 'com.myapp', '1.2.3', '', 'android', '102030'))
|
|
17
|
+
.bundle_name).toBe('index.android.bundle');
|
|
18
|
+
});
|
|
19
|
+
test('should extract the bundle name from the file when not specified and no slash in path', () => {
|
|
20
|
+
const sourcemap = new interfaces_1.RNSourcemap('index.android.bundle', 'index.android.bundle.map');
|
|
21
|
+
expect(getMetadataFromPayload(sourcemap.asMultipartPayload('1.0', 'com.myapp', '1.2.3', '', 'android', '102030'))
|
|
22
|
+
.bundle_name).toBe('index.android.bundle');
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
const getMetadataFromPayload = (payload) => JSON.parse(payload.content.get('event').value.toString());
|
|
27
|
+
//# sourceMappingURL=interfaces.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"interfaces.test.js","sourceRoot":"","sources":["../../../../src/commands/react-native/__tests__/interfaces.test.ts"],"names":[],"mappings":";;AACA,8CAAyC;AAEzC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IACrB,gBAAgB,EAAE,IAAI,CAAC,EAAE,EAAE;CAC5B,CAAC,CAAC,CAAA;AAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACxD,MAAM,SAAS,GAAG,IAAI,wBAAW,CAAC,iBAAiB,EAAE,qBAAqB,EAAE,sBAAsB,CAAC,CAAA;YACnG,MAAM,CACJ,sBAAsB,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;iBACvG,WAAW,CACf,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QAChC,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,iEAAiE,EAAE,GAAG,EAAE;YAC3E,MAAM,SAAS,GAAG,IAAI,wBAAW,CAAC,wBAAwB,EAAE,4BAA4B,CAAC,CAAA;YACzF,MAAM,CACJ,sBAAsB,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;iBACvG,WAAW,CACf,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QAChC,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,sFAAsF,EAAE,GAAG,EAAE;YAChG,MAAM,SAAS,GAAG,IAAI,wBAAW,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAA;YACrF,MAAM,CACJ,sBAAsB,CAAC,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;iBACvG,WAAW,CACf,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QAChC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,MAAM,sBAAsB,GAAG,CAAC,OAAyB,EAAsB,EAAE,CAC/E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA"}
|
package/dist/{helpers/__tests__/git.test.d.ts → commands/react-native/__tests__/upload.test.d.ts}
RENAMED
|
File without changes
|