cloudchamber: capitalize every event message

Author: gabivlj

.changeset/tricky-schools-heal.md

@@ -0,0 +1,7 @@
+---
+"wrangler": minor
+---
+
+Event messages are capitalized, images of wrong architectures properly show the error in `cloudchamber create`
+When a new "health" enum is introduced, `wrangler cloudchamber list` won't crash anymore.
+Update Cloudchamber schemas.

packages/wrangler/src/__tests__/helpers/mock-cloudchamber.ts

@@ -1,4 +1,8 @@
-import { DeploymentType, NodeGroup } from "../../cloudchamber/client";
+import {
+	DeploymentType,
+	NodeGroup,
+	PlacementStatusHealth,
+} from "../../cloudchamber/client";
 import type {
 	DeploymentV2,
 	PlacementWithEvents,
@@ -42,7 +46,7 @@ export const MOCK_DEPLOYMENTS: DeploymentV2[] = [
 		},
 		current_placement: {
 			deployment_version: 2,
-			status: { health: "running" },
+			status: { health: PlacementStatusHealth.RUNNING },
 			deployment_id: "2",
 			terminate: false,
 			created_at: "123",
@@ -91,7 +95,7 @@ export const MOCK_DEPLOYMENTS_COMPLEX: DeploymentV2[] = [
 		},
 		current_placement: {
 			deployment_version: 2,
-			status: { health: "running" },
+			status: { health: PlacementStatusHealth.RUNNING },
 			deployment_id: "2",
 			terminate: false,
 			created_at: "123",
@@ -137,7 +141,7 @@ export const MOCK_DEPLOYMENTS_COMPLEX: DeploymentV2[] = [
 		},
 		current_placement: {
 			deployment_version: 2,
-			status: { health: "running" },
+			status: { health: PlacementStatusHealth.RUNNING },
 			deployment_id: "2",
 			terminate: false,
 			created_at: "123",
@@ -156,7 +160,7 @@ export const MOCK_PLACEMENTS: PlacementWithEvents[] = [
 		deployment_version: 2,
 		terminate: false,
 		events: [],
-		status: { health: "stopped" },
+		status: { health: PlacementStatusHealth.STOPPED },
 	},
 	{
 		id: "3",
@@ -165,7 +169,7 @@ export const MOCK_PLACEMENTS: PlacementWithEvents[] = [
 		deployment_version: 3,
 		terminate: false,
 		events: [],
-		status: { health: "failed" },
+		status: { health: PlacementStatusHealth.FAILED },
 	},
 	{
 		id: "1",
@@ -174,6 +178,6 @@ export const MOCK_PLACEMENTS: PlacementWithEvents[] = [
 		deployment_version: 4,
 		terminate: false,
 		events: [],
-		status: { health: "running" },
+		status: { health: PlacementStatusHealth.RUNNING },
 	},
 ];

packages/wrangler/src/cloudchamber/cli/index.ts

@@ -16,6 +16,7 @@ import {
 } from "../client";
 import { wrap } from "../helpers/wrap";
 import { idToLocationName } from "../locations";
+import { capitalize } from "./util";
 import type {
 	CustomerImageRegistry,
 	DeploymentV2,
@@ -213,7 +214,6 @@ async function waitForImagePull(deployment: DeploymentV2) {
 	s.stop();
 	if (err) {
 		crash(err.message);
-		return;
 	}
 
 	if (
@@ -226,13 +226,19 @@ async function waitForImagePull(deployment: DeploymentV2) {
 	}
 
 	if (eventPlacement.event.name == "ImagePullError") {
-		crash(
-			"Your container image couldn't be pulled, (404 not found). Did you specify the correct URL?",
-			`Run ${brandColor(
-				process.argv0 + " cloudchamber modify " + deployment.id
-			)} to change the deployment image`
-		);
-		return;
+		// TODO: We should really report here something more specific when it's not found.
+		// For now, the cloudchamber API always returns a 404 in the message when the
+		// image is not found.
+		if (eventPlacement.event.message.includes("404")) {
+			crash(
+				"Your container image couldn't be pulled, (404 not found). Did you specify the correct URL?",
+				`Run ${brandColor(
+					process.argv0 + " cloudchamber modify " + deployment.id
+				)} to change the deployment image`
+			);
+		}
+
+		crash(capitalize(eventPlacement.event.message));
 	}
 
 	updateStatus("Pulled your image");
@@ -265,7 +271,6 @@ async function waitForVMToStart(deployment: DeploymentV2) {
 	s.stop();
 	if (err) {
 		crash(err.message);
-		return;
 	}
 
 	if (!eventPlacement.event) {
@@ -326,7 +331,6 @@ async function waitForPlacementInstance(deployment: DeploymentV2) {
 
 	if (err) {
 		crash(err.message);
-		return;
 	}
 
 	updateStatus(

packages/wrangler/src/cloudchamber/cli/util.ts

@@ -1,6 +1,12 @@
 import { bgGreen, bgRed, bgYellow } from "@cloudflare/cli/colors";
 import { PlacementStatusHealth } from "../client";
 
+export function capitalize<S extends string>(str: S): Capitalize<S> {
+	return (
+		str.length > 0 ? str[0].toUpperCase() + str.substring(1) : str
+	) as Capitalize<S>;
+}
+
 export function statusToColored(status?: PlacementStatusHealth): string {
 	if (!status) {
 		return bgYellow("PLACING");

packages/wrangler/src/cloudchamber/list.ts

@@ -12,7 +12,7 @@ import {
 import { inputPrompt, spinner } from "@cloudflare/cli/interactive";
 import isInteractive from "../is-interactive";
 import { listDeploymentsAndChoose, loadDeployments } from "./cli/deployments";
-import { statusToColored } from "./cli/util";
+import { capitalize, statusToColored } from "./cli/util";
 import { DeploymentsService, PlacementsService } from "./client";
 import { loadAccountSpinner, promiseSpinner } from "./common";
 import type { Config } from "../config";
@@ -115,6 +115,7 @@ export async function listCommand(
  */
 function eventMessage(event: PlacementEvent, lastEvent: boolean): string {
 	let { message } = event;
+	message = capitalize(message);
 	const name = event.name as EventName;
 	const health = event.statusChange["health"];
 	if (health === "failed") {