allow --name and --env args on wrangler deploy

Fixes #4123

Author: petebacondarwin

.changeset/six-rockets-show.md

@@ -0,0 +1,5 @@
+---
+"wrangler": minor
+---
+
+allow --name and --env args on wrangler deploy

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

@@ -1004,19 +1004,17 @@ describe("deploy", () => {
 				`);
 			});
 
-			it("should throw an error w/ helpful message when using --env --name", async () => {
+			it("should allow --env and --name to be used together", async () => {
 				writeWranglerConfig({ env: { "some-env": {} } });
 				writeWorkerSource();
 				mockSubDomainRequest();
+				mockUploadWorkerRequest({
+					env: "some-env",
+					expectedScriptName: "voyager",
+					legacyEnv: true,
+				});
 				await runWrangler(
 					"deploy index.js --name voyager --env some-env --legacy-env true"
-				).catch((err) =>
-					expect(err).toMatchInlineSnapshot(`
-						[Error: In legacy environment mode you cannot use --name and --env together. If you want to specify a Worker name for a specific environment you can add the following to your wrangler.toml file:
-						[env.some-env]
-						name = "voyager"
-						]
-					`)
 				);
 			});
 		});

packages/wrangler/src/__tests__/helpers/mock-upload-worker.ts

@@ -42,13 +42,10 @@ export function mockUploadWorkerRequest(
 		expectedContainers?: { class_name: string }[];
 	} = {}
 ) {
-	const expectedScriptName = (options.expectedScriptName ??= "test-name");
 	const handleUpload: HttpResponseResolver = async ({ params, request }) => {
 		const url = new URL(request.url);
 		expect(params.accountId).toEqual("some-account-id");
-		expect(params.scriptName).toEqual(
-			legacyEnv && env ? `${expectedScriptName}-${env}` : expectedScriptName
-		);
+		expect(params.scriptName).toEqual(expectedScriptName);
 		if (!legacyEnv) {
 			expect(params.envName).toEqual(env);
 		}
@@ -185,6 +182,11 @@ export function mockUploadWorkerRequest(
 		expectedObservability,
 		expectedSettingsPatch,
 	} = options;
+
+	const expectedScriptName =
+		options.expectedScriptName ??
+		"test-name" + (legacyEnv && env ? `-${env}` : "");
+
 	if (env && !legacyEnv) {
 		msw.use(
 			http.put(

packages/wrangler/src/__tests__/helpers/mock-workers-subdomain.ts

@@ -39,7 +39,7 @@ export function mockGetWorkerSubdomain({
 	previews_enabled = true,
 	env,
 	legacyEnv = false,
-	expectedScriptName = "test-name",
+	expectedScriptName = "test-name" + (legacyEnv && env ? `-${env}` : ""),
 }: {
 	enabled: boolean;
 	previews_enabled?: boolean;
@@ -56,9 +56,7 @@ export function mockGetWorkerSubdomain({
 			url,
 			({ params }) => {
 				expect(params.accountId).toEqual("some-account-id");
-				expect(params.scriptName).toEqual(
-					legacyEnv && env ? `${expectedScriptName}-${env}` : expectedScriptName
-				);
+				expect(params.scriptName).toEqual(expectedScriptName);
 				if (!legacyEnv) {
 					expect(params.envName).toEqual(env);
 				}

packages/wrangler/src/utils/getScriptName.ts

@@ -1,27 +1,8 @@
-import { configFileName, formatConfigSnippet } from "../config";
-import { CommandLineArgsError } from "../errors";
-import { isLegacyEnv } from "./isLegacyEnv";
 import type { Config } from "../config";
 
 export function getScriptName(
 	args: { name: string | undefined; env: string | undefined },
 	config: Config
 ): string | undefined {
-	if (args.name && isLegacyEnv(config) && args.env) {
-		throw new CommandLineArgsError(
-			`In legacy environment mode you cannot use --name and --env together. If you want to specify a Worker name for a specific environment you can add the following to your ${configFileName(config.configPath)} file:\n` +
-				formatConfigSnippet(
-					{
-						env: {
-							[args.env]: {
-								name: args.name,
-							},
-						},
-					},
-					config.configPath
-				)
-		);
-	}
-
 	return args.name ?? config.name;
 }