Merge pull request #1063 from github/honeyankit/improve-api-client-lo…

…gging Added more logs to troubleshoot issues faster
github · Oct 27, 2023 · 2159f6c · 2159f6c
2 parents 45c6863 + ff32e51
commit 2159f6c
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 13 deletions.
diff --git a/__tests__/api_client.test.ts b/__tests__/api_client.test.ts
@@ -66,6 +66,24 @@ describe('ApiClient', () => {
     )
   })
 
+  test('job details with certificate error', async () => {
+    const errorObject = {
+      isAxiosError: true,
+      message: 'unable to get local issuer certificate',
+      name: 'Error',
+      stack: 'Error: unable to get local issuer certificate...',
+      status: null
+    }
+
+    mockAxios.get.mockRejectedValue(errorObject)
+
+    await expect(api.getJobDetails()).rejects.toThrowError(
+      new JobDetailsFetchingError(
+        'fetching job details: unable to get local issuer certificate'
+      )
+    )
+  })
+
   test('get job credentials', async () => {
     const apiResponse = {
       data: {

diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/dist/main/index.js.map b/dist/main/index.js.map
diff --git a/src/api-client.ts b/src/api-client.ts
@@ -58,12 +58,20 @@ export class ApiClient {
     } catch (error: unknown) {
       if (axios.isAxiosError(error)) {
         const err = error
+        if (err.response) {
+          throw new JobDetailsFetchingError(
+            `fetching job details: received code ${err.response
+              ?.status}: ${JSON.stringify(err.response?.data)}`
+          )
+        } else {
+          throw new JobDetailsFetchingError(
+            `fetching job details: ${err.message}`
+          )
+        }
+      } else {
         throw new JobDetailsFetchingError(
-          `fetching job details: received code ${err.response
-            ?.status}: ${JSON.stringify(err.response?.data)}`
+          `fetching job details: ${(error as Error).message}`
         )
-      } else {
-        throw error
       }
     }
   }
@@ -89,12 +97,20 @@ export class ApiClient {
     } catch (error: unknown) {
       if (axios.isAxiosError(error)) {
         const err = error
+        if (err.response) {
+          throw new CredentialFetchingError(
+            `fetching credentials: received code ${err.response
+              ?.status}: ${JSON.stringify(err.response?.data)}`
+          )
+        } else {
+          throw new CredentialFetchingError(
+            `fetching credentials: ${err.message}`
+          )
+        }
+      } else {
         throw new CredentialFetchingError(
-          `fetching credentials: received code ${err.response
-            ?.status}: ${JSON.stringify(err.response?.data)}`
+          `fetching credentials: ${(error as Error).message}`
         )
-      } else {
-        throw error
       }
     }
   }