pr feedback

Author: emily-shen

packages/wrangler/src/cloudchamber/build.ts

@@ -81,19 +81,22 @@ export function pushYargs(yargs: CommonYargsArgv) {
 
 /**
  *
- * @returns `{ digest: string }` if the image already exists remotely. we will
+ * `{ remoteDigest: string }` implies the image already exists remotely. we will
  * try and replace this with the image tag from the last deployment if possible.
  * If a deployment failed between push and deploy, we can't know for certain
- * what the tag of the last push was, so let's just use the digest instead.
+ * what the tag of the last push was, so we will use the digest instead.
  *
- * @returns `{ tag: string }` if the image was built and pushed
+ * `{ newTag: string }` implies the image was built and pushed and the deployment
+ * should be associated with a new tag.
  */
+export type ImageRef = { remoteDigest: string } | { newTag: string };
+
 export async function buildAndMaybePush(
 args: BuildArgs,
 pathToDocker: string,
 push: boolean,
 containerConfig?: Exclude<ContainerNormalizedConfig, ImageURIConfig>
-): Promise<{ remoteDigest: string } | { newTag: string }> {
+): Promise<ImageRef> {
 try {
 const imageTag = `${getCloudflareContainerRegistry()}/${args.tag}`;
 const { buildCmd, dockerfile } = await constructBuildCommand(

packages/wrangler/src/cloudchamber/deploy.ts

@@ -8,6 +8,7 @@ import { logger } from "../logger";
 import { fetchVersion } from "../versions/api";
 import { buildAndMaybePush } from "./build";
 import { fillOpenAPIConfiguration } from "./common";
+import type { ImageRef } from "./build";
 import type {
 ContainerNormalizedConfig,
 ImageURIConfig,
@@ -19,7 +20,7 @@ export async function buildContainer(
 imageTag: string,
 dryRun: boolean,
 pathToDocker: string
-): Promise<{ remoteDigest: string } | { newTag: string }> {
+): Promise<ImageRef> {
 const imageFullName = containerConfig.name + ":" + imageTag.split("-")[0];
 logger.log("Building image", imageFullName);
 
@@ -57,7 +58,7 @@ export async function deployContainers(
 
 const pathToDocker = getDockerPath();
 const version = await fetchVersion(config, accountId, scriptName, versionId);
-let imageRef: { remoteDigest: string } | { newTag: string };
+let imageRef: ImageRef;
 for (const container of normalisedContainerConfig) {
 if ("dockerfile" in container) {
 imageRef = await buildContainer(

packages/wrangler/src/containers/deploy.ts

@@ -30,6 +30,7 @@ import {
 sortObjectRecursive,
 stripUndefined,
 } from "../utils/sortObjectRecursive";
+import type { ImageRef } from "../cloudchamber/build";
 import type { Config } from "../config";
 import type { ContainerApp } from "../config/environment";
 import type {
@@ -191,7 +192,7 @@ function containerConfigToCreateRequest(
 
 export async function apply(
 args: {
-imageRef: { remoteDigest: string } | { newTag: string };
+imageRef: ImageRef;
 durable_object_namespace_id: string;
 },
 containerConfig: ContainerNormalizedConfig,