support provisioning remote bindings

Author: penalosa

packages/wrangler/src/api/dev.ts

@@ -222,6 +222,7 @@ export async function unstable_dev(
 		logLevel: options?.logLevel ?? defaultLogLevel,
 		port: options?.port ?? 0,
 		experimentalProvision: undefined,
+		experimentalAutoCreate: false,
 		experimentalRemoteBindings: true,
 		experimentalVectorizeBindToProd: vectorizeBindToProd ?? false,
 		experimentalImagesLocalMode: imagesLocalMode ?? false,
@@ -240,6 +241,7 @@ export async function unstable_dev(
 			RESOURCES_PROVISION: false,
 			REMOTE_BINDINGS: false,
 			DEPLOY_REMOTE_DIFF_CHECK: false,
+			AUTOCREATE_RESOURCES: false,
 		},
 		() => startDev(devOptions)
 	);

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

@@ -389,6 +389,7 @@ async function resolveConfig(
 		},
 		assets: assetsOptions,
 		tailConsumers: config.tail_consumers ?? [],
+		userConfigPath: config.userConfigPath,
 	} satisfies StartDevWorkerOptions;
 
 	if (

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

@@ -9,8 +9,10 @@ import {
 } from "@cloudflare/containers-shared";
 import chalk from "chalk";
 import { Miniflare, Mutex } from "miniflare";
+import { provisionBindings } from "../../deployment-bundle/bindings";
 import * as MF from "../../dev/miniflare";
 import { getDockerPath } from "../../environment-variables/misc-variables";
+import { getFlag } from "../../experimental-flags";
 import { logger } from "../../logger";
 import { RuntimeController } from "./BaseController";
 import { castErrorCause } from "./events";
@@ -222,6 +224,16 @@ 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/api/startDevWorker/types.ts

@@ -247,6 +247,7 @@ export type StartDevWorkerOptions = Omit<
 	containers?: ContainerNormalizedConfig[];
 	name: string;
 	complianceRegion: Config["compliance_region"];
+	userConfigPath: Config["userConfigPath"];
 };
 
 export type HookValues = string | number | boolean | object | undefined | null;

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

