From 7e684fbad961e20f0f543fafe5e066b392455ff2 Mon Sep 17 00:00:00 2001 From: Adishwar Rishi Date: Wed, 3 Jan 2024 13:07:49 +1100 Subject: [PATCH 1/4] Surface inner exception when secret:bulk upload command fails --- package-lock.json | 4 ++-- src/index.ts | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 07c13fc..dcc0f21 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "wrangler-action", - "version": "3.3.2", + "version": "3.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "wrangler-action", - "version": "3.3.2", + "version": "3.4.0", "license": "MIT OR Apache-2.0", "dependencies": { "@actions/core": "^1.10.1", diff --git a/src/index.ts b/src/index.ts index 836c8d7..a285a50 100755 --- a/src/index.ts +++ b/src/index.ts @@ -5,6 +5,7 @@ import { endGroup as originalEndGroup, error as originalError, info as originalInfo, + debug, startGroup as originalStartGroup, setFailed, setOutput, @@ -204,7 +205,11 @@ async function uploadSecrets() { ), ), }); - } catch (err) { + } catch (err: unknown) { + if (err instanceof Error) { + error(err.message); + debug(`Secret upload error stack: ${err.stack}`); + } throw new Error(`Failed to upload secrets.`); } finally { endGroup(); From ebaf8960452420f681c6406f3a6956279a3d408e Mon Sep 17 00:00:00 2001 From: Adishwar Rishi Date: Wed, 3 Jan 2024 13:19:58 +1100 Subject: [PATCH 2/4] Improve debug error message for secret:bulk command failure --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index a285a50..7a72c46 100755 --- a/src/index.ts +++ b/src/index.ts @@ -208,7 +208,7 @@ async function uploadSecrets() { } catch (err: unknown) { if (err instanceof Error) { error(err.message); - debug(`Secret upload error stack: ${err.stack}`); + debug(`wrangler secret:bulk error stack: ${err.stack}`); } throw new Error(`Failed to upload secrets.`); } finally { From bbedd8e54f256d36f81f81f1f05b90937d533bb7 Mon Sep 17 00:00:00 2001 From: Adishwar Rishi Date: Fri, 5 Jan 2024 18:06:15 +1100 Subject: [PATCH 3/4] Add changeset --- .changeset/sixty-moons-switch.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/sixty-moons-switch.md diff --git a/.changeset/sixty-moons-switch.md b/.changeset/sixty-moons-switch.md new file mode 100644 index 0000000..e0b79d3 --- /dev/null +++ b/.changeset/sixty-moons-switch.md @@ -0,0 +1,5 @@ +--- +"wrangler-action": patch +--- + +Surface inner exception when secret:bulk upload command fails From b92719544ec44ae706693731f2c9785e8fbaf8e3 Mon Sep 17 00:00:00 2001 From: Adishwar Rishi Date: Fri, 5 Jan 2024 18:08:54 +1100 Subject: [PATCH 4/4] Remove extra debug description for err.stack --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 7a72c46..576e3fd 100755 --- a/src/index.ts +++ b/src/index.ts @@ -208,7 +208,7 @@ async function uploadSecrets() { } catch (err: unknown) { if (err instanceof Error) { error(err.message); - debug(`wrangler secret:bulk error stack: ${err.stack}`); + err.stack && debug(err.stack); } throw new Error(`Failed to upload secrets.`); } finally {