add deprecation warnings

Author: emily-shen

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

@@ -96,7 +96,7 @@ describe("wrangler deploy with containers", () => {
 			containers: [
 				{
 					name: "my-container",
-					instances: 10,
+					max_instances: 10,
 					class_name: "ExampleDurableObject",
 					image: "./Dockerfile",
 				},
@@ -147,7 +147,7 @@ describe("wrangler deploy with containers", () => {
 			containers: [
 				{
 					name: "my-container",
-					instances: 10,
+					max_instances: 10,
 					class_name: "ExampleDurableObject",
 					image: "./Dockerfile",
 				},
@@ -161,7 +161,7 @@ describe("wrangler deploy with containers", () => {
 
 		mockCreateApplication({
 			name: "my-container",
-			instances: 10,
+			max_instances: 10,
 			durable_objects: { namespace_id: "1" },
 			configuration: {
 				image:
@@ -206,7 +206,7 @@ describe("wrangler deploy with containers", () => {
 				{
 					image: "docker.io/hello:world",
 					name: "my-container",
-					instances: 10,
+					max_instances: 10,
 					class_name: "ExampleDurableObject",
 				},
 			],
@@ -217,7 +217,7 @@ describe("wrangler deploy with containers", () => {
 
 		mockCreateApplication({
 			name: "my-container",
-			instances: 10,
+			max_instances: 10,
 			durable_objects: { namespace_id: "1" },
 			scheduling_policy: SchedulingPolicy.DEFAULT,
 		});
@@ -287,7 +287,7 @@ describe("wrangler deploy with containers", () => {
 				containers: [
 					{
 						name: "my-container",
-						instances: 10,
+						max_instances: 10,
 						class_name: "ExampleDurableObject",
 						image: "../Dockerfile",
 					},
@@ -311,7 +311,7 @@ describe("wrangler deploy with containers", () => {
 
 		mockCreateApplication({
 			name: "my-container",
-			instances: 10,
+			max_instances: 10,
 			durable_objects: { namespace_id: "1" },
 			configuration: {
 				image:
@@ -391,7 +391,7 @@ describe("wrangler deploy with containers", () => {
 				containers: [
 					{
 						name: "my-container",
-						instances: 10,
+						max_instances: 10,
 						class_name: "ExampleDurableObject",
 						image: "../Dockerfile",
 					},
@@ -408,7 +408,7 @@ describe("wrangler deploy with containers", () => {
 
 		mockCreateApplication({
 			name: "my-container",
-			instances: 10,
+			max_instances: 10,
 			durable_objects: { namespace_id: "1" },
 			configuration: {
 				image:
@@ -453,7 +453,7 @@ describe("wrangler deploy with containers", () => {
 				{
 					image: "docker.io/hello:world",
 					name: "my-container",
-					instances: 10,
+					max_instances: 10,
 					class_name: "ExampleDurableObject",
 				},
 			],
@@ -515,7 +515,7 @@ describe("wrangler deploy with containers dry run", () => {
 				{
 					image: "./Dockerfile",
 					name: "my-container",
-					instances: 10,
+					max_instances: 10,
 					class_name: "ExampleDurableObject",
 				},
 			],

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

@@ -2464,6 +2464,36 @@ describe("normalizeAndValidateConfig()", () => {
 					  - Expected \\"containers.scheduling_policy\\" field to be one of [\\"regional\\",\\"moon\\",\\"default\\"] but got \\"invalid\\"."
 				`);
 			});
+
+			it("should warn for deprecated container fields", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						name: "test-worker",
+						containers: [
+							{
+								class_name: "test-class",
+								instances: 10,
+								configuration: {
+									image: "config-image"
+								},
+								durable_objects: {
+									namespace_id: "test-namespace"
+								}
+							},
+						],
+					} as unknown as RawConfig,
+					undefined,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+					"Processing wrangler configuration:
+					  - \\"containers.configuration\\" is deprecated. Use top level \\"containers\\" fields instead. \\"configuration.image\\" should be \\"image\\", \\"configuration.disk\\" should be set via \\"instance_type\\".
+					  - \\"containers.instances\\" is deprecated. Use \\"containers.max_instances\\" instead.
+					  - \\"containers.durable_objects\\" is deprecated. Use the \\"class_name\\" field instead."
+				`);
+			});
 		});
 
 		describe("[kv_namespaces]", () => {

packages/wrangler/src/config/validation.ts

@@ -2431,7 +2431,6 @@ function validateContainerApp(
 				name += config === undefined ? "" : `-${envName}`;
 				containerAppOptional.name = name.toLowerCase().replace(/ /g, "-");
 			}
-
 			if (
 				!containerAppOptional.configuration?.image &&
 				!containerAppOptional.image
@@ -2440,6 +2439,11 @@ function validateContainerApp(
 					`"containers.image" field must be defined for each container app. This should be the path to your Dockerfile or a image URI pointing to the Cloudflare registry.`
 				);
 			}
+			if ("configuration" in containerAppOptional) {
+				diagnostics.warnings.push(
+					`"containers.configuration" is deprecated. Use top level "containers" fields instead. "configuration.image" should be "image", "configuration.disk" should be set via "instance_type".`
+				);
+			}
 
 			// Validate that we have an image configuration for this container app.
 			// For legacy reasons we have to check both at containerAppOptional.image and
@@ -2532,6 +2536,19 @@ function validateContainerApp(
 				"string",
 				["regional", "moon", "default"]
 			);
+
+			// Add deprecation warnings for legacy fields
+			if ("instances" in containerAppOptional) {
+				diagnostics.warnings.push(
+					`"containers.instances" is deprecated. Use "containers.max_instances" instead.`
+				);
+			}
+			if ("durable_objects" in containerAppOptional) {
+				diagnostics.warnings.push(
+					`"containers.durable_objects" is deprecated. Use the "class_name" field instead.`
+				);
+			}
+
 			validateAdditionalProperties(
 				diagnostics,
 				field,
@@ -2550,6 +2567,7 @@ function validateContainerApp(
 					"constraints",
 					"rollout_step_percentage",
 					"rollout_kind",
+					"durable_objects",
 				]
 			);
 		}