wrangler 2.6.2 → 2.7.0

package/src/__tests__/secret.test.ts

@@ -1,34 +1,52 @@
 import * as fs from "node:fs";
 import { writeFileSync } from "node:fs";
 import * as TOML from "@iarna/toml";
+import { rest } from "msw";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
-import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import {
-	mockConfirm,
-	mockPrompt,
-	clearConfirmMocks,
-	clearPromptMocks,
-} from "./helpers/mock-dialogs";
-import {
-	mockGetMemberships,
-	mockGetMembershipsFail,
-} from "./helpers/mock-oauth-flow";
+import { mockConfirm, mockPrompt, clearDialogs } from "./helpers/mock-dialogs";
+import { useMockIsTTY } from "./helpers/mock-istty";
+
 import { useMockStdin } from "./helpers/mock-stdin";
+import { msw } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 
+function createFetchResult(result: unknown, success = true) {
+	return {
+		success,
+		errors: [],
+		messages: [],
+		result,
+	};
+}
+
+export function mockGetMembershipsFail() {
+	msw.use(
+		rest.get("*/memberships", (req, res, ctx) => {
+			return res.once(ctx.json(createFetchResult([], false)));
+		})
+	);
+}
+
+export function mockGetMemberships(
+	accounts: { id: string; account: { id: string; name: string } }[]
+) {
+	msw.use(
+		rest.get("*/memberships", (req, res, ctx) => {
+			return res.once(ctx.json(createFetchResult(accounts)));
+		})
+	);
+}
+
 describe("wrangler secret", () => {
 	const std = mockConsoleMethods();
-
+	const { setIsTTY } = useMockIsTTY();
 	runInTempDir();
 	mockAccountId();
 	mockApiToken();
-
 	afterEach(() => {
-		unsetAllMocks();
-		clearConfirmMocks();
-		clearPromptMocks();
+		clearDialogs();
 	});
 
 	describe("put", () => {
@@ -39,34 +57,37 @@ describe("wrangler secret", () => {
 		) {
 			const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 			const environment = env && !legacyEnv ? "/environments/:envName" : "";
-			setMockResponse(
-				`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
-				"PUT",
-				([_url, accountId, scriptName, envName], { body }) => {
-					expect(accountId).toEqual("some-account-id");
-					expect(scriptName).toEqual(
-						legacyEnv && env ? `script-name-${env}` : "script-name"
-					);
-					if (!legacyEnv) {
-						expect(envName).toEqual(env);
-					}
-					const { name, text, type } = JSON.parse(body as string);
-					expect(type).toEqual("secret_text");
-					expect(name).toEqual(input.name);
-					expect(text).toEqual(input.text);
+			msw.use(
+				rest.put(
+					`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
+					async (req, res, ctx) => {
+						expect(req.params.accountId).toEqual("some-account-id");
+						expect(req.params.scriptName).toEqual(
+							legacyEnv && env ? `script-name-${env}` : "script-name"
+						);
+						if (!legacyEnv) {
+							expect(req.params.envName).toEqual(env);
+						}
+						const { name, text, type } = await req.json();
+						expect(type).toEqual("secret_text");
+						expect(name).toEqual(input.name);
+						expect(text).toEqual(input.text);
 
-					return { name, type };
-				}
+						return res.once(ctx.json(createFetchResult({ name, type })));
+					}
+				)
 			);
 		}
 
 		describe("interactive", () => {
-			useMockStdin({ isTTY: true });
+			beforeEach(() => {
+				setIsTTY(true);
+			});
 
 			it("should trim stdin secret value", async () => {
 				mockPrompt({
 					text: "Enter a secret value:",
-					type: "password",
+					options: { isSecret: true },
 					result: `hunter2
           `,
 				});
@@ -82,7 +103,7 @@ describe("wrangler secret", () => {
 			it("should create a secret", async () => {
 				mockPrompt({
 					text: "Enter a secret value:",
-					type: "password",
+					options: { isSecret: true },
 					result: "the-secret",
 				});
 
@@ -107,15 +128,23 @@ describe("wrangler secret", () => {
 
 				// User counter to pass different secrets to the request mock
 				let counter = 0;
-				setMockResponse(
-					`/accounts/:accountId/workers/scripts/:scriptName/secrets`,
-					"PUT",
-					([_url, accountId]) => {
-						expect(accountId).toEqual("some-account-id");
-						counter++;
-
-						return { name: `secret-name-${counter}`, type: "secret_text" };
-					}
+				msw.use(
+					rest.put(
+						`*/accounts/:accountId/workers/scripts/:scriptName/secrets`,
+						(req, res, ctx) => {
+							expect(req.params.accountId).toEqual("some-account-id");
+							counter++;
+
+							return res(
+								ctx.json(
+									createFetchResult({
+										name: `secret-name-${counter}`,
+										type: "secret_text",
+									})
+								)
+							);
+						}
+					)
 				);
 
 				await runWrangler("secret:bulk ./secret.json --name script-name");
@@ -131,7 +160,7 @@ describe("wrangler secret", () => {
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
 
-			it("should handle failed secret:bulk", async () => {
+			it("should handle network failure on secret:bulk", async () => {
 				writeFileSync(
 					"secret.json",
 					JSON.stringify({
@@ -142,17 +171,16 @@ describe("wrangler secret", () => {
 
 				// User counter to pass different secrets to the request mock
 				let counter = 0;
-				setMockResponse(
-					`/accounts/:accountId/workers/scripts/:scriptName/secrets`,
-					"PUT",
-					([_url, accountId]) => {
-						expect(accountId).toEqual("some-account-id");
-						counter++;
-
-						return Promise.reject(
-							new Error(`Failed to create secret ${counter}`)
-						);
-					}
+				msw.use(
+					rest.put(
+						`*/accounts/:accountId/workers/scripts/:scriptName/secrets`,
+						(req, res) => {
+							expect(req.params.accountId).toEqual("some-account-id");
+							counter++;
+
+							return res.networkError(`Failed to create secret ${counter}`);
+						}
+					)
 				);
 
 				await runWrangler("secret:bulk ./secret.json --name script-name");
@@ -167,18 +195,22 @@ describe("wrangler secret", () => {
 				expect(std.err).toMatchInlineSnapshot(`
 			"X [ERROR] 🚨 Error uploading secret for key: secret-name-1:
 
-			                  Failed to create secret 1
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 1
 
 
 			X [ERROR] 🚨 Error uploading secret for key: secret-name-2:
 
-			                  Failed to create secret 2
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 2
 
 			"
 		`);
 			});
 
-			it("should count success and failed secret:bulk", async () => {
+			it("should count success and network failure on secret:bulk", async () => {
 				writeFileSync(
 					"secret.json",
 					JSON.stringify({
@@ -194,21 +226,27 @@ describe("wrangler secret", () => {
 
 				// User counter to pass different secrets to the request mock
 				let counter = 0;
-				setMockResponse(
-					`/accounts/:accountId/workers/scripts/:scriptName/secrets`,
-					"PUT",
-					([_url, accountId]) => {
-						expect(accountId).toEqual("some-account-id");
-						counter++;
-
-						if (counter % 2 === 0) {
-							return { name: `secret-name-${counter}`, type: "secret_text" };
-						} else {
-							return Promise.reject(
-								new Error(`Failed to create secret ${counter}`)
-							);
+				msw.use(
+					rest.put(
+						`*/accounts/:accountId/workers/scripts/:scriptName/secrets`,
+						(req, res, ctx) => {
+							expect(req.params.accountId).toEqual("some-account-id");
+							counter++;
+
+							if (counter % 2 === 0) {
+								return res(
+									ctx.json(
+										createFetchResult({
+											name: `secret-name-${counter}`,
+											type: "secret_text",
+										})
+									)
+								);
+							} else {
+								return res.networkError(`Failed to create secret ${counter}`);
+							}
 						}
-					}
+					)
 				);
 
 				await runWrangler("secret:bulk ./secret.json --name script-name");
@@ -226,22 +264,30 @@ describe("wrangler secret", () => {
 				expect(std.err).toMatchInlineSnapshot(`
 			"X [ERROR] 🚨 Error uploading secret for key: secret-name-1:
 
-			                  Failed to create secret 1
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 1
 
 
 			X [ERROR] 🚨 Error uploading secret for key: secret-name-3:
 
-			                  Failed to create secret 3
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 3
 
 
 			X [ERROR] 🚨 Error uploading secret for key: secret-name-5:
 
-			                  Failed to create secret 5
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 5
 
 
 			X [ERROR] 🚨 Error uploading secret for key: secret-name-7:
 
-			                  Failed to create secret 7
+			                  request to
+			  https://api.cloudflare.com/client/v4/accounts/some-account-id/workers/scripts/script-name/secrets
+			  failed, reason: Failed to create secret 7
 
 			"
 		`);
@@ -250,7 +296,7 @@ describe("wrangler secret", () => {
 			it("should create a secret: legacy envs", async () => {
 				mockPrompt({
 					text: "Enter a secret value:",
-					type: "password",
+					options: { isSecret: true },
 					result: "the-secret",
 				});
 
@@ -273,7 +319,7 @@ describe("wrangler secret", () => {
 			it("should create a secret: service envs", async () => {
 				mockPrompt({
 					text: "Enter a secret value:",
-					type: "password",
+					options: { isSecret: true },
 					result: "the-secret",
 				});
 
@@ -316,6 +362,9 @@ describe("wrangler secret", () => {
 		});
 
 		describe("non-interactive", () => {
+			beforeEach(() => {
+				setIsTTY(false);
+			});
 			const mockStdIn = useMockStdin({ isTTY: false });
 
 			it("should trim stdin secret value, from piped input", async () => {
@@ -381,9 +430,9 @@ describe("wrangler secret", () => {
 					mockGetMemberships([]);
 					await expect(runWrangler("secret put the-key --name script-name"))
 						.rejects.toThrowErrorMatchingInlineSnapshot(`
-                  "Failed to automatically retrieve account IDs for the logged in user.
-                  In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as \`account_id\` in your \`wrangler.toml\` file."
-                `);
+				                  "Failed to automatically retrieve account IDs for the logged in user.
+				                  In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as \`account_id\` in your \`wrangler.toml\` file."
+			                `);
 				});
 
 				it("should use the account from wrangler.toml", async () => {
@@ -423,19 +472,22 @@ describe("wrangler secret", () => {
 
 					await expect(runWrangler("secret put the-key --name script-name"))
 						.rejects.toThrowErrorMatchingInlineSnapshot(`
-                  "More than one account available but unable to select one in non-interactive mode.
-                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
-                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
-                    \\"account-name-1\\" - \\"account-id-1\\")
-                    \\"account-name-2\\" - \\"account-id-2\\")
-                    \\"account-name-3\\" - \\"account-id-3\\")"
-                `);
+				"More than one account available but unable to select one in non-interactive mode.
+				Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
+				Available accounts are (\`<name>\`: \`<account_id>\`):
+				  \`account-name-1\`: \`account-id-1\`
+				  \`account-name-2\`: \`account-id-2\`
+				  \`account-name-3\`: \`account-id-3\`"
+			`);
 				});
 			});
 		});
 	});
 
 	describe("delete", () => {
+		beforeEach(() => {
+			setIsTTY(true);
+		});
 		function mockDeleteRequest(
 			input: {
 				scriptName: string;
@@ -446,28 +498,25 @@ describe("wrangler secret", () => {
 		) {
 			const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 			const environment = env && !legacyEnv ? "/environments/:envName" : "";
-			setMockResponse(
-				`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets/:secretName`,
-				"DELETE",
-				([_url, accountId, scriptName, envOrSecretName, secretName]) => {
-					expect(accountId).toEqual("some-account-id");
-					expect(scriptName).toEqual(
-						legacyEnv && env ? `script-name-${env}` : "script-name"
-					);
-					if (!legacyEnv) {
-						if (env) {
-							expect(envOrSecretName).toEqual(env);
-							expect(secretName).toEqual(input.secretName);
-						} else {
-							expect(envOrSecretName).toEqual(input.secretName);
+			msw.use(
+				rest.delete(
+					`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets/:secretName`,
+					(req, res, ctx) => {
+						expect(req.params.accountId).toEqual("some-account-id");
+						expect(req.params.scriptName).toEqual(
+							legacyEnv && env ? `script-name-${env}` : "script-name"
+						);
+						if (!legacyEnv) {
+							if (env) {
+								expect(req.params.secretName).toEqual(input.secretName);
+							}
 						}
-					} else {
-						expect(envOrSecretName).toEqual(input.secretName);
+						return res.once(ctx.json(createFetchResult(null)));
 					}
-					return null;
-				}
+				)
 			);
 		}
+
 		it("should delete a secret", async () => {
 			mockDeleteRequest({ scriptName: "script-name", secretName: "the-key" });
 			mockConfirm({
@@ -545,6 +594,9 @@ describe("wrangler secret", () => {
 	});
 
 	describe("list", () => {
+		beforeEach(() => {
+			setIsTTY(true);
+		});
 		function mockListRequest(
 			input: { scriptName: string },
 			env?: string,
@@ -552,25 +604,30 @@ describe("wrangler secret", () => {
 		) {
 			const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 			const environment = env && !legacyEnv ? "/environments/:envName" : "";
-			setMockResponse(
-				`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
-				"GET",
-				([_url, accountId, scriptName, envName]) => {
-					expect(accountId).toEqual("some-account-id");
-					expect(scriptName).toEqual(
-						legacyEnv && env ? `script-name-${env}` : "script-name"
-					);
-					if (!legacyEnv) {
-						expect(envName).toEqual(env);
-					}
+			msw.use(
+				rest.get(
+					`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/secrets`,
+					(req, res, ctx) => {
+						expect(req.params.accountId).toEqual("some-account-id");
+						expect(req.params.scriptName).toEqual(
+							legacyEnv && env ? `script-name-${env}` : "script-name"
+						);
+						if (!legacyEnv) {
+							expect(req.params.envName).toEqual(env);
+						}
 
-					return [
-						{
-							name: "the-secret-name",
-							type: "secret_text",
-						},
-					];
-				}
+						return res.once(
+							ctx.json(
+								createFetchResult([
+									{
+										name: "the-secret-name",
+										type: "secret_text",
+									},
+								])
+							)
+						);
+					}
+				)
 			);
 		}
 

package/src/__tests__/tail.test.ts

@@ -3,6 +3,7 @@ import { rest } from "msw";
 import { Headers, Request } from "undici";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
+import { mockConfirm, clearDialogs } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
 import { msw, mswSucessScriptHandlers } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
@@ -27,6 +28,7 @@ describe("tail", () => {
 	afterEach(() => {
 		mockWebSockets.forEach((ws) => ws.close());
 		mockWebSockets.splice(0);
+		clearDialogs();
 	});
 
 	/**
@@ -44,6 +46,10 @@ describe("tail", () => {
 		});
 		it("warns about durable object restarts for tty", async () => {
 			setIsTTY(true);
+			mockConfirm({
+				text: "Would you like to continue?",
+				result: false,
+			});
 			const api = mockWebsocketAPIs();
 			expect(api.requests.creation.length).toStrictEqual(0);
 			await runWrangler("tail durable-object--websocket--response");

package/src/__tests__/tsconfig-sanity.ts

@@ -0,0 +1,12 @@
+// `@types/node` should be included
+Buffer.from("test");
+
+// `@types/jest` should be included
+test("test");
+
+// @ts-expect-error `@cloudflare/workers-types` should NOT be included
+const _handler: ExportedHandler = {};
+// @ts-expect-error `@cloudflare/workers-types` should NOT be included
+new HTMLRewriter();
+
+export {};

package/src/__tests__/tsconfig.json

@@ -0,0 +1,8 @@
+{
+	"extends": "../../tsconfig.json",
+	"compilerOptions": {
+		"types": ["node", "jest"]
+	},
+	"include": ["../*.d.ts", "**/*.ts", "**/*.tsx", "**/*.js"],
+	"exclude": ["../jest.d.ts"]
+}