fix(wrangler) remove putQueue call when deploying a worker with queue producer binding (#10288) (#10330)

* MQ-861: Remove putQueue call when setting queue producer binding

* remove calls to mockPutQueueById in tests

* Update .changeset/chatty-pens-sniff.md



* try to ensure that the required deploy workers job is not skipped

* test: add a waitFor around log check for email bindings

---------

Co-authored-by: tgarg-cf <[email protected]>

Author: petebacondarwin

.changeset/chatty-pens-sniff.md

@@ -0,0 +1,7 @@
+---
+"wrangler": patch
+---
+
+Do not attempt to update queue producer settings when deploying a Worker with a queue binding
+
+Previously, each deployed Worker would update a subset of the queue producer's settings for each queue binding, which could result in broken queue producers or at least conflicts where different Workers tried to set different producer settings on a shared queue.

packages/wrangler/src/__tests__/deploy.test.ts

@@ -56,11 +56,7 @@ import { writeWranglerConfig } from "./helpers/write-wrangler-config";
 import type { AssetManifest } from "../assets";
 import type { Config } from "../config";
 import type { CustomDomain, CustomDomainChangeset } from "../deploy/deploy";
-import type {
-	PostQueueBody,
-	PostTypedConsumerBody,
-	QueueResponse,
-} from "../queues/client";
+import type { PostTypedConsumerBody, QueueResponse } from "../queues/client";
 import type { FormData } from "undici";
 import type { Mock } from "vitest";
 
@@ -11941,10 +11937,6 @@ export default{
 				modified_on: "",
 			};
 			mockGetQueueByName(queueName, existingQueue);
-			mockPutQueueById(queueId, {
-				queue_name: queueName,
-				settings: {},
-			});
 
 			await runWrangler("deploy index.js");
 			expect(std.out).toMatchInlineSnapshot(`
@@ -11987,12 +11979,7 @@ export default{
 				modified_on: "",
 			};
 			mockGetQueueByName(queueName, existingQueue);
-			mockPutQueueById(queueId, {
-				queue_name: queueName,
-				settings: {
-					delivery_delay: 10,
-				},
-			});
+
 			await runWrangler("deploy index.js");
 			expect(std.out).toMatchInlineSnapshot(`
 				"Total Upload: xx KiB / gzip: xx KiB
@@ -13928,37 +13915,6 @@ function mockPostConsumerById(
 	return requests;
 }
 
-function mockPutQueueById(
-	expectedQueueId: string,
-	expectedBody: PostQueueBody
-) {
-	const requests = { count: 0 };
-	msw.use(
-		http.put(
-			`*/accounts/:accountId/queues/:queueId`,
-			async ({ request, params }) => {
-				const body = await request.json();
-				expect(params.queueId).toEqual(expectedQueueId);
-				expect(params.accountId).toEqual("some-account-id");
-				expect(body).toEqual(expectedBody);
-				requests.count += 1;
-				return HttpResponse.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: {
-						queue: expectedBody.queue_name,
-						settings: {
-							delivery_delay: expectedBody.settings?.delivery_delay,
-						},
-					},
-				});
-			}
-		)
-	);
-	return requests;
-}
-
 function mockPostQueueHTTPConsumer(
 	expectedQueueId: string,
 	expectedBody: PostTypedConsumerBody

packages/wrangler/src/deploy/deploy.ts

@@ -35,7 +35,6 @@ import {
 	postConsumer,
 	putConsumer,
 	putConsumerById,
-	putQueue,
 } from "../queues/client";
 import { syncLegacyAssets } from "../sites";
 import {
@@ -66,7 +65,7 @@ import type {
 	CfPlacement,
 	CfWorkerInit,
 } from "../deployment-bundle/worker";
-import type { PostQueueBody, PostTypedConsumerBody } from "../queues/client";
+import type { PostTypedConsumerBody } from "../queues/client";
 import type { LegacyAssetPaths } from "../sites";
 import type { RetrieveSourceMapFunction } from "../sourcemap";
 import type { ApiVersion, Percentage, VersionId } from "../versions/types";
@@ -1182,29 +1181,6 @@ export function isAuthenticationError(e: unknown): e is ParseError {
 	return e instanceof ParseError && (e as { code?: number }).code === 10000;
 }
 
-export async function updateQueueProducers(
-	config: Config
-): Promise<Promise<string[]>[]> {
-	const producers = config.queues.producers || [];
-	const updateProducers: Promise<string[]>[] = [];
-	for (const producer of producers) {
-		const body: PostQueueBody = {
-			queue_name: producer.queue,
-			settings: {
-				delivery_delay: producer.delivery_delay,
-			},
-		};
-
-		updateProducers.push(
-			putQueue(config, producer.queue, body).then(() => [
-				`Producer for ${producer.queue}`,
-			])
-		);
-	}
-
-	return updateProducers;
-}
-
 export async function updateQueueConsumers(
 	scriptName: string | undefined,
 	config: Config

packages/wrangler/src/triggers/deploy.ts

@@ -7,7 +7,6 @@ import {
 	publishRoutes,
 	renderRoute,
 	updateQueueConsumers,
-	updateQueueProducers,
 	validateRoutes,
 } from "../deploy/deploy";
 import { UserError } from "../errors";
@@ -274,8 +273,11 @@ export default async function triggersDeploy(
 	}
 
 	if (config.queues.producers && config.queues.producers.length) {
-		const updateProducers = await updateQueueProducers(config);
-		deployments.push(...updateProducers);
+		deployments.push(
+			...config.queues.producers.map((producer) =>
+				Promise.resolve([`Producer for ${producer.queue}`])
+			)
+		);
 	}
 
 	if (config.queues.consumers && config.queues.consumers.length) {