Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/warm-clowns-visit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"wrangler": patch
---

Support the deletion of secrets with complex names
28 changes: 22 additions & 6 deletions packages/wrangler/src/__tests__/secret.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -563,16 +563,15 @@ describe("wrangler secret", () => {
msw.use(
http.delete(
`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets/:secretName`,
({ params }) => {
({ request, params }) => {
expect(params.accountId).toEqual("some-account-id");
expect(params.scriptName).toEqual(
legacyEnv && env ? `script-name-${env}` : "script-name"
);
if (!legacyEnv) {
if (env) {
expect(params.secretName).toEqual(input.secretName);
}
}
expect(params.secretName).toEqual(input.secretName);
expect(
new URL(request.url).searchParams.get("url_encoded")
).toEqual("true");
return HttpResponse.json(createFetchResult(null));
},
{ once: true }
Expand Down Expand Up @@ -616,6 +615,23 @@ describe("wrangler secret", () => {
expect(std.err).toMatchInlineSnapshot(`""`);
});

it("should delete a secret which name includes special characters", async () => {
mockDeleteRequest({ scriptName: "script-name", secretName: "the/key" });
mockConfirm({
text: "Are you sure you want to permanently delete the secret the/key on the Worker script-name?",
result: true,
});
await runWrangler("secret delete the/key --name script-name");
expect(std.out).toMatchInlineSnapshot(`
"
⛅️ wrangler x.x.x
──────────────────
🌀 Deleting the secret the/key on the Worker script-name
✨ Success! Deleted secret the/key"
`);
expect(std.err).toMatchInlineSnapshot(`""`);
});

it("should delete a secret: legacy envs", async () => {
mockDeleteRequest(
{ scriptName: "script-name", secretName: "the-key" },
Expand Down
9 changes: 8 additions & 1 deletion packages/wrangler/src/secret/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,14 @@ export const secretDeleteCommand = createCommand({
? `/accounts/${accountId}/workers/scripts/${scriptName}/secrets`
: `/accounts/${accountId}/workers/services/${scriptName}/environments/${args.env}/secrets`;

await fetchResult(config, `${url}/${args.key}`, { method: "DELETE" });
await fetchResult(
config,
`${url}/${encodeURIComponent(args.key)}`,
{ method: "DELETE" },
new URLSearchParams({
url_encoded: "true",
})
);
metrics.sendMetricsEvent("delete encrypted variable", {
sendMetrics: config.send_metrics,
});
Expand Down
Loading