wrangler 0.0.0-e30d1013 → 0.0.0-e311bbbf

package/src/__tests__/queues.test.ts

@@ -1,9 +1,10 @@
-import { type QueueResponse, type PostConsumerBody } from "../queues/client";
+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 { msw } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
+import type { QueueResponse, PostConsumerBody } from "../queues/client";
 
 describe("wrangler", () => {
 	mockAccountId();
@@ -11,10 +12,6 @@ describe("wrangler", () => {
 	runInTempDir();
 	const std = mockConsoleMethods();
 
-	afterEach(() => {
-		unsetAllMocks();
-	});
-
 	describe("queues", () => {
 		it("should show the correct help text", async () => {
 			await runWrangler("queues --help");
@@ -31,25 +28,35 @@ describe("wrangler", () => {
 			  wrangler queues consumer       Configure Queue Consumers
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 
 		describe("list", () => {
 			function mockListRequest(queues: QueueResponse[], page: number) {
 				const requests = { count: 0 };
-				setMockResponse(
-					"/accounts/:accountId/workers/queues",
-					([_url, accountId], init, params) => {
-						requests.count++;
-						expect(params.get("page")).toEqual((page || 1).toString());
-						expect(accountId).toEqual("some-account-id");
-						expect(init).toEqual({});
-						return queues;
-					}
+				msw.use(
+					rest.get(
+						"*/accounts/:accountId/workers/queues?*",
+						async (request, response, context) => {
+							requests.count += 1;
+							const query = request.url.searchParams;
+							expect(Number(query.get("page"))).toEqual(page);
+							expect(await request.text()).toEqual("");
+							return response.once(
+								context.json({
+									success: true,
+									errors: [],
+									messages: [],
+									result: queues,
+								})
+							);
+						}
+					)
 				);
 				return requests;
 			}
@@ -63,10 +70,11 @@ describe("wrangler", () => {
 			List Queues
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]
 
 			Options:
 			      --page  Page number for pagination  [number]"
@@ -116,15 +124,30 @@ describe("wrangler", () => {
 		describe("create", () => {
 			function mockCreateRequest(expectedQueueName: string) {
 				const requests = { count: 0 };
-				setMockResponse(
-					"/accounts/:accountId/workers/queues",
-					"POST",
-					([_url, accountId], { body }) => {
-						expect(accountId).toEqual("some-account-id");
-						const queueName = JSON.parse(body as string).queue_name;
-						expect(queueName).toEqual(expectedQueueName);
-						requests.count += 1;
-					}
+
+				msw.use(
+					rest.post(
+						"*/accounts/:accountId/workers/queues",
+						async (request, response, context) => {
+							requests.count += 1;
+							const body = (await request.json()) as {
+								queue_name: string;
+							};
+							expect(body.queue_name).toEqual(expectedQueueName);
+							return response.once(
+								context.json({
+									success: true,
+									errors: [],
+									messages: [],
+									result: {
+										queue_name: expectedQueueName,
+										created_on: "01-01-2001",
+										modified_on: "01-01-2001",
+									},
+								})
+							);
+						}
+					)
 				);
 				return requests;
 			}
@@ -141,10 +164,11 @@ describe("wrangler", () => {
 			  name  The name of the queue  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 			});
 
@@ -157,18 +181,67 @@ describe("wrangler", () => {
 			  `);
 				expect(requests.count).toEqual(1);
 			});
+
+			it("should show link to dash when not enabled", async () => {
+				const queueName = "testQueue";
+				msw.use(
+					rest.post(
+						"*/accounts/:accountId/workers/queues",
+						async (request, response, context) => {
+							expect(request.params.accountId).toEqual("some-account-id");
+							return response.once(
+								context.status(403),
+								context.json({
+									success: false,
+									errors: [
+										{ message: "workers.api.error.unauthorized", code: 10023 },
+									],
+									messages: [],
+								})
+							);
+						}
+					)
+				);
+
+				await expect(
+					runWrangler(`queues create ${queueName}`)
+				).rejects.toThrowError();
+				expect(std.out).toMatchInlineSnapshot(`
+			"Creating queue testQueue.
+			Queues is not currently enabled on this account. Go to https://dash.cloudflare.com/some-account-id/workers/queues to enable it.
+
+			X [ERROR] A request to the Cloudflare API (/accounts/some-account-id/workers/queues) failed.
+
+			  workers.api.error.unauthorized [code: 10023]
+
+			  If you think this is a bug, please open an issue at:
+			  https://github.com/cloudflare/workers-sdk/issues/new/choose
+
+			"
+		`);
+			});
 		});
 
 		describe("delete", () => {
 			function mockDeleteRequest(expectedQueueName: string) {
 				const requests = { count: 0 };
-				setMockResponse(
-					`/accounts/:accountId/workers/queues/${expectedQueueName}`,
-					"DELETE",
-					([_url, accountId]) => {
-						expect(accountId).toEqual("some-account-id");
-						requests.count += 1;
-					}
+				msw.use(
+					rest.delete(
+						"*/accounts/:accountId/workers/queues/:queueName",
+						async (request, response, context) => {
+							requests.count += 1;
+							expect(request.params.queueName).toEqual(expectedQueueName);
+							expect(request.params.accountId).toEqual("some-account-id");
+							return response.once(
+								context.json({
+									success: true,
+									errors: [],
+									messages: [],
+									result: {},
+								})
+							);
+						}
+					)
 				);
 				return requests;
 			}
@@ -185,10 +258,11 @@ describe("wrangler", () => {
 			  name  The name of the queue  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 			});
 
@@ -218,10 +292,11 @@ describe("wrangler", () => {
 			  wrangler queues consumer remove <queue-name> <script-name>  Remove a Queue Consumer
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 			});
 
@@ -231,14 +306,24 @@ describe("wrangler", () => {
 					expectedBody: PostConsumerBody
 				) {
 					const requests = { count: 0 };
-					setMockResponse(
-						`/accounts/:accountId/workers/queues/${expectedQueueName}/consumers`,
-						"POST",
-						([_url, accountId], { body }) => {
-							expect(accountId).toEqual("some-account-id");
-							expect(JSON.parse(body as string)).toEqual(expectedBody);
-							requests.count += 1;
-						}
+					msw.use(
+						rest.post(
+							"*/accounts/:accountId/workers/queues/:queueName/consumers",
+							async (request, response, context) => {
+								requests.count += 1;
+								expect(request.params.queueName).toEqual(expectedQueueName);
+								expect(request.params.accountId).toEqual("some-account-id");
+								expect(await request.json()).toEqual(expectedBody);
+								return response.once(
+									context.json({
+										success: true,
+										errors: [],
+										messages: [],
+										result: {},
+									})
+								);
+							}
+						)
 					);
 					return requests;
 				}
@@ -256,16 +341,18 @@ describe("wrangler", () => {
 				  script-name  Name of the consumer script  [string] [required]
 
 				Flags:
-				  -c, --config   Path to .toml configuration file  [string]
-				  -e, --env      Environment to use for operations and .env files  [string]
-				  -h, --help     Show help  [boolean]
-				  -v, --version  Show version number  [boolean]
+				  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+				  -c, --config                    Path to .toml configuration file  [string]
+				  -e, --env                       Environment to use for operations and .env files  [string]
+				  -h, --help                      Show help  [boolean]
+				  -v, --version                   Show version number  [boolean]
 
 				Options:
 				      --batch-size         Maximum number of messages per batch  [number]
 				      --batch-timeout      Maximum number of seconds to wait to fill a batch with messages  [number]
 				      --message-retries    Maximum number of retries for each message  [number]
-				      --dead-letter-queue  Queue to send messages that failed to be consumed  [string]"
+				      --dead-letter-queue  Queue to send messages that failed to be consumed  [string]
+				      --max-concurrency    The maximum number of concurrent consumer Worker invocations. Must be a positive integer  [number]"
 			`);
 				});
 
@@ -277,6 +364,7 @@ describe("wrangler", () => {
 							batch_size: undefined,
 							max_retries: undefined,
 							max_wait_time_ms: undefined,
+							max_concurrency: undefined,
 						},
 						dead_letter_queue: undefined,
 					};
@@ -296,19 +384,64 @@ describe("wrangler", () => {
 							batch_size: 20,
 							max_retries: 3,
 							max_wait_time_ms: 10 * 1000,
+							max_concurrency: 3,
 						},
 						dead_letter_queue: "myDLQ",
 					};
 					mockPostRequest("testQueue", expectedBody);
 
 					await runWrangler(
-						"queues consumer add testQueue testScript --env myEnv --batch-size 20 --batch-timeout 10 --message-retries 3 --dead-letter-queue myDLQ"
+						"queues consumer add testQueue testScript --env myEnv --batch-size 20 --batch-timeout 10 --message-retries 3 --max-concurrency 3 --dead-letter-queue myDLQ"
 					);
 					expect(std.out).toMatchInlineSnapshot(`
 						"Adding consumer to queue testQueue.
 						Added consumer to queue testQueue."
 					`);
 				});
+
+				it("should show link to dash when not enabled", async () => {
+					const queueName = "testQueue";
+					msw.use(
+						rest.post(
+							"*/accounts/:accountId/workers/queues/:queueName/consumers",
+							async (request, response, context) => {
+								expect(request.params.queueName).toEqual(queueName);
+								expect(request.params.accountId).toEqual("some-account-id");
+								return response.once(
+									context.status(403),
+									context.json({
+										success: false,
+										errors: [
+											{
+												code: 10023,
+												message: "workers.api.error.unauthorized",
+											},
+										],
+										messages: [],
+										result: {},
+									})
+								);
+							}
+						)
+					);
+
+					await expect(
+						runWrangler(`queues consumer add ${queueName} testScript`)
+					).rejects.toThrowError();
+					expect(std.out).toMatchInlineSnapshot(`
+				"Adding consumer to queue testQueue.
+				Queues is not currently enabled on this account. Go to https://dash.cloudflare.com/some-account-id/workers/queues to enable it.
+
+				X [ERROR] A request to the Cloudflare API (/accounts/some-account-id/workers/queues/testQueue/consumers) failed.
+
+				  workers.api.error.unauthorized [code: 10023]
+
+				  If you think this is a bug, please open an issue at:
+				  https://github.com/cloudflare/workers-sdk/issues/new/choose
+
+				"
+			`);
+				});
 			});
 
 			describe("delete", () => {
@@ -317,13 +450,32 @@ describe("wrangler", () => {
 					expectedScriptName: string,
 					expectedEnvName?: string
 				) {
-					let resource = `/accounts/:accountId/workers/queues/${expectedQueueName}/consumers/${expectedScriptName}`;
+					const requests = { count: 0 };
+					let resource = `accounts/:accountId/workers/queues/:expectedQueueName/consumers/:expectedScriptName`;
 					if (expectedEnvName !== undefined) {
-						resource += `/environments/${expectedEnvName}`;
+						resource += `/environments/:expectedEnvName`;
 					}
-					setMockResponse(resource, "DELETE", ([_url, accountId]) => {
-						expect(accountId).toEqual("some-account-id");
-					});
+					msw.use(
+						rest.delete(`*/${resource}`, async (request, response, context) => {
+							requests.count++;
+							expect(request.params.accountId).toBe("some-account-id");
+							expect(request.params.expectedQueueName).toBe(expectedQueueName);
+							expect(request.params.expectedScriptName).toBe(
+								expectedScriptName
+							);
+							return response.once(
+								context.status(200),
+								context.json({
+									success: true,
+									errors: [],
+									messages: [],
+									result: {},
+								})
+							);
+						})
+					);
+
+					return requests;
 				}
 
 				it("should show the correct help text", async () => {
@@ -339,16 +491,19 @@ describe("wrangler", () => {
 				  script-name  Name of the consumer script  [string] [required]
 
 				Flags:
-				  -c, --config   Path to .toml configuration file  [string]
-				  -e, --env      Environment to use for operations and .env files  [string]
-				  -h, --help     Show help  [boolean]
-				  -v, --version  Show version number  [boolean]"
+				  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+				  -c, --config                    Path to .toml configuration file  [string]
+				  -e, --env                       Environment to use for operations and .env files  [string]
+				  -h, --help                      Show help  [boolean]
+				  -v, --version                   Show version number  [boolean]"
 			`);
 				});
 
 				it("should delete a consumer with no --env", async () => {
-					mockDeleteRequest("testQueue", "testScript");
+					const requests = mockDeleteRequest("testQueue", "testScript");
 					await runWrangler("queues consumer remove testQueue testScript");
+
+					expect(requests.count).toEqual(1);
 					expect(std.out).toMatchInlineSnapshot(`
 						"Removing consumer from queue testQueue.
 						Removed consumer from queue testQueue."
@@ -356,10 +511,16 @@ describe("wrangler", () => {
 				});
 
 				it("should delete a consumer with --env", async () => {
-					mockDeleteRequest("testQueue", "testScript", "myEnv");
+					const requests = mockDeleteRequest(
+						"testQueue",
+						"testScript",
+						"myEnv"
+					);
 					await runWrangler(
 						"queues consumer remove testQueue testScript --env myEnv"
 					);
+
+					expect(requests.count).toEqual(1);
 					expect(std.out).toMatchInlineSnapshot(`
 						"Removing consumer from queue testQueue.
 						Removed consumer from queue testQueue."

package/src/__tests__/r2.test.ts

@@ -4,7 +4,7 @@ import prettyBytes from "pretty-bytes";
 import { MAX_UPLOAD_SIZE } from "../r2/constants";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { msw, mswSuccessR2handlers } from "./helpers/msw";
+import { createFetchResult, msw, mswSuccessR2handlers } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
 import type { R2BucketInfo } from "../r2/helpers";
@@ -39,10 +39,11 @@ describe("r2", () => {
 			  wrangler r2 bucket delete <name>  Delete an R2 bucket
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 		});
 
@@ -60,12 +61,8 @@ describe("r2", () => {
 							expect(accountId).toEqual("some-account-id");
 							expect(await request.text()).toEqual("");
 							return response.once(
-								context.status(200),
-								context.json({
-									success: true,
-									errors: [],
-									messages: [],
-									result: {
+								context.json(
+									createFetchResult({
 										buckets: [
 											{
 												name: "bucket-1-local-once",
@@ -76,8 +73,8 @@ describe("r2", () => {
 												creation_date: "01-01-2001",
 											},
 										],
-									},
-								})
+									})
+								)
 							);
 						}
 					)
@@ -107,10 +104,11 @@ describe("r2", () => {
 			  name  The name of the new bucket  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`
 				            "X [ERROR] Not enough non-option arguments: got 0, need at least 1
@@ -135,10 +133,11 @@ describe("r2", () => {
 			  name  The name of the new bucket  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`
 				            "X [ERROR] Unknown arguments: def, ghi
@@ -155,15 +154,7 @@ describe("r2", () => {
 							const { accountId } = request.params;
 							expect(accountId).toEqual("some-account-id");
 							expect(await request.json()).toEqual({ name: "testBucket" });
-							response.once(
-								context.status(200),
-								context.json({
-									success: true,
-									errors: [],
-									messages: [],
-									result: {},
-								})
-							);
+							return response.once(context.json(createFetchResult({})));
 						}
 					)
 				);
@@ -192,10 +183,11 @@ describe("r2", () => {
 			  name  The name of the bucket to delete  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`
 				            "X [ERROR] Not enough non-option arguments: got 0, need at least 1
@@ -220,10 +212,11 @@ describe("r2", () => {
 			  name  The name of the bucket to delete  [string] [required]
 
 			Flags:
-			  -c, --config   Path to .toml configuration file  [string]
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -c, --config                    Path to .toml configuration file  [string]
+			  -e, --env                       Environment to use for operations and .env files  [string]
+			  -h, --help                      Show help  [boolean]
+			  -v, --version                   Show version number  [boolean]"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`
 				            "X [ERROR] Unknown arguments: def, ghi
@@ -245,15 +238,7 @@ describe("r2", () => {
 								"Bearer some-api-token"
 							);
 
-							return response.once(
-								context.status(200),
-								context.json({
-									success: true,
-									errors: [],
-									messages: [],
-									result: null,
-								})
-							);
+							return response.once(context.json(createFetchResult(null)));
 						}
 					)
 				);
@@ -332,18 +317,14 @@ describe("r2", () => {
 					  "host": "api.cloudflare.com",
 					}
 				`);
-						response.once(
-							context.status(200),
-							context.json({
-								success: true,
-								errors: [],
-								messages: [],
-								result: {
+						return response.once(
+							context.json(
+								createFetchResult({
 									accountId: "some-account-id",
 									bucketName: "bucketName-object-test",
 									objectName: "wormhole-img.png",
-								},
-							})
+								})
+							)
 						);
 					}
 				)