Merge pull request #30 from dannleed/fix/HCK-4224-fix-FE-script-generation

HCK-4224: fix generation azure cli fe script params

Author: mtseluiko

forward_engineering/api.js

@@ -1,4 +1,4 @@
-const applyToInstanceHelper = require('./applyToInstance/applyToInstanceHelper');
+const applyToInstanceHelper = require('./applyToInstance');
 const getIndexPolicyScript = require('./helpers/getIndexPolicyScript');
 const { getUniqueKeyPolicyScript } = require('./helpers/getUniqueKeyPolicyScript');
 const { buildAzureCLIScript } = require('./helpers/azureCLIScriptHelpers/buildAzureCLIScript');

forward_engineering/applyToInstance/applyToInstanceHelper.js

@@ -1,5 +1,6 @@
 const { StoredProcedure, UserDefinedFunction, Trigger } = require('../../reverse_engineering/node_modules/@azure/cosmos');
 const setUpDocumentClient = require('../../reverse_engineering/helpers/setUpDocumentClient');
+const { TTL_ON_DEFAULT, TTL_ON, TTL_OFF } = require('../../shared/constants');
 
 const applyToInstanceHelper = (_) => ({
 	setUpDocumentClient(connectionInfo) {
@@ -59,12 +60,13 @@ const applyToInstanceHelper = (_) => ({
 
 	getTTL(containerData) {
 		switch (containerData.TTL) {
-			case 'On (no default)':
+			case TTL_ON_DEFAULT:
 				return -1;
-			case 'On':
-				return _.parseInt(TTLseconds) || 0;
+			case TTL_ON:
+				return _.parseInt(containerData.TTLseconds) || -1;
+			case TTL_OFF:
 			default:
-				return -1;
+				return 0;
 		}
 	},
 

forward_engineering/applyToInstance/index.js

@@ -1,5 +1,6 @@
 const reApi = require('../../reverse_engineering/api');
 const executeWithTimeout = require('../../reverse_engineering/helpers/executeWithTimeout');
+const { TTL_ON, TTL_ON_DEFAULT } = require('../../shared/constants');
 const applyToInstanceHelper = require('./applyToInstanceHelper');
 
 const createOrUpdate = async (sample, container) => {
@@ -93,10 +94,11 @@ module.exports = {
 
 			progress('Create container  if not exists ...');
 
+			const shouldIncludeTtl = [TTL_ON, TTL_ON_DEFAULT].includes(containerData.TTL);
 			const { container, resource: containerDef } = await database.containers.createIfNotExists({
 				id: containerId,
 				partitionKey: script.partitionKey,
-				defaultTtl: helper.getTTL(containerData),
+				...(shouldIncludeTtl && { defaultTtl: helper.getTTL(containerData) }),
 				...(script.uniqueKeyPolicy && { uniqueKeyPolicy: script.uniqueKeyPolicy }),
 				...helper.getContainerThroughputProps(containerData),
 			});

forward_engineering/helpers/azureCLIScriptHelpers/buildAzureCLIScript.js

@@ -59,12 +59,13 @@ const getAzureCliContainerCreateStatement =
 		const helper = applyToInstanceHelper(_);
 
 		const partitionKeyParams = getPartitionKeyParams(_)(containerData);
-		const throughputParam = getThroughputParam(helper.getContainerThroughputProps(containerData));
+		const throughputParam = getThroughputParam(helper.getContainerThroughputProps(containerData[0]));
 		const indexingPolicyParam = `--idx ${escapeAndWrapInQuotes(
 			JSON.stringify(getIndexPolicyScript(_)(containerData)),
 		)}`;
 		const uniqueKeysPolicyParam = getUniqueKeysPolicyParam(containerData[0], escapeAndWrapInQuotes);
-		const ttlParam = `--ttl ${helper.getTTL(containerData[0])}`;
+		const ttl = helper.getTTL(containerData[0]);
+		const ttlParam = ttl !== 0 ? `--ttl ${helper.getTTL(containerData[0])}` : '';
 
 		const cliStatement = `${CLI} ${CONTAINER} ${CREATE}`;
 		const requiredParams = [

reverse_engineering/api.js

@@ -5,6 +5,7 @@ const _ = require('lodash');
 const axios = require('axios');
 const qs = require('qs');
 const executeWithTimeout = require('./helpers/executeWithTimeout');
+const { TTL_ON_DEFAULT, TTL_ON, TTL_OFF } = require('../shared/constants');
 let client;
 
 module.exports = {
@@ -142,9 +143,11 @@ module.exports = {
 					accountID: data.accountKey,
 					defaultConsistency: accountInfo.consistencyPolicy,
 					preferredLocation: accountInfo.writableLocations[0] ? accountInfo.writableLocations[0].name : '',
-					tenant: data.tenantId,
-					resGrp: data.resourceGroupName,
-					subscription: data.subscriptionId,
+					...(includeAccountInformation && {
+						resGrp: data.resourceGroupName,
+						tenant: data.tenantId,
+						subscription: data.subscriptionId,
+					}),
 				},
 				additionalAccountInfo,
 			);
@@ -657,9 +660,9 @@ async function getUdfs(containerInstance) {
 
 function getTTL(defaultTTL) {
 	if (!defaultTTL) {
-		return 'Off';
+		return TTL_OFF;
 	}
-	return defaultTTL === -1 ? 'On (no default)' : 'On';
+	return defaultTTL === -1 ? TTL_ON_DEFAULT : TTL_ON;
 }
 
 function getSamplingInfo(recordSamplingSettings, fieldInference) {
@@ -773,7 +776,7 @@ function createSchemaByPartitionKeyPath(path, documents = []) {
 		};
 	};
 
-	const getProperties = (paths) => {
+	const getProperties = paths => {
 		return paths.reduce((result, path) => {
 			if (!path || !_.isString(path)) {
 				return result;
@@ -790,9 +793,9 @@ function createSchemaByPartitionKeyPath(path, documents = []) {
 
 			return {
 				...result,
-				...getNestedObject(namePath)
-			}
-		}, {})
+				...getNestedObject(namePath),
+			};
+		}, {});
 	};
 
 	if (!Array.isArray(path)) {

shared/constants.js

@@ -6,7 +6,14 @@ const PARTITION_KEY_KIND = {
 	MultiHash: 'MultiHash',
 };
 
+const TTL_ON = 'On';
+const TTL_OFF = 'Off';
+const TTL_ON_DEFAULT = 'On (no default)';
+
 module.exports = {
 	PARTITION_KEY_DEFINITION_VERSION,
 	PARTITION_KEY_KIND,
+	TTL_ON,
+	TTL_OFF,
+	TTL_ON_DEFAULT,
 };