From d08a45c49099b7cc428353c0ff5e7485f0274973 Mon Sep 17 00:00:00 2001 From: Anmol1696 Date: Thu, 3 Oct 2024 13:50:08 +0400 Subject: [PATCH] update starship context to include timeout, update tests --- clients/js/__output__/custom-pod-ports.yaml | 1 + .../__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 ++++++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/clients/js/__output__/custom-pod-ports.yaml b/clients/js/__output__/custom-pod-ports.yaml index d26a75f6..1458b998 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/client/__tests__/__snapshots__/client.config.test.ts.snap b/clients/js/packages/client/__tests__/__snapshots__/client.config.test.ts.snap index d5ee5415..5c8d17f9 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 aed92e67..fe3ed320 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 9e314eca..05e28283 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 deeee4b8..c5743b3c 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 = { @@ -30,7 +31,8 @@ export const defaultStarshipContext: Partial = { 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 ];