add config normalisation function

Author: emily-shen

packages/containers-shared/src/types.ts

@@ -1,3 +1,9 @@
+import {
+	CreateApplicationRolloutRequest,
+	InstanceType,
+	SchedulingPolicy,
+} from "./client";
+
 export interface Logger {
 	debug: (message: string) => void;
 	log: (message: string) => void;
@@ -20,6 +26,30 @@ export type BuildArgs = {
 	setNetworkToHost?: boolean;
 };
 
+export type ContainerNormalisedConfig = RegistryLinkConfig | DockerfileConfig;
+export type DockerfileConfig = SharedContainerConfig & {
+	/**  absolute path, resolved relative to the wrangler config file */
+	dockerfile: string;
+	/** absolute path, resolved relative to the wrangler config file. defaults to the directory of the dockerfile */
+	image_build_context: string;
+	image_vars?: Record<string, string>;
+};
+export type RegistryLinkConfig = SharedContainerConfig & {
+	registry_link: string;
+};
+
+export type InstanceTypeOrLimits =
+	| {
+			/** if undefined in config, defaults to instance_type */
+			disk_size?: number;
+			vcpu?: number;
+			memory_mib?: number;
+	  }
+	| {
+			/** if undefined in config, defaults to "dev" */
+			instance_type: InstanceType;
+	  };
+
 /** build/pull agnostic container options */
 export type ContainerDevOptions = {
 	/** may be dockerfile or registry link */
@@ -32,3 +62,26 @@ export type ContainerDevOptions = {
 	/** build time args */
 	args?: Record<string, string>;
 };
+
+/**
+ * Shared container config that is used regardless of whether the image is from a dockerfile or a registry link.
+ */
+export type SharedContainerConfig = {
+	/** if undefined in config, defaults to worker_name[-envName]-class_name. */
+	name: string;
+	/** container's DO class name */
+	class_name: string;
+	/** if undefined in config, defaults to 0 */
+	max_instances: number;
+	/** if undefined in config, defaults to "default" */
+	scheduling_policy: SchedulingPolicy;
+	/** if undefined in config, defaults to 25 */
+	rollout_step_percentage: number;
+	/** if undefined in config, defaults to "full_auto" */
+	rollout_kind: "full_auto" | "full_manual" | "none";
+	constraints?: {
+		regions?: string[];
+		cities?: string[];
+		tier?: number;
+	};
+} & InstanceTypeOrLimits;

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

@@ -2413,6 +2413,8 @@ describe("normalizeAndValidateConfig()", () => {
 						},
 						class_name: "test-class",
 						name: "test-worker-name-test-class",
+						// this has been set twice to accomodate both cloudchamber and containers
+						image: "something",
 					},
 				]);
 				if (config.containers) {