saving progress

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

Author: jeromy-cannon

src/commands/base.ts

@@ -255,18 +255,20 @@ export abstract class BaseCommand extends ShellRunner {
     const consensusNodes: ConsensusNode[] = [];
 
     // using the remoteConfigManager to get the consensus nodes
-    Object.values(this.getRemoteConfigManager().components.consensusNodes).forEach(node => {
-      consensusNodes.push(
-        new ConsensusNode(
-          node.name,
-          node.nodeId,
-          node.namespace,
-          node.cluster,
-          // use local config to get the context
-          this.getLocalConfig().clusterRefs[node.cluster],
-        ),
-      );
-    });
+    if (this.getRemoteConfigManager()?.components?.consensusNodes) {
+      Object.values(this.getRemoteConfigManager().components.consensusNodes).forEach(node => {
+        consensusNodes.push(
+          new ConsensusNode(
+            node.name,
+            node.nodeId,
+            node.namespace,
+            node.cluster,
+            // use local config to get the context
+            this.getLocalConfig().clusterRefs[node.cluster],
+          ),
+        );
+      });
+    }
 
     // return the consensus nodes
     return consensusNodes;

src/commands/network.ts

@@ -362,6 +362,7 @@ export class NetworkCommand extends BaseCommand {
       flags.debugNodeAlias,
       flags.loadBalancerEnabled,
       flags.log4j2Xml,
+      flags.nodeAliasesUnparsed,
       flags.persistentVolumeClaims,
       flags.profileName,
       flags.profileFile,
@@ -433,6 +434,12 @@ export class NetworkCommand extends BaseCommand {
 
     config.consensusNodes = this.getConsensusNodes();
     config.contexts = this.getContexts();
+    if (config.nodeAliases.length === 0) {
+      config.nodeAliases = config.consensusNodes.map(node => node.name) as NodeAliases;
+      if (config.nodeAliases.length === 0) {
+        throw new SoloError('no node aliases provided via flags or RemoteConfig');
+      }
+    }
 
     if (!(await this.k8Factory.default().namespaces().has(namespace))) {
       await this.k8Factory.default().namespaces().create(namespace);

src/commands/node/configs.ts

@@ -300,14 +300,20 @@ export const refreshConfigBuilder = async function (argv, ctx, task) {
 };
 
 export const keysConfigBuilder = function (argv, ctx, task) {
-  const config = this.getConfig(KEYS_CONFIGS_NAME, argv.flags, [
+  const config: NodeKeysConfigClass = this.getConfig(KEYS_CONFIGS_NAME, argv.flags, [
     'curDate',
     'keysDir',
     'nodeAliases',
   ]) as NodeKeysConfigClass;
 
   config.curDate = new Date();
   config.nodeAliases = helpers.parseNodeAliases(config.nodeAliasesUnparsed);
+  if (config.nodeAliases.length === 0) {
+    config.nodeAliases = this.consensusNodes.map((node: {nodeAlias: string}) => node.nodeAlias);
+    if (config.nodeAliases.length === 0) {
+      throw new SoloError('no node aliases provided via flags or RemoteConfig');
+    }
+  }
   config.keysDir = path.join(this.configManager.getFlag(flags.cacheDir), 'keys');
 
   if (!fs.existsSync(config.keysDir)) {

src/commands/node/flags.ts

@@ -221,9 +221,9 @@ export const REFRESH_FLAGS = {
 };
 
 export const KEYS_FLAGS = {
-  requiredFlags: [flags.cacheDir, flags.generateGossipKeys, flags.generateTlsKeys, flags.nodeAliasesUnparsed],
+  requiredFlags: [flags.cacheDir, flags.generateGossipKeys, flags.generateTlsKeys, flags.deployment],
   requiredFlagsWithDisabledPrompt: [],
-  optionalFlags: [flags.devMode, flags.quiet],
+  optionalFlags: [flags.devMode, flags.quiet, flags.nodeAliasesUnparsed],
 };
 
 export const STOP_FLAGS = {

src/commands/node/handlers.ts

@@ -42,6 +42,7 @@ import {type ComponentsDataWrapper} from '../../core/config/remote/components_da
 import {type Optional} from '../../types/index.js';
 import {type NamespaceName} from '../../core/kube/resources/namespace/namespace_name.js';
 import {Templates} from '../../core/templates.js';
+import {type ConsensusNode} from '../../core/model/consensus_node.js';
 
 export class NodeCommandHandlers implements CommandHandlers {
   private readonly accountManager: AccountManager;
@@ -52,6 +53,8 @@ export class NodeCommandHandlers implements CommandHandlers {
   private readonly tasks: NodeCommandTasks;
   private readonly leaseManager: LeaseManager;
   public readonly remoteConfigManager: RemoteConfigManager;
+  public readonly contexts: string[];
+  public readonly consensusNodes: ConsensusNode[];
 
   private getConfig: any;
   private prepareChartPath: any;
@@ -79,6 +82,10 @@ export class NodeCommandHandlers implements CommandHandlers {
 
     this.getConfig = opts.parent.getConfig.bind(opts.parent);
     this.prepareChartPath = opts.parent.prepareChartPath.bind(opts.parent);
+
+    this.consensusNodes = opts.parent.getConsensusNodes();
+    this.contexts = opts.parent.getContexts();
+
     this.parent = opts.parent;
   }
 

src/core/config/remote/remote_config_manager.ts

@@ -63,7 +63,7 @@ export class RemoteConfigManager {
 
   /** @returns the components data wrapper cloned */
   public get components(): ComponentsDataWrapper {
-    return this.remoteConfig.components.clone();
+    return this.remoteConfig?.components?.clone();
   }
 
   /* ---------- Readers and Modifiers ---------- */

test/e2e/commands/network.test.ts

@@ -27,9 +27,9 @@ describe('NetworkCommand', () => {
   const applicationEnvParentDirectory = path.join(getTmpDir(), 'network-command-test');
   const applicationEnvFilePath = path.join(applicationEnvParentDirectory, 'application.env');
   const argv = getDefaultArgv();
-  argv[flags.namespace.name] = namespace.name;
+  // argv[flags.namespace.name] = namespace.name;
   argv[flags.releaseTag.name] = HEDERA_PLATFORM_VERSION_TAG;
-  argv[flags.nodeAliasesUnparsed.name] = 'node1';
+  // argv[flags.nodeAliasesUnparsed.name] = 'node1';
   argv[flags.generateGossipKeys.name] = true;
   argv[flags.generateTlsKeys.name] = true;
   argv[flags.deployMinio.name] = true;

test/test_container.ts

@@ -6,6 +6,7 @@ import {Container} from '../src/core/dependency_injection/container_init.js';
 import fs from 'fs';
 import {type NamespaceNameAsString} from '../src/core/config/remote/types.js';
 import * as yaml from 'yaml';
+import {K8Client} from '../src/core/kube/k8_client/k8_client.js';
 
 const cacheDirectory = path.join('test', 'data', 'tmp');
 
@@ -28,4 +29,6 @@ export function resetForTest(namespace?: NamespaceNameAsString, cacheDir: string
 
   fs.writeFileSync(path.join(cacheDirectory, localConfigFile), yaml.stringify(parsedData));
   resetTestContainer(cacheDir);
+
+  parsedData.clusterRefs['cluster-1'] = new K8Client(undefined).contexts().readCurrent();
 }