wrangler 2.12.3 → 2.13.0

package/src/__tests__/jest.setup.ts

@@ -1,7 +1,11 @@
+import chalk from "chalk";
 import fetchMock from "jest-fetch-mock";
 import { MockWebSocket } from "./helpers/mock-web-socket";
 import { msw } from "./helpers/msw";
 
+//turn off chalk for tests due to inconsistencies between operating systems
+chalk.level = 0;
+
 /**
  * The relative path between the bundled code and the Wrangler package.
  * This is used as a reliable way to compute paths relative to the Wrangler package

package/src/__tests__/mtls-certificates.test.ts

@@ -385,14 +385,17 @@ describe("wrangler", () => {
 				  wrangler logout                      🚪 Logout from Cloudflare
 				  wrangler whoami                      🕵️  Retrieve your user info and test your auth config
 				  wrangler types                       📝 Generate types from bindings & module rules in config
-				  wrangler deployments                 🚢 Displays the 10 most recent deployments for a worker
+				  wrangler deployments                 🚢 List and view details for deployments
+				  wrangler rollback [deployment-id]    🔙 Rollback a deployment
 
 				Flags:
 				  -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]"
+				  -v, --version                   Show version number  [boolean]
+
+				🚧\`wrangler rollback\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose"
 			`);
 				});
 			});

package/src/__tests__/publish.test.ts

@@ -32,7 +32,7 @@ import {
 	createFetchResult,
 	msw,
 	mswSuccessDeployments,
-	mswSuccessLastDeployment,
+	mswSuccessDeploymentScriptMetadata,
 } from "./helpers/msw";
 import { FileReaderSync } from "./helpers/msw/read-file-sync";
 import { runInTempDir } from "./helpers/run-in-tmp";
@@ -89,7 +89,7 @@ describe("publish", () => {
 			);
 			writeWorkerSource();
 			mockSubDomainRequest();
-			mockUploadWorkerRequest({ expectedType: "esm", sendScriptIds: true });
+			mockUploadWorkerRequest({ expectedType: "esm" });
 			mockOAuthServerCallback();
 
 			await runWrangler("publish ./index");
@@ -1341,6 +1341,32 @@ export default{
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
+		it("should allow cloudflare module import", async () => {
+			writeWranglerToml();
+			fs.writeFileSync(
+				"./index.js",
+				`
+import { EmailMessage } from "cloudflare:email";
+export default{
+  fetch(){
+    return new Response("all done");
+  }
+}
+`
+			);
+			mockUploadWorkerRequest();
+			mockSubDomainRequest();
+			await runWrangler("publish index.js");
+			expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: Galaxy-Class"
+		`);
+			expect(std.err).toMatchInlineSnapshot(`""`);
+		});
+
 		it("should be able to transpile entry-points in sub-directories (esm)", async () => {
 			writeWranglerToml();
 			writeWorkerSource({ basePath: "./src" });
@@ -7324,54 +7350,6 @@ export default{
 		});
 	});
 
-	it("should publish if the last deployed source check fails", async () => {
-		writeWorkerSource();
-		writeWranglerToml();
-		mockSubDomainRequest();
-		mockUploadWorkerRequest();
-		msw.use(
-			rest.get(
-				"*/accounts/:accountId/workers/deployments/by-script/:scriptTag",
-				(_, res, ctx) => {
-					return res(
-						ctx.json(
-							createFetchResult({
-								latest: { number: "2" },
-							})
-						)
-					);
-				}
-			),
-			rest.get(
-				"*/accounts/:accountId/workers/services/:scriptName",
-				(_, res, ctx) => {
-					return res(
-						ctx.json(
-							createFetchResult(null, false, [
-								{ code: 10090, message: "workers.api.error.service_not_found" },
-							])
-						)
-					);
-				}
-			)
-		);
-
-		await runWrangler("publish index.js");
-		expect(std).toMatchInlineSnapshot(`
-		Object {
-		  "debug": "",
-		  "err": "",
-		  "info": "",
-		  "out": "Total Upload: xx KiB / gzip: xx KiB
-		Uploaded test-name (TIMINGS)
-		Published test-name (TIMINGS)
-		  https://test-name.test-sub-domain.workers.dev
-		Current Deployment ID: undefined",
-		  "warn": "",
-		}
-	`);
-	});
-
 	it("should not publish if there's any other kind of error when checking deployment source", async () => {
 		writeWorkerSource();
 		writeWranglerToml();
@@ -7481,6 +7459,83 @@ export default{
 		`);
 		});
 
+		it("should support queue consumer concurrency with a max concurrency specified", async () => {
+			writeWranglerToml({
+				queues: {
+					consumers: [
+						{
+							queue: "queue1",
+							dead_letter_queue: "myDLQ",
+							max_batch_size: 5,
+							max_batch_timeout: 3,
+							max_retries: 10,
+							max_concurrency: 5,
+						},
+					],
+				},
+			});
+			await fs.promises.writeFile("index.js", `export default {};`);
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			mockGetQueue("queue1");
+			mockPutQueueConsumer("queue1", "test-name", {
+				dead_letter_queue: "myDLQ",
+				settings: {
+					batch_size: 5,
+					max_retries: 10,
+					max_wait_time_ms: 3000,
+					max_concurrency: 5,
+				},
+			});
+			await runWrangler("publish index.js");
+			expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			  Consumer for queue1
+			Current Deployment ID: Galaxy-Class"
+		`);
+		});
+
+		it("should support queue consumer concurrency with a null max concurrency", async () => {
+			writeWranglerToml({
+				queues: {
+					consumers: [
+						{
+							queue: "queue1",
+							dead_letter_queue: "myDLQ",
+							max_batch_size: 5,
+							max_batch_timeout: 3,
+							max_retries: 10,
+							max_concurrency: null,
+						},
+					],
+				},
+			});
+			await fs.promises.writeFile("index.js", `export default {};`);
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			mockGetQueue("queue1");
+			mockPutQueueConsumer("queue1", "test-name", {
+				dead_letter_queue: "myDLQ",
+				settings: {
+					batch_size: 5,
+					max_retries: 10,
+					max_wait_time_ms: 3000,
+				},
+			});
+			await runWrangler("publish index.js");
+			expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			  Consumer for queue1
+			Current Deployment ID: Galaxy-Class"
+		`);
+		});
+
 		it("consumer should error when a queue doesn't exist", async () => {
 			writeWranglerToml({
 				queues: {
@@ -7609,6 +7664,33 @@ export default{
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
+
+		it("should send keepVars when `keep_vars = true`", async () => {
+			process.env = {
+				CLOUDFLARE_API_TOKEN: "hunter2",
+				CLOUDFLARE_ACCOUNT_ID: "some-account-id",
+			};
+			setIsTTY(false);
+			writeWranglerToml({
+				keep_vars: true,
+			});
+			writeWorkerSource();
+			mockSubDomainRequest();
+			mockUploadWorkerRequest({ keepVars: true });
+			mockOAuthServerCallback();
+			mockGetMemberships([]);
+
+			await runWrangler("publish index.js");
+
+			expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: Galaxy-Class"
+		`);
+			expect(std.err).toMatchInlineSnapshot(`""`);
+		});
 	});
 });
 
