From dc90451a94226792d67567dd0243df96debe84e1 Mon Sep 17 00:00:00 2001 From: Jill Regan Date: Sun, 22 Feb 2026 12:31:37 -0500 Subject: [PATCH] Apply code suggestions --- src/utils.test.ts | 3 +-- src/utils.ts | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/utils.test.ts b/src/utils.test.ts index 575c30f..a74874f 100644 --- a/src/utils.test.ts +++ b/src/utils.test.ts @@ -356,7 +356,7 @@ describe("loadSecrets when using Service Account", () => { describe("secret reference validation", () => { 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( () => { throw new Error("invalid reference format"); @@ -379,7 +379,6 @@ describe("loadSecrets when using Service Account", () => { } }, ); - mockResolve.mockResolvedValue("value1"); await expect(loadSecrets(false)).rejects.toThrow( "Invalid secret reference(s): OTHER", diff --git a/src/utils.ts b/src/utils.ts index e66cc18..6a3e0bb 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -38,7 +38,7 @@ const getEnvVarNamesWithSecretRefs = (): string[] => ); const validateSecretRefs = (envNames: string[]): void => { - const invalid: string[] = []; + const invalid: { name: string; message: string }[] = []; for (const envName of envNames) { const ref = process.env[envName]; @@ -48,15 +48,16 @@ const validateSecretRefs = (envNames: string[]): void => { try { Secrets.validateSecretReference(ref); - } catch { - invalid.push(envName); + } catch (err) { + const message = err instanceof Error ? err.message : String(err); + invalid.push({ name: envName, message }); } } // Throw an error if any secret references are invalid if (invalid.length > 0) { - const names = invalid.join(", "); - throw new Error(`Invalid secret reference(s): ${names}`); + const details = invalid.map(({ name, message }) => `${name}: ${message}`).join("; "); + throw new Error(`Invalid secret reference(s): ${details}`); } };