@datadog/datadog-ci 1.13.0 → 1.13.1
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.
|
@@ -66,18 +66,62 @@ describe('dd-api', () => {
|
|
|
66
66
|
const { batch_id: batchId } = yield triggerTests({ tests });
|
|
67
67
|
expect(batchId).toBe(BATCH_ID);
|
|
68
68
|
}));
|
|
69
|
-
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
69
|
+
describe('Retry policy', () => {
|
|
70
|
+
const api = api_1.apiConstructor(apiConfiguration);
|
|
71
|
+
const testCases = [
|
|
72
|
+
{
|
|
73
|
+
makeApiRequest: () => api.getBatch('batch-id'),
|
|
74
|
+
name: 'get batch',
|
|
75
|
+
shouldBeRetriedOn404: true,
|
|
76
|
+
shouldBeRetriedOn5xx: true,
|
|
77
|
+
},
|
|
78
|
+
{
|
|
79
|
+
makeApiRequest: () => api.getPresignedURL(['test-id']),
|
|
80
|
+
name: 'get presigned url',
|
|
81
|
+
shouldBeRetriedOn404: false,
|
|
82
|
+
shouldBeRetriedOn5xx: true,
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
makeApiRequest: () => api.getTest('public-id'),
|
|
86
|
+
name: 'get test',
|
|
87
|
+
shouldBeRetriedOn404: false,
|
|
88
|
+
shouldBeRetriedOn5xx: true,
|
|
89
|
+
},
|
|
90
|
+
{
|
|
91
|
+
makeApiRequest: () => api.pollResults(['result-id']),
|
|
92
|
+
name: 'poll results',
|
|
93
|
+
shouldBeRetriedOn404: true,
|
|
94
|
+
shouldBeRetriedOn5xx: true,
|
|
95
|
+
},
|
|
96
|
+
{
|
|
97
|
+
makeApiRequest: () => api.searchTests('search query'),
|
|
98
|
+
name: 'search tests',
|
|
99
|
+
shouldBeRetriedOn404: false,
|
|
100
|
+
shouldBeRetriedOn5xx: true,
|
|
101
|
+
},
|
|
102
|
+
{
|
|
103
|
+
makeApiRequest: () => api.triggerTests({ tests: [{ public_id: '123-456-789', executionRule: interfaces_1.ExecutionRule.NON_BLOCKING }] }),
|
|
104
|
+
name: 'trigger tests',
|
|
105
|
+
shouldBeRetriedOn404: false,
|
|
106
|
+
shouldBeRetriedOn5xx: true,
|
|
107
|
+
},
|
|
108
|
+
];
|
|
109
|
+
test.each(testCases)('should retry "$name" request (HTTP 404: $shouldBeRetriedOn404, HTTP 5xx: $shouldBeRetriedOn5xx)', ({ makeApiRequest, shouldBeRetriedOn404, shouldBeRetriedOn5xx }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
110
|
+
const serverError = new Error('Server Error');
|
|
111
|
+
const requestMock = jest.fn();
|
|
112
|
+
requestMock.mockImplementation(() => {
|
|
113
|
+
throw serverError;
|
|
114
|
+
});
|
|
115
|
+
jest.spyOn(axios_1.default, 'create').mockImplementation((() => requestMock));
|
|
116
|
+
serverError.response = { status: 404 };
|
|
117
|
+
yield expect(makeApiRequest()).rejects.toThrow();
|
|
118
|
+
expect(requestMock).toHaveBeenCalledTimes(shouldBeRetriedOn404 ? 4 : 1);
|
|
119
|
+
requestMock.mockClear();
|
|
120
|
+
serverError.response = { status: 502 };
|
|
121
|
+
yield expect(makeApiRequest()).rejects.toThrow();
|
|
122
|
+
expect(requestMock).toHaveBeenCalledTimes(shouldBeRetriedOn5xx ? 4 : 1);
|
|
123
|
+
}));
|
|
124
|
+
});
|
|
81
125
|
test('should get a presigned URL from api', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
82
126
|
const spy = jest.spyOn(axios_1.default, 'create').mockImplementation((() => () => ({ data: PRESIGNED_URL_PAYLOAD })));
|
|
83
127
|
const api = api_1.apiConstructor(apiConfiguration);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.test.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/__tests__/api.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAAiE;AAIjE,gCAAqC;AACrC,wCAA+C;AAC/C,8CAA6G;AAE7G,yCAAsG;AAEtG,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,MAAM,gBAAgB,GAAqB;QACzC,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,KAAK;QACb,aAAa,EAAE,YAAY;QAC3B,OAAO,EAAE,MAAM;QACf,SAAS,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAuB;KACpD,CAAA;IACD,MAAM,QAAQ,GAAG;QACf,YAAY,EAAE,eAAe;QAC7B,EAAE,EAAE,EAAE;QACN,SAAS,EAAE,IAAI;QACf,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,aAAa;KACtB,CAAA;IACD,MAAM,SAAS,GAAG,KAAK,CAAA;IACvB,MAAM,QAAQ,GAAG,KAAK,CAAA;IACtB,MAAM,YAAY,GAA4B;QAC5C,OAAO,EAAE;YACP;gBACE,KAAK,EAAE,qBAAU,CAAC,aAAa,CAAC;gBAChC,MAAM,EAAG,EAA8B;gBACvC,QAAQ,EAAE,SAAS;gBACnB,SAAS,EAAE,CAAC;aACb;SACF;KACF,CAAA;IACD,MAAM,iBAAiB,GAAG,QAAQ,CAAA;IAClC,MAAM,eAAe,GAAY;QAC/B,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,CAAC,QAAQ,CAAC;KACtB,CAAA;IACD,MAAM,qBAAqB,GAAG;QAC5B,GAAG,EAAE,qBAAqB;KAC3B,CAAA;IAED,IAAI,CAAC,6BAA6B,EAAE,GAAS,EAAE;QAC7C,IAAI,CAAC,KAAK,CAAC,eAAK,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,YAAY,EAAC,CAAC,CAAQ,CAAC,CAAA;QAC3F,MAAM,GAAG,GAAG,oBAAc,CAAC,gBAAgB,CAAC,CAAA;QAC5C,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;QAClD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC7C,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,gCAAgC,EAAE,GAAS,EAAE;QAChD,IAAI,CAAC,KAAK,CAAC,eAAK,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,eAAe,EAAC,CAAC,CAAQ,CAAC,CAAA;QAC9F,MAAM,GAAG,GAAG,oBAAc,CAAC,gBAAgB,CAAC,CAAA;QAC5C,MAAM,EAAC,YAAY,EAAC,GAAG,GAAG,CAAA;QAC1B,MAAM,KAAK,GAAkB,CAAC,EAAC,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,0BAAa,CAAC,QAAQ,EAAC,CAAC,CAAA;QACpG,MAAM,EAAC,QAAQ,EAAE,OAAO,EAAC,GAAG,MAAM,YAAY,CAAC,EAAC,KAAK,EAAC,CAAC,CAAA;QACvD,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAChC,CAAC,CAAA,CAAC,CAAA;IAEF,
|
|
1
|
+
{"version":3,"file":"api.test.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/__tests__/api.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAAiE;AAIjE,gCAAqC;AACrC,wCAA+C;AAC/C,8CAA6G;AAE7G,yCAAsG;AAEtG,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,MAAM,gBAAgB,GAAqB;QACzC,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,KAAK;QACb,aAAa,EAAE,YAAY;QAC3B,OAAO,EAAE,MAAM;QACf,SAAS,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAuB;KACpD,CAAA;IACD,MAAM,QAAQ,GAAG;QACf,YAAY,EAAE,eAAe;QAC7B,EAAE,EAAE,EAAE;QACN,SAAS,EAAE,IAAI;QACf,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,aAAa;KACtB,CAAA;IACD,MAAM,SAAS,GAAG,KAAK,CAAA;IACvB,MAAM,QAAQ,GAAG,KAAK,CAAA;IACtB,MAAM,YAAY,GAA4B;QAC5C,OAAO,EAAE;YACP;gBACE,KAAK,EAAE,qBAAU,CAAC,aAAa,CAAC;gBAChC,MAAM,EAAG,EAA8B;gBACvC,QAAQ,EAAE,SAAS;gBACnB,SAAS,EAAE,CAAC;aACb;SACF;KACF,CAAA;IACD,MAAM,iBAAiB,GAAG,QAAQ,CAAA;IAClC,MAAM,eAAe,GAAY;QAC/B,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,CAAC,QAAQ,CAAC;KACtB,CAAA;IACD,MAAM,qBAAqB,GAAG;QAC5B,GAAG,EAAE,qBAAqB;KAC3B,CAAA;IAED,IAAI,CAAC,6BAA6B,EAAE,GAAS,EAAE;QAC7C,IAAI,CAAC,KAAK,CAAC,eAAK,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,YAAY,EAAC,CAAC,CAAQ,CAAC,CAAA;QAC3F,MAAM,GAAG,GAAG,oBAAc,CAAC,gBAAgB,CAAC,CAAA;QAC5C,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;QAClD,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC7C,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,gCAAgC,EAAE,GAAS,EAAE;QAChD,IAAI,CAAC,KAAK,CAAC,eAAK,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,eAAe,EAAC,CAAC,CAAQ,CAAC,CAAA;QAC9F,MAAM,GAAG,GAAG,oBAAc,CAAC,gBAAgB,CAAC,CAAA;QAC5C,MAAM,EAAC,YAAY,EAAC,GAAG,GAAG,CAAA;QAC1B,MAAM,KAAK,GAAkB,CAAC,EAAC,SAAS,EAAE,iBAAiB,EAAE,aAAa,EAAE,0BAAa,CAAC,QAAQ,EAAC,CAAC,CAAA;QACpG,MAAM,EAAC,QAAQ,EAAE,OAAO,EAAC,GAAG,MAAM,YAAY,CAAC,EAAC,KAAK,EAAC,CAAC,CAAA;QACvD,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAChC,CAAC,CAAA,CAAC,CAAA;IAEF,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,MAAM,GAAG,GAAG,oBAAc,CAAC,gBAAgB,CAAC,CAAA;QAE5C,MAAM,SAAS,GAAG;YAChB;gBACE,cAAc,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAC9C,IAAI,EAAE,WAAoB;gBAC1B,oBAAoB,EAAE,IAAI;gBAC1B,oBAAoB,EAAE,IAAI;aAC3B;YACD;gBACE,cAAc,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,CAAC;gBACtD,IAAI,EAAE,mBAA4B;gBAClC,oBAAoB,EAAE,KAAK;gBAC3B,oBAAoB,EAAE,IAAI;aAC3B;YACD;gBACE,cAAc,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC;gBAC9C,IAAI,EAAE,UAAmB;gBACzB,oBAAoB,EAAE,KAAK;gBAC3B,oBAAoB,EAAE,IAAI;aAC3B;YACD;gBACE,cAAc,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAC;gBACpD,IAAI,EAAE,cAAuB;gBAC7B,oBAAoB,EAAE,IAAI;gBAC1B,oBAAoB,EAAE,IAAI;aAC3B;YACD;gBACE,cAAc,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC;gBACrD,IAAI,EAAE,cAAuB;gBAC7B,oBAAoB,EAAE,KAAK;gBAC3B,oBAAoB,EAAE,IAAI;aAC3B;YACD;gBACE,cAAc,EAAE,GAAG,EAAE,CACnB,GAAG,CAAC,YAAY,CAAC,EAAC,KAAK,EAAE,CAAC,EAAC,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,0BAAa,CAAC,YAAY,EAAC,CAAC,EAAC,CAAC;gBACpG,IAAI,EAAE,eAAwB;gBAC9B,oBAAoB,EAAE,KAAK;gBAC3B,oBAAoB,EAAE,IAAI;aAC3B;SACF,CAAA;QAED,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAClB,iGAAiG,EACjG,CAAO,EAAC,cAAc,EAAE,oBAAoB,EAAE,oBAAoB,EAAC,EAAE,EAAE;YACrE,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,cAAc,CAAe,CAAA;YAE3D,MAAM,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;YAC7B,WAAW,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBAClC,MAAM,WAAW,CAAA;YACnB,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,KAAK,CAAC,eAAK,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,CAAC,GAAG,EAAE,CAAC,WAAW,CAAQ,CAAC,CAAA;YAE1E,WAAW,CAAC,QAAQ,GAAG,EAAC,MAAM,EAAE,GAAG,EAAkB,CAAA;YAErD,MAAM,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;YAChD,MAAM,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAEvE,WAAW,CAAC,SAAS,EAAE,CAAA;YAEvB,WAAW,CAAC,QAAQ,GAAG,EAAC,MAAM,EAAE,GAAG,EAAkB,CAAA;YAErD,MAAM,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;YAChD,MAAM,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACzE,CAAC,CAAA,CACF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,qCAAqC,EAAE,GAAS,EAAE;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,eAAK,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,qBAAqB,EAAC,CAAC,CAAQ,CAAC,CAAA;QAChH,MAAM,GAAG,GAAG,oBAAc,CAAC,gBAAgB,CAAC,CAAA;QAC5C,MAAM,EAAC,eAAe,EAAC,GAAG,GAAG,CAAA;QAC7B,MAAM,EAAC,GAAG,EAAC,GAAG,MAAM,eAAe,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAA;QACxD,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAA;QAC9C,GAAG,CAAC,WAAW,EAAE,CAAA;IACnB,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,gDAAgD,EAAE,GAAS,EAAE;QAChE,MAAM,WAAW,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAC,KAAK,EAAE,EAAE,EAAC,EAAC,CAAC,CAAC,CAAA;QACrE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,eAAK,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,CAAC,GAAG,EAAE,CAAC,WAAW,CAAQ,CAAC,CAAA;QAEtF,MAAM,EAAC,WAAW,EAAC,GAAG,oBAAc,CAAC,gBAAgB,CAAC,CAAA;QAEtD,MAAM,MAAM,CAAC,WAAW,CAAC,iCAAiC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,EAAE,EAAC,CAAC,CAAA;QAC1F,MAAM,CAAC,WAAW,CAAC,CAAC,oBAAoB,CACtC,MAAM,CAAC,gBAAgB,CAAC;YACtB,MAAM,EAAE;gBACN,KAAK,EAAE,8BAAoB,GAAG,CAAC;gBAC/B,IAAI,EAAE,iCAAiC;aACxC;SACF,CAAC,CACH,CAAA;QACD,GAAG,CAAC,WAAW,EAAE,CAAA;IACnB,CAAC,CAAA,CAAC,CAAA;IAEF,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,MAAM,KAAK,GAAG,CAAC,EAAC,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,0BAAa,CAAC,YAAY,EAAC,CAAC,CAAA;QACrF,IAAI,mBAAuC,CAAA;QAE3C,SAAS,CAAC,GAAG,EAAE;YACb,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA;QAC9C,CAAC,CAAC,CAAA;QAEF,QAAQ,CAAC,GAAG,EAAE;YACZ,IAAI,mBAAmB,KAAK,SAAS,EAAE;gBACrC,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,mBAAmB,CAAA;aAC7C;iBAAM;gBACL,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA;aAC9B;QACH,CAAC,CAAC,CAAA;QAEF,UAAU,CAAC,GAAG,EAAE;YACd,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA;QAC/B,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,oCAAoC,EAAE,GAAS,EAAE;YACpD,MAAM,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAC,GAAG,6BAAkB,EAAE,CAAA;YAE1E,IAAI;gBACF,MAAM,qBAAqB,mCACtB,gBAAgB,KACnB,SAAS,GACV,CAAA;gBAED,MAAM,GAAG,GAAG,oBAAc,CAAC,qBAAqB,CAAC,CAAA;gBAEjD,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;gBACtD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,6BAAkB,CAAC,CAAA;gBAChD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,CAAA;gBAEvC,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,CAAC,CAAA;gBAC/D,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,EAAC,GAAG,EAAE,MAAM,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAC,CAAC,CAAA;gBAC/E,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,gBAAgB,EAAE,CAAA;gBAE7C,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;gBACnD,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,qBAAU,CAAC,aAAa,CAAC,CAAC,CAAA;gBACrD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,CAAA;gBAEpC,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,EAAC,KAAK,EAAC,CAAC,CAAA;gBACrD,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,kCAAuB,CAAC,CAAA;gBACtD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,EAAC,KAAK,EAAC,CAAC,CAAA;aACpD;oBAAS;gBACR,MAAM,UAAU,EAAE,CAAA;aACnB;QACH,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,2CAA2C,EAAE,GAAS,EAAE;YAC3D,MAAM,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAC,GAAG,6BAAkB,EAAE,CAAA;YAC1E,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,oBAAoB,SAAS,CAAC,IAAI,EAAE,CAAA;YAE7D,IAAI;gBACF,MAAM,GAAG,GAAG,oBAAc,CAAC,gBAAgB,CAAC,CAAA;gBAE5C,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;gBACtD,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,6BAAkB,CAAC,CAAA;gBAChD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,gBAAgB,EAAE,CAAA;gBAEvC,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,EAAC,KAAK,EAAC,CAAC,CAAA;gBACrD,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,kCAAuB,CAAC,CAAA;gBACtD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,EAAC,KAAK,EAAC,CAAC,CAAA;aACpD;oBAAS;gBACR,MAAM,UAAU,EAAE,CAAA;aACnB;QACH,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,mDAAmD,EAAE,GAAS,EAAE;YACnE,MAAM,EAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAC,GAAG,6BAAkB,EAAE,CAAA;YAC1E,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,wBAAwB,CAAA;YAEjD,IAAI;gBACF,MAAM,qBAAqB,mCACtB,gBAAgB,KACnB,SAAS,GACV,CAAA;gBACD,MAAM,GAAG,GAAG,oBAAc,CAAC,qBAAqB,CAAC,CAAA;gBAEjD,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,EAAC,KAAK,EAAC,CAAC,CAAA;gBACrD,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,kCAAuB,CAAC,CAAA;gBACtD,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,EAAC,KAAK,EAAC,CAAC,CAAA;aACpD;oBAAS;gBACR,MAAM,UAAU,EAAE,CAAA;aACnB;QACH,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
|
@@ -14,6 +14,8 @@ const querystring_1 = require("querystring");
|
|
|
14
14
|
const utils_1 = require("../../helpers/utils");
|
|
15
15
|
const command_1 = require("./command");
|
|
16
16
|
const utils_2 = require("./utils");
|
|
17
|
+
const MAX_RETRIES = 3;
|
|
18
|
+
const DELAY_BETWEEN_RETRIES = 500; // In ms
|
|
17
19
|
class EndpointError extends Error {
|
|
18
20
|
constructor(message, status) {
|
|
19
21
|
super(message);
|
|
@@ -69,7 +71,7 @@ const searchTests = (request) => (query) => __awaiter(void 0, void 0, void 0, fu
|
|
|
69
71
|
return resp.data;
|
|
70
72
|
});
|
|
71
73
|
const getBatch = (request) => (batchId) => __awaiter(void 0, void 0, void 0, function* () {
|
|
72
|
-
const resp = yield retryRequest({ url: `/synthetics/ci/batch/${batchId}` }, request);
|
|
74
|
+
const resp = yield retryRequest({ url: `/synthetics/ci/batch/${batchId}` }, request, retryOn5xxOr404Errors);
|
|
73
75
|
const serverBatch = resp.data.data;
|
|
74
76
|
return {
|
|
75
77
|
results: serverBatch.results.filter((r) => r.status !== 'skipped'),
|
|
@@ -82,7 +84,7 @@ const pollResults = (request) => (resultIds) => __awaiter(void 0, void 0, void 0
|
|
|
82
84
|
result_ids: JSON.stringify(resultIds),
|
|
83
85
|
},
|
|
84
86
|
url: '/synthetics/tests/poll_results',
|
|
85
|
-
}, request);
|
|
87
|
+
}, request, retryOn5xxOr404Errors);
|
|
86
88
|
return resp.data.results;
|
|
87
89
|
});
|
|
88
90
|
const getPresignedURL = (request) => (testIds) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -96,8 +98,17 @@ const getPresignedURL = (request) => (testIds) => __awaiter(void 0, void 0, void
|
|
|
96
98
|
return resp.data;
|
|
97
99
|
});
|
|
98
100
|
const retryOn5xxErrors = (retries, error) => {
|
|
99
|
-
if (retries <
|
|
100
|
-
return
|
|
101
|
+
if (retries < MAX_RETRIES && exports.is5xxError(error)) {
|
|
102
|
+
return DELAY_BETWEEN_RETRIES;
|
|
103
|
+
}
|
|
104
|
+
};
|
|
105
|
+
const retryOn5xxOr404Errors = (retries, error) => {
|
|
106
|
+
const retryOn5xxDelay = retryOn5xxErrors(retries, error);
|
|
107
|
+
if (retryOn5xxDelay) {
|
|
108
|
+
return retryOn5xxDelay;
|
|
109
|
+
}
|
|
110
|
+
if (retries < MAX_RETRIES && exports.isNotFoundError(error)) {
|
|
111
|
+
return DELAY_BETWEEN_RETRIES;
|
|
101
112
|
}
|
|
102
113
|
};
|
|
103
114
|
const getErrorHttpStatus = (error) => { var _a; return 'status' in error ? error.status : (_a = error.response) === null || _a === void 0 ? void 0 : _a.status; };
|
|
@@ -110,7 +121,7 @@ const is5xxError = (error) => {
|
|
|
110
121
|
return statusCode && statusCode >= 500 && statusCode <= 599;
|
|
111
122
|
};
|
|
112
123
|
exports.is5xxError = is5xxError;
|
|
113
|
-
const retryRequest = (args, request) => utils_2.retry(() => request(args),
|
|
124
|
+
const retryRequest = (args, request, retryPolicy = retryOn5xxErrors) => utils_2.retry(() => request(args), retryPolicy);
|
|
114
125
|
const apiConstructor = (configuration) => {
|
|
115
126
|
const { baseUrl, baseIntakeUrl, apiKey, appKey, proxyOpts } = configuration;
|
|
116
127
|
const baseOptions = { apiKey, appKey, proxyOpts };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAqC;AAIrC,+CAAqD;AAErD,uCAA8C;AAW9C,mCAA2C;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":"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"}
|