@@ -7630,7 +7712,7 @@ function mockDeploymentsListRequest() {
 }
 
 function mockLastDeploymentRequest() {
-	msw.use(...mswSuccessLastDeployment);
+	msw.use(...mswSuccessDeploymentScriptMetadata);
 }
 
 /** Create a mock handler for the request to upload a worker script. */
@@ -7648,7 +7730,6 @@ function mockUploadWorkerRequest(
 		expectedUnsafeMetaData?: Record<string, string>;
 		env?: string;
 		legacyEnv?: boolean;
-		sendScriptIds?: boolean;
 		keepVars?: boolean;
 		tag?: string;
 	} = {}
@@ -7666,7 +7747,6 @@ function mockUploadWorkerRequest(
 		legacyEnv = false,
 		expectedMigrations,
 		expectedUnsafeMetaData,
-		sendScriptIds,
 		keepVars,
 	} = options;
 	if (env && !legacyEnv) {
@@ -7748,12 +7828,11 @@ function mockUploadWorkerRequest(
 			ctx.json(
 				createFetchResult({
 					available_on_subdomain,
-					...(sendScriptIds && {
-						id: "abc12345",
-						etag: "etag98765",
-						pipeline_hash: "hash9999",
-						tag: "sample-tag",
-					}),
+					id: "abc12345",
+					etag: "etag98765",
+					pipeline_hash: "hash9999",
+					tag: "sample-tag",
+					deployment_id: "Galaxy-Class",
 				})
 			)
 		);

package/src/__tests__/queues.test.ts

@@ -351,7 +351,8 @@ describe("wrangler", () => {
 				      --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]"
 			`);
 				});
 
@@ -363,6 +364,7 @@ describe("wrangler", () => {
 							batch_size: undefined,
 							max_retries: undefined,
 							max_wait_time_ms: undefined,
+							max_concurrency: undefined,
 						},
 						dead_letter_queue: undefined,
 					};
@@ -382,13 +384,14 @@ 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.