@@ -364,13 +364,12 @@ export async function convertBindingsToCfWorkerInitBindings(
 
 	const fetchers: Record<string, ServiceFetch> = {};
 
-	const iterator: [string, WorkerMetadataBinding | Binding][] = Array.isArray(
-		inputBindings
-	)
-		? inputBindings.map((b) => [b.name, b])
-		: Object.entries(inputBindings ?? {});
+	const bindingEntries: [string, WorkerMetadataBinding | Binding][] =
+		Array.isArray(inputBindings)
+			? inputBindings.map((b) => [b.name, b])
+			: Object.entries(inputBindings ?? {});
 
-	for (const [name, binding] of iterator) {
+	for (const [name, binding] of bindingEntries) {
 		if (binding.type === "plain_text") {
 			bindings.vars ??= {};
 			bindings.vars[name] = "value" in binding ? binding.value : binding.text;
@@ -380,13 +379,13 @@ export async function convertBindingsToCfWorkerInitBindings(
 		} else if (binding.type === "kv_namespace") {
 			bindings.kv_namespaces ??= [];
 			bindings.kv_namespaces.push({
-				...binding,
+				...omitType(binding),
 				binding: name,
 				id: "namespace_id" in binding ? binding.namespace_id : binding.id,
 			});
 		} else if (binding.type === "send_email") {
 			bindings.send_email ??= [];
-			bindings.send_email.push({ ...binding, name: name });
+			bindings.send_email.push({ ...omitType(binding), name: name });
 		} else if (binding.type === "wasm_module") {
 			if (!("source" in binding)) {
 				continue;
@@ -414,47 +413,53 @@ export async function convertBindingsToCfWorkerInitBindings(
 			bindings.data_blobs ??= {};
 			bindings.data_blobs[name] = await getBinaryFileContents(binding.source);
 		} else if (binding.type === "browser") {
-			bindings.browser = { ...binding, binding: name };
+			bindings.browser = { ...omitType(binding), binding: name };
 		} else if (binding.type === "ai") {
-			bindings.ai = { ...binding, binding: name };
+			bindings.ai = { ...omitType(binding), binding: name };
 		} else if (binding.type === "images") {
-			bindings.images = { ...binding, binding: name };
+			bindings.images = { ...omitType(binding), binding: name };
 		} else if (binding.type === "version_metadata") {
 			bindings.version_metadata = { binding: name };
 		} else if (binding.type === "durable_object_namespace") {
 			bindings.durable_objects ??= { bindings: [] };
-			bindings.durable_objects.bindings.push({ ...binding, name: name });
+			bindings.durable_objects.bindings.push({
+				...omitType(binding),
+				name: name,
+			});
 		} else if (binding.type === "queue") {
 			bindings.queues ??= [];
-			bindings.queues.push({ ...binding, binding: name });
+			bindings.queues.push({ ...omitType(binding), binding: name });
 		} else if (binding.type === "r2_bucket") {
 			bindings.r2_buckets ??= [];
-			bindings.r2_buckets.push({ ...binding, binding: name });
+			bindings.r2_buckets.push({ ...omitType(binding), binding: name });
 		} else if (binding.type === "d1") {
 			bindings.d1_databases ??= [];
 			bindings.d1_databases.push({
-				...binding,
+				...omitType(binding),
 				binding: name,
 				database_id: "id" in binding ? binding.id : binding.database_id,
 			});
 		} else if (binding.type === "vectorize") {
 			bindings.vectorize ??= [];
-			bindings.vectorize.push({ ...binding, binding: name });
+			bindings.vectorize.push({ ...omitType(binding), binding: name });
 		} else if (binding.type === "hyperdrive") {
 			bindings.hyperdrive ??= [];
-			bindings.hyperdrive.push({ ...binding, binding: name });
+			bindings.hyperdrive.push({ ...omitType(binding), binding: name });
 		} else if (binding.type === "service") {
 			bindings.services ??= [];
-			bindings.services.push({ ...binding, binding: name });
+			bindings.services.push({ ...omitType(binding), binding: name });
 		} else if (binding.type === "fetcher") {
 			fetchers[name] = binding.fetcher;
 		} else if (binding.type === "analytics_engine") {
 			bindings.analytics_engine_datasets ??= [];
-			bindings.analytics_engine_datasets.push({ ...binding, binding: name });
+			bindings.analytics_engine_datasets.push({
+				...omitType(binding),
+				binding: name,
+			});
 		} else if (binding.type === "dispatch_namespace") {
 			bindings.dispatch_namespaces ??= [];
 			bindings.dispatch_namespaces.push({
-				...binding,
+				...omitType(binding),
 				binding: name,
 				outbound:
 					binding.outbound && "worker" in binding.outbound
@@ -463,31 +468,34 @@ export async function convertBindingsToCfWorkerInitBindings(
 			});
 		} else if (binding.type === "mtls_certificate") {
 			bindings.mtls_certificates ??= [];
-			bindings.mtls_certificates.push({ ...binding, binding: name });
+			bindings.mtls_certificates.push({ ...omitType(binding), binding: name });
 		} else if (binding.type === "pipeline") {
 			bindings.pipelines ??= [];
-			bindings.pipelines.push({ ...binding, binding: name });
+			bindings.pipelines.push({ ...omitType(binding), binding: name });
 		} else if (binding.type === "logfwdr") {
 			bindings.logfwdr ??= { bindings: [] };
-			bindings.logfwdr.bindings.push({ ...binding, name: name });
+			bindings.logfwdr.bindings.push({ ...omitType(binding), name: name });
 		} else if (binding.type === "workflow") {
 			bindings.workflows ??= [];
-			bindings.workflows.push({ ...binding, binding: name });
+			bindings.workflows.push({ ...omitType(binding), binding: name });
 		} else if (binding.type === "secrets_store_secret") {
 			bindings.secrets_store_secrets ??= [];
-			bindings.secrets_store_secrets.push({ ...binding, binding: name });
+			bindings.secrets_store_secrets.push({
+				...omitType(binding),
+				binding: name,
+			});
 		} else if (binding.type === "unsafe_hello_world") {
 			bindings.unsafe_hello_world ??= [];
-			bindings.unsafe_hello_world.push({ ...binding, binding: name });
+			bindings.unsafe_hello_world.push({ ...omitType(binding), binding: name });
 		} else if (binding.type === "ratelimit") {
 			bindings.ratelimits ??= [];
-			bindings.ratelimits.push({ ...binding, name: name });
+			bindings.ratelimits.push({ ...omitType(binding), name: name });
 		} else if (binding.type === "worker_loader") {
 			bindings.worker_loaders ??= [];
-			bindings.worker_loaders.push({ ...binding, binding: name });
+			bindings.worker_loaders.push({ ...omitType(binding), binding: name });
 		} else if (binding.type === "vpc_service") {
 			bindings.vpc_services ??= [];
-			bindings.vpc_services.push({ ...binding, binding: name });
+			bindings.vpc_services.push({ ...omitType(binding), binding: name });
 		} else if (isUnsafeBindingType(binding.type)) {
 			bindings.unsafe ??= {
 				bindings: [],
@@ -511,6 +519,13 @@ function isUnsafeBindingType(type: string): type is `unsafe_${string}` {
 	return type.startsWith("unsafe_");
 }
 
+function omitType<T extends Record<string, unknown>>({
+	type: _,
+	...value
+}: T): Omit<T, "type"> {
+	return value;
+}
+
 export function extractBindingsOfType<
 	Type extends NonNullable<StartDevWorkerOptions["bindings"]>[string]["type"],
 >(

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

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

packages/wrangler/src/deploy/index.ts

@@ -219,13 +219,6 @@ export const deployCommand = createCommand({
 				"Name of a dispatch namespace to deploy the Worker to (Workers for Platforms)",
 			type: "string",
 		},
-		"experimental-auto-create": {
-			describe: "Automatically provision draft bindings with new resources",
-			type: "boolean",
-			default: true,
-			hidden: true,
-			alias: "x-auto-create",
-		},
 		"containers-rollout": {
 			describe:
 				"Rollout strategy for Containers changes. If set to immediate, it will override `rollout_percentage_steps` if configured and roll out to 100% of instances in one step. ",
@@ -251,6 +244,7 @@ export const deployCommand = createCommand({
 			RESOURCES_PROVISION: args.experimentalProvision ?? false,
 			REMOTE_BINDINGS: args.experimentalRemoteBindings ?? true,
 			DEPLOY_REMOTE_DIFF_CHECK: args.experimentalDeployRemoteDiffCheck ?? false,
+			AUTOCREATE_RESOURCES: args.experimentalAutoCreate,
 		}),
 		warnIfMultipleEnvsConfiguredButNoneSpecified: true,
 	},