Zodify all the things (#249)

Author: bwateratmsft

package-lock.json

@@ -24,7 +24,8 @@
     },
     "dependencies": {
         "dayjs": "^1.11.2",
-        "tree-kill": "^1.2.2"
+        "tree-kill": "^1.2.2",
+        "zod": "^3.25.56"
     },
     "devDependencies": {
         "@types/chai": "^4.3.0",
@@ -39,7 +40,7 @@
         "mocha-junit-reporter": "^2.0.2",
         "ts-node": "^10.4.0",
         "tsconfig-paths": "^4.0.0",
-        "typescript": "^4.5.5",
+        "typescript": "^5.8.3",
         "vscode-jsonrpc": "^8.0.1"
     },
     "mocha": {

packages/vscode-container-client/package.json

@@ -9,8 +9,8 @@ import { asIds } from "../../utils/asIds";
 import { CommandLineArgs, composeArgs, withArg } from "../../utils/commandLineBuilder";
 import { DockerClientBase } from "../DockerClientBase/DockerClientBase";
 import { withDockerJsonFormatArg } from "../DockerClientBase/withDockerJsonFormatArg";
-import { isDockerContextRecord } from "./DockerContextRecord";
-import { isDockerInspectContextRecord } from "./DockerInspectContextRecord";
+import { DockerContextRecordSchema } from "./DockerContextRecord";
+import { DockerInspectContextRecordSchema } from "./DockerInspectContextRecord";
 
 export class DockerClient extends DockerClientBase implements IContainersClient {
     /**
@@ -67,13 +67,7 @@ export class DockerClient extends DockerClientBase implements IContainersClient
                         return;
                     }
 
-                    const rawContext = JSON.parse(contextJson);
-
-                    // Validate that the image object matches the expected output
-                    // for the list contexts command
-                    if (!isDockerContextRecord(rawContext)) {
-                        throw new Error('Invalid context JSON');
-                    }
+                    const rawContext = DockerContextRecordSchema.parse(JSON.parse(contextJson));
 
                     contexts.push({
                         name: rawContext.Name,
@@ -172,11 +166,7 @@ export class DockerClient extends DockerClientBase implements IContainersClient
                 }
 
                 try {
-                    const inspect = JSON.parse(inspectString);
-
-                    if (!isDockerInspectContextRecord(inspect)) {
-                        throw new Error('Invalid context inspect json');
-                    }
+                    const inspect = DockerInspectContextRecordSchema.parse(JSON.parse(inspectString));
 
                     // Return the normalized InspectVolumesItem record
                     const volume: InspectContextsItem = {

packages/vscode-container-client/src/clients/DockerClient/DockerClient.ts

@@ -3,27 +3,11 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export type DockerContextRecord = {
-    Name: string;
-    Current: boolean;
-    Description?: string;
-    DockerEndpoint?: string;
-};
-
-export function isDockerContextRecord(maybeContext: unknown): maybeContext is DockerContextRecord {
-    const context = maybeContext as DockerContextRecord;
-
-    if (!context || typeof context !== 'object') {
-        return false;
-    }
-
-    if (typeof context.Name !== 'string') {
-        return false;
-    }
-
-    if (typeof context.Current !== 'boolean') {
-        return false;
-    }
-
-    return true;
-}
+import { z } from 'zod/v4';
+
+export const DockerContextRecordSchema = z.object({
+    Name: z.string(),
+    Current: z.boolean(),
+    Description: z.string().optional(),
+    DockerEndpoint: z.string().optional(),
+});

packages/vscode-container-client/src/clients/DockerClient/DockerContextRecord.ts

@@ -3,14 +3,11 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export type DockerInspectContextRecord = {
-    Name: string;
-    Metadata?: {
-        Description?: string;
-    }
-};
+import { z } from 'zod/v4';
 
-// TODO: Actually test properties
-export function isDockerInspectContextRecord(maybeContext: unknown): maybeContext is DockerInspectContextRecord {
-    return true;
-}
+export const DockerInspectContextRecordSchema = z.object({
+    Name: z.string(),
+    Metadata: z.object({
+        Description: z.string().optional(),
+    }).optional(),
+});