fix tests & remove dev behaviour

Author: penalosa

packages/wrangler/src/__tests__/api/startDevWorker/BundleController.test.ts

@@ -35,6 +35,7 @@ function configDefaults(
 		build: unusable<StartDevWorkerOptions["build"]>(),
 		legacy: {},
 		dev: { persist },
+		userConfigPath: undefined,
 		...config,
 	};
 }

packages/wrangler/src/__tests__/api/startDevWorker/LocalRuntimeController.test.ts

@@ -133,6 +133,7 @@ function configDefaults(
 		build: unusable<StartDevWorkerOptions["build"]>(),
 		legacy: {},
 		dev: { persist: "./persist" },
+		userConfigPath: undefined,
 		...config,
 	};
 }

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

@@ -2820,6 +2820,7 @@ describe("normalizeAndValidateConfig()", () => {
 						MULTIWORKER: false,
 						REMOTE_BINDINGS: false,
 						DEPLOY_REMOTE_DIFF_CHECK: false,
+						AUTOCREATE_RESOURCES: false,
 					},
 					() =>
 						normalizeAndValidateConfig(
@@ -2977,6 +2978,7 @@ describe("normalizeAndValidateConfig()", () => {
 						MULTIWORKER: false,
 						REMOTE_BINDINGS: false,
 						DEPLOY_REMOTE_DIFF_CHECK: false,
+						AUTOCREATE_RESOURCES: false,
 					},
 					() =>
 						normalizeAndValidateConfig(
@@ -3316,6 +3318,7 @@ describe("normalizeAndValidateConfig()", () => {
 						MULTIWORKER: false,
 						REMOTE_BINDINGS: false,
 						DEPLOY_REMOTE_DIFF_CHECK: false,
+						AUTOCREATE_RESOURCES: false,
 					},
 					() =>
 						normalizeAndValidateConfig(

packages/wrangler/src/__tests__/dev/remote-bindings.test.ts

@@ -475,7 +475,6 @@ describe("dev with remote bindings", { sequential: true }, () => {
 								name: "EMAIL",
 								remote: true,
 								remoteProxyConnectionString,
-								type: "send_email",
 							},
 						],
 					},

packages/wrangler/src/__tests__/experimental-commands-api.test.ts

@@ -30,6 +30,13 @@ describe("experimental_getWranglerCommands", () => {
 			    "requiresArg": true,
 			    "type": "string",
 			  },
+			  "experimental-auto-create": Object {
+			    "alias": "x-auto-create",
+			    "default": true,
+			    "describe": "Automatically provision draft bindings with new resources",
+			    "hidden": true,
+			    "type": "boolean",
+			  },
 			  "experimental-provision": Object {
 			    "alias": Array [
 			      "x-provision",

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

@@ -198,6 +198,7 @@ describe("metrics", () => {
 				command: "wrangler docs",
 				args: {
 					xRemoteBindings: true,
+					xAutoCreate: true,
 					search: ["<REDACTED>"],
 				},
 			};

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

@@ -685,8 +685,8 @@ describe("versions view", () => {
 				env.AI                                                                   AI
 				env.VERSION_METADATA                                                     Worker Version Metadata
 				env.WFP (wfp-namespace)                                                  Dispatch Namespace
-				env.WFP_2 (wfp-namespace)                                                Dispatch Namespace
-				env.WFP_3 (wfp-namespace)                                                Dispatch Namespace
+				env.WFP_2 (wfp-namespace (outbound -> outbound-worker))                  Dispatch Namespace
+				env.WFP_3 (wfp-namespace (outbound -> outbound-worker))                  Dispatch Namespace
 				env.MTLS (mtls-id)                                                       mTLS Certificate
 				"
 			`);

packages/wrangler/src/api/startDevWorker/LocalRuntimeController.ts

@@ -224,16 +224,6 @@ export class LocalRuntimeController extends RuntimeController {
 							undefined
 						: await unwrapHook(data.config.dev.auth);
 
-				if (getFlag("RESOURCES_PROVISION") && auth) {
-					await provisionBindings(
-						configBundle.bindings,
-						auth?.accountId,
-						data.config.name,
-						getFlag("AUTOCREATE_RESOURCES"),
-						data.config,
-						true
-					);
-				}
 				this.#remoteProxySessionData =
 					await maybeStartOrUpdateRemoteProxySession(
 						{

packages/wrangler/src/deployment-bundle/bindings.ts

@@ -461,17 +461,12 @@ export async function provisionBindings(
 	accountId: string,
 	scriptName: string,
 	autoCreate: boolean,
-	config: Config | StartDevWorkerOptions,
+	config: Config,
 	requireRemote = false
 ): Promise<void> {
-	const configPath = "configPath" in config ? config.configPath : config.config;
+	const configPath = config.userConfigPath ?? config.configPath;
 	const pendingResources = await collectPendingResources(
-		{
-			compliance_region:
-				"compliance_region" in config
-					? config.compliance_region
-					: config.complianceRegion,
-		},
+		config,
 		accountId,
 		scriptName,
 		bindings,
@@ -496,25 +491,15 @@ export async function provisionBindings(
 			printable[resource.resourceType].push({ binding: resource.binding });
 		}
 
-		const tailConsumers =
-			"configPath" in config ? config.tail_consumers : config.tailConsumers;
-		printBindings(printable, tailConsumers, { provisioning: true });
+		printBindings(printable, config.tail_consumers, { provisioning: true });
 		logger.log();
 
 		const existingResources: Record<string, NormalisedResourceInfo[]> = {};
 
 		for (const resource of pendingResources) {
 			existingResources[resource.resourceType] ??= await LOADERS[
 				resource.resourceType
-			](
-				{
-					compliance_region:
-						"compliance_region" in config
-							? config.compliance_region
-							: config.complianceRegion,
-				},
-				accountId
-			);
+			](config, accountId);
 
 			await runProvisioningFlow(
 				resource,
@@ -534,11 +519,9 @@ export async function provisionBindings(
 			allChanges.set(resource.binding, resource.handler.binding);
 		}
 
-		for (const resourceType of [
-			"kv_namespaces",
-			"r2_buckets",
-			"d1_databases",
-		] as const) {
+		for (const resourceType of Object.keys(
+			HANDLERS
+		) as (keyof typeof HANDLERS)[]) {
 			for (const binding of bindings[resourceType] ?? []) {
 				patch[resourceType] ??= [];
 
@@ -565,11 +548,7 @@ export async function provisionBindings(
 		// portability of the config file, and adds robustness to bindings being renamed.
 		if (!isNonInteractiveOrCI()) {
 			try {
-				await experimental_patchConfig(
-					config.userConfigPath ?? configPath,
-					patch,
-					false
-				);
+				await experimental_patchConfig(configPath, patch, false);
 				logger.log(
 					"Your Worker was deployed with provisioned resources. We've written the IDs of these resources to your config file, which you can choose to save or discard. Either way future deploys will continue to work."
 				);
@@ -591,10 +570,8 @@ export async function provisionBindings(
 		);
 		logger.log(`🎉 All resources provisioned, continuing with deployment...\n`);
 
-		const sendMetrics =
-			"send_metrics" in config ? config.send_metrics : config.sendMetrics;
 		metrics.sendMetricsEvent("provision resources", resourceCount, {
-			sendMetrics,
+			sendMetrics: config.send_metrics,
 		});
 	}
 }