changed strategy to override values on argv so they have effect durin…

…g the post middleware command execution

Signed-off-by: instamenta <[email protected]>

src/commands/account.ts

@@ -177,6 +177,7 @@ export class AccountCommand extends BaseCommand {
         {
           title: 'Initialize',
           task: async (ctx, task) => {
+            self.configManager.update(argv);
             await self.configManager.executePrompt(task, [flags.namespace]);
 
             const config = {
@@ -329,6 +330,7 @@ export class AccountCommand extends BaseCommand {
         {
           title: 'Initialize',
           task: async (ctx, task) => {
+            self.configManager.update(argv);
             await self.configManager.executePrompt(task, [flags.namespace]);
 
             const config = {
@@ -411,6 +413,7 @@ export class AccountCommand extends BaseCommand {
         {
           title: 'Initialize',
           task: async (ctx, task) => {
+            self.configManager.update(argv);
             await self.configManager.executePrompt(task, [flags.accountId, flags.namespace]);
 
             const config = {
@@ -493,6 +496,7 @@ export class AccountCommand extends BaseCommand {
         {
           title: 'Initialize',
           task: async (ctx, task) => {
+            self.configManager.update(argv);
             await self.configManager.executePrompt(task, [flags.accountId, flags.namespace]);
 
             const config = {

src/commands/cluster/configs.ts

@@ -38,6 +38,7 @@ export const connectConfigBuilder = async function (argv, ctx, task) {
 export const setupConfigBuilder = async function (argv, ctx, task) {
   const parent = this.parent;
   const configManager = parent.getConfigManager();
+  configManager.update(argv);
   flags.disablePrompts([flags.chartDirectory]);
 
   await configManager.executePrompt(task, [

src/commands/deployment.ts

@@ -68,6 +68,7 @@ export class DeploymentCommand extends BaseCommand {
         {
           title: 'Initialize',
           task: async (ctx, task) => {
+            self.configManager.update(argv);
             self.logger.debug('Updated config with argv', {config: self.configManager.config});
 
             await self.configManager.executePrompt(task, [
@@ -137,7 +138,9 @@ export class DeploymentCommand extends BaseCommand {
 
             for (const context of Object.keys(ctx.config.contextCluster)) {
               const cluster = ctx.config.contextCluster[context];
-              subTasks.push(RemoteConfigTasks.createRemoteConfig.bind(this)(cluster, context, ctx.config.namespace));
+              subTasks.push(
+                RemoteConfigTasks.createRemoteConfig.bind(this)(cluster, context, ctx.config.namespace, argv),
+              );
             }
 
             return task.newListr(subTasks, {

src/commands/init.ts

@@ -45,6 +45,7 @@ export class InitCommand extends BaseCommand {
         {
           title: 'Setup home directory and cache',
           task: ctx => {
+            self.configManager.update(argv);
             ctx.dirs = this.setupHomeDirectory();
           },
         },

src/commands/mirror_node.ts

@@ -225,6 +225,8 @@ export class MirrorNodeCommand extends BaseCommand {
         {
           title: 'Initialize',
           task: async (ctx, task) => {
+            self.configManager.update(argv);
+
             // disable the prompts that we don't want to prompt the user for
             flags.disablePrompts([
               flags.deployHederaExplorer,
@@ -598,6 +600,7 @@ export class MirrorNodeCommand extends BaseCommand {
               }
             }
 
+            self.configManager.update(argv);
             await self.configManager.executePrompt(task, [flags.namespace]);
 
             // @ts-ignore

src/commands/network.ts

@@ -356,6 +356,7 @@ export class NetworkCommand extends BaseCommand {
   }
 
   async prepareConfig(task: any, argv: any) {
+    this.configManager.update(argv);
     this.logger.debug('Updated config with argv', {config: this.configManager.config});
 
     // disable the prompts that we don't want to prompt the user for
@@ -749,6 +750,7 @@ export class NetworkCommand extends BaseCommand {
               }
             }
 
+            self.configManager.update(argv);
             await self.configManager.executePrompt(task, [flags.deletePvcs, flags.deleteSecrets, flags.namespace]);
 
             ctx.config = {

src/commands/node/tasks.ts

@@ -1738,6 +1738,8 @@ export class NodeCommandTasks {
         this.logger.setDevMode(true);
       }
 
+      this.configManager.update(argv);
+
       // disable the prompts that we don't want to prompt the user for
       flags.disablePrompts([...requiredFlagsWithDisabledPrompt, ...optionalFlags]);
 

src/commands/relay.ts

@@ -215,6 +215,8 @@ export class RelayCommand extends BaseCommand {
             // reset nodeAlias
             self.configManager.setFlag(flags.nodeAliasesUnparsed, '');
 
+            self.configManager.update(argv);
+
             flags.disablePrompts([flags.operatorId, flags.operatorKey]);
 
             await self.configManager.executePrompt(task, RelayCommand.DEPLOY_FLAGS_LIST);
@@ -343,6 +345,7 @@ export class RelayCommand extends BaseCommand {
             // reset nodeAlias
             self.configManager.setFlag(flags.nodeAliasesUnparsed, '');
 
+            self.configManager.update(argv);
             await self.configManager.executePrompt(task, RelayCommand.DESTROY_FLAGS_LIST);
 
             // prompt if inputs are empty and set it in the context

src/core/config/remote/common_flags_data_wrapper.ts

@@ -43,11 +43,11 @@ export class CommonFlagsDataWrapper implements ToObject<RemoteConfigCommonFlagsS
    */
   public async handleFlags(argv: AnyObject): Promise<void> {
     for (const flag of CommonFlagsDataWrapper.COMMON_FLAGS) {
-      await this.checkFlag(flag);
+      await this.checkFlag(flag, argv);
     }
   }
 
-  private async checkFlag(flag: CommandFlag): Promise<void> {
+  private async checkFlag(flag: CommandFlag, argv: AnyObject): Promise<void> {
     const detectFlagMismatch = async () => {
       const oldValue = this.flags[flag.constName] as string;
       const newValue = this.configManager.getFlag<string>(flag);
@@ -61,7 +61,7 @@ export class CommonFlagsDataWrapper implements ToObject<RemoteConfigCommonFlagsS
       // if its present but there is a mismatch warn user
       else if (oldValue && oldValue !== newValue) {
         const answer = await select<string>({
-          message: 'Value in remote config differs with the one you are passing, choose with which you want to keep',
+          message: 'Value in remote config differs with the one you are passing, choose which you want to use',
           choices: [
             {
               name: `[old value] ${oldValue}`,
@@ -74,8 +74,13 @@ export class CommonFlagsDataWrapper implements ToObject<RemoteConfigCommonFlagsS
           ],
         });
 
-        // Override if user chooses new the new value, else do nothing and keep the old one
-        if (answer === newValue) this.flags[flag.constName] = newValue;
+        // Override if user chooses new the new value, else override and keep the old one
+        if (answer === newValue) {
+          this.flags[flag.constName] = newValue;
+        } else {
+          this.configManager.setFlag(flag, oldValue);
+          argv[flag.constName] = oldValue;
+        }
       }
     };
 
@@ -86,14 +91,11 @@ export class CommonFlagsDataWrapper implements ToObject<RemoteConfigCommonFlagsS
 
     // if the value is not set and exists, override it
     else if (this.flags[flag.constName]) {
+      argv[flag.constName] = this.flags[flag.constName];
       this.configManager.setFlag(flag, this.flags[flag.constName]);
     }
   }
 
-  private overrideFlagValue (flag: CommandFlag, argv: AnyObject): void {
-    this.configManager
-  }
-
   public static async initializeEmpty(configManager: ConfigManager, argv: AnyObject): Promise<CommonFlagsDataWrapper> {
     const commonFlagsDataWrapper = new CommonFlagsDataWrapper(configManager, {});
     await commonFlagsDataWrapper.handleFlags(argv);