From 768c1ca2be0f8744884d6fd5f10ac42ce96390cb Mon Sep 17 00:00:00 2001 From: yevhenii-moroziuk Date: Wed, 14 May 2025 09:47:09 +0300 Subject: [PATCH] HCK-11091: Move the log of the start to the studio --- forward_engineering/applyToInstance/index.js | 2 - reverse_engineering/api.js | 70 +++++++------------- 2 files changed, 25 insertions(+), 47 deletions(-) diff --git a/forward_engineering/applyToInstance/index.js b/forward_engineering/applyToInstance/index.js index 8f9f078..c215122 100644 --- a/forward_engineering/applyToInstance/index.js +++ b/forward_engineering/applyToInstance/index.js @@ -67,8 +67,6 @@ module.exports = { try { const helper = applyToInstanceHelper(_); logger.progress = logger.progress || (() => {}); - logger.clear(); - logger.log('info', connectionInfo, 'Apply to instance connection settings', connectionInfo.hiddenKeys); const client = helper.setUpDocumentClient(connectionInfo); const script = parseScript(connectionInfo.script); const containerData = _.get(connectionInfo, 'containerData[0]'); diff --git a/reverse_engineering/api.js b/reverse_engineering/api.js index 27c2376..435d305 100644 --- a/reverse_engineering/api.js +++ b/reverse_engineering/api.js @@ -18,9 +18,7 @@ module.exports = { }, testConnection: async function (connectionInfo, logger, cb) { - logger.clear(); client = setUpDocumentClient(connectionInfo); - logger.log('info', connectionInfo, 'Reverse-Engineering connection settings', connectionInfo.hiddenKeys); try { await executeWithTimeout(getDatabasesData); return cb(); @@ -31,8 +29,6 @@ module.exports = { getDatabases: async function (connectionInfo, logger, cb) { client = setUpDocumentClient(connectionInfo); - logger.clear(); - logger.log('info', connectionInfo, 'Reverse-Engineering connection settings', connectionInfo.hiddenKeys); try { const dbsData = await getDatabasesData(); @@ -47,7 +43,6 @@ module.exports = { getDocumentKinds: async function (connectionInfo, logger, cb) { client = setUpDocumentClient(connectionInfo); - logger.log('info', connectionInfo, 'Reverse-Engineering connection settings', connectionInfo.hiddenKeys); try { const collections = await listCollections(connectionInfo.database); @@ -92,8 +87,6 @@ module.exports = { getDbCollectionsNames: async function (connectionInfo, logger, cb) { try { client = setUpDocumentClient(connectionInfo); - logger.log('info', connectionInfo, 'Reverse-Engineering connection settings', connectionInfo.hiddenKeys); - logger.log( 'info', { Database: connectionInfo.database }, @@ -123,34 +116,24 @@ module.exports = { try { logger.progress = logger.progress || (() => {}); client = setUpDocumentClient(data); - logger.log('info', data, 'Reverse-Engineering connection settings', data.hiddenKeys); const { recordSamplingSettings, fieldInference } = data; - logger.log( - 'info', - getSamplingInfo(recordSamplingSettings, fieldInference), - 'Reverse-Engineering sampling params', - data.hiddenKeys, - ); - const bucketList = data.collectionData.dataBaseNames; logger.log('info', { CollectionList: bucketList }, 'Selected collection list', data.hiddenKeys); const { resource: accountInfo } = await client.getDatabaseAccount(); const additionalAccountInfo = await getAdditionalAccountInfo(data, logger); const modelInfo = { - accountID: data.accountKey, - defaultConsistency: accountInfo.consistencyPolicy, - preferredLocation: accountInfo.writableLocations[0] ? accountInfo.writableLocations[0].name : '', - ...(data?.includeAccountInformation && { - resGrp: data.resourceGroupName, - tenant: data.tenantId, - subscription: data.subscriptionId, - }), - ...additionalAccountInfo, - }; - - + accountID: data.accountKey, + defaultConsistency: accountInfo.consistencyPolicy, + preferredLocation: accountInfo.writableLocations[0] ? accountInfo.writableLocations[0].name : '', + ...(data?.includeAccountInformation && { + resGrp: data.resourceGroupName, + tenant: data.tenantId, + subscription: data.subscriptionId, + }), + ...additionalAccountInfo, + }; logger.log('info', modelInfo, 'Model info', data.hiddenKeys); const dbCollectionsPromise = bucketList.map(async bucketName => { @@ -165,21 +148,20 @@ module.exports = { const indexes = getIndexes(collection.indexingPolicy); const isHierarchicalPartitionKey = Array.isArray(partitionKey) && partitionKey.length > 1; const bucketInfo = { - dbId: data.database, - capacityMode, - throughput, - autopilot, - partitionKey, - uniqueKey: getUniqueKeys(collection), - storedProcs, - triggers, - udfs, - TTL: getTTL(collection.defaultTtl), - TTLseconds: collection.defaultTtl, - hierarchicalPartitionKey: isHierarchicalPartitionKey, - ...indexes, - }; - + dbId: data.database, + capacityMode, + throughput, + autopilot, + partitionKey, + uniqueKey: getUniqueKeys(collection), + storedProcs, + triggers, + udfs, + TTL: getTTL(collection.defaultTtl), + TTLseconds: collection.defaultTtl, + hierarchicalPartitionKey: isHierarchicalPartitionKey, + ...indexes, + }; const documentsAmount = await getDocumentsAmount(containerInstance); const size = getSampleDocSize(documentsAmount, recordSamplingSettings); @@ -361,7 +343,7 @@ function generateCustomInferSchema(documents, params) { inferSchema.properties[prop]['samples'].indexOf(item[prop]) === -1 && inferSchema.properties[prop]['samples'].length < sampleSize ) { - inferSchema.properties[prop]['samples'].push(item[prop]) + inferSchema.properties[prop]['samples'].push(item[prop]); } inferSchema.properties[prop]['type'] = typeOf(item[prop]); @@ -685,8 +667,6 @@ async function getAdditionalAccountInfo(connectionInfo, logger) { return {}; } - logger.log('info', {}, 'Account additional info', connectionInfo.hiddenKeys); - try { const { clientId, appSecret, tenantId, subscriptionId, resourceGroupName, host } = connectionInfo; const accNameRegex = /https:\/\/(.+)\.documents.+/i;