Remove error handeling
This commit is contained in:
46
src/utils.ts
46
src/utils.ts
@@ -92,7 +92,6 @@ const getSecretFromConnectItem = async (
|
||||
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 (fileId) {
|
||||
const maxAttempts = 3;
|
||||
@@ -111,13 +110,9 @@ const getSecretFromConnectItem = async (
|
||||
typeof err === "object" &&
|
||||
(err as Record<string, unknown>).statusCode === 503;
|
||||
if (is503 && attempt < maxAttempts) {
|
||||
core.info(
|
||||
`getFileContent returned 503 (attempt ${attempt}/${maxAttempts}), retrying in ${retryDelayMs / 1000}s...`,
|
||||
);
|
||||
await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
|
||||
continue;
|
||||
}
|
||||
core.error(`getFileContent failed: ${getErrorMessage(err)}`);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
@@ -415,27 +410,25 @@ const loadSecretsViaConnect = async (
|
||||
if (!ref) {
|
||||
continue;
|
||||
}
|
||||
let parsed, vaultId, item, secretValue;
|
||||
|
||||
try {
|
||||
parsed = parseOpRef(ref);
|
||||
} catch (err) {
|
||||
throw new Error(`Failed to parse ref "${ref}": ${getErrorMessage(err)}`);
|
||||
}
|
||||
try {
|
||||
vaultId = await fetchVaultId(client, parsed.vault, ref, vaultIdByQuery);
|
||||
} catch (err) {
|
||||
throw new Error(`Failed to resolve vault for "${ref}": ${getErrorMessage(err)}`);
|
||||
}
|
||||
try {
|
||||
item = await client.getItem(vaultId, parsed.item);
|
||||
} catch (err) {
|
||||
throw new Error(`Failed to get item for "${ref}": ${getErrorMessage(err)}`);
|
||||
}
|
||||
try {
|
||||
secretValue = await getSecretFromConnectItem(client, item, parsed);
|
||||
// Parse the op ref and get the item from the Connect SDK
|
||||
const parsed = parseOpRef(ref);
|
||||
|
||||
const vaultId = await fetchVaultId(
|
||||
client,
|
||||
parsed.vault,
|
||||
ref,
|
||||
vaultIdByQuery,
|
||||
);
|
||||
const item = await client.getItem(vaultId, parsed.item);
|
||||
|
||||
// Get the secret value from the item as Connect returns a full item object
|
||||
const secretValue = await getSecretFromConnectItem(client, item, parsed);
|
||||
setResolvedSecret(envName, secretValue, shouldExportEnv);
|
||||
} 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
|
||||
const loadSecretsViaServiceAccount = async (
|
||||
shouldExportEnv: boolean,
|
||||
|
||||
Reference in New Issue
Block a user