HCK-7311: http requester #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

chulanovskyi-bs merged 22 commits into develop from feat/HCK-7311-http-requester

Aug 30, 2024

esbuild.package.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -34,5 +34,6 @@ esbuild @@
     			}),
     			addReleaseFlag(path.resolve(RELEASE_FOLDER_PATH, 'package.json')),
     		],
+    		external: ['electron'],
     	})
     	.catch(() => process.exit(1));

forward_engineering/api.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,5 +1,6 @@
  
    'use strict';

    const { get } = require('lodash');

    const { GlueClient, CreateDatabaseCommand, CreateTableCommand, GetDatabasesCommand } = require('@aws-sdk/client-glue');

    const { getDatabaseStatement } = require('./helpers/databaseHelper');

    const { getTableStatement } = require('./helpers/tableHelper');

    @@ -9,12 +10,11 @@ const { getGlueDatabaseCreateStatement } = require('./helpers/awsCliScriptHelper
  
    const { getGlueTableCreateStatement } = require('./helpers/awsCliScriptHelpers/glueTableHelper');

    const { getApiStatements } = require('./helpers/awsCliScriptHelpers/applyToInstanceHelper');

    const sqlFormatter = require('./custom_modules/sql-formatter');

    const { setDependencies, dependencies } = require('./appDependencies');

    const { HttpHandler } = require('../shared/httpHandler/httpHandler');

    module.exports = {

    	generateScript(data, logger, callback, app) {

    	generateScript(data, logger, callback) {

    		try {

    			setDependencies(app);

    			const jsonSchema = JSON.parse(data.jsonSchema);

    			const modelDefinitions = JSON.parse(data.modelDefinitions);

    			const internalDefinitions = JSON.parse(data.internalDefinitions);

    @@ -24,9 +24,7 @@ module.exports = {
  
    			if (data.options.targetScriptOptions && data.options.targetScriptOptions.keyword === 'hiveQl') {

    				const needMinify = (

    					dependencies.lodash

    						.get(data, 'options.additionalOptions', [])

    						.find(option => option.id === 'minify') || {}

    					get(data, 'options.additionalOptions', []).find(option => option.id === 'minify') || {}

    				).value;

    				return callback(

    @@ -58,9 +56,8 @@ module.exports = {
  
    		}

    	},

    	generateContainerScript(data, logger, callback, app) {

    	generateContainerScript(data, logger, callback) {

    		try {

    			setDependencies(app);

    			const containerData = data.containerData;

    			const modelDefinitions = JSON.parse(data.modelDefinitions);

    			const externalDefinitions = JSON.parse(data.externalDefinitions);

    @@ -69,9 +66,7 @@ module.exports = {
  
    			const internalDefinitions = parseEntities(data.entities, data.internalDefinitions);

    			if (data.options.targetScriptOptions && data.options.targetScriptOptions.keyword === 'hiveQl') {

    				const needMinify = (

    					dependencies.lodash

    						.get(data, 'options.additionalOptions', [])

    						.find(option => option.id === 'minify') || {}

    					get(data, 'options.additionalOptions', []).find(option => option.id === 'minify') || {}

    				).value;

    				const foreignKeyHashTable = foreignKeyHelper.getForeignKeyHashTable(

    @@ -124,16 +119,15 @@ module.exports = {
  
    		}

    	},

    	async applyToInstance(data, logger, callback, app) {

    		setDependencies(app);

    	async applyToInstance(data, logger, callback) {

    		if (!data.script) {

    			return callback({ message: 'Empty script' });

    		}

    		logger.clear();

    		logger.log('info', data, data.hiddenKeys);

    		const glueInstance = getGlueInstance(data, app);

    		const glueInstance = getGlueInstance({ connectionInfo: data, logger });

    		try {

    			const { db, table } = getApiStatements(data.script);

    @@ -162,11 +156,10 @@ module.exports = {
  
    		}

    	},

    	async testConnection(connectionInfo, logger, callback, app) {

    		setDependencies(app);

    	async testConnection(connectionInfo, logger, callback) {

    		logger.log('info', connectionInfo, 'Test connection', connectionInfo.hiddenKeys);

    		const glueInstance = getGlueInstance(connectionInfo, app);

    		const glueInstance = getGlueInstance({ connectionInfo, logger });

    		try {

    			const command = new GetDatabasesCommand();

    @@ -188,20 +181,23 @@ const buildAWSCLIScript = (containerData, tableSchema) => {
  
    const buildAWSCLIModelScript = (containerData, tablesSchemas = {}) => {

    	const dbStatement = getGlueDatabaseCreateStatement(containerData[0]);

    	const tablesStatements = Object.entries(tablesSchemas).map(([key, value]) => {

    		return getGlueTableCreateStatement(value, dependencies.lodash.get(containerData[0], 'name', ''));

    		return getGlueTableCreateStatement(value, get(containerData[0], 'name', ''));

    	});

    	return composeCLIStatements([dbStatement, ...tablesStatements]);

    };

    const getGlueInstance = (connectionInfo, app) => {

    	const { accessKeyId, secretAccessKey, region, sessionToken } = connectionInfo;

    const getGlueInstance = ({ connectionInfo, logger }) => {

    	const { accessKeyId, secretAccessKey, region, sessionToken, queryRequestTimeout } = connectionInfo;

    	const httpHandler = new HttpHandler({ logger, requestTimeout: queryRequestTimeout });

    	return new GlueClient({

    		region,

    		credentials: {

    			accessKeyId,

    			secretAccessKey,

    			sessionToken,

    		},

    		requestHandler: httpHandler,

    	});

    };

forward_engineering/appDependencies.js

This file was deleted.

forward_engineering/helpers/generalHelper.js

-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     'use strict';
-    const { dependencies } = require('../appDependencies');
+    const { partition, findLastIndex } = require('lodash');
     const buildStatement = (mainStatement, isActivated) => {
     	let composeStatements = (...statements) => {
@@ Expand Down Expand Up @@
     };
     const commentDeactivatedInlineKeys = (keys, deactivatedKeyNames) => {
-    	const [activatedKeys, deactivatedKeys] = dependencies.lodash.partition(
+    	const [activatedKeys, deactivatedKeys] = partition(
     		keys,
     		key => !(deactivatedKeyNames.has(key) || deactivatedKeyNames.has(key.slice(1, -1))),
     	);
@@ Expand Down Expand Up @@
     	if (splitedStatement.length < 4 || !splitedStatement[splitedStatement.length - 2].trim().startsWith('--')) {
     		return statement;
     	}
-    	const lineWithTrailingCommaIndex = dependencies.lodash.findLastIndex(splitedStatement, line => {
+    	const lineWithTrailingCommaIndex = findLastIndex(splitedStatement, line => {
     		if (line.trim() !== ');' && !line.trim().startsWith('--')) {
     			return true;
     		}
@@ Expand Down @@

forward_engineering/helpers/indexHelper.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,6 @@
  
    'use strict';

    const { dependencies } = require('../appDependencies');

    const { partition } = require('lodash');

    const { getTab, buildStatement, getName, replaceSpaceWithUnderscore } = require('./generalHelper');

    const schemaHelper = require('./jsonSchemaHelper');

    const { getItemByPath } = require('./jsonSchemaHelper');

    @@ -36,7 +36,7 @@ const getIndexKeys = (keys, jsonSchema, definitions) => {
  
    		[jsonSchema, ...definitions],

    	);

    	const idToNameHashTable = schemaHelper.getIdToNameHashTable([jsonSchema, ...definitions]);

    	const [activatedKeys, deactivatedKeys] = dependencies.lodash.partition(paths, path => {

    	const [activatedKeys, deactivatedKeys] = partition(paths, path => {

    		const item = getItemByPath(path, jsonSchema);

    		return item ? item.isActivated : true;

    	});

forward_engineering/helpers/tableHelper.js

-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     'use strict';
+    const { partition } = require('lodash');
     const {
     	buildStatement,
     	getName,
@@ Expand All / @@ -12,7 +13,6 @@ const { @@
     } = require('./generalHelper');
     const { getColumnsStatement, getColumnStatement, getColumns } = require('./columnHelper');
     const keyHelper = require('./keyHelper');
-    const { dependencies } = require('../appDependencies');
     const getCreateStatement = ({
     	dbName,
@@ Expand Down Expand Up @@
     	if (!Array.isArray(sortedKeys) || !sortedKeys.length) {
     		return '';
     	}
-    	const [activatedKeys, deactivatedKeys] = dependencies.lodash.partition(
+    	const [activatedKeys, deactivatedKeys] = partition(
     		sortedKeys,
     		keyData => !deactivatedColumnNames.has(keyData.name),
     	);
@@ Expand All @@
     		return '';
     	}
-    	const [activatedKeys, deactivatedKeys] = dependencies.lodash.partition(keys, key => key.isActivated);
+    	const [activatedKeys, deactivatedKeys] = partition(keys, key => key.isActivated);
     	if (!isParentActivated || deactivatedKeys.length === 0) {
     		return { isAllKeysDeactivated: false, keysString: getKeysStatement(keys) };
     	}
@@ Expand Down @@

Navigation Menu

Uh oh!

HCK-7311: http requester #49

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!