fixed test cases

Signed-off-by: Jeromy Cannon <jeromy@swirldslabs.com>
hashgraph · Feb 4, 2025 · c7293c6 · c7293c6
1 parent 503df12
commit c7293c6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/src/commands/cluster/configs.ts b/src/commands/cluster/configs.ts
@@ -39,7 +39,7 @@ export const setupConfigBuilder = async function (argv, ctx, task) {
 
   ctx.config = {
     chartDir: configManager.getFlag(flags.chartDirectory) as string,
-    clusterSetupNamespace: configManager.getFlag(flags.clusterSetupNamespace) as string,
+    clusterSetupNamespace: configManager.getFlag(flags.clusterSetupNamespace) as NamespaceName,
     deployCertManager: configManager.getFlag(flags.deployCertManager) as boolean,
     deployCertManagerCrds: configManager.getFlag(flags.deployCertManagerCrds) as boolean,
     deployMinio: configManager.getFlag(flags.deployMinio) as boolean,
@@ -99,7 +99,7 @@ export interface ClusterConnectConfigClass {
 
 export interface ClusterSetupConfigClass {
   chartDir: string;
-  clusterSetupNamespace: string;
+  clusterSetupNamespace: NamespaceName;
   deployCertManager: boolean;
   deployCertManagerCrds: boolean;
   deployMinio: boolean;

diff --git a/src/commands/cluster/flags.ts b/src/commands/cluster/flags.ts
@@ -40,7 +40,7 @@ export const USE_FLAGS = {
     flags.quiet,
     flags.clusterName,
     flags.context,
-    flags.namespace, // TODO should we be using cluster setup namespace?
+    flags.namespace,
     flags.userEmailAddress,
   ],
 };
diff --git a/src/core/constants.ts b/src/core/constants.ts
@@ -15,7 +15,7 @@ export const SOLO_HOME_DIR = process.env.SOLO_HOME || path.join(process.env.HOME
 export const SOLO_LOGS_DIR = path.join(SOLO_HOME_DIR, 'logs');
 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 DEFAULT_NAMESPACE = NamespaceName.of('default');
 export const DEFAULT_CERT_MANAGER_NAMESPACE = NamespaceName.of('cert-manager');
 export const HELM = 'helm';
 export const RESOURCES_DIR = normalize(path.join(ROOT_DIR, 'resources'));

diff --git a/test/e2e/commands/cluster.test.ts b/test/e2e/commands/cluster.test.ts
@@ -13,6 +13,7 @@ import {sleep} from '../../../src/core/helpers.js';
 import * as version from '../../../version.js';
 import {Duration} from '../../../src/core/time/duration.js';
 import {NamespaceName} from '../../../src/core/kube/namespace_name.js';
+import {NamespaceNameInvalidError} from '../../../src/core/kube/kube_errors.js';
 
 describe('ClusterCommand', () => {
   // mock showUser and showJSON to silent logging during tests
@@ -32,6 +33,7 @@ describe('ClusterCommand', () => {
   const namespace = NamespaceName.of(testName);
   const argv = getDefaultArgv();
   argv[flags.namespace.name] = namespace.name;
+  argv[flags.clusterSetupNamespace.name] = constants.SOLO_SETUP_NAMESPACE.name;
   argv[flags.releaseTag.name] = HEDERA_PLATFORM_VERSION_TAG;
   argv[flags.nodeAliasesUnparsed.name] = 'node1';
   argv[flags.generateGossipKeys.name] = true;
@@ -65,7 +67,6 @@ describe('ClusterCommand', () => {
 
   beforeEach(() => {
     configManager.reset();
-    configManager.update(argv);
   });
 
   // give a few ticks so that connections can close
@@ -79,13 +80,11 @@ describe('ClusterCommand', () => {
 
   it('solo cluster setup should fail with invalid cluster name', async () => {
     argv[flags.clusterSetupNamespace.name] = 'INVALID';
-    configManager.update(argv);
     await expect(clusterCmd.handlers.setup(argv)).to.be.rejectedWith('Error on cluster setup');
   }).timeout(Duration.ofMinutes(1).toMillis());
 
   it('solo cluster setup should work with valid args', async () => {
     argv[flags.clusterSetupNamespace.name] = namespace.name;
-    configManager.update(argv);
     expect(await clusterCmd.handlers.setup(argv)).to.be.true;
   }).timeout(Duration.ofMinutes(1).toMillis());
 
@@ -105,7 +104,6 @@ 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);
 
     try {
       await expect(clusterCmd.handlers.reset(argv)).to.be.rejectedWith('Error on cluster reset');
@@ -117,7 +115,6 @@ describe('ClusterCommand', () => {
 
   it('solo cluster reset should work with valid args', async () => {
     argv[flags.clusterSetupNamespace.name] = namespace.name;
-    configManager.update(argv);
     expect(await clusterCmd.handlers.reset(argv)).to.be.true;
   }).timeout(Duration.ofMinutes(1).toMillis());
 });
diff --git a/test/e2e/integration/core/k8_e2e.test.ts b/test/e2e/integration/core/k8_e2e.test.ts
@@ -126,7 +126,8 @@ describe('K8', () => {
   it('should be able to list namespaces', async () => {
     const namespaces = await k8.getNamespaces();
     expect(namespaces).not.to.have.lengthOf(0);
-    expect(namespaces).to.contain(constants.DEFAULT_NAMESPACE);
+    const match = namespaces.filter(n => n.name === constants.DEFAULT_NAMESPACE.name);
+    expect(match).to.have.lengthOf(1);
   }).timeout(defaultTimeout);
 
   it('should be able to list context names', () => {