fix: use default namespace for cluster setup

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
hashgraph · Jan 22, 2024 · 214daba · 214daba
1 parent b663d57
commit 214daba
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/fullstack-network-manager/src/commands/cluster.mjs b/fullstack-network-manager/src/commands/cluster.mjs
@@ -56,7 +56,7 @@ export class ClusterCommand extends BaseCommand {
 
           // extract config values
           const clusterName = self.configManager.getFlag(flags.clusterName)
-          const namespace = 'default' // we always install the shared component in default namespace
+          const namespace = argv.namespace || constants.DEFAULT_NAMESPACE
           const chartDir = self.configManager.getFlag(flags.chartDirectory)
           const deployPrometheusStack = self.configManager.getFlag(flags.deployPrometheusStack)
           const deployMinio = self.configManager.getFlag(flags.deployMinio)
@@ -151,7 +151,7 @@ export class ClusterCommand extends BaseCommand {
         task: async (ctx, task) => {
           self.configManager.load(argv)
           const clusterName = self.configManager.getFlag(flags.clusterName)
-          const namespace = self.configManager.getFlag(flags.namespace)
+          const namespace = argv.namespace || constants.DEFAULT_NAMESPACE
 
           ctx.config = {
             clusterName,

diff --git a/fullstack-network-manager/src/commands/flags.mjs b/fullstack-network-manager/src/commands/flags.mjs
@@ -37,7 +37,7 @@ export const namespace = {
   name: 'namespace',
   definition: {
     describe: 'Namespace',
-    default: '',
+    default: constants.DEFAULT_NAMESPACE,
     alias: 'n',
     type: 'string'
   }

diff --git a/fullstack-network-manager/src/commands/prompts.mjs b/fullstack-network-manager/src/commands/prompts.mjs
@@ -15,9 +15,13 @@ export async function promptNamespaceArg (task, input) {
       })
     }
 
-    return input.replace('namespace/', '')
+    if (!input) {
+      throw new FullstackTestingError('namespace cannot be empty')
+    }
+
+    return input
   } catch (e) {
-    throw new FullstackTestingError(`input failed: ${flags.namespace.name}`, e)
+    throw new FullstackTestingError(`input failed: ${flags.namespace.name}: ${e.message}`, e)
   }
 }
 
@@ -32,12 +36,16 @@ export async function promptSelectNamespaceArg (task, input, choices = []) {
         choices: helpers.cloneArray(choices)
       })
 
+      if (!input) {
+        throw new FullstackTestingError('namespace cannot be empty')
+      }
+
       return input
     }
 
     return input
   } catch (e) {
-    throw new FullstackTestingError(`input failed: ${flags.namespace.name}`, e)
+    throw new FullstackTestingError(`input failed: ${flags.namespace.name}: ${e.message}`, e)
   }
 }
 
@@ -78,6 +86,10 @@ export async function promptReleaseTag (task, input) {
       })
     }
 
+    if (!input) {
+      throw new FullstackTestingError('release-tag cannot be empty')
+    }
+
     return input
   } catch (e) {
     throw new FullstackTestingError(`input failed: ${flags.releaseTag.name}`, e)

diff --git a/fullstack-network-manager/src/core/constants.mjs b/fullstack-network-manager/src/core/constants.mjs
@@ -13,6 +13,7 @@ export const FST_LOGS_DIR = `${FST_HOME_DIR}/logs`
 export const FST_CACHE_DIR = `${FST_HOME_DIR}/cache`
 export const CLUSTER_NAME = 'kind-fst' // since by default we use kind to create cluster we use 'kind-' prefix
 export const CONTEXT_NAME = CLUSTER_NAME // since by default we use kind to create cluster we use 'kind-' prefix
+export const DEFAULT_NAMESPACE = 'default'
 export const RELEASE_NAME = 'fst'
 export const NAMESPACE_NAME = `fst-${USER_SANITIZED}`