removed caching of configmanager, expect a lot of test cases that nee…

…d to be fixed

Signed-off-by: Jeromy Cannon <[email protected]>

src/commands/node.ts

@@ -798,9 +798,9 @@ export class NodeCommand extends BaseCommand {
     const self = this
     if (localBuildPath !== '') {
       return self.uploadPlatformSoftware(nodeAliases, podNames, task, localBuildPath)
-    } 
+    }
       return self.fetchPlatformSoftware(nodeAliases, podNames, releaseTag, task, self.platformInstaller)
-    
+
   }
 
   fetchPlatformSoftware (nodeAliases: NodeAliases, podNames: Record<NodeAlias, PodName>, releaseTag: string,
@@ -1214,7 +1214,6 @@ export class NodeCommand extends BaseCommand {
           // reset flags so that keys are not regenerated later
           self.configManager.setFlag(flags.generateGossipKeys, false)
           self.configManager.setFlag(flags.generateTlsKeys, false)
-          self.configManager.persist()
         }
       }
     ])
@@ -1844,7 +1843,6 @@ export class NodeCommand extends BaseCommand {
           // reset flags so that keys are not regenerated later
           self.configManager.setFlag(flags.generateGossipKeys, false)
           self.configManager.setFlag(flags.generateTlsKeys, false)
-          self.configManager.persist()
         }
       }
     ]
@@ -2652,7 +2650,6 @@ export class NodeCommand extends BaseCommand {
           // reset flags so that keys are not regenerated later
           self.configManager.setFlag(flags.generateGossipKeys, false)
           self.configManager.setFlag(flags.generateTlsKeys, false)
-          self.configManager.persist()
         }
       }
     ], {
@@ -2869,7 +2866,6 @@ export class NodeCommand extends BaseCommand {
           // reset flags so that keys are not regenerated later
           self.configManager.setFlag(flags.generateGossipKeys, false)
           self.configManager.setFlag(flags.generateTlsKeys, false)
-          self.configManager.persist()
         }
       }
     ]

src/commands/prompts.ts

@@ -503,8 +503,6 @@ export async function execute (task: ListrTaskWrapper<any, any, any>, configMana
     const input = await prompt(task, configManager.getFlag(flag))
     configManager.setFlag(flag, input)
   }
-
-  configManager.persist()
 }
 
 /**

src/commands/relay.ts

@@ -236,7 +236,6 @@ export class RelayCommand extends BaseCommand {
 
           // reset nodeAlias
           self.configManager.setFlag(flags.nodeAliasesUnparsed, '')
-          self.configManager.persist()
         }
       },
       {
@@ -316,7 +315,6 @@ export class RelayCommand extends BaseCommand {
 
           // reset nodeAliasesUnparsed
           self.configManager.setFlag(flags.nodeAliasesUnparsed, '')
-          self.configManager.persist()
         },
         skip: (ctx) => !ctx.config.isChartInstalled
       }

src/core/config_manager.ts

@@ -14,15 +14,11 @@
  * limitations under the License.
  *
  */
-import fs from 'fs'
 import { SoloError, MissingArgumentError } from './errors.ts'
-import { constants } from './index.ts'
 import { SoloLogger } from './logging.ts'
 import * as flags from '../commands/flags.ts'
 import * as paths from 'path'
 import * as helpers from './helpers.ts'
-import * as yaml from 'js-yaml'
-import { yamlToObject } from './helpers.ts'
 import type * as yargs from 'yargs'
 import { type CommandFlag } from '../types/index.js'
 
