CC-5749 Drop deprecated containers observability.logging field (#11437)

* CC-5749 Drop deprecated containers observability.logging field

* Mark the changes as minor

Co-authored-by: Edmund Hung <me@edmund.dev>

---------

Co-authored-by: Edmund Hung <me@edmund.dev>

Author: ichernetsky-cf

.changeset/fruity-rice-chew.md

@@ -0,0 +1,6 @@
+---
+"@cloudflare/containers-shared": minor
+"wrangler": minor
+---
+
+Drop deprecated containers `observability.logging` field

packages/containers-shared/src/client/index.ts

@@ -160,7 +160,6 @@ export { NetworkMode } from "./models/NetworkMode";
 export type { NetworkParameters } from "./models/NetworkParameters";
 export { NodeGroup } from "./models/NodeGroup";
 export type { Observability } from "./models/Observability";
-export type { ObservabilityLogging } from "./models/ObservabilityLogging";
 export type { ObservabilityLogs } from "./models/ObservabilityLogs";
 export type { Placement } from "./models/Placement";
 export type { PlacementEvent } from "./models/PlacementEvent";

packages/containers-shared/src/client/models/Observability.ts

@@ -2,13 +2,11 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { ObservabilityLogging } from "./ObservabilityLogging";
 import type { ObservabilityLogs } from "./ObservabilityLogs";
 
 /**
  * Settings for observability such as logging.
  */
 export type Observability = {
-	logging?: ObservabilityLogging;
 	logs?: ObservabilityLogs;
 };

packages/containers-shared/src/client/models/ObservabilityLogging.ts

@@ -1301,80 +1301,6 @@ describe("cloudchamber apply", () => {
 		expect(app.instances).toEqual(1);
 	});
 
-	test("ignores deprecated observability.logging", async () => {
-		setIsTTY(false);
-		writeWranglerConfig({
-			name: "my-container",
-			containers: [
-				{
-					name: "my-container-app",
-					class_name: "DurableObjectClass",
-					instances: 1,
-					image: "registry.cloudflare.com/beep:boop",
-				},
-			],
-		});
-		mockGetApplications([
-			{
-				id: "abc",
-				name: "my-container-app",
-				instances: 1,
-				created_at: new Date().toString(),
-				version: 1,
-				account_id: "1",
-				scheduling_policy: SchedulingPolicy.REGIONAL,
-				configuration: {
-					image: "registry.cloudflare.com/beep:boop",
-					observability: {
-						logs: {
-							enabled: true,
-						},
-						logging: {
-							enabled: true,
-						},
-					},
-					disk: {
-						size: "2GB",
-						size_mb: 2000,
-					},
-					vcpu: 0.0625,
-					memory: "256MB",
-					memory_mib: 256,
-				},
-				constraints: {
-					tier: 1,
-				},
-			},
-		]);
-		const applicationReqBodyPromise = mockModifyApplication();
-		await runWrangler("cloudchamber apply");
-		expect(std.stdout).toMatchInlineSnapshot(`
-			"╭ Deploy a container application deploy changes to your application
-			│
-			│ Container application changes
-			│
-			├ EDIT my-container-app
-			│
-			│   instance_type = \\"lite\\"
-			│   [containers.configuration.observability.logs]
-			│ - enabled = true
-			│ + enabled = false
-			│   [containers.constraints]
-			│   tier = 1
-			│
-			│
-			│  SUCCESS  Modified application my-container-app
-			│
-			╰ Applied changes
-
-			"
-		`);
-		expect(std.stderr).toMatchInlineSnapshot(`""`);
-		const app = await applicationReqBodyPromise;
-		expect(app.constraints?.tier).toEqual(1);
-		expect(app.instances).toEqual(1);
-	});
-
 	test("keeps observability logs enabled", async () => {
 		setIsTTY(false);
 		writeWranglerConfig({
@@ -1404,9 +1330,6 @@ describe("cloudchamber apply", () => {
 						logs: {
 							enabled: true,
 						},
-						logging: {
-							enabled: true,
-						},
 					},
 					disk: {
 						size: "2GB",
@@ -1516,9 +1439,6 @@ describe("cloudchamber apply", () => {
 						logs: {
 							enabled: false,
 						},
-						logging: {
-							enabled: false,
-						},
 					},
 					disk: {
 						size: "2GB",

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

@@ -1368,63 +1368,6 @@ describe("wrangler deploy with containers", () => {
 				"
 			`);
 		});
-		it("should ignore deprecated observability.logging field from the api", async () => {
-			mockGetVersion("Galaxy-Class");
-			writeWranglerConfig({
-				...DEFAULT_DURABLE_OBJECTS,
-				containers: [DEFAULT_CONTAINER_FROM_REGISTRY],
-			});
-
-			mockGetApplications([
-				{
-					...sharedGetApplicationResult,
-					configuration: {
-						...sharedGetApplicationResult.configuration,
-						observability: {
-							logging: {
-								enabled: false,
-							},
-							logs: {
-								enabled: true,
-							},
-						},
-					},
-				},
-			]);
-
-			mockModifyApplication({
-				configuration: {
-					image: "registry.cloudflare.com/some-account-id/hello:world",
-					observability: { logs: { enabled: false } },
-				},
-			});
-
-			mockCreateApplicationRollout();
-
-			await runWrangler("deploy index.js");
-
-			expect(cliStd.stdout).toMatchInlineSnapshot(`
-				"╭ Deploy a container application deploy changes to your application
-				│
-				│ Container application changes
-				│
-				├ EDIT my-container
-				│
-				│   instance_type = \\"lite\\"
-				│   [containers.configuration.observability.logs]
-				│ - enabled = true
-				│ + enabled = false
-				│   [containers.constraints]
-				│   tier = 1
-				│
-				│
-				│  SUCCESS  Modified application my-container (Application ID: abc)
-				│
-				╰ Applied changes
-
-				"
-			`);
-		});
 		it("should keep observability logs enabled", async () => {
 			mockGetVersion("Galaxy-Class");
 			writeWranglerConfig({
@@ -1486,9 +1429,6 @@ describe("wrangler deploy with containers", () => {
 							logs: {
 								enabled: false,
 							},
-							logging: {
-								enabled: false,
-							},
 						},
 					},
 				},

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

@@ -133,20 +133,6 @@ function applicationToCreateApplication(
 	return app;
 }
 
-function cleanupObservability(
-	observability: ObservabilityConfiguration | undefined
-) {
-	if (observability === undefined) {
-		return;
-	}
-
-	// `logging` field is deprecated, so if the server returns both `logging` and `logs`
-	// fields, drop the `logging` one.
-	if (observability.logging !== undefined && observability.logs !== undefined) {
-		delete observability.logging;
-	}
-}
-
 function observabilityToConfiguration(
 	observability: Observability | undefined,
 	existingObservabilityConfig: ObservabilityConfiguration | undefined
@@ -353,9 +339,6 @@ export async function apply(
 		ApplicationsService.listApplications(),
 		{ message: "Loading applications" }
 	);
-	applications.forEach((app) =>
-		cleanupObservability(app.configuration.observability)
-	);
 	const applicationByNames: Record<ApplicationName, Application> = {};
 	// TODO: this is not correct right now as there can be multiple applications
 	// with the same name.

packages/wrangler/src/cloudchamber/apply.ts

@@ -218,20 +218,6 @@ function createApplicationToModifyApplication(
 	};
 }
 
-function cleanupObservability(
-	observability: ObservabilityConfiguration | undefined
-) {
-	if (observability === undefined) {
-		return;
-	}
-
-	// `logging` field is deprecated, so if the server returns both `logging` and `logs`
-	// fields, drop the `logging` one.
-	if (observability.logging !== undefined && observability.logs !== undefined) {
-		delete observability.logging;
-	}
-}
-
 /**
  * Resolves current configuration based on previous deployment.
  */
@@ -349,9 +335,6 @@ export async function apply(
 		ApplicationsService.listApplications(),
 		{ message: "Loading applications" }
 	);
-	existingApplications.forEach((app) =>
-		cleanupObservability(app.configuration.observability)
-	);
 	// TODO: this is not correct right now as there can be multiple applications
 	// with the same name.
 	/** Previous deployment of this app, if this exists  */