fixed issue where even though the cache dir flag is set, it was still using environment variables instead.

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

Author: jeromy-cannon

src/commands/base.ts

@@ -329,14 +329,15 @@ export abstract class BaseCommand extends ShellRunner {
    * Setup home directories
    * @param dirs a list of directories that need to be created in sequence
    */
-  public setupHomeDirectory(
-    dirs: string[] = [
-      constants.SOLO_HOME_DIR,
-      constants.SOLO_LOGS_DIR,
-      constants.SOLO_CACHE_DIR,
-      constants.SOLO_VALUES_DIR,
-    ],
-  ) {
+  public setupHomeDirectory(dirs: string[] = []) {
+    if (dirs?.length === 0) {
+      dirs = [
+        constants.SOLO_HOME_DIR,
+        constants.SOLO_LOGS_DIR,
+        this.configManager.getFlag<string>(Flags.cacheDir),
+        constants.SOLO_VALUES_DIR,
+      ];
+    }
     const self = this;
 
     try {

src/commands/flags.ts

@@ -884,7 +884,7 @@ export class Flags {
     name: 'application-properties',
     definition: {
       describe: 'application.properties file for node',
-      defaultValue: path.join(constants.SOLO_CACHE_DIR, 'templates', 'application.properties'),
+      defaultValue: path.join('templates', 'application.properties'),
       type: 'string',
     },
     prompt: undefined,
@@ -897,7 +897,7 @@ export class Flags {
       describe:
         'the application.env file for the node provides environment variables to the solo-container' +
         ' to be used when the hedera platform is started',
-      defaultValue: path.join(constants.SOLO_CACHE_DIR, 'templates', 'application.env'),
+      defaultValue: path.join('templates', 'application.env'),
       type: 'string',
     },
     prompt: undefined,
@@ -908,7 +908,7 @@ export class Flags {
     name: 'api-permission-properties',
     definition: {
       describe: 'api-permission.properties file for node',
-      defaultValue: path.join(constants.SOLO_CACHE_DIR, 'templates', 'api-permission.properties'),
+      defaultValue: path.join('templates', 'api-permission.properties'),
       type: 'string',
     },
     prompt: undefined,
@@ -919,7 +919,7 @@ export class Flags {
     name: 'bootstrap-properties',
     definition: {
       describe: 'bootstrap.properties file for node',
-      defaultValue: path.join(constants.SOLO_CACHE_DIR, 'templates', 'bootstrap.properties'),
+      defaultValue: path.join('templates', 'bootstrap.properties'),
       type: 'string',
     },
     prompt: undefined,
@@ -941,7 +941,7 @@ export class Flags {
     name: 'settings-txt',
     definition: {
       describe: 'settings.txt file for node',
-      defaultValue: path.join(constants.SOLO_CACHE_DIR, 'templates', 'settings.txt'),
+      defaultValue: path.join('templates', 'settings.txt'),
       type: 'string',
     },
     prompt: undefined,
@@ -1053,7 +1053,7 @@ export class Flags {
     name: 'log4j2-xml',
     definition: {
       describe: 'log4j2.xml file for node',
-      defaultValue: path.join(constants.SOLO_CACHE_DIR, 'templates', 'log4j2.xml'),
+      defaultValue: path.join('templates', 'log4j2.xml'),
       type: 'string',
     },
     prompt: undefined,

src/core/constants.ts

@@ -163,7 +163,7 @@ export const PROFILE_TINY = 'tiny';
 export const PROFILE_LOCAL = 'local';
 
 export const ALL_PROFILES = [PROFILE_LOCAL, PROFILE_TINY, PROFILE_SMALL, PROFILE_MEDIUM, PROFILE_LARGE];
-export const DEFAULT_PROFILE_FILE = path.join(SOLO_CACHE_DIR, 'profiles', 'custom-spec.yaml');
+export const DEFAULT_PROFILE_FILE = path.join('profiles', 'custom-spec.yaml');
 
 export const STANDARD_DATAMASK = '***';
 

src/core/profile_manager.ts

@@ -56,7 +56,10 @@ export class ProfileManager {
    * @throws {IllegalArgumentError} if the profile file is not found.
    */
   loadProfiles(forceReload = false): Map<string, AnyObject> {
-    const profileFile = this.configManager.getFlag<string>(flags.profileFile);
+    const profileFile = path.join(
+      this.configManager.getFlag<string>(flags.cacheDir),
+      this.configManager.getFlag<string>(flags.profileFile),
+    );
     if (!profileFile) throw new MissingArgumentError('profileFile is required');
 
     // return the cached value as quickly as possible
@@ -210,7 +213,10 @@ export class ProfileManager {
     );
 
     for (const flag of flags.nodeConfigFileFlags.values()) {
-      const filePath = this.configManager.getFlag<string>(flag);
+      const filePath = path.join(
+        this.configManager.getFlag<string>(flags.cacheDir),
+        this.configManager.getFlag<string>(flag),
+      );
       if (!filePath) {
         throw new SoloError(`Configuration file path is missing for: ${flag.name}`);
       }

test/data/local-config.yaml

@@ -1,6 +1,11 @@
 userEmailAddress: joe@doe.com
 soloVersion: '0.0.0'
 deployments:
+  relay-deployment:
+    clusters:
+      - e2e-cluster-1
+      - e2e-cluster-2
+    namespace: dual-cluster-relay-cmd-e2e
   deployment:
     clusters:
       - cluster-1

test/e2e/commands/dual_cluster_relay.test.ts

@@ -94,8 +94,64 @@ e2eTestSuite(
         const contexts: string[] = splitFlagInput(argv[flags.context.name]);
         for (const context of contexts) {
           const k8 = bootstrapResp.opts.k8Factory.getK8(context);
+          if (await k8.namespaces().has(namespace)) {
+            await k8.namespaces().delete(namespace);
+          }
+          await k8.namespaces().create(namespace);
 
-          const data: Record<string, string> = {};
+          const data: Record<string, string> = {
+            'remote-config-data': `
+  metadata:
+    namespace: dual-cluster-relay-cmd-e2e
+    deploymentName: relay-deployment
+    lastUpdatedAt: 2025-02-14T22:10:13.586000Z
+    lastUpdateBy: john@doe.com
+    soloChartVersion: ""
+    hederaPlatformVersion: ""
+    hederaMirrorNodeChartVersion: ""
+    hederaExplorerChartVersion: ""
+    hederaJsonRpcRelayChartVersion: ""
+    soloVersion: 0.34.0
+  version: 1.0.0
+  clusters:
+    e2e-cluster-1:
+      name: e2e-cluster-1
+      namespace: dual-cluster-relay-cmd-e2e
+      deployment: relay-deployment
+      dnsBaseDomain: cluster.local
+      dnsConsensusNodePattern: network-\${nodeAlias}-svc.\${namespace}.svc
+    e2e-cluster-2:
+      name: e2e-cluster-2
+      namespace: dual-cluster-relay-cmd-e2e
+      deployment: relay-deployment
+      dnsBaseDomain: cluster.local
+      dnsConsensusNodePattern: network-\${nodeAlias}-svc.\${namespace}.svc
+    components:
+    relays: {}
+    haProxies: {}
+    mirrorNodes: {}
+    envoyProxies: {}
+    consensusNodes:
+      node1:
+        name: node1
+        cluster: e2e-cluster-1
+        namespace: dual-cluster-relay-cmd-e2e
+        state: requested
+        nodeId: 0
+      node2:
+        name: node2
+        cluster: e2e-cluster-2
+        namespace: dual-cluster-relay-cmd-e2e
+        state: requested
+        nodeId: 1
+    mirrorNodeExplorers: {}
+  commandHistory:
+      - deployment create
+  lastExecutedCommand: deployment create
+  flags:
+    nodeAliasesUnparsed: node1,node2
+`,
+          };
 
           await k8
             .configMaps()