@@ -35,26 +31,12 @@ import { type CommandFlag } from '../types/index.js'
 export class ConfigManager {
   config!: Record<string, any>
 
-  constructor (private readonly logger: SoloLogger, private readonly cachedConfigFile = constants.SOLO_CONFIG_FILE) {
+  constructor (private readonly logger: SoloLogger) {
     if (!logger || !(logger instanceof SoloLogger)) throw new MissingArgumentError('An instance of core/SoloLogger is required')
-    if (!cachedConfigFile) throw new MissingArgumentError('cached config file path is required')
 
     this.reset()
   }
 
-  /**
-   * Load the cached config
-   */
-  load () {
-    try {
-      if (fs.existsSync(this.cachedConfigFile)) {
-        this.config = yamlToObject(this.cachedConfigFile) as Record<string, any>
-      }
-    } catch (e: Error | any) {
-      throw new SoloError(`failed to initialize config manager: ${e.message}`, e)
-    }
-  }
-
   /** Reset config */
   reset () {
     this.config = {
@@ -69,8 +51,7 @@ export class ConfigManager {
    *
    * It uses the below precedence for command flag values:
    *  1. User input of the command flag
-   *  2. Cached config value of the command flag.
-   *  3. Default value of the command flag if the command is not 'init'.
+   *  2. Default value of the command flag if the command is not 'init'.
    */
   applyPrecedence (argv: yargs.Argv<any>, aliases: any): yargs.Argv<any> {
     for (const key of Object.keys(aliases)) {
@@ -93,7 +74,7 @@ export class ConfigManager {
   }
 
   /** Update the config using the argv */
-  update (argv: object | any = {}, persist: boolean = false) {
+  update (argv: object | any = {}) {
     if (argv && Object.keys(argv).length > 0) {
       for (const flag of flags.allFlags) {
         if (flag.name === flags.force.name) {
@@ -147,23 +128,6 @@ export class ConfigManager {
       }
 
       this.config.updatedAt = new Date().toISOString()
-
-      if (persist) {
-        this.persist()
-      }
-    }
-  }
-
-  /** Persist the config in the cached config file */
-  persist () {
-    try {
-      this.config.updatedAt = new Date().toISOString()
-      const newYaml = yaml.dump(this.config)
-      fs.writeFileSync(this.cachedConfigFile, newYaml)
-      // refresh config with the file contents
-      this.load()
-    } catch (e: Error | any) {
-      throw new SoloError(`failed to persis config: ${e.message}`, e)
     }
   }
 
@@ -194,9 +158,4 @@ export class ConfigManager {
   getVersion (): string {
     return this.config.version
   }
-
-  /** Get last updated at timestamp */
-  getUpdatedAt (): string {
-    return this.config.updatedAt
-  }
 }

src/core/constants.ts

@@ -30,7 +30,6 @@ export const SOLO_CACHE_DIR = path.join(SOLO_HOME_DIR, 'cache')
 export const SOLO_VALUES_DIR = path.join(SOLO_CACHE_DIR, 'values-files')
 export const DEFAULT_NAMESPACE = 'default'
 export const HELM = 'helm'
-export const SOLO_CONFIG_FILE = path.join(SOLO_HOME_DIR, 'solo.yaml')
 export const RESOURCES_DIR = normalize(path.join(ROOT_DIR, 'resources'))
 export const TEMP_DIR = normalize(path.join(ROOT_DIR, 'temp'))
 

src/index.ts

@@ -46,7 +46,7 @@ export function main (argv: any) {
     const zippy = new Zippy(logger)
     const helmDepManager = new HelmDependencyManager(downloader, zippy, logger)
     const depManagerMap = new Map()
-      .set(constants.HELM, helmDepManager)
+    .set(constants.HELM, helmDepManager)
     const depManager = new DependencyManager(logger, depManagerMap)
 
     const helm = new Helm(logger)
@@ -79,7 +79,9 @@ export function main (argv: any) {
     }
 
     const processArguments = (argv: any, yargs: any) => {
-      argv._[0] === 'init' ? configManager.reset() : configManager.load()
+      if (argv._[0] === 'init') {
+        configManager.reset()
+      }
 
       // Set default cluster name and namespace from kubernetes context
       // these will be overwritten if user has entered the flag values explicitly
@@ -92,7 +94,7 @@ export function main (argv: any) {
       argv = configManager.applyPrecedence(argv, yargs.parsed.aliases)
 
       // update and persist config
-      configManager.update(argv, true)
+      configManager.update(argv)
 
       logger.showUser(chalk.cyan('\n******************************* Solo *********************************************'))
       logger.showUser(chalk.cyan('Version\t\t\t:'), chalk.yellow(configManager.getVersion()))
@@ -105,19 +107,19 @@ export function main (argv: any) {
     }
 
     return yargs(hideBin(argv))
-      .usage('Usage:\n  $0 <command> [options]')
-      .alias('h', 'help')
-      .alias('v', 'version')
-      // @ts-ignore
-      .command(commands.Initialize(opts))
-      .strict()
-      // @ts-ignore
-      .option(flags.devMode.name, flags.devMode.definition)
-      .wrap(120)
-      .demand(1, 'Select a command')
-      // @ts-ignore
-      .middleware(processArguments, false) // applyBeforeValidate = false as otherwise middleware is called twice
-      .parse()
+    .usage('Usage:\n  $0 <command> [options]')
+    .alias('h', 'help')
+    .alias('v', 'version')
+    // @ts-ignore
+    .command(commands.Initialize(opts))
+    .strict()
+    // @ts-ignore
+    .option(flags.devMode.name, flags.devMode.definition)
+    .wrap(120)
+    .demand(1, 'Select a command')
+    // @ts-ignore
+    .middleware(processArguments, false) // applyBeforeValidate = false as otherwise middleware is called twice
+    .parse()
   } catch (e: Error | any) {
     logger.showUserError(e)
     process.exit(1)

test/e2e/commands/account.test.ts

@@ -144,7 +144,7 @@ e2eTestSuite(testName, argv, undefined, undefined, undefined, undefined, undefin
         try {
           argv[flags.privateKey.name] = constants.GENESIS_KEY
           argv[flags.amount.name] = 777
-          configManager.update(argv, true)
+          configManager.update(argv)
 
           await expect(accountCmd.create(argv)).to.eventually.be.ok
 
@@ -166,7 +166,7 @@ e2eTestSuite(testName, argv, undefined, undefined, undefined, undefined, undefin
         try {
           argv[flags.amount.name] = 0
           argv[flags.accountId.name] = accountId1
-          configManager.update(argv, true)
+          configManager.update(argv)
 
           await expect(accountCmd.update(argv)).to.eventually.be.ok
 
@@ -188,7 +188,7 @@ e2eTestSuite(testName, argv, undefined, undefined, undefined, undefined, undefin
           argv[flags.accountId.name] = accountId2
           argv[flags.privateKey.name] = constants.GENESIS_KEY
           argv[flags.amount.name] = 333
-          configManager.update(argv, true)
+          configManager.update(argv)
 
           await expect(accountCmd.update(argv)).to.eventually.be.ok
 
@@ -208,7 +208,7 @@ e2eTestSuite(testName, argv, undefined, undefined, undefined, undefined, undefin
       it('should be able to get account-1', async () => {
         try {
           argv[flags.accountId.name] = accountId1
-          configManager.update(argv, true)
+          configManager.update(argv)
 
           await expect(accountCmd.get(argv)).to.eventually.be.ok
           // @ts-ignore to access the private property
@@ -227,7 +227,7 @@ e2eTestSuite(testName, argv, undefined, undefined, undefined, undefined, undefin
       it('should be able to get account-2', async () => {
         try {
           argv[flags.accountId.name] = accountId2
-          configManager.update(argv, true)
+          configManager.update(argv)
 
           await expect(accountCmd.get(argv)).to.eventually.be.ok
           // @ts-ignore to access the private property
@@ -249,7 +249,7 @@ e2eTestSuite(testName, argv, undefined, undefined, undefined, undefined, undefin
         try {
           argv[flags.ecdsaPrivateKey.name] = ecdsaPrivateKey.toString()
           argv[flags.setAlias.name] = true
-          configManager.update(argv, true)
+          configManager.update(argv)
 
           await expect(accountCmd.create(argv)).to.eventually.be.ok
 

test/e2e/commands/cluster.test.ts

@@ -65,7 +65,7 @@ describe('ClusterCommand', () => {
 
     await k8.deleteNamespace(namespace)
     argv[flags.clusterSetupNamespace.name] = constants.SOLO_SETUP_NAMESPACE
-    configManager.update(argv, true)
+    configManager.update(argv)
     await clusterCmd.setup(argv) // restore solo-cluster-setup for other e2e tests to leverage
     do {
       await sleep(5 * SECONDS)
@@ -85,13 +85,13 @@ describe('ClusterCommand', () => {
 
   it('solo cluster setup should fail with invalid cluster name', async () => {
     argv[flags.clusterSetupNamespace.name] = 'INVALID'
-    configManager.update(argv, true)
+    configManager.update(argv)
     await expect(clusterCmd.setup(argv)).to.be.rejectedWith('Error on cluster setup')
   }).timeout(MINUTES)
 
   it('solo cluster setup should work with valid args', async () => {
     argv[flags.clusterSetupNamespace.name] = namespace
-    configManager.update(argv, true)
+    configManager.update(argv)
     await expect(clusterCmd.setup(argv)).to.eventually.be.ok
   }).timeout(MINUTES)
 
@@ -111,7 +111,7 @@ describe('ClusterCommand', () => {
   // helm list would return an empty list if given invalid namespace
   it('solo cluster reset should fail with invalid cluster name', async () => {
     argv[flags.clusterSetupNamespace.name] = 'INVALID'
-    configManager.update(argv, true)
+    configManager.update(argv)
 
     try {
       await expect(clusterCmd.reset(argv)).to.be.rejectedWith('Error on cluster reset')
@@ -123,7 +123,7 @@ describe('ClusterCommand', () => {
 
   it('solo cluster reset should work with valid args', async () => {
     argv[flags.clusterSetupNamespace.name] = namespace
-    configManager.update(argv, true)
+    configManager.update(argv)
     await expect(clusterCmd.reset(argv)).to.eventually.be.ok
   }).timeout(MINUTES)
 })

test/e2e/commands/network.test.ts

@@ -123,7 +123,7 @@ describe('NetworkCommand', () => {
     argv[flags.deletePvcs.name] = true
     argv[flags.deleteSecrets.name] = true
     argv[flags.force.name] = true
-    configManager.update(argv, true)
+    configManager.update(argv)
 
     try {
       await expect(networkCmd.destroy(argv)).to.eventually.be.ok

test/e2e/e2e_node_util.ts

@@ -23,17 +23,15 @@ import {
   balanceQueryShouldSucceed,
   e2eTestSuite,
   getDefaultArgv,
-  getTestConfigManager,
   HEDERA_PLATFORM_VERSION_TAG,
-  TEST_CLUSTER
+  TEST_CLUSTER, testLogger
 } from '../test_util.ts'
 import { getNodeLogs, sleep } from '../../src/core/helpers.ts'
 import { NodeCommand } from '../../src/commands/node.ts'
 import { MINUTES, SECONDS } from '../../src/core/constants.ts'
 import type { NodeAlias } from '../../src/types/aliases.ts'
-import { NodeAliases } from '../../src/types/aliases.ts'
 import type { ListrTaskWrapper } from 'listr2'
-import type { K8 } from '../../src/core/index.ts'
+import { ConfigManager, type K8 } from '../../src/core/index.ts'
 
 export function e2eNodeKeyRefreshTest (testName: string, mode: string, releaseTag = HEDERA_PLATFORM_VERSION_TAG) {
   const namespace = testName
@@ -174,8 +172,8 @@ export function e2eNodeKeyRefreshTest (testName: string, mode: string, releaseTa
 
       async function nodeRefreshTestSetup (argv: Record<any, any>, testName: string, k8: K8, nodeAliases: string) {
         argv[flags.nodeAliasesUnparsed.name] = nodeAliases
-        const configManager = getTestConfigManager(`${testName}-solo.yaml`)
-        configManager.update(argv, true)
+        const configManager = new ConfigManager(testLogger)
+        configManager.update(argv)
 
         const podArray = await k8.getPodsByLabel(
             [`app=network-${nodeAliases}`,

test/e2e/integration/core/platform_installer_e2e.test.ts

@@ -50,7 +50,6 @@ e2eTestSuite(namespace, argv, undefined, undefined, undefined, undefined, undefi
   describe('PackageInstallerE2E', async () => {
     const k8 = bootstrapResp.opts.k8
     const accountManager = bootstrapResp.opts.accountManager
-    const configManager = bootstrapResp.opts.configManager
     const installer = bootstrapResp.opts.platformInstaller
     const podName = 'network-node1-0'
     const packageVersion = 'v0.42.5'
@@ -68,7 +67,6 @@ e2eTestSuite(namespace, argv, undefined, undefined, undefined, undefined, undefi
       if (!fs.existsSync(testCacheDir)) {
         fs.mkdirSync(testCacheDir)
       }
-      configManager.load()
     })
 
     describe('fetchPlatform', () => {