fix: skip service tagging when no top-level name configured (#10658)

Author: 1000hz

.changeset/bumpy-islands-slide.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+Fixed an issue with service tags not being applied properly to Workers when the Wrangler configuration file did not include a top-level `name` property.

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

@@ -13658,6 +13658,40 @@ export default{
 			await runWrangler("deploy");
 		});
 
+		test("no top-level name", async ({ expect }) => {
+			mockUploadWorkerRequest({ expectedScriptName: "test-name-production" });
+			mockGetScriptWithTags(["some-tag", "cf:service=undefined"]);
+
+			writeWranglerConfig({
+				name: undefined,
+				main: "./index.js",
+				env: {
+					production: {
+						name: "test-name-production",
+					},
+				},
+			});
+
+			expect.assertions(2);
+			let requestCount = 0;
+			mockPatchScriptSettings(async ({ request }) => {
+				requestCount++;
+				if (requestCount === 2) {
+					await expect(request.json()).resolves.toEqual({
+						tags: ["some-tag"],
+					});
+				}
+			});
+
+			await runWrangler("deploy --env production");
+
+			expect(std.warn).toMatchInlineSnapshot(`
+				"▲ [WARNING] No top-level \`name\` has been defined in Wrangler configuration. Add a top-level \`name\` to group this Worker together with its sibling environments in the Cloudflare dashboard.
+
+				"
+			`);
+		});
+
 		test("displays warning when error updating tags", async ({ expect }) => {
 			mockUploadWorkerRequest({ expectedScriptName: "test-name-production" });
 			mockGetScriptWithTags([

packages/wrangler/src/__tests__/versions/versions.upload.test.ts

@@ -628,6 +628,35 @@ describe("versions upload", () => {
 			expect(tagsUpdateHandler.isUsed).toBeFalsy();
 		});
 
+		test("no top-level name", async ({ expect }) => {
+			mockGetScriptWithTags(["some-tag", "cf:service=undefined"]);
+
+			writeWranglerConfig({
+				name: undefined,
+				main: "./index.js",
+				env: {
+					production: {
+						name: "test-name-production",
+					},
+				},
+			});
+
+			expect.assertions(2);
+			mockPatchScriptSettings(async ({ request }) => {
+				await expect(request.json()).resolves.toEqual({
+					tags: ["some-tag"],
+				});
+			});
+
+			await runWrangler("versions upload --env production");
+
+			expect(std.warn).toMatchInlineSnapshot(`
+				"▲ [WARNING] No top-level \`name\` has been defined in Wrangler configuration. Add a top-level \`name\` to group this Worker together with its sibling environments in the Cloudflare dashboard.
+
+				"
+			`);
+		});
+
 		test("displays warning when error updating tags", async ({ expect }) => {
 			mockGetScriptWithTags([
 				"some-tag",

packages/wrangler/src/environments/index.ts

@@ -18,7 +18,29 @@ export async function applyServiceAndEnvironmentTags(
 ) {
 	tags ??= [];
 	const env = config.targetEnvironment;
-	const serviceTag = `${SERVICE_TAG_PREFIX}${config.topLevelName}`;
+	const serviceName = config.topLevelName;
+
+	if (!serviceName) {
+		logger.warn(
+			"No top-level `name` has been defined in Wrangler configuration. Add a top-level `name` to group this Worker together with its sibling environments in the Cloudflare dashboard."
+		);
+
+		if (tags.some((tag) => tag.startsWith(SERVICE_TAG_PREFIX))) {
+			try {
+				return await patchNonVersionedScriptSettings(
+					config,
+					accountId,
+					scriptName,
+					{
+						tags: tags.filter((tag) => !tag.startsWith(SERVICE_TAG_PREFIX)),
+					}
+				);
+			} catch {}
+		}
+		return;
+	}
+
+	const serviceTag = `${SERVICE_TAG_PREFIX}${serviceName}`;
 	const environmentTag = env ? `${ENVIRONMENT_TAG_PREFIX}${env}` : null;
 
 	const hasMissingServiceTag = !tags.includes(serviceTag);