@getjones/test-infra 5.2.10 → 5.2.11

package/src/common/consts/userTypes.js

@@ -1,16 +1,16 @@
-const ACCESS_TYPES = {
-	SAAS: 'SAAS',
-	HUB: 'HUB',
-	POTENTIAL_HUB: 'POTENTIAL_HUB',
-	UNKNOWN: 'UNKNOWN'
-};
-
-module.exports = {
-	ACCESS_TYPES,
-	ICS: 'ICS',
-	PM: 'PM',
-	AUDITOR: 'Auditor',
-	VENDOR: 'Vendor',
-	auditor: 'Auditor',
-	operator: 'Operator'
-};
+const ACCESS_TYPES = {
+	SAAS: 'SAAS',
+	HUB: 'HUB',
+	POTENTIAL_HUB: 'POTENTIAL_HUB',
+	UNKNOWN: 'UNKNOWN'
+};
+
+module.exports = {
+	ACCESS_TYPES,
+	ICS: 'ICS',
+	PM: 'PM',
+	AUDITOR: 'Auditor',
+	VENDOR: 'Vendor',
+	auditor: 'Auditor',
+	operator: 'Operator'
+};

package/src/common/errorCodes.js

@@ -1,11 +1,12 @@
-module.exports = {
-	UNKNOWN: 'UNKNOWN',
-	UNAUTHORIZED: 'UNAUTHORIZED',
-	VALIDATION: 'VALIDATION',
-	CONFLICT: 'CONFLICT',
-	EXPIRED: 'EXPIRED',
-	NOT_EXIST: 'NOT_EXIST',
-	NOT_ELIGIBLE: 'NOT_ELIGIBLE',
-	RECORD_NOT_IN_ACCOUNT: 'RECORD_NOT_IN_ACCOUNT',
-	GLOBAL_RECORD_NOT_IN_ACCOUNT: 'GLOBAL_RECORD_NOT_IN_ACCOUNT'
-};
+module.exports = {
+	UNKNOWN: 'UNKNOWN',
+	UNAUTHORIZED: 'UNAUTHORIZED',
+	VALIDATION: 'VALIDATION',
+	CONFLICT: 'CONFLICT',
+	EXPIRED: 'EXPIRED',
+	NOT_EXIST: 'NOT_EXIST',
+	NOT_FOUND: 'NOT_FOUND',
+	NOT_ELIGIBLE: 'NOT_ELIGIBLE',
+	RECORD_NOT_IN_ACCOUNT: 'RECORD_NOT_IN_ACCOUNT',
+	GLOBAL_RECORD_NOT_IN_ACCOUNT: 'GLOBAL_RECORD_NOT_IN_ACCOUNT'
+};

package/src/common/httpResponseStatusCodes.json

