wrangler containers apply uses observability configuration (#9558)

Author: ichernetsky-cf

.changeset/bumpy-beers-stare.md

@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+`wrangler containers apply` uses `observability` configuration.

packages/containers-shared/src/client/core/OpenAPI.ts

@@ -1,6 +1,5 @@
 /* istanbul ignore file */
 /* tslint:disable */
-/* eslint-disable */
 import { Agent } from "undici";
 import type { ApiRequestOptions } from "./ApiRequestOptions";
 

packages/containers-shared/src/client/core/request.ts

@@ -9,6 +9,21 @@ import type { ApiRequestOptions } from "./ApiRequestOptions";
 import type { ApiResult } from "./ApiResult";
 import type { OnCancel } from "./CancelablePromise";
 
+interface FetchError {
+	code: number;
+	documentation_url?: string;
+	message: string;
+	error_chain?: FetchError[];
+}
+
+interface FetchResult<ResponseType = unknown> {
+	success: boolean;
+	result: ResponseType;
+	errors: FetchError[];
+	messages?: string[];
+	result_info?: unknown;
+}
+
 const isDefined = <T>(
 	value: T | null | undefined
 ): value is Exclude<T, null | undefined> => {
@@ -197,6 +212,13 @@ const getRequestBody = (options: ApiRequestOptions): any => {
 	return undefined;
 };
 
+const isResponseSchemaV4 = (
+	config: OpenAPIConfig,
+	_options: ApiRequestOptions
+): boolean => {
+	return config.BASE.endsWith("/containers");
+};
+
 export const sendRequest = async (
 	config: OpenAPIConfig,
 	options: ApiRequestOptions,
@@ -319,16 +341,28 @@ export const request = <T>(
 					options.responseHeader
 				);
 
-				const result: ApiResult = {
-					url,
-					ok: response.ok,
-					status: response.status,
-					statusText: response.statusText,
-					body: responseHeader ?? responseBody,
+				const parseResponseSchemaV4 = (body: any): ApiResult => {
+					const fetchResult = body as FetchResult<T>;
+					return {
+						url,
+						ok: response.ok && fetchResult.success,
+						status: response.status,
+						statusText: response.statusText,
+						body: responseHeader ?? fetchResult.result,
+					};
 				};
 
-				catchErrorCodes(options, result);
+				const result: ApiResult = isResponseSchemaV4(config, options)
+					? parseResponseSchemaV4(responseBody)
+					: {
+							url,
+							ok: response.ok,
+							status: response.status,
+							statusText: response.statusText,
+							body: responseHeader ?? responseBody,
+						};
 
+				catchErrorCodes(options, result);
 				resolve(result.body);
 			}
 		} catch (error) {

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

@@ -5,7 +5,6 @@ export { ApiError } from "./core/ApiError";
 export { CancelablePromise, CancelError } from "./core/CancelablePromise";
 export { OpenAPI } from "./core/OpenAPI";
 export type { OpenAPIConfig } from "./core/OpenAPI";
-export { request } from "./core/request";
 
 export type { AccountDefaults } from "./models/AccountDefaults";
 export type { AccountID } from "./models/AccountID";
@@ -14,9 +13,11 @@ export type { AccountLocation } from "./models/AccountLocation";
 export type { AccountLocationLimits } from "./models/AccountLocationLimits";
 export type { AccountLocationLimitsAsProperty } from "./models/AccountLocationLimitsAsProperty";
 export type { AccountRegistryToken } from "./models/AccountRegistryToken";
+export type { AddressAssignment } from "./models/AddressAssignment";
 export type { Application } from "./models/Application";
 export type { ApplicationAffinities } from "./models/ApplicationAffinities";
 export { ApplicationAffinityColocation } from "./models/ApplicationAffinityColocation";
+export type { ApplicationConstraintPop } from "./models/ApplicationConstraintPop";
 export type { ApplicationConstraints } from "./models/ApplicationConstraints";
 export type { ApplicationHealth } from "./models/ApplicationHealth";
 export type { ApplicationHealthInstances } from "./models/ApplicationHealthInstances";
@@ -113,11 +114,11 @@ export { ImageRegistryProtocolIsReferencedError } from "./models/ImageRegistryPr
 export { ImageRegistryProtocolNotFound } from "./models/ImageRegistryProtocolNotFound";
 export type { ImageRegistryProtocols } from "./models/ImageRegistryProtocols";
 export type { ImageRegistryProtoDomain } from "./models/ImageRegistryProtoDomain";
+export { InstanceType } from "./models/InstanceType";
 export type { InternalError } from "./models/InternalError";
 export type { IP } from "./models/IP";
 export type { IPAllocation } from "./models/IPAllocation";
 export type { IPAllocationConfiguration } from "./models/IPAllocationConfiguration";
-export type { IPAllocationPlacement } from "./models/IPAllocationPlacement";
 export type { IPAllocationsWithFilter } from "./models/IPAllocationsWithFilter";
 export { IPType } from "./models/IPType";
 export type { IPV4 } from "./models/IPV4";
@@ -158,6 +159,7 @@ 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";
 export type { PlacementEvents } from "./models/PlacementEvents";
@@ -168,6 +170,8 @@ export { PlacementStatusHealth } from "./models/PlacementStatusHealth";
 export type { PlacementWithEvents } from "./models/PlacementWithEvents";
 export type { PlainTextSecretValue } from "./models/PlainTextSecretValue";
 export type { Port } from "./models/Port";
+export type { PortRange } from "./models/PortRange";
+export type { PortRangeAllocation } from "./models/PortRangeAllocation";
 export { ProvisionerConfiguration } from "./models/ProvisionerConfiguration";
 export type { Ref } from "./models/Ref";
 export type { Region } from "./models/Region";

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

@@ -9,10 +9,14 @@ import type { MemorySizeWithUnit } from "./MemorySizeWithUnit";
  */
 export type AccountDefaults = {
 	vcpus: number;
-	memory_mib?: number;
+	memory_mib: number;
 	/**
-	 * DEPRECATED in favor of memory_mib
+	 * Default disk size in MB
+	 */
+	disk_mb?: number;
+	/**
+	 * Deprecated in favor of memory_mib
 	 * @deprecated
 	 */
-	memory: MemorySizeWithUnit;
+	memory?: MemorySizeWithUnit;
 };

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

@@ -19,20 +19,24 @@ export type AccountLimit = {
 	 * @deprecated
 	 */
 	memory_per_deployment: MemorySizeWithUnit;
-	memory_mib_per_deployment?: number;
+	memory_mib_per_deployment: number;
 	/**
 	 * Deprecated in favor of disk_mb_per_deployment
 	 * @deprecated
 	 */
 	disk_per_deployment: DiskSizeWithUnit;
-	disk_mb_per_deployment?: number;
+	disk_mb_per_deployment: number;
 	total_vcpu: number;
 	/**
-	 * DEPRECATED in favor of total_memory_mib
+	 * Deprecated in favor of total_memory_mib
 	 * @deprecated
 	 */
 	total_memory: MemorySizeWithUnit;
-	total_memory_mib?: number;
+	total_memory_mib: number;
+	/**
+	 * Total amount of disk usage allowed for the account
+	 */
+	total_disk_mb: number;
 	node_group: NodeGroup;
 	/**
 	 * Network modes that will be included in this customer's vm

packages/containers-shared/src/client/models/IPAllocationPlacement.ts renamed to packages/containers-shared/src/client/models/AddressAssignment.ts

@@ -7,10 +7,10 @@ import type { PlacementID } from "./PlacementID";
 import type { UnixTimestamp } from "./UnixTimestamp";
 
 /**
- * The allocation that exists when an IP has been assigned to a metal
+ * The allocation that exists when an IP or a port range has been assigned to a metal
  */
-export type IPAllocationPlacement = {
+export type AddressAssignment = {
 	placementID?: PlacementID;
-	expiration: UnixTimestamp;
+	expiration?: UnixTimestamp;
 	deploymentID?: DeploymentID;
 };

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

@@ -0,0 +1,8 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+/**
+ * The name of a pop to be specified in an application pop. Requires specific entitlements to use this.
+ */
+export type ApplicationConstraintPop = string;

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

@@ -2,6 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
+import type { ApplicationConstraintPop } from "./ApplicationConstraintPop";
 import type { City } from "./City";
 import type { Region } from "./Region";
 
@@ -10,4 +11,5 @@ export type ApplicationConstraints = {
 	tier?: number;
 	regions?: Array<Region>;
 	cities?: Array<City>;
+	pops?: Array<ApplicationConstraintPop>;
 };

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

@@ -3,8 +3,30 @@
 /* eslint-disable */
 
 export type ApplicationHealthInstances = {
+	/**
+	 * Number of active durable object containers in this application.
+	 *
+	 */
+	durable_objects_active?: number;
+	/**
+	 * Number of healthy instances. If the application is attached to a DO namespace,
+	 * this represents the number of prepared container instances.
+	 *
+	 */
 	healthy: number;
+	/**
+	 * Number of failing container instances.
+	 *
+	 */
 	failed: number;
+	/**
+	 * Number of container instances that are being prepared.
+	 *
+	 */
 	starting: number;
+	/**
+	 * Number of container instances pending to be scheduled.
+	 *
+	 */
 	scheduling: number;
 };