From 2b0337f68764de19ae9bd2435bb08f7908a5e094 Mon Sep 17 00:00:00 2001
From: Esteban Pastorino <ejpastorino@gmail.com>
Date: Wed, 22 Nov 2023 17:33:56 -0300
Subject: [PATCH] fix: more error handling in metadata fetching to normalize
 errors

---
 .../src/plugins_core/blobs_upload/index.ts      |   2 +-
 .../src/plugins_core/blobs_upload/utils.ts      |   9 +++++++--
 .../tests/blobs_upload/snapshots/tests.js.md    |   2 +-
 .../tests/blobs_upload/snapshots/tests.js.snap  | Bin 896 -> 903 bytes
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/build/src/plugins_core/blobs_upload/index.ts b/packages/build/src/plugins_core/blobs_upload/index.ts
index 48d13cb335..97e377009f 100644
--- 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
index 45a090a5a2..66fab7af38 100644
--- 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
index 3f84d0230b..8121bace0d 100644
--- 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
index 1673a1f13c2e62024e8d5698771f4029113fc9e0..7de1da857e5fdc22c88fae9e64f7cb43d2c30132 100644
GIT binary patch
literal 903
zcmV;219<#FRzV<BZeeh9Xm4~Nb~6eC03oRe%jo(tZfBB1V9jp>SS&u82m|XnsK3_@
zbP1$nd>@Ml00000000B+n9Xj}KoG|Z6sUaT4d#Fp5Y%bt%?CsYtprpQl@^Ipw6-V7
z(#@{5yKb8s2p)k4pj<g{=UupP<{_B1^HC>FOOsNiZK8bHJD!aHGxHle2lY^>Xvcj1
zhL&4_`|GqF8b}kNSo{!TB}*1`Dq*jQ5@MwNZQwC*1Bq6<JjNK9j6o`>bAbjpS#gb#
zRl3cMWQl1iYd#*tF|+L5{Er)Rx98mB+ReE;*T2qtuh0r!Z^P4+ix^J(@P2>!aG{@`
z_ZZ%yHe5*$;EBxDD2JIE6@STJau#cXH4LrC7^aN?tWGi8a@lwu2f)Ip@@ScMX-t&i
zPWw%zYyb(1c31;V?yzjpSo-c#T+35juJe7HYO*jos$na!ZF1x6HWF(B&xxFfw85oW
z=f-Yp5oD{`f}xB{yUt|;HNCyoDnet>bRwj{tEtvx(k}@*ZmgJ`FD2`|k(Jq)UdkPL
zeXCl+x!gpf#4eR^l=&vNnYaA3LuPPn1u4KZ6x=i?_pqTk$scrM%$2aX?{Yvr7^jhS
z)icmZRn<xaTD(G?bg!sD)KMUIOscfZeJ|f{EG7`AnmO45IR2n67hfF9McYJ;!044j
zFidTcl~UOrFOQ(&&jJ;{&!{*76(>aC9=FX}wmfAVJQUcZFzmZJ2O<^(9UqH_Vx|tV
zGeAxmARiO~nSYuN53TCr&`|N?FadA<DG>12tr-EQ>AJAc!{i5@^A7%IjJ!;Y+|Jxm
zf*|kbfzG}BZPyoI`Dh7z-zUu$p{NuX)k52(P2Xms4jH)QERqd#z#C;GDZ}WpDljv7
zrX+S)Ix;6dfqgJ-|A_XJ4x7!)|2i{+;>?Vgj8K@~okKmZiEhof`-m13b){QJ-9#*W
zDvVIOFdLy$H$r>q%PC#!ruG6%)sdl}$)FwO{k&%HF^QRQ9FIJ+*@PamtNQ{}PBo#2
z2k@%aN}n`d16X5J*fH!i>4Pwk+m?phm9js=xivjv2ax|l!iYk2OpoNQQ=oL_<y7{2
zkjpOuv(qTw9SYTdZ<H)~Uey&0rz+Eu3BWAaD>WgYlc5$-lTy*$9?1F07hqjKLPgmX
dfcIu=rTP-KHdm^vZuP2Q>n}ibVf#=T001p(upa;b

literal 896
zcmV-`1AqKMRzV<BZeeh9Xm4~Nb~6eC0HUbevK9MNZb4-R2L)11Z_s+m8@4YX(C}eW
zVtUl-K_80<00000000B+n9Xj}KoG|Zlot7b#2d`5AgI&On-7Q*T8UD%s2@n2qP0Cq
zR^9AcyX!W&fy5*50F)~S?z{^Z&b$N6+WDxHrlko~{YaE1wRb$4{Qo<@iE~s7g^Kpg
z$1iBP71-LK<Iq5w2*u(j5G%Q0L8lT98z>=0I^PB!12>Rpb--hcfyo%8f*KcSfKwFL
z7+Iy;+(?#~hO*|vQ5-YN-pziyGc!Nq9=Gn!Jh=UN*4soYc&!aDQZ8aR@5B4~>HU>{
zdfqd5i`sA{J%HyjSECeWYLxvYf5}Cx3060>9%Go+1F$;9?8v$CDh_~!QTgdIozj>n
z!=3iqO4$Gs7VWb-nml32qOtV9v$&dDT&nSwO*KUr9aXWJ*fyncaa)Nsf#*a{L|W(4
zY;a@uv<R}*Y{8J@(r$2BM@=tpw2IIeG@S~m@JgyRh4i-sT{l)uE|-!uUeC7Km|034
zd3~#z!lm3sqr?Gi;V8>ZX|rtk#}1jnu@$5O(@=2Jm^{Ol<|Kd6tua@^V#|3zJs78v
zb-QPvlPap22();EI_Y6ifvBTE?3h$;nnzxK-dIc^PBn9~1#tRBT`sPl%0=5ijlk$H
zhhUi6A}gh`Jzkzb#qR|wew|Wr0xC|3z(Z~u)ol5aaqw7Slftl{>H>&Z5OjPj9;=x;
z$W8%y$pHDd2*~{1ba-f07l(#6KMoUc?pJ|;Kjx+cyiDH<3q4GE&?WESZ_3E)#K^rY
zEg1xPKM!>7^>4er0Lv#!;QKylwg^R~z^EqL1|9k~6Ll!SnX^bS%mHsykR*rExhgOV
zd8s6JSUS=ZpTIt7+h3yntjne|^S{o_pg1!lCL<K4cjr*c_e6Kkxci7E6E&rqC*4Hc
zyI&ZgzvrhT^wN#co_#r`t6giaz*HSs`ac=8qq1Mr>^;Sp3CHosPd1&<V|I04fbzK}
z^zZ;))mrJZ#%lm;j5c-*hYflo4CJv3L+KW>AHumcJz~><mDozC@91)?_EEyF8v*M(
zTbsZvWI!QPfk;$w-f=QqOC|ub%5D^_0dhN<1Tbo{?(u;9XMY#!<`F8&hOxJ^yHa@#
WyW1<3RkwOm2=WJMqn#4l82|uq%&?sR