Add backward compatibility

Author: bigorn0

reverse_engineering/api.js

@@ -442,8 +442,19 @@ function createSchemaByPartitionKeyPath(path, documents = []) {
 }
 
 const setUpDocumentClient = connectionInfo => {
-	const dbName = connectionInfo.azureCosmosdbAccount;
-	const endpoint = `https://${dbName}.documents.azure.com/`;
+	const getHttpsEndpoint = info => {
+		// For backward compatibility with previously generated connections
+		if (info.gremlinEndpoint) {
+			const dbNameRegExp = /wss:\/\/(\S*).gremlin\.cosmos\./i;
+			const dbName = dbNameRegExp.exec(info.gremlinEndpoint);
+
+			return `https://${dbName[1]}.documents.azure.com:443/`;
+		} else {
+			return `https://${info?.azureCosmosdbAccount}.documents.azure.com/`;
+		}
+	};
+
+	const endpoint = getHttpsEndpoint(connectionInfo);
 	const key = connectionInfo.accountKey;
 
 	return new CosmosClient({ endpoint, key });
@@ -586,14 +597,19 @@ async function getAdditionalAccountInfo(connectionInfo, logger) {
 	logger.log('info', {}, 'Account additional info', connectionInfo.hiddenKeys);
 
 	try {
-		const {
-			clientId,
-			appSecret,
-			tenantId,
-			subscriptionId,
-			resourceGroupName,
-			azureCosmosdbAccount: accountName,
-		} = connectionInfo;
+		const { clientId, appSecret, tenantId, subscriptionId, resourceGroupName } = connectionInfo;
+
+		const getAccountName = info => {
+			if (info.azureCosmosdbAccount) {
+				return info.azureCosmosdbAccount;
+			}
+
+			// For backward compatibility
+			const accNameRegex = /wss:\/\/(.+)\.gremlin.+/i;
+			const { gremlinEndpoint } = info;
+			return accNameRegex.test(gremlinEndpoint) ? accNameRegex.exec(gremlinEndpoint)[1] : '';
+		};
+
 		const tokenBaseURl = `https://login.microsoftonline.com/${tenantId}/oauth2/token`;
 		const { data: tokenData } = await axios({
 			method: 'post',
@@ -608,6 +624,7 @@ async function getAdditionalAccountInfo(connectionInfo, logger) {
 				'Content-Type': 'application/x-www-form-urlencoded',
 			},
 		});
+		const accountName = getAccountName(connectionInfo);
 		const dbAccountBaseUrl = `https://management.azure.com/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}?api-version=2015-04-08`;
 		const { data: accountData } = await axios({
 			method: 'get',

reverse_engineering/config.json

@@ -6,6 +6,6 @@
 	"excludeDocKind": ["id"],
 	"scenario": "getDatabases",
 	"connectionList": ["name", "azureCosmosdbAccount"],
-	"widestColumn": "gremlinEndpoint",
+	"widestColumn": "azureCosmosdbAccount",
 	"helpUrl": "https://hackolade.com/help/Azureinstance2.html"
 }

reverse_engineering/connection_settings_modal/connectionSettingsModalConfig.json

@@ -13,11 +13,11 @@
 				}
 			},
 			{
-				"inputLabel": "Azure Cosmos DB Account",
+				"inputLabel": "Azure Cosmos DB Account name",
 				"inputKeyword": "azureCosmosdbAccount",
 				"inputType": "text",
 				"inputPlaceholder": "",
-				"inputTooltip": "Paste the Azure Cosmos DB account",
+				"inputTooltip": "Paste the Azure Cosmos DB account name",
 				"defaultValue": "",
 				"validation": [
 					{
@@ -32,7 +32,7 @@
 				"inputType": "password",
 				"inputPlaceholder": "",
 				"defaultValue": "",
-				"inputTooltip": "Paste the account Primary or Secondary (Read-Only) Key",
+				"inputTooltip": "Paste the account Primary or Secondary (Read-Only if doing only RE but FE will require write rights) Key",
 				"isHiddenKey": true
 			}
 		]

reverse_engineering/gremlinHelper.js

@@ -19,7 +19,7 @@ const connectToInstance = info => {
 		const traversalSource = 'g';
 		const databaseName = info.database || database;
 		const accountKeyString = info.accountKey || accountKey;
-		gremlinEndpoint = `wss://${info.azureCosmosdbAccount}.gremlin.cosmos.azure.com`;
+		gremlinEndpoint = info?.gremlinEndpoint || `wss://${info.azureCosmosdbAccount}.gremlin.cosmos.azure.com`;
 
 		persistConnectionInfo(info);