@@ -1,20 +1,20 @@
-{
-    "OK": 200,
-    "CREATED": 201,
-    "ACCEPTED": 202,
-    "NO_CONTENT": 204,
-    "IM_USED": 226,
-    "FOUND": 302,
-    "BAD_REQUEST": 400,
-    "UNAUTHORIZED": 401,
-    "FORBIDDEN": 403,
-    "NOT_FOUND": 404,
-    "CONFLICT": 409,
-    "UNPROCESSABLE_ENTITY": 422,
-    "TOO_MANY_REQUESTS": 429,
-    "CLIENT_CLOSED_REQUEST": 499,
-    "INTERNAL_SERVER_ERROR": 500,
-    "BAD_GATEWAY": 502,
-    "SERVICE_UNAVAILABLE": 503,
-    "GATEWAY_TIMEOUT": 504
+{
+    "OK": 200,
+    "CREATED": 201,
+    "ACCEPTED": 202,
+    "NO_CONTENT": 204,
+    "IM_USED": 226,
+    "FOUND": 302,
+    "BAD_REQUEST": 400,
+    "UNAUTHORIZED": 401,
+    "FORBIDDEN": 403,
+    "NOT_FOUND": 404,
+    "CONFLICT": 409,
+    "UNPROCESSABLE_ENTITY": 422,
+    "TOO_MANY_REQUESTS": 429,
+    "CLIENT_CLOSED_REQUEST": 499,
+    "INTERNAL_SERVER_ERROR": 500,
+    "BAD_GATEWAY": 502,
+    "SERVICE_UNAVAILABLE": 503,
+    "GATEWAY_TIMEOUT": 504
 }

package/src/common/httpResponseTypes.json

@@ -1,3 +1,3 @@
-{
-    "arrayBuffer": "arraybuffer"
+{
+    "arrayBuffer": "arraybuffer"
 }

package/src/common/requests/apiKeyAuth/requests.js

@@ -1,45 +1,45 @@
-const requestHandler = require('./../requestHandlers');
-
-const getRequestHandler = (url, apiKey, params = {}, headers = {}) => {
-	enrichApiKey(headers, apiKey);
-	return requestHandler.getRequestHandler(url, headers, params);
-};
-
-const postRequestHandler = (url, apiKey, body, headers = {}, params = {}) => {
-	enrichApiKey(headers, apiKey);
-	return requestHandler.postRequestHandler(url, body, headers, params);
-};
-
-const putRequestHandler = (url, apiKey, body, headers = {}, params = {}) => {
-	enrichApiKey(headers, apiKey);
-	return requestHandler.putRequestHandler(url, body, headers, params);
-};
-
-const putFileRequestHandler = (url, apiKey, fileData, headers = {}) => {
-	enrichApiKey(headers, apiKey);
-	return requestHandler.putFileRequestHandler(url, fileData, headers);
-};
-
-const patchRequestHandler = (url, apiKey, body, headers = {}) => {
-	enrichApiKey(headers, apiKey);
-	return requestHandler.patchRequestHandler(url, body, headers);
-};
-
-const deleteRequestHandler = (url, apiKey, headers = {}, params = {}, data = {}) => {
-	enrichApiKey(headers, apiKey);
-	return requestHandler.deleteRequestHandler(url, headers, params, data);
-};
-
-const enrichApiKey = (headers, apiKey) => {
-	headers['x-api-key'] = apiKey;
-	headers['Content-Type'] = 'application/json';
-};
-
-module.exports = {
-	getRequestHandler,
-	postRequestHandler,
-	putRequestHandler,
-	putFileRequestHandler,
-	patchRequestHandler,
-	deleteRequestHandler
-};
+const requestHandler = require('./../requestHandlers');
+
+const getRequestHandler = (url, apiKey, params = {}, headers = {}) => {
+	enrichApiKey(headers, apiKey);
+	return requestHandler.getRequestHandler(url, headers, params);
+};
+
+const postRequestHandler = (url, apiKey, body, headers = {}, params = {}) => {
+	enrichApiKey(headers, apiKey);
+	return requestHandler.postRequestHandler(url, body, headers, params);
+};
+
+const putRequestHandler = (url, apiKey, body, headers = {}, params = {}) => {
+	enrichApiKey(headers, apiKey);
+	return requestHandler.putRequestHandler(url, body, headers, params);
+};
+
+const putFileRequestHandler = (url, apiKey, fileData, headers = {}) => {
+	enrichApiKey(headers, apiKey);
+	return requestHandler.putFileRequestHandler(url, fileData, headers);
+};
+
+const patchRequestHandler = (url, apiKey, body, headers = {}) => {
+	enrichApiKey(headers, apiKey);
+	return requestHandler.patchRequestHandler(url, body, headers);
+};
+
+const deleteRequestHandler = (url, apiKey, headers = {}, params = {}, data = {}) => {
+	enrichApiKey(headers, apiKey);
+	return requestHandler.deleteRequestHandler(url, headers, params, data);
+};
+
+const enrichApiKey = (headers, apiKey) => {
+	headers['x-api-key'] = apiKey;
+	headers['Content-Type'] = 'application/json';
+};
+
+module.exports = {
+	getRequestHandler,
+	postRequestHandler,
+	putRequestHandler,
+	putFileRequestHandler,
+	patchRequestHandler,
+	deleteRequestHandler
+};

package/src/common/requests/cookieAuth/requests.js

@@ -1,40 +1,40 @@
-const requestHandler = require('./../requestHandlers');
-
-const getRequestHandler = (url, params = {}, context = null, headers = {}, responseType) => {
-	enrichCookie(headers, context);
-	return requestHandler.getRequestHandler(url, headers, params, responseType);
-};
-
-const postRequestHandler = (url, body, context = null, headers = {}, params = {}) => {
-	enrichCookie(headers, context);
-	return requestHandler.postRequestHandler(url, body, headers, params);
-};
-
-const putRequestHandler = (url, body, context = null, headers = {}, params = {}) => {
-	enrichCookie(headers, context);
-	return requestHandler.putRequestHandler(url, body, headers, params);
-};
-
-const patchRequestHandler = (url, context, body, headers = {}) => {
-	enrichCookie(headers, context);
-	return requestHandler.patchRequestHandler(url, body, headers);
-};
-
-const deleteRequestHandler = (url, context = null, headers = {}, params = {}, data = {}) => {
-	enrichCookie(headers, context);
-	return requestHandler.deleteRequestHandler(url, headers, params, data);
-};
-
-const enrichCookie = (headers, context) => {
-	if (context) {
-		headers.Cookie = context;
-	}
-};
-
-module.exports = {
-	getRequestHandler,
-	postRequestHandler,
-	putRequestHandler,
-	patchRequestHandler,
-	deleteRequestHandler
-};
+const requestHandler = require('./../requestHandlers');
+
+const getRequestHandler = (url, params = {}, context = null, headers = {}, responseType) => {
+	enrichCookie(headers, context);
+	return requestHandler.getRequestHandler(url, headers, params, responseType);
+};
+
+const postRequestHandler = (url, body, context = null, headers = {}, params = {}) => {
+	enrichCookie(headers, context);
+	return requestHandler.postRequestHandler(url, body, headers, params);
+};
+
+const putRequestHandler = (url, body, context = null, headers = {}, params = {}) => {
+	enrichCookie(headers, context);
+	return requestHandler.putRequestHandler(url, body, headers, params);
+};
+
+const patchRequestHandler = (url, context, body, headers = {}) => {
+	enrichCookie(headers, context);
+	return requestHandler.patchRequestHandler(url, body, headers);
+};
+
+const deleteRequestHandler = (url, context = null, headers = {}, params = {}, data = {}) => {
+	enrichCookie(headers, context);
+	return requestHandler.deleteRequestHandler(url, headers, params, data);
+};
+
+const enrichCookie = (headers, context) => {
+	if (context) {
+		headers.Cookie = context;
+	}
+};
+
+module.exports = {
+	getRequestHandler,
+	postRequestHandler,
+	putRequestHandler,
+	patchRequestHandler,
+	deleteRequestHandler
+};

package/src/common/requests/internalAuth/requests.js

@@ -1,48 +1,48 @@
-const requestHandler = require('../requestHandlers');
-const env = require('../../../env');
-const { crossServiceCommunicationAuthKey } = env.getEnv();
-
-const defaultApiKey = crossServiceCommunicationAuthKey;
-
-const getRequestHandler = (url, params = {}, headers = {}) => {
-	enrichAuthKey(headers);
-	return requestHandler.getRequestHandler(url, headers, params);
-};
-
-const postRequestHandler = (url, body, headers = {}, params = {}) => {
-	enrichAuthKey(headers);
-	return requestHandler.postRequestHandler(url, body, headers, params);
-};
-
-const putRequestHandler = (url, body, headers = {}, params = {}) => {
-	enrichAuthKey(headers, defaultApiKey);
-	return requestHandler.putRequestHandler(url, body, headers, params);
-};
-
-const putFileRequestHandler = (url, fileData, headers = {}) => {
-	enrichAuthKey(headers);
-	return requestHandler.putFileRequestHandler(url, fileData, headers);
-};
-
-const patchRequestHandler = (url, body, headers = {}) => {
-	enrichAuthKey(headers);
-	return requestHandler.patchRequestHandler(url, body, headers);
-};
-
-const deleteRequestHandler = (url, headers = {}, params = {}, data = {}) => {
-	enrichAuthKey(headers);
-	return requestHandler.deleteRequestHandler(url, headers, params, data);
-};
-
-const enrichAuthKey = headers => {
-	headers['x-jcsc-auth'] = defaultApiKey;
-};
-
-module.exports = {
-	getRequestHandler,
-	postRequestHandler,
-	putRequestHandler,
-	putFileRequestHandler,
-	patchRequestHandler,
-	deleteRequestHandler
-};
+const requestHandler = require('../requestHandlers');
+const env = require('../../../env');
+const { crossServiceCommunicationAuthKey } = env.getEnv();
+
+const defaultApiKey = crossServiceCommunicationAuthKey;
+
+const getRequestHandler = (url, params = {}, headers = {}) => {
+	enrichAuthKey(headers);
+	return requestHandler.getRequestHandler(url, headers, params);
+};
+
+const postRequestHandler = (url, body, headers = {}, params = {}) => {
+	enrichAuthKey(headers);
+	return requestHandler.postRequestHandler(url, body, headers, params);
+};
+
+const putRequestHandler = (url, body, headers = {}, params = {}) => {
+	enrichAuthKey(headers, defaultApiKey);
+	return requestHandler.putRequestHandler(url, body, headers, params);
+};
+
+const putFileRequestHandler = (url, fileData, headers = {}) => {
+	enrichAuthKey(headers);
+	return requestHandler.putFileRequestHandler(url, fileData, headers);
+};
+
+const patchRequestHandler = (url, body, headers = {}) => {
+	enrichAuthKey(headers);
+	return requestHandler.patchRequestHandler(url, body, headers);
+};
+
+const deleteRequestHandler = (url, headers = {}, params = {}, data = {}) => {
+	enrichAuthKey(headers);
+	return requestHandler.deleteRequestHandler(url, headers, params, data);
+};
+
+const enrichAuthKey = headers => {
+	headers['x-jcsc-auth'] = defaultApiKey;
+};
+
+module.exports = {
+	getRequestHandler,
+	postRequestHandler,
+	putRequestHandler,
+	putFileRequestHandler,
+	patchRequestHandler,
+	deleteRequestHandler
+};

package/src/common/requests/requestHandlers.js

@@ -1,112 +1,112 @@
-const axios = require('axios');
-const FormData = require('form-data');
-const { Agent: HttpAgent } = require('http');
-const { Agent: HttpsAgent } = require('https');
-
-const httpResponseStatusCodes = require('../httpResponseStatusCodes.json');
-
-const TRANSIENT_STATUSES = new Set([
-	httpResponseStatusCodes.BAD_GATEWAY,
-	httpResponseStatusCodes.SERVICE_UNAVAILABLE,
-	httpResponseStatusCodes.GATEWAY_TIMEOUT
-]);
-
-const MAX_BODY_LENGTH = 50 * 1024 * 1024;
-const REQUEST_TIMEOUT_MS = 120000;
-const MAX_RETRIES = 3;
-const INITIAL_RETRY_DELAY_MS = 300;
-const MAX_RANDOM_RETRY_DELAY_MS = 100;
-
-// Shared keep-alive agents (one pair per worker) so sockets are reused, not recreated per request
-const AGENT_OPTIONS = { keepAlive: true, maxSockets: 50, maxFreeSockets: 10, scheduling: 'lifo' };
-const httpAgent = new HttpAgent(AGENT_OPTIONS);
-const httpsAgent = new HttpsAgent(AGENT_OPTIONS);
-
-const buildConfig = (config = {}) => ({
-	... config,
-	httpAgent,
-	httpsAgent,
-	timeout: REQUEST_TIMEOUT_MS,
-	maxRedirects: 0 // to use the native transport
-});
-
-const isResponseStatusClientErrorCode = httpResponseStatusCode => {
-	const minClientErrorCode = httpResponseStatusCodes.BAD_REQUEST;
-	const maxClientErrorCode = httpResponseStatusCodes.CLIENT_CLOSED_REQUEST;
-
-	return httpResponseStatusCode >= minClientErrorCode && httpResponseStatusCode <= maxClientErrorCode;
-};
-
-const logUnexpectedErrorStatus = error => {
-	if (error.response && isResponseStatusClientErrorCode(error.response.status)) {
-		console.warn('Unexpected client error status:', error.response.status, error.response.data);
-	}
-};
-
-const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
-
-const executeRequest = async (method, url, sendRequest, { retryable }) => {
-	const maxRetries = retryable ? MAX_RETRIES : 0;
-	let lastError;
-
-	for (let retry = 0; retry <= maxRetries; retry++) {
-		try {
-			return await sendRequest();
-		} catch (error) {
-			lastError = error;
-
-			if (error.response && !TRANSIENT_STATUSES.has(error.response.status)) {
-				logUnexpectedErrorStatus(error);
-				return error.response;
-			}
-
-			if (retry < maxRetries) {
-				const exponentialDelayMs = INITIAL_RETRY_DELAY_MS * 2 ** retry;
-				const randomDelayAdditionMs = Math.floor(Math.random() * MAX_RANDOM_RETRY_DELAY_MS);
-
-				await wait(exponentialDelayMs + randomDelayAdditionMs);
-				continue;
-			}
-
-			break;
-		}
-	}
-
-	if (lastError.response) {
-		logUnexpectedErrorStatus(lastError);
-		return lastError.response;
-	}
-
-	throw new Error(`HTTP ${method} request to ${url} failed after ${maxRetries + 1} attempt(s): ${lastError.code || lastError.message}`);
-};
-
-const getRequestHandler = (url, headers = {}, params = {}, responseType) =>
-	executeRequest('GET', url, () => axios.get(url, buildConfig({ params, headers, responseType })), { retryable: true });
-
-const postRequestHandler = (url, body, headers = {}, params = {}) =>
-	executeRequest('POST', url, () => axios.post(url, body, buildConfig({ headers, params })), { retryable: false });
-
-const putRequestHandler = (url, body, headers = {}, params = {}) =>
-	executeRequest('PUT', url, () => axios.put(url, body, buildConfig({ headers, params, maxBodyLength: MAX_BODY_LENGTH })), { retryable: true });
-
-const putFileRequestHandler = (url, fileData, headers = {}) =>
-	executeRequest('PUT', url, () => {
-		const form = new FormData();
-		form.append('file', fileData);
-		return axios.put(url, form, buildConfig({ headers: { ... headers, ... form.getHeaders() }, maxBodyLength: MAX_BODY_LENGTH }));
-	}, { retryable: true });
-
-const patchRequestHandler = (url, body, headers = {}) =>
-	executeRequest('PATCH', url, () => axios.patch(url, body, buildConfig({ headers })), { retryable: false });
-
-const deleteRequestHandler = (url, headers = {}, params = {}, data = {}) =>
-	executeRequest('DELETE', url, () => axios.delete(url, buildConfig({ params, headers, data })), { retryable: true });
-
-module.exports = {
-	getRequestHandler,
-	postRequestHandler,
-	putRequestHandler,
-	putFileRequestHandler,
-	patchRequestHandler,
-	deleteRequestHandler
-};
+const axios = require('axios');
+const FormData = require('form-data');
+const { Agent: HttpAgent } = require('http');
+const { Agent: HttpsAgent } = require('https');
+
+const httpResponseStatusCodes = require('../httpResponseStatusCodes.json');
+
+const TRANSIENT_STATUSES = new Set([
+	httpResponseStatusCodes.BAD_GATEWAY,
+	httpResponseStatusCodes.SERVICE_UNAVAILABLE,
+	httpResponseStatusCodes.GATEWAY_TIMEOUT
+]);
+
+const MAX_BODY_LENGTH = 50 * 1024 * 1024;
+const REQUEST_TIMEOUT_MS = 120000;
+const MAX_RETRIES = 3;
+const INITIAL_RETRY_DELAY_MS = 300;
+const MAX_RANDOM_RETRY_DELAY_MS = 100;
+
+// Shared keep-alive agents (one pair per worker) so sockets are reused, not recreated per request
+const AGENT_OPTIONS = { keepAlive: true, maxSockets: 50, maxFreeSockets: 10, scheduling: 'lifo' };
+const httpAgent = new HttpAgent(AGENT_OPTIONS);
+const httpsAgent = new HttpsAgent(AGENT_OPTIONS);
+
+const buildConfig = (config = {}) => ({
+	... config,
+	httpAgent,
+	httpsAgent,
+	timeout: REQUEST_TIMEOUT_MS,
+	maxRedirects: 0 // to use the native transport
+});
+
+const isResponseStatusClientErrorCode = httpResponseStatusCode => {
+	const minClientErrorCode = httpResponseStatusCodes.BAD_REQUEST;
+	const maxClientErrorCode = httpResponseStatusCodes.CLIENT_CLOSED_REQUEST;
+
+	return httpResponseStatusCode >= minClientErrorCode && httpResponseStatusCode <= maxClientErrorCode;
+};
+
+const logUnexpectedErrorStatus = error => {
+	if (error.response && isResponseStatusClientErrorCode(error.response.status)) {
+		console.warn('Unexpected client error status:', error.response.status, error.response.data);
+	}
+};
+
+const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+
+const executeRequest = async (method, url, sendRequest, { retryable }) => {
+	const maxRetries = retryable ? MAX_RETRIES : 0;
+	let lastError;
+
+	for (let retry = 0; retry <= maxRetries; retry++) {
+		try {
+			return await sendRequest();
+		} catch (error) {
+			lastError = error;
+
+			if (error.response && !TRANSIENT_STATUSES.has(error.response.status)) {
+				logUnexpectedErrorStatus(error);
+				return error.response;
+			}
+
+			if (retry < maxRetries) {
+				const exponentialDelayMs = INITIAL_RETRY_DELAY_MS * 2 ** retry;
+				const randomDelayAdditionMs = Math.floor(Math.random() * MAX_RANDOM_RETRY_DELAY_MS);
+
+				await wait(exponentialDelayMs + randomDelayAdditionMs);
+				continue;
+			}
+
+			break;
+		}
+	}
+
+	if (lastError.response) {
+		logUnexpectedErrorStatus(lastError);
+		return lastError.response;
+	}
+
+	throw new Error(`HTTP ${method} request to ${url} failed after ${maxRetries + 1} attempt(s): ${lastError.code || lastError.message}`);
+};
+
+const getRequestHandler = (url, headers = {}, params = {}, responseType) =>
+	executeRequest('GET', url, () => axios.get(url, buildConfig({ params, headers, responseType })), { retryable: true });
+
+const postRequestHandler = (url, body, headers = {}, params = {}) =>
+	executeRequest('POST', url, () => axios.post(url, body, buildConfig({ headers, params })), { retryable: false });
+
+const putRequestHandler = (url, body, headers = {}, params = {}) =>
+	executeRequest('PUT', url, () => axios.put(url, body, buildConfig({ headers, params, maxBodyLength: MAX_BODY_LENGTH })), { retryable: true });
+
+const putFileRequestHandler = (url, fileData, headers = {}) =>
+	executeRequest('PUT', url, () => {
+		const form = new FormData();
+		form.append('file', fileData);
+		return axios.put(url, form, buildConfig({ headers: { ... headers, ... form.getHeaders() }, maxBodyLength: MAX_BODY_LENGTH }));
+	}, { retryable: true });
+
+const patchRequestHandler = (url, body, headers = {}) =>
+	executeRequest('PATCH', url, () => axios.patch(url, body, buildConfig({ headers })), { retryable: false });
+
+const deleteRequestHandler = (url, headers = {}, params = {}, data = {}) =>
+	executeRequest('DELETE', url, () => axios.delete(url, buildConfig({ params, headers, data })), { retryable: true });
+
+module.exports = {
+	getRequestHandler,
+	postRequestHandler,
+	putRequestHandler,
+	putFileRequestHandler,
+	patchRequestHandler,
+	deleteRequestHandler
+};

package/src/common/utils/arrayUtils.js

@@ -1,19 +1,19 @@
-const formatToStringList = input =>
-	Array.isArray(input) ? input.join(',') : input;
-
-const shallowSort = input => {
-	if (!Array.isArray(input)) {
-		return input;
-	}
-
-	return [... input].sort((a, b) => {
-		const aKey = JSON.stringify(a);
-		const bKey = JSON.stringify(b);
-		return aKey < bKey ? -1 : aKey > bKey ? 1 : 0;
-	});
-};
-
-module.exports = {
-	formatToStringList,
-	shallowSort
-};
+const formatToStringList = input =>
+	Array.isArray(input) ? input.join(',') : input;
+
+const shallowSort = input => {
+	if (!Array.isArray(input)) {
+		return input;
+	}
+
+	return [... input].sort((a, b) => {
+		const aKey = JSON.stringify(a);
+		const bKey = JSON.stringify(b);
+		return aKey < bKey ? -1 : aKey > bKey ? 1 : 0;
+	});
+};
+
+module.exports = {
+	formatToStringList,
+	shallowSort
+};