wesley/load-secrets-action
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove error handeling

Browse Source
This commit is contained in:
Jill Regan
2026-02-20 18:19:18 -05:00
parent 44ef890925
commit 5523b3fd67
1 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/utils.ts
View File

@@ -92,7 +92,6 @@ const getSecretFromConnectItem = async (
return fieldValue; return fieldValue;
} }
// If a file was found, get the content of the file
// If a file was found, get the content of the file (with retry on 503) // If a file was found, get the content of the file (with retry on 503)
if (fileId) { if (fileId) {
const maxAttempts = 3; const maxAttempts = 3;
@@ -111,13 +110,9 @@ const getSecretFromConnectItem = async (
typeof err === "object" && typeof err === "object" &&
(err as Record<string, unknown>).statusCode === 503; (err as Record<string, unknown>).statusCode === 503;
if (is503 && attempt < maxAttempts) { if (is503 && attempt < maxAttempts) {
core.info(
`getFileContent returned 503 (attempt ${attempt}/${maxAttempts}), retrying in ${retryDelayMs / 1000}s...`,
);
await new Promise((resolve) => setTimeout(resolve, retryDelayMs)); await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
continue; continue;
} }
core.error(`getFileContent failed: ${getErrorMessage(err)}`);
throw err; throw err;
} }
} }
@@ -415,27 +410,25 @@ const loadSecretsViaConnect = async (
if (!ref) { if (!ref) {
continue; continue;
} }
let parsed, vaultId, item, secretValue;
try { try {
parsed = parseOpRef(ref); // Parse the op ref and get the item from the Connect SDK
} catch (err) { const parsed = parseOpRef(ref);
throw new Error(`Failed to parse ref "${ref}": ${getErrorMessage(err)}`);
} const vaultId = await fetchVaultId(
try { client,
vaultId = await fetchVaultId(client, parsed.vault, ref, vaultIdByQuery); parsed.vault,
} catch (err) { ref,
throw new Error(`Failed to resolve vault for "${ref}": ${getErrorMessage(err)}`); vaultIdByQuery,
} );
try { const item = await client.getItem(vaultId, parsed.item);
item = await client.getItem(vaultId, parsed.item);
} catch (err) { // Get the secret value from the item as Connect returns a full item object
throw new Error(`Failed to get item for "${ref}": ${getErrorMessage(err)}`); const secretValue = await getSecretFromConnectItem(client, item, parsed);
}
try {
secretValue = await getSecretFromConnectItem(client, item, parsed);
setResolvedSecret(envName, secretValue, shouldExportEnv); setResolvedSecret(envName, secretValue, shouldExportEnv);
} catch (err) { } catch (err) {
throw new Error(`Failed to get secret value for "${ref}": ${getErrorMessage(err)}`); const msg = err instanceof Error ? err.message : String(err);
throw new Error(`Failed to load ref "${ref}": ${msg}`);
} }
} }
@@ -444,13 +437,6 @@ const loadSecretsViaConnect = async (
} }
}; };
function getErrorMessage(err: unknown): string {
if (err instanceof Error) return err.message;
if (err && typeof (err as { message?: unknown }).message === "string")
return (err as { message: string }).message;
return String(err);
}
// Service Account loads secrets via the 1Password SDK // Service Account loads secrets via the 1Password SDK
const loadSecretsViaServiceAccount = async ( const loadSecretsViaServiceAccount = async (
shouldExportEnv: boolean, shouldExportEnv: boolean,