HCK-8703: hckFetch

esbuild.package.js

@@ -34,5 +34,6 @@ esbuild
 			}),
 			addReleaseFlag(path.resolve(RELEASE_FOLDER_PATH, 'package.json')),
 		],
+		external: ['electron'],
 	})
 	.catch(() => process.exit(1));

forward_engineering/api.js

@@ -1,4 +1,14 @@
-const aws = require('aws-sdk');
+const path = require('path');
+const {
+	SchemasClient,
+	ListRegistriesCommand,
+	UpdateRegistryCommand,
+	DescribeRegistryCommand,
+	CreateRegistryCommand,
+	UpdateSchemaCommand,
+	CreateSchemaCommand,
+} = require('@aws-sdk/client-schemas');
+const { hckFetchAwsSdkHttpHandler } = require('@hackolade/fetch');
 const validationHelper = require('./helpers/validationHelper');
 const getInfo = require('./helpers/infoHelper');
 const { getPaths } = require('./helpers/pathHelper');
@@ -7,10 +17,10 @@ const commonHelper = require('./helpers/commonHelper');
 const { getServers } = require('./helpers/serversHelper');
 const getExtensions = require('./helpers/extensionsHelper');
 const { getRegistryCreateCLIStatement, getSchemaCreateCLIStatement } = require('./helpers/awsCLIHelpers/awsCLIHelper');
-const { getApiStatements, getItemUpdateParamiters } = require('./helpers/awsCLIHelpers/applyToInstanceHelper');
+const { getApiStatements, getItemUpdateParameters } = require('./helpers/awsCLIHelpers/applyToInstanceHelper');
 const handleReferencePath = require('./helpers/handleReferencePath');
 const mapJsonSchema = require('../reverse_engineering/helpers/adaptJsonSchema/mapJsonSchema');
-const path = require('path');
+const { SCHEMAS_CLIENT_API_VERSION, NOT_FOUND_RESPONSE_CODE } = require('../shared/constants');
 
 module.exports = {
 	generateModelScript(data, logger, cb) {
@@ -57,7 +67,7 @@ module.exports = {
 			};
 			const extensions = getExtensions(data.modelData[0].scopesExtensions);
 
-			const resultSchema = Object.assign({}, openApiSchema, extensions);
+			const resultSchema = { ...openApiSchema, ...extensions };
 			let schema = addCommentsSigns(JSON.stringify(resultSchema, null, 2), 'json');
 			schema = removeCommentLines(schema);
 
@@ -90,10 +100,7 @@ module.exports = {
 		}
 	},
 
-	async applyToInstance(data, logger, callback, app) {
-		const NOT_FOUND_RESPONSE_CODE = 'NotFoundException';
-		const BAD_REQUEST_RESPONSE_CODE = 'BadRequestException';
-		const NOTHING_TO_UPDATE_RESPONSE_MESSAGE = 'Invalid request. Please provide at least one field to update.';
+	async applyToInstance(data, logger, callback) {
 		if (!data.script) {
 			return callback({ message: 'Empty script' });
 		}
@@ -108,24 +115,26 @@ module.exports = {
 			if (registry) {
 				try {
 					if (registry.Description) {
-						await schemasInstance.updateRegistry(getItemUpdateParamiters(registry)).promise();
+						await schemasInstance.send(new UpdateRegistryCommand(getItemUpdateParameters(registry)));
 					} else {
-						await schemasInstance.describeRegistry({ RegistryName: registry.RegistryName }).promise();
+						await schemasInstance.send(
+							new DescribeRegistryCommand({ RegistryName: registry.RegistryName }),
+						);
 					}
 				} catch (err) {
 					if (err.code === NOT_FOUND_RESPONSE_CODE) {
-						await schemasInstance.createRegistry(registry).promise();
+						await schemasInstance.send(new CreateRegistryCommand(registry));
 					} else {
 						return callback(err);
 					}
 				}
 			}
 			if (schema) {
 				try {
-					await schemasInstance.updateSchema(getItemUpdateParamiters(schema)).promise();
+					await schemasInstance.send(new UpdateSchemaCommand(getItemUpdateParameters(schema)));
 				} catch (err) {
 					if (err.code === NOT_FOUND_RESPONSE_CODE) {
-						await schemasInstance.createSchema(schema).promise();
+						await schemasInstance.send(new CreateSchemaCommand(schema));
 					} else {
 						return callback(err);
 					}
@@ -141,7 +150,7 @@ module.exports = {
 		logger.log('info', connectionInfo, 'Test connection', connectionInfo.hiddenKeys);
 		const schemasInstance = getSchemasInstance(connectionInfo);
 		try {
-			await schemasInstance.listRegistries().promise();
+			await schemasInstance.send(new ListRegistriesCommand());
 			callback();
 		} catch (err) {
 			logger.log('error', { message: err.message, stack: err.stack, error: err }, 'Connection failed');
@@ -221,7 +230,7 @@ const removeCommentLines = scriptString => {
 		.split('\n')
 		.filter(line => !isCommentedLine.test(line))
 		.join('\n')
-		.replace(/(.*?),\s*(\}|])/g, '$1$2');
+		.replace(/(.*?),\s*([}\]])/g, '$1$2');
 };
 
 const buildAWSCLIScript = (modelMetadata, openAPISchema, targetScriptOptions = {}) => {
@@ -238,9 +247,17 @@ const buildAWSCLIScript = (modelMetadata, openAPISchema, targetScriptOptions = {
 };
 
 const getSchemasInstance = connectionInfo => {
-	const { accessKeyId, secretAccessKey, region, sessionToken } = connectionInfo;
-	aws.config.update({ accessKeyId, secretAccessKey, region, sessionToken });
-	return new aws.Schemas({ apiVersion: '2019-12-02' });
+	const { accessKeyId, secretAccessKey, region, sessionToken, queryRequestTimeout } = connectionInfo;
+	return new SchemasClient({
+		credentials: {
+			accessKeyId,
+			secretAccessKey,
+			sessionToken,
+		},
+		region,
+		apiVersion: SCHEMAS_CLIENT_API_VERSION,
+		requestHandler: hckFetchAwsSdkHttpHandler({ requestTimeout: queryRequestTimeout }),
+	});
 };
 
 const handleRefInContainers = (containers, externalDefinitions, resolveApiExternalRefs) => {

forward_engineering/helpers/awsCLIHelpers/applyToInstanceHelper.js

@@ -9,11 +9,9 @@ const getApiStatements = script => {
 	return cliStatements.reduce((acc, statement) => {
 		const oneLineStatement = statement.replace(/\n/g, '');
 		if (registryRegexp.test(oneLineStatement)) {
-			const parsedInput = getStatementInput(registryRegexp, oneLineStatement);
-			acc.registry = parsedInput;
+			acc.registry = getStatementInput(registryRegexp, oneLineStatement);
 		} else if (schemaRegexp.test(oneLineStatement)) {
-			const parsedInput = getStatementInput(schemaRegexp, oneLineStatement);
-			acc.schema = parsedInput;
+			acc.schema = getStatementInput(schemaRegexp, oneLineStatement);
 		}
 		return acc;
 	}, {});
@@ -24,12 +22,12 @@ const getStatementInput = (regExp, statement) => {
 	return JSON.parse(jsonInput);
 };
 
-const getItemUpdateParamiters = data => {
+const getItemUpdateParameters = data => {
 	const { Tags, ...parameters } = data;
 	return parameters;
 };
 
 module.exports = {
 	getApiStatements,
-	getItemUpdateParamiters,
+	getItemUpdateParameters,
 };