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

Merge branch 'jill/validate-secret-reference' into jill/migrate-to-connect-sdk

Browse Source
This commit is contained in:
Jill Regan
2026-02-22 12:32:39 -05:00
parent db4ac8464b dc90451a94
commit 50fb695a57
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils.test.ts
View File

@@ -549,7 +549,7 @@ describe("loadSecrets when using Service Account", () => {
describe("secret reference validation", () => { describe("secret reference validation", () => {
it("fails with clear message when a secret reference is invalid", async () => { it("fails with clear message when a secret reference is invalid", async () => {
process.env.MY_SECRET = "op://invalid/ref/form"; process.env.MY_SECRET = "op://x";
(Secrets.validateSecretReference as jest.Mock).mockImplementationOnce( (Secrets.validateSecretReference as jest.Mock).mockImplementationOnce(
() => { () => {
throw new Error("invalid reference format"); throw new Error("invalid reference format");
@@ -572,7 +572,6 @@ describe("loadSecrets when using Service Account", () => {
} }
}, },
); );
mockResolve.mockResolvedValue("value1");
await expect(loadSecrets(false)).rejects.toThrow( await expect(loadSecrets(false)).rejects.toThrow(
"Invalid secret reference(s): OTHER", "Invalid secret reference(s): OTHER",

11
src/utils.ts
View File

@@ -281,7 +281,7 @@ export const getEnvVarNamesWithSecretRefs = (): string[] =>
); );
const validateSecretRefs = (envNames: string[]): void => { const validateSecretRefs = (envNames: string[]): void => {
const invalid: string[] = []; const invalid: { name: string; message: string }[] = [];
for (const envName of envNames) { for (const envName of envNames) {
const ref = process.env[envName]; const ref = process.env[envName];
@@ -291,15 +291,16 @@ const validateSecretRefs = (envNames: string[]): void => {
try { try {
Secrets.validateSecretReference(ref); Secrets.validateSecretReference(ref);
} catch { } catch (err) {
invalid.push(envName); const message = err instanceof Error ? err.message : String(err);
invalid.push({ name: envName, message });
} }
} }
// Throw an error if any secret references are invalid // Throw an error if any secret references are invalid
if (invalid.length > 0) { if (invalid.length > 0) {
const names = invalid.join(", "); const details = invalid.map(({ name, message }) => `${name}: ${message}`).join("; ");
throw new Error(`Invalid secret reference(s): ${names}`); throw new Error(`Invalid secret reference(s): ${details}`);
} }
}; };