feat: add timeout flag to network destroy command

examples/custom-network-config/Taskfile.yml

@@ -5,11 +5,15 @@ dotenv:
 silent: false
 
 env:
-  SOLO_CHART_VERSION: v0.32.0
-  CONSENSUS_NODE_VERSION: v0.54.1
-  SOLO_NAMESPACE: solo-{{ env "USER" | replace "." "-" | trunc 63 }}
+  SOLO_CHART_VERSION: 0.34.0
+  CONSENSUS_NODE_VERSION: v0.56.0
+  SOLO_NAMESPACE: solo-{{ env "USER" | replace "." "-" | trunc 63 | default "test" }}
   SOLO_CLUSTER_SETUP_NAMESPACE: solo-setup
+  SOLO_CLUSTER_RELEASE_NAME: solo-cluster-setup
   SOLO_NETWORK_SIZE: 7
+  SOLO_CLUSTER_NAME: solo-cluster
+  KIND_IMAGE: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
+  MIRROR_RELEASE_NAME: mirror
 
 vars:
   solo_settings_file: "{{.ROOT_DIR}}/settings.txt"
@@ -86,7 +90,7 @@ tasks:
       #- test "$(yq -r '.flags."node-ids"' < {{ .solo_user_dir }}/solo.yaml)" == "{{ .node_identifiers }}"
       - test "$(jq -r '.flags."node-ids"' < {{ .solo_user_dir }}/solo.config)" == "{{ .node_identifiers }}"
     cmds:
-      - solo init --namespace "${SOLO_NAMESPACE}" --node-ids {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}" --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}"
+      - solo init
 
   solo:keys:
     internal: true
@@ -99,23 +103,23 @@ tasks:
           test -f {{ .solo_keys_dir }}/s-private-node${n}.pem
          done
     cmds:
-      - solo node keys --gossip-keys --tls-keys
+      - solo node keys --gossip-keys --tls-keys --node-aliases-unparsed {{.node_identifiers}}
 
   solo:network:deploy:
     internal: true
     cmds:
-      - solo network deploy --release-tag "${CONSENSUS_NODE_VERSION}" --solo-chart-version "${SOLO_CHART_VERSION}" --values-file {{ .solo_values_file }} --settings-txt {{ .solo_settings_file }}
-      - solo node setup --release-tag "${CONSENSUS_NODE_VERSION}"
+      - solo network deploy --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}" --solo-chart-version "${SOLO_CHART_VERSION}" --values-file {{ .solo_values_file }} --settings-txt {{ .solo_settings_file }}
+      - solo node setup --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}"
 
   solo:network:destroy:
     internal: true
     cmds:
-      - solo network destroy --namespace "${SOLO_NAMESPACE}" --delete-pvcs --delete-secrets --force
+      - solo network destroy --namespace "${SOLO_NAMESPACE}" --delete-pvcs --delete-secrets --force --enable-timeout
 
   solo:node:start:
     internal: true
     cmds:
-      - solo node start --namespace "${SOLO_NAMESPACE}" {{ .CLI_ARGS }}
+      - solo node start --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} {{ .CLI_ARGS }}
 
   solo:node:stop:
     internal: true

src/commands/flags.ts

@@ -22,8 +22,8 @@
 
 /**
  * Set flag from the flag option
  * @param y instance of yargs
  * @param commandFlags a set of command flags
  *
  */
 export function setCommandFlags (y: any, ...commandFlags: CommandFlag[]) {
@@ -309,6 +309,16 @@
   }
 }
 
