fix custom instance limit units and add extra test

Author: emily-shen

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

@@ -221,6 +221,91 @@ describe("wrangler deploy with containers", () => {
 		`);
 	});
 
+	it("should be able to deploy a new container with custom instance limits", async () => {
+		// note no docker commands have been mocked here!
+		mockGetVersion("Galaxy-Class");
+		writeWranglerConfig({
+			...DEFAULT_DURABLE_OBJECTS,
+			containers: [
+				{
+					...DEFAULT_CONTAINER_FROM_REGISTRY,
+					configuration: {
+						vcpu: 1,
+						memory_mib: 1000,
+						disk: { size_mb: 2000 },
+					},
+				},
+			],
+		});
+
+		mockGetApplications([]);
+
+		mockCreateApplication({
+			name: "my-container",
+			max_instances: 10,
+			scheduling_policy: SchedulingPolicy.DEFAULT,
+			configuration: {
+				image: "docker.io/hello:world",
+				disk: {
+					size_mb: 2000,
+				},
+				vcpu: 1,
+				memory_mib: 1000,
+			},
+		});
+
+		await runWrangler("deploy index.js");
+
+		expect(std.out).toMatchInlineSnapshot(`
+					"Total Upload: xx KiB / gzip: xx KiB
+					Worker Startup Time: 100 ms
+					Your Worker has access to the following bindings:
+					Binding                                            Resource
+					env.EXAMPLE_DO_BINDING (ExampleDurableObject)      Durable Object
+
+					Uploaded test-name (TIMINGS)
+					Deployed test-name triggers (TIMINGS)
+					  https://test-name.test-sub-domain.workers.dev
+					Current Version ID: Galaxy-Class"
+				`);
+		expect(std.err).toMatchInlineSnapshot(`""`);
+
+		expect(cliStd.stdout).toMatchInlineSnapshot(`
+			"╭ Deploy a container application deploy changes to your application
+			│
+			│ Container application changes
+			│
+			├ NEW my-container
+			│
+			│   [[containers]]
+			│   name = \\"my-container\\"
+			│   scheduling_policy = \\"default\\"
+			│   instances = 0
+			│   max_instances = 10
+			│
+			│     [containers.configuration]
+			│     image = \\"docker.io/hello:world\\"
+			│     memory_mib = 1_000
+			│     vcpu = 1
+			│
+			│       [containers.configuration.disk]
+			│       size_mb = 2_000
+			│
+			│     [containers.constraints]
+			│     tier = 1
+			│
+			│     [containers.durable_objects]
+			│     namespace_id = \\"1\\"
+			│
+			│
+			│  SUCCESS  Created application my-container (Application ID: undefined)
+			│
+			╰ Applied changes
+
+			"
+		`);
+	});
+
 	it("should resolve the docker build context path based on the dockerfile location, if image_build_context is not provided", async () => {
 		vi.stubEnv("WRANGLER_DOCKER_BIN", "/usr/bin/docker");
 		mockGetVersion("Galaxy-Class");
@@ -1364,8 +1449,6 @@ function mockModifyApplication(expected?: Partial<Application>) {
 		http.patch("*/applications/:id", async ({ request }) => {
 			const json = await request.json();
 			if (expected !== undefined) {
-				// console.dir("expected" + JSON.stringify(expected, null, 2));
-				// console.dir("json" + JSON.stringify(json, null, 2));
 				expect(json).toMatchObject(expected);
 			}
 			expect((json as CreateApplicationRequest).name).toBeUndefined();
@@ -1386,8 +1469,6 @@ function mockCreateApplicationRollout(expected?: Record<string, unknown>) {
 		http.post("*/applications/:id/rollouts", async ({ request }) => {
 			const json = await request.json();
 			if (expected !== undefined) {
-				// console.dir("expected" + JSON.stringify(expected, null, 2));
-				// console.dir("json" + JSON.stringify(json, null, 2));
 				expect(json).toMatchObject(expected);
 			}
 			return HttpResponse.json({

packages/wrangler/src/containers/deploy.ts

@@ -167,7 +167,7 @@ function containerConfigToCreateRequest(
 			...("instance_type" in containerApp
 				? { instance_type: containerApp.instance_type }
 				: {
-						disk: { size_mb: containerApp.disk_bytes / (1024 * 1024) },
+						disk: { size_mb: containerApp.disk_bytes / (1000 * 1000) },
 						memory_mib: containerApp.memory_mib,
 						vcpu: containerApp.vcpu,
 					}),