From 86f74c45375582d74c88fc6139443dfa631df058 Mon Sep 17 00:00:00 2001 From: Andrew Kanieski Date: Mon, 3 May 2021 20:51:58 -0400 Subject: [PATCH 1/7] Added some additional logging --- src/NodeJs/ConfigurationProcessor.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/NodeJs/ConfigurationProcessor.ts b/src/NodeJs/ConfigurationProcessor.ts index 64c22f0..74b1360 100644 --- a/src/NodeJs/ConfigurationProcessor.ts +++ b/src/NodeJs/ConfigurationProcessor.ts @@ -66,6 +66,7 @@ export async function ProcessConfigurationFile(commandLineOptions: ICommandLineO const configuration = jsoncParse(readFileSync(configFile, defaultEncoding)) as IConfigurationFile; // replace token if overriden from command line + logger.logInfo(`Loaded configuration from ${configFile}: \r\n${JSON.stringify(configuration, null, 4)}`); configuration.sourceAccountToken = commandLineOptions.sourceToken ? commandLineOptions.sourceToken : configuration.sourceAccountToken; configuration.targetAccountToken = commandLineOptions.targetToken ? commandLineOptions.targetToken : configuration.targetAccountToken; From 4010b678f5909d69b1296213ac4593d2d224a659 Mon Sep 17 00:00:00 2001 From: Andrew Kanieski Date: Mon, 3 May 2021 20:58:25 -0400 Subject: [PATCH 2/7] Update ConfigurationProcessor.ts --- src/NodeJs/ConfigurationProcessor.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NodeJs/ConfigurationProcessor.ts b/src/NodeJs/ConfigurationProcessor.ts index 74b1360..fc0428a 100644 --- a/src/NodeJs/ConfigurationProcessor.ts +++ b/src/NodeJs/ConfigurationProcessor.ts @@ -1,5 +1,5 @@ import { existsSync, readFileSync, writeFileSync } from "fs"; -import { normalize } from "path"; +import { normalize, join, resolve } from "path"; import * as minimist from "minimist"; import * as url from "url"; import { defaultConfiguration, defaultConfigurationFilename, defaultEncoding, paramConfig, paramMode, paramSourceToken, paramTargetToken } from "../common/Constants"; @@ -66,7 +66,7 @@ export async function ProcessConfigurationFile(commandLineOptions: ICommandLineO const configuration = jsoncParse(readFileSync(configFile, defaultEncoding)) as IConfigurationFile; // replace token if overriden from command line - logger.logInfo(`Loaded configuration from ${configFile}: \r\n${JSON.stringify(configuration, null, 4)}`); + logger.logInfo(`Loaded configuration from ${resolve(join(process.cwd(), configFile))}: \r\n${JSON.stringify(configuration, null, 4)}`); configuration.sourceAccountToken = commandLineOptions.sourceToken ? commandLineOptions.sourceToken : configuration.sourceAccountToken; configuration.targetAccountToken = commandLineOptions.targetToken ? commandLineOptions.targetToken : configuration.targetAccountToken; From c751da9128f921d170e8a0af055e287b8bef6230 Mon Sep 17 00:00:00 2001 From: Andrew Kanieski Date: Mon, 3 May 2021 21:05:25 -0400 Subject: [PATCH 3/7] Update ConfigurationProcessor.ts --- src/NodeJs/ConfigurationProcessor.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/NodeJs/ConfigurationProcessor.ts b/src/NodeJs/ConfigurationProcessor.ts index fc0428a..569bab7 100644 --- a/src/NodeJs/ConfigurationProcessor.ts +++ b/src/NodeJs/ConfigurationProcessor.ts @@ -63,10 +63,11 @@ export async function ProcessConfigurationFile(commandLineOptions: ICommandLineO process.exit(1); } - const configuration = jsoncParse(readFileSync(configFile, defaultEncoding)) as IConfigurationFile; + const rawFile = readFileSync(configFile, defaultEncoding); + const configuration = jsoncParse(rawFile) as IConfigurationFile; // replace token if overriden from command line - logger.logInfo(`Loaded configuration from ${resolve(join(process.cwd(), configFile))}: \r\n${JSON.stringify(configuration, null, 4)}`); + logger.logInfo(`Loaded configuration from ${resolve(join(process.cwd(), configFile))}: \r\n${rawFile}`); configuration.sourceAccountToken = commandLineOptions.sourceToken ? commandLineOptions.sourceToken : configuration.sourceAccountToken; configuration.targetAccountToken = commandLineOptions.targetToken ? commandLineOptions.targetToken : configuration.targetAccountToken; From 89e6557617f5eb60e34a9a814f0f85caf57af3d2 Mon Sep 17 00:00:00 2001 From: Andrew Kanieski Date: Mon, 3 May 2021 21:49:19 -0400 Subject: [PATCH 4/7] Update ConfigurationProcessor.ts --- src/NodeJs/ConfigurationProcessor.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NodeJs/ConfigurationProcessor.ts b/src/NodeJs/ConfigurationProcessor.ts index 569bab7..5f3ab13 100644 --- a/src/NodeJs/ConfigurationProcessor.ts +++ b/src/NodeJs/ConfigurationProcessor.ts @@ -2,7 +2,7 @@ import { existsSync, readFileSync, writeFileSync } from "fs"; import { normalize, join, resolve } from "path"; import * as minimist from "minimist"; import * as url from "url"; -import { defaultConfiguration, defaultConfigurationFilename, defaultEncoding, paramConfig, paramMode, paramSourceToken, paramTargetToken } from "../common/Constants"; +import { defaultConfiguration, defaultConfigurationFilename, defaultEncoding, paramConfig, paramMode, paramSourceToken, paramTargetToken, paramOverwriteProcessOnTarget } from "../common/Constants"; import { IConfigurationFile, LogLevel, Modes, ICommandLineOptions } from "../common/Interfaces"; import { logger } from "../common/Logger"; import { Utility } from "../common/Utilities"; @@ -46,6 +46,7 @@ export function ProcesCommandLine(): ICommandLineOptions { ret[paramConfig] = configFileName; ret[paramSourceToken] = parsedArgs[paramSourceToken]; ret[paramTargetToken] = parsedArgs[paramTargetToken]; + ret[paramOverwriteProcessOnTarget] = parsedArgs[paramOverwriteProcessOnTarget]; return ret; } From 1fd163192f8b850612fe98af8ddd3401d499648b Mon Sep 17 00:00:00 2001 From: Andrew Kanieski Date: Mon, 3 May 2021 22:59:00 -0400 Subject: [PATCH 5/7] Restored paramOverwriteProcessOnTarget --- src/NodeJs/ConfigurationProcessor.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/NodeJs/ConfigurationProcessor.ts b/src/NodeJs/ConfigurationProcessor.ts index 5f3ab13..17e2c75 100644 --- a/src/NodeJs/ConfigurationProcessor.ts +++ b/src/NodeJs/ConfigurationProcessor.ts @@ -46,11 +46,10 @@ export function ProcesCommandLine(): ICommandLineOptions { ret[paramConfig] = configFileName; ret[paramSourceToken] = parsedArgs[paramSourceToken]; ret[paramTargetToken] = parsedArgs[paramTargetToken]; - ret[paramOverwriteProcessOnTarget] = parsedArgs[paramOverwriteProcessOnTarget]; + ret[paramOverwriteProcessOnTarget] = !!parsedArgs[paramOverwriteProcessOnTarget]; return ret; } - export async function ProcessConfigurationFile(commandLineOptions: ICommandLineOptions): Promise { // Load configuration file const configFile = commandLineOptions.config; @@ -64,11 +63,9 @@ export async function ProcessConfigurationFile(commandLineOptions: ICommandLineO process.exit(1); } - const rawFile = readFileSync(configFile, defaultEncoding); - const configuration = jsoncParse(rawFile) as IConfigurationFile; + const configuration = jsoncParse(readFileSync(configFile, defaultEncoding)) as IConfigurationFile; // replace token if overriden from command line - logger.logInfo(`Loaded configuration from ${resolve(join(process.cwd(), configFile))}: \r\n${rawFile}`); configuration.sourceAccountToken = commandLineOptions.sourceToken ? commandLineOptions.sourceToken : configuration.sourceAccountToken; configuration.targetAccountToken = commandLineOptions.targetToken ? commandLineOptions.targetToken : configuration.targetAccountToken; From a36c0b99d40b08b6a9c20e3a72a1ee02298d1e4d Mon Sep 17 00:00:00 2001 From: Andrew Kanieski Date: Mon, 3 May 2021 23:00:18 -0400 Subject: [PATCH 6/7] Update ConfigurationProcessor.ts --- src/NodeJs/ConfigurationProcessor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NodeJs/ConfigurationProcessor.ts b/src/NodeJs/ConfigurationProcessor.ts index 17e2c75..e9c1715 100644 --- a/src/NodeJs/ConfigurationProcessor.ts +++ b/src/NodeJs/ConfigurationProcessor.ts @@ -1,5 +1,5 @@ import { existsSync, readFileSync, writeFileSync } from "fs"; -import { normalize, join, resolve } from "path"; +import { normalize } from "path"; import * as minimist from "minimist"; import * as url from "url"; import { defaultConfiguration, defaultConfigurationFilename, defaultEncoding, paramConfig, paramMode, paramSourceToken, paramTargetToken, paramOverwriteProcessOnTarget } from "../common/Constants"; From aac8cc80e789b44ef5c5f433d146005435e99dba Mon Sep 17 00:00:00 2001 From: Andrew Kanieski Date: Mon, 3 May 2021 23:01:16 -0400 Subject: [PATCH 7/7] Fixed whitespace typo --- src/NodeJs/ConfigurationProcessor.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/NodeJs/ConfigurationProcessor.ts b/src/NodeJs/ConfigurationProcessor.ts index e9c1715..631f579 100644 --- a/src/NodeJs/ConfigurationProcessor.ts +++ b/src/NodeJs/ConfigurationProcessor.ts @@ -50,6 +50,7 @@ export function ProcesCommandLine(): ICommandLineOptions { return ret; } + export async function ProcessConfigurationFile(commandLineOptions: ICommandLineOptions): Promise { // Load configuration file const configFile = commandLineOptions.config;