fixed tests, altered used/unused command options

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

Author: jeromy-cannon

src/commands/network.mjs

@@ -40,9 +40,11 @@ export class NetworkCommand extends BaseCommand {
   static get DEPLOY_FLAGS_LIST () {
     return [
       flags.apiPermissionProperties,
+      flags.app,
       flags.applicationEnv,
       flags.applicationProperties,
       flags.bootstrapProperties,
+      flags.chainId,
       flags.chartDirectory,
       flags.deployHederaExplorer,
       flags.deployMirrorNode,
@@ -133,9 +135,11 @@ export class NetworkCommand extends BaseCommand {
     // disable the prompts that we don't want to prompt the user for
     prompts.disablePrompts([
       flags.apiPermissionProperties,
+      flags.app,
       flags.applicationEnv,
       flags.applicationProperties,
       flags.bootstrapProperties,
+      flags.chainId,
       flags.deployHederaExplorer,
       flags.deployMirrorNode,
       flags.hederaExplorerTlsLoadBalancerIp,

src/commands/node.mjs

@@ -63,10 +63,8 @@ export class NodeCommand extends BaseCommand {
 
   static get SETUP_FLAGS_LIST () {
     return [
-      flags.app,
       flags.appConfig,
       flags.cacheDir,
-      flags.chainId,
       flags.devMode,
       flags.force,
       flags.generateGossipKeys,
@@ -100,7 +98,6 @@ export class NodeCommand extends BaseCommand {
 
   static get REFRESH_FLAGS_LIST () {
     return [
-      flags.app,
       flags.cacheDir,
       flags.devMode,
       flags.force,
@@ -117,6 +114,7 @@ export class NodeCommand extends BaseCommand {
 
   static get ADD_FLAGS_LIST () {
     return [
+      flags.app,
       flags.cacheDir,
       flags.chainId,
       flags.chartDirectory,
@@ -412,7 +410,6 @@ export class NodeCommand extends BaseCommand {
 
   async initializeSetup (config, configManager, k8) {
     // compute other config parameters
-    config.releasePrefix = Templates.prepareReleasePrefix(config.releaseTag)
     config.keysDir = path.join(validatePath(config.cacheDir), 'keys')
     config.stagingDir = Templates.renderStagingDir(
       configManager.getFlag(flags.cacheDir),
@@ -518,7 +515,6 @@ export class NodeCommand extends BaseCommand {
 
           // disable the prompts that we don't want to prompt the user for
           prompts.disablePrompts([
-            flags.app,
             flags.appConfig,
             flags.devMode,
             flags.force,
@@ -533,7 +529,6 @@ export class NodeCommand extends BaseCommand {
            * @property {string} app
            * @property {string} appConfig
            * @property {string} cacheDir
-           * @property {string} chainId
            * @property {boolean} devMode
            * @property {boolean} force
            * @property {boolean} generateGossipKeys
@@ -548,7 +543,6 @@ export class NodeCommand extends BaseCommand {
            * @property {string} keysDir
            * @property {string[]} nodeIds
            * @property {string[]} podNames
-           * @property {string} releasePrefix
            * @property {string} stagingDir
            * @property {string} stagingKeysDir
            * -- methods --
@@ -566,7 +560,6 @@ export class NodeCommand extends BaseCommand {
               'keysDir',
               'nodeIds',
               'podNames',
-              'releasePrefix',
               'stagingDir',
               'stagingKeysDir'
             ])
@@ -805,7 +798,7 @@ export class NodeCommand extends BaseCommand {
             }
           })
         },
-        skip: (ctx, _) => self.configManager.getFlag(flags.app) !== ''
+        skip: (ctx, _) => self.configManager.getFlag(flags.app) !== '' && self.configManager.getFlag(flags.app) !== constants.HEDERA_APP_NAME
       }], {
       concurrent: false,
       rendererOptions: constants.LISTR_DEFAULT_RENDERER_OPTION
@@ -1003,7 +996,6 @@ export class NodeCommand extends BaseCommand {
           self.configManager.update(argv)
           // disable the prompts that we don't want to prompt the user for
           prompts.disablePrompts([
-            flags.app,
             flags.devMode,
             flags.force
           ])
@@ -1013,7 +1005,6 @@ export class NodeCommand extends BaseCommand {
           /**
            * @typedef {Object} NodeRefreshConfigClass
            * -- flags --
-           * @property {string} app
            * @property {string} cacheDir
            * @property {boolean} devMode
            * @property {boolean} force
@@ -1025,7 +1016,6 @@ export class NodeCommand extends BaseCommand {
            * @property {string} keysDir
            * @property {string[]} nodeIds
            * @property {Object} podNames
-           * @property {string} releasePrefix
            * @property {string} stagingDir
            * @property {string} stagingKeysDir
            * -- methods --
@@ -1042,7 +1032,6 @@ export class NodeCommand extends BaseCommand {
               'keysDir',
               'nodeIds',
               'podNames',
-              'releasePrefix',
               'stagingDir',
               'stagingKeysDir'
             ])
@@ -1258,6 +1247,8 @@ export class NodeCommand extends BaseCommand {
 
           // disable the prompts that we don't want to prompt the user for
           prompts.disablePrompts([
+            flags.app,
+            flags.chainId,
             flags.chartDirectory,
             flags.devMode,
             flags.force,
@@ -1269,6 +1260,7 @@ export class NodeCommand extends BaseCommand {
           /**
            * @typedef {Object} NodeAddConfigClass
            * -- flags --
+           * @property {string} app
            * @property {string} cacheDir
            * @property {string} chainId
            * @property {string} chartDirectory
@@ -1288,7 +1280,6 @@ export class NodeCommand extends BaseCommand {
            * @property {string} keysDir
            * @property {string[]} nodeIds
            * @property {Object} podNames
-           * @property {string} releasePrefix
            * @property {Map<String, NetworkNodeServices>} serviceMap
            * @property {string} stagingDir
            * @property {string} stagingKeysDir
@@ -1309,7 +1300,6 @@ export class NodeCommand extends BaseCommand {
               'keysDir',
               'nodeIds',
               'podNames',
-              'releasePrefix',
               'serviceMap',
               'stagingDir',
               'stagingKeysDir'
@@ -1747,6 +1737,7 @@ export class NodeCommand extends BaseCommand {
             command: 'start',
             desc: 'Start a node',
             builder: y => flags.setCommandFlags(y,
+              flags.app,
               flags.namespace,
               flags.nodeIDs
             ),

test/e2e/core/platform_installer_e2e.test.mjs

@@ -80,33 +80,6 @@ describe('PackageInstallerE2E', () => {
     }, 60000)
   })
 
-  describe('prepareConfigTxt', () => {
-    it('should succeed in generating config.txt', async () => {
-      const tmpDir = getTmpDir()
-      const configPath = `${tmpDir}/config.txt`
-      const nodeIDs = ['node0']
-      const chainId = '299'
-
-      const configLines = await installer.prepareConfigTxt(nodeIDs, configPath, packageVersion, chainId)
-
-      // verify format is correct
-      expect(configLines.length).toBe(4)
-      expect(configLines[0]).toBe(`swirld, ${chainId}`)
-      expect(configLines[1]).toBe(`app, ${constants.HEDERA_APP_NAME}`)
-      expect(configLines[2]).toContain('address, 0, node0, node0, 1')
-      expect(configLines[3]).toBe('nextNodeId, 1')
-
-      // verify the file exists
-      expect(fs.existsSync(configPath)).toBeTruthy()
-      const fileContents = fs.readFileSync(configPath).toString()
-
-      // verify file content matches
-      expect(fileContents).toBe(configLines.join('\n'))
-
-      fs.rmSync(tmpDir, { recursive: true })
-    }, defaultTimeout)
-  })
-
   describe('copyGossipKeys', () => {
     it('should succeed to copy legacy pfx gossip keys for node0', async () => {
       const podName = 'network-node0-0'

test/test_util.js

@@ -209,12 +209,20 @@ export function bootstrapNetwork (testName, argv,
       await networkCmd.deploy(argv)
 
       expect(networkCmd.getUnusedConfigs(NetworkCommand.DEPLOY_CONFIGS_NAME)).toEqual([
+        flags.apiPermissionProperties.constName,
+        flags.app.constName,
+        flags.applicationEnv.constName,
+        flags.applicationProperties.constName,
+        flags.bootstrapProperties.constName,
+        flags.chainId.constName,
         flags.deployHederaExplorer.constName,
         flags.deployMirrorNode.constName,
         flags.hederaExplorerTlsHostName.constName,
         flags.hederaExplorerTlsLoadBalancerIp.constName,
+        flags.log4j2Xml.constName,
         flags.profileFile.constName,
         flags.profileName.constName,
+        flags.settingTxt.constName,
         flags.tlsClusterIssuerType.constName
       ])
     }, 180000)