@@ -381,7 +381,6 @@ const loadSecretsViaConnect = async (
381381 // eslint-disable-next-line @typescript-eslint/naming-convention
382382 serverURL : host ,
383383 token,
384- timeout : 30000 ,
385384 } ) ;
386385 } catch ( err ) {
387386 const message = err instanceof Error ? err . message : String ( err ) ;
@@ -395,25 +394,27 @@ const loadSecretsViaConnect = async (
395394 if ( ! ref ) {
396395 continue ;
397396 }
398-
397+ let parsed , vaultId , item , secretValue ;
399398 try {
400- // Parse the op ref and get the item from the Connect SDK
401- const parsed = parseOpRef ( ref ) ;
402-
403- const vaultId = await fetchVaultId (
404- client ,
405- parsed . vault ,
406- ref ,
407- vaultIdByQuery ,
408- ) ;
409- const item = await client . getItem ( vaultId , parsed . item ) ;
410-
411- // Get the secret value from the item as Connect returns a full item object
412- const secretValue = await getSecretFromConnectItem ( client , item , parsed ) ;
399+ parsed = parseOpRef ( ref ) ;
400+ } catch ( err ) {
401+ throw new Error ( `Failed to parse ref "${ ref } ": ${ getErrorMessage ( err ) } ` ) ;
402+ }
403+ try {
404+ vaultId = await fetchVaultId ( client , parsed . vault , ref , vaultIdByQuery ) ;
405+ } catch ( err ) {
406+ throw new Error ( `Failed to resolve vault for "${ ref } ": ${ getErrorMessage ( err ) } ` ) ;
407+ }
408+ try {
409+ item = await client . getItem ( vaultId , parsed . item ) ;
410+ } catch ( err ) {
411+ throw new Error ( `Failed to get item for "${ ref } ": ${ getErrorMessage ( err ) } ` ) ;
412+ }
413+ try {
414+ secretValue = await getSecretFromConnectItem ( client , item , parsed ) ;
413415 setResolvedSecret ( envName , secretValue , shouldExportEnv ) ;
414416 } catch ( err ) {
415- const msg = err instanceof Error ? err . message : String ( err ) ;
416- throw new Error ( `Failed to load ref "${ ref } ": ${ msg } ` ) ;
417+ throw new Error ( `Failed to get secret value for "${ ref } ": ${ getErrorMessage ( err ) } ` ) ;
417418 }
418419 }
419420
@@ -422,6 +423,13 @@ const loadSecretsViaConnect = async (
422423 }
423424} ;
424425
426+ function getErrorMessage ( err : unknown ) : string {
427+ if ( err instanceof Error ) return err . message ;
428+ if ( err && typeof ( err as { message ?: unknown } ) . message === "string" )
429+ return ( err as { message : string } ) . message ;
430+ return String ( err ) ;
431+ }
432+
425433// Service Account loads secrets via the 1Password SDK
426434const loadSecretsViaServiceAccount = async (
427435 shouldExportEnv : boolean ,
0 commit comments