feat: refactor components data handling to support node aliases by cluster

Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com>

Author: jeromy-cannon

src/core/config/remote/components_data_wrapper.ts

@@ -11,14 +11,17 @@ import {EnvoyProxyComponent} from './components/envoy_proxy_component.js';
 import {ConsensusNodeComponent} from './components/consensus_node_component.js';
 import {MirrorNodeExplorerComponent} from './components/mirror_node_explorer_component.js';
 import {
+  type ClusterRef,
   type Component,
+  type ComponentName,
   type ComponentsDataStructure,
   type IConsensusNodeComponent,
   type IRelayComponent,
-  type ComponentName,
   type NamespaceNameAsString,
 } from './types.js';
 import {type ToObject, type Validate} from '../../../types/index.js';
+import type {NodeAlias} from '../../../types/aliases.js';
+import {Templates} from '../../templates.js';
 
 /**
  * Represent the components in the remote config and handles:
@@ -232,29 +235,24 @@ export class ComponentsDataWrapper implements Validate, ToObject<ComponentsDataS
   }
 
   public static initializeWithNodes(
-    nodeAliases: string[],
-    cluster: string,
+    nodeAliasesByCluster: Record<ClusterRef, NodeAlias[]>,
     namespace: NamespaceNameAsString,
   ): ComponentsDataWrapper {
     const consensusNodeComponents: Record<ComponentName, ConsensusNodeComponent> = {};
-    nodeAliases.forEach((alias, index) => {
-      consensusNodeComponents[alias] = new ConsensusNodeComponent(
-        alias,
-        cluster,
-        namespace,
-        ConsensusNodeStates.REQUESTED,
-        index,
-      );
+
+    Object.entries(nodeAliasesByCluster).forEach(([clusterRef, nodeAliases]) => {
+      nodeAliases.forEach(nodeAlias => {
+        consensusNodeComponents[nodeAlias] = new ConsensusNodeComponent(
+          nodeAlias,
+          clusterRef,
+          namespace,
+          ConsensusNodeStates.REQUESTED,
+          Templates.nodeIdFromNodeAlias(nodeAlias),
+        );
+      });
     });
-    const componentDataWrapper = new ComponentsDataWrapper(
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-      consensusNodeComponents,
-      undefined,
-    );
-    return componentDataWrapper;
+
+    return new ComponentsDataWrapper(undefined, undefined, undefined, undefined, consensusNodeComponents, undefined);
   }
 
   /** checks if component exists in the respective group */

src/core/config/remote/remote_config_manager.ts

@@ -22,7 +22,7 @@ import {inject, injectable} from 'tsyringe-neo';
 import {patchInject} from '../../dependency_injection/container_helper.js';
 import {ErrorMessages} from '../../error_messages.js';
 import {CommonFlagsDataWrapper} from './common_flags_data_wrapper.js';
-import {type AnyObject} from '../../../types/aliases.js';
+import {type AnyObject, type NodeAlias} from '../../../types/aliases.js';
 import {NamespaceName} from '../../kube/resources/namespace/namespace_name.js';
 import {ResourceNotFoundError} from '../../kube/errors/resource_operation_errors.js';
 import {InjectTokens} from '../../dependency_injection/inject_tokens.js';
@@ -113,7 +113,10 @@ export class RemoteConfigManager {
     );
 
     // temporary workaround until we can have `solo deployment add` command
-    const nodeAliases: string[] = helpers.splitFlagInput(this.configManager.getFlag(flags.nodeAliasesUnparsed));
+    const nodeAliasesByCluster: Record<ClusterRef, NodeAlias[]> = helpers.getNodeAliasesByClusterFromNodeAliasesFlag(
+      this.configManager.getFlag(flags.nodeAliasesUnparsed),
+      Object.keys(clusters),
+    );
 
     this.remoteConfig = new RemoteConfigDataWrapper({
       metadata: new RemoteConfigMetadata(
@@ -126,11 +129,7 @@ export class RemoteConfigManager {
       clusters,
       commandHistory: ['deployment create'],
       lastExecutedCommand: 'deployment create',
-      components: ComponentsDataWrapper.initializeWithNodes(
-        nodeAliases,
-        this.configManager.getFlag(flags.deploymentClusters),
-        this.getNamespace().name,
-      ),
+      components: ComponentsDataWrapper.initializeWithNodes(nodeAliasesByCluster, this.getNamespace().name),
       flags: await CommonFlagsDataWrapper.initialize(this.configManager, argv),
     });
 

src/core/helpers.ts

@@ -18,7 +18,7 @@ import {type Duration} from './time/duration.js';
 import {type NodeAddConfigClass} from '../commands/node/node_add_config.js';
 import {type ConsensusNode} from './model/consensus_node.js';
 import {type Optional} from '../types/index.js';
-import {type Version} from './config/remote/types.js';
+import {type ClusterRef, type ClusterRefs, type Version} from './config/remote/types.js';
 import {fileURLToPath} from 'url';
 import {type NamespaceName} from './kube/resources/namespace/namespace_name.js';
 
@@ -74,6 +74,32 @@ export function splitFlagInput(input: string, separator = ',') {
     .filter(Boolean);
 }
 
+export function getNodeAliasesByClusterFromNodeAliasesFlag(
+  flagValue: string,
+  clusterRefs: ClusterRef[],
+): Record<ClusterRef, NodeAlias[]> {
+  const nodeAliasesByCluster: Record<ClusterRef, NodeAlias[]> = {};
+  clusterRefs.forEach(cluster => {
+    nodeAliasesByCluster[cluster] = [];
+  });
+
+  const parameterPairs: string[] = splitFlagInput(flagValue);
+  for (const parameterPair of parameterPairs) {
+    if (parameterPair.includes('=')) {
+      const [cluster, nodeAlias] = splitFlagInput(parameterPair, '=');
+      if (nodeAliasesByCluster[cluster]) {
+        nodeAliasesByCluster[cluster].push(nodeAlias as NodeAlias);
+      } else {
+        clusterRefs.forEach(cluster => {
+          nodeAliasesByCluster[cluster].push(nodeAlias as NodeAlias);
+        });
+      }
+    }
+  }
+
+  return nodeAliasesByCluster;
+}
+
 /**
  * @param arr - The array to be cloned
  * @returns a new array with the same elements as the input array