gate new deploy remote diff check

Author: dario-piotrowicz

packages/wrangler/src/__tests__/config/configuration.test.ts

@@ -2656,6 +2656,7 @@ describe("normalizeAndValidateConfig()", () => {
 						RESOURCES_PROVISION: true,
 						MULTIWORKER: false,
 						REMOTE_BINDINGS: false,
+						DEPLOY_REMOTE_DIFF_CHECK: false,
 					},
 					() =>
 						normalizeAndValidateConfig(
@@ -2812,6 +2813,7 @@ describe("normalizeAndValidateConfig()", () => {
 						RESOURCES_PROVISION: true,
 						MULTIWORKER: false,
 						REMOTE_BINDINGS: false,
+						DEPLOY_REMOTE_DIFF_CHECK: false,
 					},
 					() =>
 						normalizeAndValidateConfig(
@@ -3150,6 +3152,7 @@ describe("normalizeAndValidateConfig()", () => {
 						RESOURCES_PROVISION: true,
 						MULTIWORKER: false,
 						REMOTE_BINDINGS: false,
+						DEPLOY_REMOTE_DIFF_CHECK: false,
 					},
 					() =>
 						normalizeAndValidateConfig(

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

@@ -13006,7 +13006,7 @@ export default{
 				result: true,
 			});
 
-			await runWrangler("deploy");
+			await runWrangler("deploy --x-remote-diff-check");
 
 			expect(normalizeLogWithConfigDiff(std.warn)).toMatchInlineSnapshot(`
 				"▲ [WARNING] Your local configuration differs from the remote configuration of your Worker set via the Cloudflare Dashboard:
@@ -13068,7 +13068,7 @@ export default{
 				result: true,
 			});
 
-			await runWrangler("deploy");
+			await runWrangler("deploy --x-remote-diff-check");
 
 			// Note: we display the toml config diff in json format since code-wise we'd have to convert the rawConfig to toml
 			//       to be able to show toml content/diffs, that combined with the fact that json(c) config files are the

packages/wrangler/src/api/dev.ts

@@ -239,6 +239,7 @@ export async function unstable_dev(
 			MULTIWORKER: false,
 			RESOURCES_PROVISION: false,
 			REMOTE_BINDINGS: false,
+			DEPLOY_REMOTE_DIFF_CHECK: false,
 		},
 		() => startDev(devOptions)
 	);

packages/wrangler/src/core/register-yargs-command.ts

@@ -156,6 +156,7 @@ function createHandler(def: CommandDefinition, commandName: string) {
 						MULTIWORKER: false,
 						RESOURCES_PROVISION: args.experimentalProvision ?? false,
 						REMOTE_BINDINGS: args.experimentalRemoteBindings ?? false,
+						DEPLOY_REMOTE_DIFF_CHECK: false,
 					};
 
 			await run(experimentalFlags, () => {

packages/wrangler/src/deploy/deploy.ts

@@ -379,24 +379,26 @@ export default async function deploy(props: Props): Promise<{
 			workerTag = script.tag;
 
 			if (script.last_deployed_from === "dash") {
-				const remoteWorkerConfig = await downloadWorkerConfig(
-					accountId,
-					name,
-					entry.file,
-					serviceMetaData.default_environment.environment
-				);
-
 				let configDiff: ReturnType<typeof getRemoteConfigDiff> | undefined;
-				let rawConfig: RawConfig | undefined;
-				if (config.configPath) {
-					try {
-						rawConfig = parseRawConfigFile(config.configPath);
-					} catch {
-						// We were unable to either read the file so the more comprehensive diffing just won't kick in
-						// (but a warning with a confirmation prompt will still be shown to the user)
-					}
-					if (rawConfig) {
-						configDiff = getRemoteConfigDiff(remoteWorkerConfig, rawConfig);
+				if (getFlag("DEPLOY_REMOTE_DIFF_CHECK")) {
+					const remoteWorkerConfig = await downloadWorkerConfig(
+						accountId,
+						name,
+						entry.file,
+						serviceMetaData.default_environment.environment
+					);
+
+					let rawConfig: RawConfig | undefined;
+					if (config.configPath) {
+						try {
+							rawConfig = parseRawConfigFile(config.configPath);
+						} catch {
+							// We were unable to either read the file so the more comprehensive diffing just won't kick in
+							// (but a warning with a confirmation prompt will still be shown to the user)
+						}
+						if (rawConfig) {
+							configDiff = getRemoteConfigDiff(remoteWorkerConfig, rawConfig);
+						}
 					}
 				}
 

packages/wrangler/src/deploy/index.ts

@@ -226,13 +226,20 @@ export const deployCommand = createCommand({
 			hidden: true,
 			alias: "x-auto-create",
 		},
+		"experimental-deploy-remote-diff-check": {
+			describe: `Experimental: Enable The Deployment Remote Diff check`,
+			type: "boolean",
+			hidden: true,
+			alias: ["x-remote-diff-check"],
+		},
 	},
 	behaviour: {
 		useConfigRedirectIfAvailable: true,
 		overrideExperimentalFlags: (args) => ({
 			MULTIWORKER: false,
 			RESOURCES_PROVISION: args.experimentalProvision ?? false,
 			REMOTE_BINDINGS: args.experimentalRemoteBindings ?? false,
+			DEPLOY_REMOTE_DIFF_CHECK: args.experimentalDeployRemoteDiffCheck ?? false,
 		}),
 		warnIfMultipleEnvsConfiguredButNoneSpecified: true,
 	},

packages/wrangler/src/dev.ts

@@ -69,6 +69,7 @@ export const dev = createCommand({
 			MULTIWORKER: Array.isArray(args.config),
 			RESOURCES_PROVISION: args.experimentalProvision ?? false,
 			REMOTE_BINDINGS: args.experimentalRemoteBindings ?? false,
+			DEPLOY_REMOTE_DIFF_CHECK: false,
 		}),
 	},
 	metadata: {

packages/wrangler/src/experimental-flags.ts

@@ -5,6 +5,7 @@ export type ExperimentalFlags = {
 	MULTIWORKER: boolean;
 	RESOURCES_PROVISION: boolean;
 	REMOTE_BINDINGS: boolean;
+	DEPLOY_REMOTE_DIFF_CHECK: boolean;
 };
 
 const flags = new AsyncLocalStorage<ExperimentalFlags>();

packages/wrangler/src/pages/dev.ts

@@ -885,6 +885,7 @@ export const pagesDevCommand = createCommand({
 				MULTIWORKER: Array.isArray(args.config),
 				RESOURCES_PROVISION: false,
 				REMOTE_BINDINGS: false,
+				DEPLOY_REMOTE_DIFF_CHECK: false,
 			},
 			() =>
 				startDev({

packages/wrangler/src/versions/upload.ts

@@ -264,6 +264,7 @@ export const versionsUploadCommand = createCommand({
 			MULTIWORKER: false,
 			RESOURCES_PROVISION: args.experimentalProvision ?? false,
 			REMOTE_BINDINGS: args.experimentalRemoteBindings ?? false,
+			DEPLOY_REMOTE_DIFF_CHECK: false,
 		}),
 		warnIfMultipleEnvsConfiguredButNoneSpecified: true,
 	},