Add runtime validation of the api responses from cloudflare

Author: Ankcorn

example.vars .dev.vars.exampleexample.vars renamed to .dev.vars.example

@@ -1,5 +1,4 @@
 node_modules
 .env
 .dev.vars
-.wrangler
-worker-configuration.d.ts
+.wrangler

.gitignore

@@ -1,5 +1,8 @@
 {
 	"files.associations": {
 		"wrangler.json": "jsonc"
-	}
+	},
+	"typescript.tsdk": "node_modules/typescript/lib",
+	"typescript.experimental.useTsgo": true,
+	"typescript.native-preview.trace.server": "messages"
 }

.vscode/settings.json

@@ -25,7 +25,7 @@
 							{
 								"name": "query1",
 								"data_source": "metrics",
-								"query": "sum:cloudflare.containers.instances.total.max{*}"
+								"query": "sum:cloudflare.containers.instances.max{$application_name}"
 							}
 						],
 						"response_format": "timeseries",
@@ -68,27 +68,27 @@
 							{
 								"name": "query1",
 								"data_source": "metrics",
-								"query": "sum:cloudflare.containers.instances.total.healthy{*}"
+								"query": "sum:cloudflare.containers.instances.healthy{$application_name}"
 							},
 							{
 								"name": "query2",
 								"data_source": "metrics",
-								"query": "sum:cloudflare.containers.instances.total.starting{*}"
+								"query": "sum:cloudflare.containers.instances.starting{$application_name}"
 							},
 							{
 								"name": "query3",
 								"data_source": "metrics",
-								"query": "sum:cloudflare.containers.instances.total.scheduling{*}"
+								"query": "sum:cloudflare.containers.instances.scheduling{$application_name}"
 							},
 							{
 								"name": "query4",
 								"data_source": "metrics",
-								"query": "sum:cloudflare.containers.instances.total.failed{*}"
+								"query": "sum:cloudflare.containers.instances.failed{$application_name}"
 							},
 							{
 								"name": "query5",
 								"data_source": "metrics",
-								"query": "sum:cloudflare.containers.instances.total.stopped{*}"
+								"query": "sum:cloudflare.containers.instances.stopped{$application_name}"
 							}
 						],
 						"response_format": "timeseries",

datadog-dashboard.json

@@ -29,5 +29,9 @@
 		"typescript": "^5.0.4",
 		"vitest": "~3.0.0",
 		"wrangler": "^4.53.0"
+	},
+	"dependencies": {
+		"p-all": "^5.0.1",
+		"zod": "^4.1.13"
 	}
 }

package-lock.json

@@ -1,31 +1,32 @@
-import type {
+import { z } from "zod/v4";
+import {
 	CloudchamberMetricsResponse,
 	Container,
-	MetricsGroup,
+	type MetricsGroup,
 } from "../types";
 
 export interface CloudflareApiConfig {
 	accountId: string;
 	apiToken: string;
 }
 
-export interface ContainersListResponse {
-	success: boolean;
-	result: Container[];
-	errors: unknown[];
-	messages: unknown[];
-}
+const ContainersListResponseSchema = z.object({
+	success: z.boolean(),
+	result: z.array(Container),
+	errors: z.array(z.unknown()).optional(),
+	messages: z.array(z.unknown()).optional(),
+});
 
 export interface GraphQLResponse<T> {
 	data: T | null;
 	errors: { message: string; path: string[] | null }[] | null;
 }
 
 const CONTAINERS_METRICS_QUERY = `
-query GetCloudchamberMetrics($accountTag: string!, $datetimeStart: Time, $datetimeEnd: Time, $applicationId: string) {
+query GetCloudchamberMetrics($accountTag: string!, $datetimeStart: Time, $datetimeEnd: Time, $applicationIds: [string!]) {
   viewer {
     accounts(filter: {accountTag: $accountTag}) {
-      cloudchamberMetricsAdaptiveGroups(limit: 10000, filter: {applicationId: $applicationId, datetimeMinute_geq: $datetimeStart, datetimeMinute_leq: $datetimeEnd}) {
+      cloudchamberMetricsAdaptiveGroups(limit: 10000, filter: {applicationId_in: $applicationIds, datetimeMinute_geq: $datetimeStart, datetimeMinute_leq: $datetimeEnd}) {
         avg {
           memory
           cpuLoad
@@ -91,7 +92,7 @@ export class CloudflareApi {
 			);
 		}
 
-		const data = (await response.json()) as ContainersListResponse;
+		const data = ContainersListResponseSchema.parse(await response.json());
 
 		if (!data.success) {
 			throw new Error(`API error: ${JSON.stringify(data.errors)}`);
@@ -101,13 +102,13 @@ export class CloudflareApi {
 	}
 
 	/**
-	 * Get metrics for a specific container application
-	 * @param applicationId - The container application ID
+	 * Get metrics for multiple container applications
+	 * @param applicationIds - Array of container application IDs
 	 * @param startTime - Start of the time range (defaults to 5 minutes ago)
 	 * @param endTime - End of the time range (defaults to now)
 	 */
 	async getContainerMetrics(
-		applicationId: string,
+		applicationIds: string[],
 		startTime?: Date,
 		endTime?: Date,
 	): Promise<MetricsGroup[]> {
@@ -118,7 +119,7 @@ export class CloudflareApi {
 			accountTag: this.config.accountId,
 			datetimeStart: start.toISOString(),
 			datetimeEnd: now.toISOString(),
-			applicationId,
+			applicationIds,
 		};
 
 		const response = await fetch(this.graphqlUrl, {
@@ -136,16 +137,17 @@ export class CloudflareApi {
 			);
 		}
 
-		const data = (await response.json()) as CloudchamberMetricsResponse;
+		const data = CloudchamberMetricsResponse.parse(await response.json());
 
 		if (data.errors && data.errors.length > 0) {
 			throw new Error(`GraphQL errors: ${JSON.stringify(data.errors)}`);
 		}
 
 		const groups =
 			data.data?.viewer?.accounts?.[0]?.cloudchamberMetricsAdaptiveGroups ?? [];
+
 		console.log("Fetched container metrics", {
-			applicationId,
+			applicationCount: applicationIds.length,
 			groupCount: groups.length,
 		});
 

package.json

@@ -1,13 +1,5 @@
 export { MetricsExporterWorkflow } from "./workflow";
 
-export interface Env {
-	CLOUDFLARE_API_TOKEN: string;
-	CLOUDFLARE_ACCOUNT_ID: string;
-	DATADOG_API_KEY: string;
-	DATADOG_SITE?: string;
-	METRICS_WORKFLOW: Workflow;
-}
-
 const REQUIRED_ENV_VARS = [
 	"CLOUDFLARE_API_TOKEN",
 	"CLOUDFLARE_ACCOUNT_ID",