fix: more error handling in metadata fetching to normalize errors

netlify · Nov 22, 2023 · 2b0337f · 2b0337f
1 parent 7eaed56
commit 2b0337f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/packages/build/src/plugins_core/blobs_upload/index.ts b/packages/build/src/plugins_core/blobs_upload/index.ts
@@ -38,7 +38,7 @@ const coreStep = async function ({
   } catch (err) {
     logError(logs, `Error uploading blobs to deploy store: ${err.message}`)
 
-    const error = new Error(`Failed while uploading blobs to deploy store.`)
+    const error = new Error(`Failed while uploading blobs to deploy store`)
     addErrorInfo(error, { type: 'blobsUploadError' })
     throw error
   }

diff --git a/packages/build/src/plugins_core/blobs_upload/utils.ts b/packages/build/src/plugins_core/blobs_upload/utils.ts
@@ -60,7 +60,12 @@ async function readMetadata(metadataPath: string): Promise<Record<string, string
     }
     throw err
   }
-
-  const metadata = JSON.parse(metadataFile)
+  let metadata = {}
+  try {
+    metadata = JSON.parse(metadataFile)
+  } catch (err) {
+    // Normalize the error message
+    throw new Error(`Error parsing metadata file '${metadataPath}'`)
+  }
   return metadata
 }
diff --git a/packages/build/tests/blobs_upload/snapshots/tests.js.md b/packages/build/tests/blobs_upload/snapshots/tests.js.md
@@ -176,7 +176,7 @@ Generated by [AVA](https://avajs.dev).
     ␊
     Uploading 1 blobs to deploy store...␊
       - Uploading blob with-metadata.txt␊
-    Error uploading blobs to deploy store: Failed while reading 'with-metadata.txt' and its metadata: Unexpected token T in JSON at position 0␊
+    Error uploading blobs to deploy store: Failed while reading 'with-metadata.txt' and its metadata: Error parsing metadata file 'packages/build/tests/blobs_upload/fixtures/src_with_malformed_blobs_metadata/dist/.netlify/blobs/deploy/$with-metadata.txt.json'␊
     ␊
     Core internal error                                           ␊
     ────────────────────────────────────────────────────────────────␊

diff --git a/packages/build/tests/blobs_upload/snapshots/tests.js.snap b/packages/build/tests/blobs_upload/snapshots/tests.js.snap