+export const enableTimeout: CommandFlag = {
+  constName: 'enableTimeout',
+  name: 'enable-timeout',
+  definition: {
+    describe: 'enable time out for running a command',
+    defaultValue: false,
+    type: 'boolean'
+  }
+}
+
 export const tlsClusterIssuerType: CommandFlag = {
   constName: 'tlsClusterIssuerType',
   name: 'tls-cluster-issuer-type',
@@ -821,6 +831,7 @@
   ed25519PrivateKey,
   enableHederaExplorerTls,
   enablePrometheusSvcMonitor,
+  enableTimeout,
   endpointType,
   soloChartVersion,
   generateGossipKeys,

src/commands/network.ts

@@ -228,6 +228,33 @@ export class NetworkCommand extends BaseCommand {
     return config
   }
 
+  async destroyTask (ctx: any, task: any) {
+    const self = this
+    task.title = `Uninstalling chart ${constants.SOLO_DEPLOYMENT_CHART}`
+    await self.chartManager.uninstall(ctx.config.namespace, constants.SOLO_DEPLOYMENT_CHART)
+
+    if (ctx.config.deletePvcs) {
+      const pvcs = await self.k8.listPvcsByNamespace(ctx.config.namespace)
+      task.title = `Deleting PVCs in namespace ${ctx.config.namespace}`
+      if (pvcs) {
+        for (const pvc of pvcs) {
+          await self.k8.deletePvc(pvc, ctx.config.namespace)
+        }
+      }
+    }
+
+    if (ctx.config.deleteSecrets) {
+      task.title = `Deleting secrets in namespace ${ctx.config.namespace}`
+      const secrets = await self.k8.listSecretsByNamespace(ctx.config.namespace)
+
+      if (secrets) {
+        for (const secret of secrets) {
+          await self.k8.deleteSecret(secret, ctx.config.namespace)
+        }
+      }
+    }
+  }
+
   /** Run helm install and deploy network components */
   async deploy (argv: any) {
     const self = this
@@ -437,9 +464,12 @@ export class NetworkCommand extends BaseCommand {
         deletePvcs: boolean
         deleteSecrets: boolean
         namespace: string
+        enableTimeout: boolean
+        force: boolean
       }
+      checkTimeout: boolean
     }
-
+    let networkDestroySuccess = true
     const tasks = new Listr<Context>([
       {
         title: 'Initialize',
@@ -466,43 +496,35 @@ export class NetworkCommand extends BaseCommand {
           ctx.config = {
             deletePvcs: self.configManager.getFlag<boolean>(flags.deletePvcs) as boolean,
             deleteSecrets: self.configManager.getFlag<boolean>(flags.deleteSecrets) as boolean,
-            namespace: self.configManager.getFlag<string>(flags.namespace) as string
+            namespace: self.configManager.getFlag<string>(flags.namespace) as string,
+            enableTimeout: self.configManager.getFlag<boolean>(flags.enableTimeout) as boolean,
+            force: self.configManager.getFlag<boolean>(flags.force) as boolean,
           }
 
           return ListrLease.newAcquireLeaseTask(lease, task)
         }
       },
       {
-        title: `Uninstall chart ${constants.SOLO_DEPLOYMENT_CHART}`,
-        task: async (ctx) => {
-          await self.chartManager.uninstall(ctx.config.namespace, constants.SOLO_DEPLOYMENT_CHART)
-        }
-      },
-      {
-        title: 'Delete PVCs',
-        task: async (ctx) => {
-          const pvcs = await self.k8.listPvcsByNamespace(ctx.config.namespace)
-
-          if (pvcs) {
-            for (const pvc of pvcs) {
-              await self.k8.deletePvc(pvc, ctx.config.namespace)
-            }
-          }
-        },
-        skip: (ctx) => !ctx.config.deletePvcs
-      },
-      {
-        title: 'Delete Secrets',
-        task: async (ctx) => {
-          const secrets = await self.k8.listSecretsByNamespace(ctx.config.namespace)
+        title: 'Running sub-tasks to destroy network',
+        task: async (ctx, task) => {
+          if (ctx.config.enableTimeout) {
+            const timeoutId = setTimeout(() => {
+              const message = `\n\nUnable to finish network destroy in ${constants.NETWORK_DESTROY_WAIT_TIMEOUT} seconds\n\n`
+              self.logger.error(message)
+              self.logger.showUser(chalk.red(message))
+              networkDestroySuccess = false
+              if (ctx.config.deletePvcs && ctx.config.deleteSecrets && ctx.config.force) {
+                self.k8.deleteNamespace(ctx.config.namespace)
+              }
+            }, constants.NETWORK_DESTROY_WAIT_TIMEOUT * 1000)
 
-          if (secrets) {
-            for (const secret of secrets) {
-              await self.k8.deleteSecret(secret, ctx.config.namespace)
-            }
+            await self.destroyTask(ctx, task)
+
+            clearTimeout(timeoutId)
+          } else {
+            await self.destroyTask(ctx, task)
           }
-        },
-        skip: (ctx) => !ctx.config.deleteSecrets
+        }
       }
     ], {
       concurrent: false,
@@ -517,7 +539,7 @@ export class NetworkCommand extends BaseCommand {
       await lease.release()
     }
 
-    return true
+    return networkDestroySuccess
   }
 
   /** Run helm upgrade to refresh network components with new settings */
@@ -606,7 +628,8 @@ export class NetworkCommand extends BaseCommand {
               flags.deletePvcs,
               flags.deleteSecrets,
               flags.force,
-              flags.namespace
+              flags.namespace,
+              flags.enableTimeout
             ),
             handler: (argv: any) => {
               networkCmd.logger.debug('==== Running \'network destroy\' ===')

src/core/constants.ts

@@ -178,5 +178,6 @@ export const RELAY_PODS_RUNNING_DELAY = +process.env.RELAY_PODS_RUNNING_DELAY ||
 export const RELAY_PODS_READY_MAX_ATTEMPTS = +process.env.RELAY_PODS_READY_MAX_ATTEMPTS || 100
 export const RELAY_PODS_READY_DELAY = +process.env.RELAY_PODS_READY_DELAY || 1_000
 
+export const NETWORK_DESTROY_WAIT_TIMEOUT = +process.env.NETWORK_DESTROY_WAIT_TIMEOUT || 120
 
 export const DEFAULT_LOCAL_CONFIG_FILE = 'local-config.yaml'