Skip to content

Commit 5523b3f

Browse files
committed
Remove error handeling
1 parent 44ef890 commit 5523b3f

File tree

1 file changed

+16
-30
lines changed

1 file changed

+16
-30
lines changed

src/utils.ts

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ const getSecretFromConnectItem = async (
9292
return fieldValue;
9393
}
9494

95-
// If a file was found, get the content of the file
9695
// If a file was found, get the content of the file (with retry on 503)
9796
if (fileId) {
9897
const maxAttempts = 3;
@@ -111,13 +110,9 @@ const getSecretFromConnectItem = async (
111110
typeof err === "object" &&
112111
(err as Record<string, unknown>).statusCode === 503;
113112
if (is503 && attempt < maxAttempts) {
114-
core.info(
115-
`getFileContent returned 503 (attempt ${attempt}/${maxAttempts}), retrying in ${retryDelayMs / 1000}s...`,
116-
);
117113
await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
118114
continue;
119115
}
120-
core.error(`getFileContent failed: ${getErrorMessage(err)}`);
121116
throw err;
122117
}
123118
}
@@ -415,27 +410,25 @@ const loadSecretsViaConnect = async (
415410
if (!ref) {
416411
continue;
417412
}
418-
let parsed, vaultId, item, secretValue;
419-
try {
420-
parsed = parseOpRef(ref);
421-
} catch (err) {
422-
throw new Error(`Failed to parse ref "${ref}": ${getErrorMessage(err)}`);
423-
}
424-
try {
425-
vaultId = await fetchVaultId(client, parsed.vault, ref, vaultIdByQuery);
426-
} catch (err) {
427-
throw new Error(`Failed to resolve vault for "${ref}": ${getErrorMessage(err)}`);
428-
}
429-
try {
430-
item = await client.getItem(vaultId, parsed.item);
431-
} catch (err) {
432-
throw new Error(`Failed to get item for "${ref}": ${getErrorMessage(err)}`);
433-
}
413+
434414
try {
435-
secretValue = await getSecretFromConnectItem(client, item, parsed);
415+
// Parse the op ref and get the item from the Connect SDK
416+
const parsed = parseOpRef(ref);
417+
418+
const vaultId = await fetchVaultId(
419+
client,
420+
parsed.vault,
421+
ref,
422+
vaultIdByQuery,
423+
);
424+
const item = await client.getItem(vaultId, parsed.item);
425+
426+
// Get the secret value from the item as Connect returns a full item object
427+
const secretValue = await getSecretFromConnectItem(client, item, parsed);
436428
setResolvedSecret(envName, secretValue, shouldExportEnv);
437429
} catch (err) {
438-
throw new Error(`Failed to get secret value for "${ref}": ${getErrorMessage(err)}`);
430+
const msg = err instanceof Error ? err.message : String(err);
431+
throw new Error(`Failed to load ref "${ref}": ${msg}`);
439432
}
440433
}
441434

@@ -444,13 +437,6 @@ const loadSecretsViaConnect = async (
444437
}
445438
};
446439

447-
function getErrorMessage(err: unknown): string {
448-
if (err instanceof Error) return err.message;
449-
if (err && typeof (err as { message?: unknown }).message === "string")
450-
return (err as { message: string }).message;
451-
return String(err);
452-
}
453-
454440
// Service Account loads secrets via the 1Password SDK
455441
const loadSecretsViaServiceAccount = async (
456442
shouldExportEnv: boolean,

0 commit comments

Comments
 (0)