test

replicatedhq · Feb 22, 2024 · 58cc578 · 58cc578
1 parent c319a24
commit 58cc578
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/dist/clusters.js b/dist/clusters.js
@@ -66,12 +66,18 @@ async function pollForStatus(vendorPortalApi, clusterId, expectedStatus, timeout
             console.debug(`Cluster status is ${clusterDetails.status}, sleeping for ${sleeptime} seconds`);
         }
         catch (err) {
-            if (!(err instanceof StatusError) || err.statusCode < 500) {
-                throw err;
+            if (err instanceof StatusError) {
+                if (err.statusCode >= 500) {
+                    // 5xx errors are likely transient, so we should retry
+                    console.debug(`Got HTTP error with status ${err.statusCode}, sleeping for ${sleeptime} seconds`);
+                }
+                else {
+                    console.debug(`Got HTTP error with status ${err.statusCode}, exiting`);
+                    throw err;
+                }
             }
             else {
-                // 5xx errors are likely transient, so we should retry
-                console.debug(`Got HTTP error with status ${err.statusCode}, sleeping for ${sleeptime} seconds`);
+                throw err;
             }
         }
         await new Promise(f => setTimeout(f, sleeptime * 1000));

diff --git a/dist/clusters.spec.js b/dist/clusters.spec.js
@@ -131,9 +131,9 @@ describe('upgradeCluster', () => {
     const mockServer = mockttp.getLocal();
     const apiClient = new configuration_1.VendorPortalApi();
     apiClient.apiToken = "abcd1234";
-    apiClient.endpoint = "http://localhost:8080";
+    apiClient.endpoint = "http://localhost:30880";
     beforeEach(async () => {
-        mockServer.start(8080);
+        mockServer.start(30880);
     });
     afterEach(async () => {
         mockServer.stop();
@@ -151,9 +151,9 @@ describe('pollForCluster', () => {
     const mockServer = mockttp.getLocal();
     const apiClient = new configuration_1.VendorPortalApi();
     apiClient.apiToken = "abcd1234";
-    apiClient.endpoint = "http://localhost:8080";
+    apiClient.endpoint = "http://localhost:30880";
     beforeEach(async () => {
-        mockServer.start(8080);
+        mockServer.start(30880);
     });
     afterEach(async () => {
         mockServer.stop();

diff --git a/src/clusters.spec.ts b/src/clusters.spec.ts
@@ -147,11 +147,11 @@ describe('upgradeCluster', () => {
     const mockServer = mockttp.getLocal();
     const apiClient = new VendorPortalApi();
     apiClient.apiToken = "abcd1234";
-    apiClient.endpoint = "http://localhost:8080";
+    apiClient.endpoint = "http://localhost:30880";
 
 
     beforeEach(async () => {
-        mockServer.start(8080);
+        mockServer.start(30880);
     });
 
     afterEach(async () => {
@@ -174,10 +174,10 @@ describe('pollForCluster', () => {
     const mockServer = mockttp.getLocal();
     const apiClient = new VendorPortalApi();
     apiClient.apiToken = "abcd1234";
-    apiClient.endpoint = "http://localhost:8080";
+    apiClient.endpoint = "http://localhost:30880";
 
     beforeEach(async () => {
-        mockServer.start(8080);
+        mockServer.start(30880);
     });
 
     afterEach(async () => {

diff --git a/src/clusters.ts b/src/clusters.ts
@@ -94,11 +94,16 @@ export async function pollForStatus(vendorPortalApi: VendorPortalApi, clusterId:
 
         console.debug(`Cluster status is ${clusterDetails.status}, sleeping for ${sleeptime} seconds`);
       } catch (err) {
-        if (!(err instanceof StatusError) || err.statusCode < 500) {
-          throw err;
+        if (err instanceof StatusError) {
+          if (err.statusCode >= 500) {
+            // 5xx errors are likely transient, so we should retry
+            console.debug(`Got HTTP error with status ${err.statusCode}, sleeping for ${sleeptime} seconds`);
+          } else {
+            console.debug(`Got HTTP error with status ${err.statusCode}, exiting`);
+            throw err;
+          }
         } else {
-          // 5xx errors are likely transient, so we should retry
-          console.debug(`Got HTTP error with status ${err.statusCode}, sleeping for ${sleeptime} seconds`);
+          throw err;
         }
       }