From 5d6ef8ad286974aad4ef6629c86631d8ff20078e Mon Sep 17 00:00:00 2001
From: Anmol <anmol1696@gmail.com>
Date: Thu, 3 Oct 2024 15:35:54 +0530
Subject: [PATCH] feature: update starship context to include timeout, update
 tests (#562)

* update starship context to include timeout, update tests

* add timeout to params

* fix lint
---
 clients/js/__output__/custom-pod-ports.yaml               | 1 +
 clients/js/packages/cli/src/utils.ts                      | 5 ++++-
 .../__tests__/__snapshots__/client.config.test.ts.snap    | 4 ++--
 .../__tests__/__snapshots__/client.ports.test.ts.snap     | 4 ++--
 .../client/__tests__/__snapshots__/client.test.ts.snap    | 4 ++--
 clients/js/packages/client/src/client.ts                  | 8 ++++++--
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/clients/js/__output__/custom-pod-ports.yaml b/clients/js/__output__/custom-pod-ports.yaml
index d26a75f69..1458b9981 100644
--- a/clients/js/__output__/custom-pod-ports.yaml
+++ b/clients/js/__output__/custom-pod-ports.yaml
@@ -7,6 +7,7 @@ chains:
   defaultPorts:
     rpc: 26657
     grpc: 9090
+    grpc-web: 9091
     rest: 1317
     exposer: 8081
     faucet: 8000
diff --git a/clients/js/packages/cli/src/utils.ts b/clients/js/packages/cli/src/utils.ts
index a4ad2489c..981c4f19b 100644
--- a/clients/js/packages/cli/src/utils.ts
+++ b/clients/js/packages/cli/src/utils.ts
@@ -38,7 +38,8 @@ export const params: string[] = [
   'repo',
   'repoUrl',
   'chart',
-  'namespace'
+  'namespace',
+  'timeout',
 ];
 
 export const loadConfig = (argv: any): Config => {
@@ -89,6 +90,8 @@ Command-line Options:
                         Will overide config file settings for name.
   --version <ver>   Specify the version of the Helm chart, default: v0.2.6.
                         Will overide config file settings for version.
+  --timeout <time>  Specify the timeout for the Helm operations, default: 10m.
+                        Will overide config file settings for timeout.
 
 Examples:
   $ starship start --config ./config/two-chain.yaml
diff --git a/clients/js/packages/client/__tests__/__snapshots__/client.config.test.ts.snap b/clients/js/packages/client/__tests__/__snapshots__/client.config.test.ts.snap
index d5ee54152..5c8d17f99 100644
--- a/clients/js/packages/client/__tests__/__snapshots__/client.config.test.ts.snap
+++ b/clients/js/packages/client/__tests__/__snapshots__/client.config.test.ts.snap
@@ -11,7 +11,7 @@ helm repo update
 helm search repo starship/devnet --version v0.2.3
 Call: deploy()
 Log: Installing the helm chart. This is going to take a while.....
-helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3
+helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
 Log: Run "starship get-pods" to check the status of the cluster
 Call: startPortForward()
 Log: Attempting to stop any existing port-forwards...
@@ -46,7 +46,7 @@ exports[`StarshipClient setup 2`] = `
 "helm repo add starship https://cosmology-tech.github.io/starship/
 helm repo update
 helm search repo starship/devnet --version v0.2.3
-helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3
+helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
 ps -ef | grep -i 'kubectl port-forward' | grep -v 'grep' | awk '{print $2}'
 sleep 2
 kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 &
diff --git a/clients/js/packages/client/__tests__/__snapshots__/client.ports.test.ts.snap b/clients/js/packages/client/__tests__/__snapshots__/client.ports.test.ts.snap
index aed92e67b..fe3ed3207 100644
--- a/clients/js/packages/client/__tests__/__snapshots__/client.ports.test.ts.snap
+++ b/clients/js/packages/client/__tests__/__snapshots__/client.ports.test.ts.snap
@@ -11,7 +11,7 @@ helm repo update
 helm search repo starship/devnet --version v0.2.3
 Call: deploy()
 Log: Installing the helm chart. This is going to take a while.....
-helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3
+helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
 Log: Run "starship get-pods" to check the status of the cluster
 Call: startPortForward()
 Log: Attempting to stop any existing port-forwards...
@@ -44,7 +44,7 @@ exports[`StarshipClient setup 2`] = `
 "helm repo add starship https://cosmology-tech.github.io/starship/
 helm repo update
 helm search repo starship/devnet --version v0.2.3
-helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3
+helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
 ps -ef | grep -i 'kubectl port-forward' | grep -v 'grep' | awk '{print $2}'
 sleep 2
 kubectl port-forward pods/osmosis-1-genesis-0 1317:6767676 > /dev/null 2>&1 &
diff --git a/clients/js/packages/client/__tests__/__snapshots__/client.test.ts.snap b/clients/js/packages/client/__tests__/__snapshots__/client.test.ts.snap
index 9e314ecaa..05e282839 100644
--- a/clients/js/packages/client/__tests__/__snapshots__/client.test.ts.snap
+++ b/clients/js/packages/client/__tests__/__snapshots__/client.test.ts.snap
@@ -9,7 +9,7 @@ helm repo update
 helm search repo starship/devnet --version v0.2.3
 Call: deploy()
 Log: Installing the helm chart. This is going to take a while.....
-helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3
+helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
 Log: Run "starship get-pods" to check the status of the cluster
 Call: startPortForward()
 Log: Attempting to stop any existing port-forwards...
@@ -44,7 +44,7 @@ exports[`StarshipClient setup 2`] = `
 "helm repo add starship https://cosmology-tech.github.io/starship/
 helm repo update
 helm search repo starship/devnet --version v0.2.3
-helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3
+helm install -f ../../__fixtures__/config.yaml osmojs starship/devnet --version v0.2.3 --timeout 10m
 ps -ef | grep -i 'kubectl port-forward' | grep -v 'grep' | awk '{print $2}'
 sleep 2
 kubectl port-forward pods/osmosis-1-genesis-0 26657:26657 > /dev/null 2>&1 &
diff --git a/clients/js/packages/client/src/client.ts b/clients/js/packages/client/src/client.ts
index deeee4b82..3521543e4 100644
--- a/clients/js/packages/client/src/client.ts
+++ b/clients/js/packages/client/src/client.ts
@@ -22,6 +22,7 @@ export interface StarshipContext {
   namespace?: string;
   verbose?: boolean;
   curdir?: string;
+  timeout?: string;
 }
 
 export const defaultStarshipContext: Partial<StarshipContext> = {
@@ -30,7 +31,8 @@ export const defaultStarshipContext: Partial<StarshipContext> = {
   repoUrl: 'https://cosmology-tech.github.io/starship/',
   chart: 'starship/devnet',
   namespace: '',
-  version: ''
+  version: '',
+  timeout: '10m'
 };
 
 export interface PodPorts {
@@ -47,7 +49,7 @@ export interface PodPorts {
 }
 
 const defaultName: string = 'starship';
-const defaultVersion: string = 'v0.2.13';
+const defaultVersion: string = 'v0.2.14';
 
 // TODO talk to Anmol about moving these into yaml, if not already possible?
 const defaultPorts: PodPorts = {
@@ -395,6 +397,8 @@ export class StarshipClient implements StarshipClientI {
       this.ctx.chart,
       '--version',
       this.config.version,
+      '--timeout',
+      this.ctx.timeout,
       ...this.getDeployArgs(),
       ...options
     ];