kubernetes-fluent-client 3.6.2 → 3.6.3-nightly.1

package/dist/fluent/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fluent/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAwB,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAOjF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAS,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAuC,MAAM,mBAAmB,CAAC;AAKjF;;;;;;GAMG;AACH,wBAAgB,GAAG,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,EACtF,KAAK,EAAE,CAAC,EACR,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAyRf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fluent/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAwB,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAOjF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAS,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAuC,MAAM,mBAAmB,CAAC;AAKjF;;;;;;GAMG;AACH,wBAAgB,GAAG,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,EACtF,KAAK,EAAE,CAAC,EACR,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAgSf"}

package/dist/fluent/index.js

@@ -92,7 +92,7 @@ export function K8s(model, filters = {}) {
             throw new Error("Kind must be Pod or have a selector");
         }
         try {
-            const object = await k8sExec(model, filters, FetchMethods.GET);
+            const object = await k8sExec(model, filters, { method: FetchMethods.GET });
             if (kind !== "Pod") {
                 if (kind === "Service") {
                     const svc = object;
@@ -118,7 +118,7 @@ export function K8s(model, filters = {}) {
             throw new Error(`Failed to get logs in KFC Logs function`);
         }
         const podModel = { ...model, name: "V1Pod" };
-        const logPromises = podList.map(po => k8sExec(podModel, { ...filters, name: po.metadata.name }, FetchMethods.LOG));
+        const logPromises = podList.map(po => k8sExec(podModel, { ...filters, name: po.metadata.name }, { method: FetchMethods.LOG }));
         const responses = await Promise.all(logPromises);
         const combinedString = responses.reduce((accumulator, currentString, i) => {
             const prefixedLines = currentString
@@ -142,7 +142,7 @@ export function K8s(model, filters = {}) {
             }
             filters.name = name;
         }
-        return k8sExec(model, filters, FetchMethods.GET);
+        return k8sExec(model, filters, { method: FetchMethods.GET });
     }
     /**
      * @inheritdoc
@@ -157,7 +157,7 @@ export function K8s(model, filters = {}) {
         }
         try {
             // Try to delete the resource
-            await k8sExec(model, filters, FetchMethods.DELETE);
+            await k8sExec(model, filters, { method: FetchMethods.DELETE });
         }
         catch (e) {
             // If the resource doesn't exist, ignore the error
@@ -173,7 +173,7 @@ export function K8s(model, filters = {}) {
      */
     async function Apply(resource, applyCfg = { force: false }) {
         syncFilters(resource);
-        return k8sExec(model, filters, FetchMethods.APPLY, resource, applyCfg);
+        return k8sExec(model, filters, { method: FetchMethods.APPLY, payload: resource }, applyCfg);
     }
     /**
      * @inheritdoc
@@ -181,7 +181,7 @@ export function K8s(model, filters = {}) {
      */
     async function Create(resource) {
         syncFilters(resource);
-        return k8sExec(model, filters, FetchMethods.POST, resource);
+        return k8sExec(model, filters, { method: FetchMethods.POST, payload: resource });
     }
     /**
      * @inheritdoc
@@ -204,7 +204,10 @@ export function K8s(model, filters = {}) {
                 },
             };
             // Try to evict the resource
-            await k8sExec(model, filters, FetchMethods.POST, evictionPayload);
+            await k8sExec(model, filters, {
+                method: FetchMethods.POST,
+                payload: evictionPayload,
+            });
         }
         catch (e) {
             // If the resource doesn't exist, ignore the error
@@ -223,7 +226,7 @@ export function K8s(model, filters = {}) {
         if (payload.length < 1) {
             throw new Error("No operations specified");
         }
-        return k8sExec(model, filters, FetchMethods.PATCH, payload);
+        return k8sExec(model, filters, { method: FetchMethods.PATCH, payload });
     }
     /**
      * @inheritdoc
@@ -231,7 +234,7 @@ export function K8s(model, filters = {}) {
      */
     async function PatchStatus(resource) {
         syncFilters(resource);
-        return k8sExec(model, filters, FetchMethods.PATCH_STATUS, resource);
+        return k8sExec(model, filters, { method: FetchMethods.PATCH_STATUS, payload: resource });
     }
     /**
      * @inheritdoc

package/dist/fluent/utils.d.ts

@@ -45,16 +45,43 @@ export declare function pathBuilder<T extends GenericClass>(serverUrl: string, m
  * @returns the fetch options and server URL
  */
 export declare function k8sCfg(method: FetchMethods): K8sConfigPromise;
+/**
+ * Prepares and mutates the request options and URL for Kubernetes PATCH or APPLY operations.
+ *
+ * This function modifies the request's HTTP method, headers, and URL based on the operation type.
+ * It handles the following:
+ *
+ * - `PATCH_STATUS`: Converts the method to `PATCH`, appends `/status` to the path, sets merge patch headers,
+ *   and rewrites the payload to contain only the `status` field.
+ * - `PATCH`: Sets the content type to `application/json-patch+json`.
+ * - `APPLY`: Converts the method to `PATCH`, sets server-side apply headers, and updates the query string
+ *   with field manager and force options.
+ *
+ * @template K
+ * @param methodPayload - The original method and payload. May be mutated if `PATCH_STATUS` is used.
+ * @param opts - The request options.
+ * @param opts.method - The HTTP method (e.g. `PATCH`, `APPLY`, or `PATCH_STATUS`).
+ * @param opts.headers - The headers to be updated with the correct content type.
+ * @param url - The URL to mutate with subresource path or query parameters.
+ * @param applyCfg - Server-side apply options, such as `force`.
+ */
+export declare function prepareRequestOptions<K>(methodPayload: MethodPayload<K>, opts: {
+    method?: string;
+    headers?: Record<string, string>;
+}, url: URL, applyCfg: ApplyCfg): void;
+export type MethodPayload<K> = {
+    method: FetchMethods;
+    payload?: K | unknown;
+};
 /**
  * Execute a request against the Kubernetes API server.
  *
  * @param model - the model to use for the API
  * @param filters - (optional) filter overrides, can also be chained
- * @param method - the HTTP method to use
- * @param payload - (optional) the payload to send
+ * @param methodPayload - method and payload for the request
  * @param applyCfg - (optional) configuration for the apply method
  *
  * @returns the parsed JSON response
  */
-export declare function k8sExec<T extends GenericClass, K>(model: T, filters: Filters, method: FetchMethods, payload?: K | unknown, applyCfg?: ApplyCfg): Promise<K>;
+export declare function k8sExec<T extends GenericClass, K>(model: T, filters: Filters, methodPayload: MethodPayload<K>, applyCfg?: ApplyCfg): Promise<K>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/fluent/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fluent/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAS,UAAU,EAAE,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAMtF;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAkBvF;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,SAAS,CAqBvE;AACD;;;;GAIG;AACH,wBAAsB,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAMvD;AACD;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAChD,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,WAAW,UAAQ,OAwDpB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,gBAAgB,CA+BnE;AASD;;;;;;;;;;GAUG;AACH,wBAAsB,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,EACrD,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,YAAY,EACpB,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,EACrB,QAAQ,GAAE,QAA2B,cA+DtC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fluent/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAS,UAAU,EAAE,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAMtF;;;;;GAKG;AACH,wBAAsB,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAkBvF;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,SAAS,CAqBvE;AACD;;;;GAIG;AACH,wBAAsB,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAMvD;AACD;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAChD,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,WAAW,UAAQ,OAwDpB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,gBAAgB,CA+BnE;AASD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EACrC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,EAC/B,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAC3D,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,QAAQ,GACjB,IAAI,CAsBN;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC;CACvB,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAsB,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,EACrD,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,EAC/B,QAAQ,GAAE,QAA2B,cAkDtC"}

package/dist/fluent/utils.js

@@ -164,29 +164,70 @@ const isEvictionPayload = (payload) => payload !== null &&
     typeof payload === "object" &&
     "kind" in payload &&
     payload.kind === "Eviction";
+/**
+ * Prepares and mutates the request options and URL for Kubernetes PATCH or APPLY operations.
+ *
+ * This function modifies the request's HTTP method, headers, and URL based on the operation type.
+ * It handles the following:
+ *
+ * - `PATCH_STATUS`: Converts the method to `PATCH`, appends `/status` to the path, sets merge patch headers,
+ *   and rewrites the payload to contain only the `status` field.
+ * - `PATCH`: Sets the content type to `application/json-patch+json`.
+ * - `APPLY`: Converts the method to `PATCH`, sets server-side apply headers, and updates the query string
+ *   with field manager and force options.
+ *
+ * @template K
+ * @param methodPayload - The original method and payload. May be mutated if `PATCH_STATUS` is used.
+ * @param opts - The request options.
+ * @param opts.method - The HTTP method (e.g. `PATCH`, `APPLY`, or `PATCH_STATUS`).
+ * @param opts.headers - The headers to be updated with the correct content type.
+ * @param url - The URL to mutate with subresource path or query parameters.
+ * @param applyCfg - Server-side apply options, such as `force`.
+ */
+export function prepareRequestOptions(methodPayload, opts, url, applyCfg) {
+    switch (opts.method) {
+        // PATCH_STATUS is a special case that uses the PATCH method on status subresources
+        case "PATCH_STATUS":
+            opts.method = "PATCH";
+            url.pathname = `${url.pathname}/status`;
+            opts.headers["Content-Type"] = PatchStrategy.MergePatch;
+            methodPayload.payload = { status: methodPayload.payload.status };
+            break;
+        case "PATCH":
+            opts.headers["Content-Type"] = PatchStrategy.JsonPatch;
+            break;
+        case "APPLY":
+            opts.headers["Content-Type"] = SSA_CONTENT_TYPE;
+            opts.method = "PATCH";
+            url.searchParams.set("fieldManager", "pepr");
+            url.searchParams.set("fieldValidation", "Strict");
+            url.searchParams.set("force", applyCfg.force ? "true" : "false");
+            break;
+    }
+}
 /**
  * Execute a request against the Kubernetes API server.
  *
  * @param model - the model to use for the API
  * @param filters - (optional) filter overrides, can also be chained
- * @param method - the HTTP method to use
- * @param payload - (optional) the payload to send
+ * @param methodPayload - method and payload for the request
  * @param applyCfg - (optional) configuration for the apply method
  *
  * @returns the parsed JSON response
  */
-export async function k8sExec(model, filters, method, payload, applyCfg = { force: false }) {
+export async function k8sExec(model, filters, methodPayload, applyCfg = { force: false }) {
     const reconstruct = async (method) => {
         const configMethod = method === FetchMethods.LOG ? FetchMethods.GET : method;
         const { opts, serverUrl } = await k8sCfg(configMethod);
         // Build the base path once, using excludeName only for standard POST requests
-        const shouldExcludeName = method === "POST" && !(payload && isEvictionPayload(payload));
+        const shouldExcludeName = method === FetchMethods.POST &&
+            !(methodPayload.payload && isEvictionPayload(methodPayload.payload));
         const baseUrl = pathBuilder(serverUrl.toString(), model, filters, shouldExcludeName);
         // Append appropriate subresource paths
-        if (payload && isEvictionPayload(payload)) {
+        if (methodPayload.payload && isEvictionPayload(methodPayload.payload)) {
             baseUrl.pathname = `${baseUrl.pathname}/eviction`;
         }
-        else if (method === "LOG") {
+        else if (method === FetchMethods.LOG) {
             baseUrl.pathname = `${baseUrl.pathname}/log`;
         }
         return {
@@ -194,35 +235,17 @@ export async function k8sExec(model, filters, method, payload, applyCfg = { forc
             opts,
         };
     };
-    const { opts, serverUrl } = await reconstruct(method);
+    const { opts, serverUrl } = await reconstruct(methodPayload.method);
     const url = serverUrl instanceof URL ? serverUrl : new URL(serverUrl);
-    switch (opts.method) {
-        // PATCH_STATUS is a special case that uses the PATCH method on status subresources
-        case "PATCH_STATUS":
-            opts.method = "PATCH";
-            url.pathname = `${url.pathname}/status`;
-            opts.headers["Content-Type"] = PatchStrategy.MergePatch;
-            payload = { status: payload.status };
-            break;
-        case "PATCH":
-            opts.headers["Content-Type"] = PatchStrategy.JsonPatch;
-            break;
-        case "APPLY":
-            opts.headers["Content-Type"] = SSA_CONTENT_TYPE;
-            opts.method = "PATCH";
-            url.searchParams.set("fieldManager", "pepr");
-            url.searchParams.set("fieldValidation", "Strict");
-            url.searchParams.set("force", applyCfg.force ? "true" : "false");
-            break;
-    }
-    if (payload) {
-        opts.body = JSON.stringify(payload);
+    prepareRequestOptions(methodPayload, opts, url, applyCfg);
+    if (methodPayload.payload) {
+        opts.body = JSON.stringify(methodPayload.payload);
     }
     const resp = await fetch(url, opts);
     if (resp.ok) {
         return resp.data;
     }
-    if (resp.status === 404 && method === "PATCH_STATUS") {
+    if (resp.status === 404 && methodPayload.method === FetchMethods.PATCH_STATUS) {
         resp.statusText =
             "Not Found" + " (NOTE: This error is expected if the resource has no status subresource)";
     }

package/dist/generate.d.ts

@@ -1,11 +1,12 @@
-import { InputData, TargetLanguage } from "quicktype-core";
+import { InputData, TargetLanguage, quicktype } from "quicktype-core";
 import { CustomResourceDefinition } from "./upstream.js";
 import { LogFn } from "./types.js";
+export type QuicktypeLang = Parameters<typeof quicktype>[0]["lang"];
 export interface GenerateOptions {
     source: string;
     directory?: string;
     plain?: boolean;
-    language?: string | TargetLanguage;
+    language: QuicktypeLang;
     npmPackage?: string;
     logFn: LogFn;
     noPost?: boolean;
@@ -35,9 +36,10 @@ export declare function prepareInputData(name: string, schema: string): Promise<
  * Generates TypeScript types using quicktype.
  *
  * @param inputData - The input data for quicktype.
+ * @param opts - The options for generating the TypeScript types.
  * @returns A promise that resolves to an array of generated TypeScript type lines.
  */
-export declare function generateTypes(inputData: InputData): Promise<string[]>;
+export declare function generateTypes(inputData: InputData, opts: GenerateOptions): Promise<string[]>;
 /**
  * Writes the processed lines to the output file.
  *

package/dist/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,SAAS,EAET,cAAc,EAEf,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,eAAe,GACpB,OAAO,CACR;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CAuCA;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAYvF;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAW3E;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,GAAG,cAAc,GAChC,IAAI,CAON;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC,CA0B/F;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,IAAI,CAMtD;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAC5D;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CA8BA"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,SAAS,EAET,cAAc,EACd,SAAS,EACV,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACpE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,aAAa,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,eAAe,GACpB,OAAO,CACR;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CAuCA;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAYvF;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CASnB;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,GAAG,cAAc,GAChC,IAAI,CAON;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC,CA0B/F;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,IAAI,CAMtD;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAC5D;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CA8BA"}

package/dist/generate.js

@@ -32,7 +32,7 @@ export async function convertCRDtoTS(crd, opts) {
         const schema = JSON.stringify(match.schema.openAPIV3Schema);
         opts.logFn(`- Generating ${crd.spec.group}/${match.name} types for ${name}`);
         const inputData = await prepareInputData(name, schema);
-        const generatedTypes = await generateTypes(inputData);
+        const generatedTypes = await generateTypes(inputData, opts);
         const fileName = `${name.toLowerCase()}-${match.name.toLowerCase()}`;
         writeGeneratedFile(fileName, opts.directory || "", generatedTypes, opts.language || "ts");
         results[fileName] = generatedTypes;
@@ -61,14 +61,14 @@ export async function prepareInputData(name, schema) {
  * Generates TypeScript types using quicktype.
  *
  * @param inputData - The input data for quicktype.
+ * @param opts - The options for generating the TypeScript types.
  * @returns A promise that resolves to an array of generated TypeScript type lines.
  */
-export async function generateTypes(inputData) {
-    // If the language is not specified, default to TypeScript
+export async function generateTypes(inputData, opts) {
     // Generate the types
     const out = await quicktype({
         inputData,
-        lang: "ts",
+        lang: opts.language,
         rendererOptions: { "just-types": "true" },
     });
     return out.lines;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "3.6.2",
+  "version": "3.6.3-nightly.1",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply.",
   "bin": "./dist/cli.js",
   "main": "dist/index.js",
@@ -40,7 +40,7 @@
     "semantic-release": "semantic-release",
     "test": "vitest src run --coverage",
     "test:e2e": "vitest run e2e/",
-    "test:e2e:prep-crds": "kubectl apply -f test/ && npx tsx src/cli.ts crd ./test/datastore.crd.yaml e2e && npx tsx src/cli.ts crd https://raw.githubusercontent.com/defenseunicorns/kubernetes-fluent-client/refs/heads/main/test/webapp.crd.yaml e2e",
+    "test:e2e:prep-crds": "kubectl apply -f test/ && npx tsx src/cli.ts crd ./test/datastore.crd.yaml e2e && npx tsx src/cli.ts crd https://raw.githubusercontent.com/defenseunicorns/kubernetes-fluent-client/refs/heads/main/test/webapp.crd.yaml e2e && npx tsx src/cli.ts crd https://raw.githubusercontent.com/defenseunicorns/kubernetes-fluent-client/refs/heads/main/test/webapp.crd.yaml -l json-schema e2e/schemas/webapp",
     "test:e2e:prep-cluster": "k3d cluster create kfc-dev --k3s-arg '--debug@server:0' --wait && kubectl rollout status deployment -n kube-system",
     "test:e2e:prep-image": "npm run build && npm pack && npm i kubernetes-fluent-client-0.0.0-development.tgz --no-save",
     "test:e2e:run": "npm run test:e2e:prep-cluster && npm run test:e2e:prep-crds && npm run test:e2e:prep-image && npm run test:e2e && npm run test:e2e:cleanup",
@@ -54,7 +54,7 @@
     "fast-json-patch": "3.1.1",
     "http-status-codes": "2.3.0",
     "node-fetch": "2.7.0",
-    "quicktype-core": "23.2.5",
+    "quicktype-core": "23.2.6",
     "type-fest": "^4.39.1",
     "undici": "^7.7.0",
     "yargs": "18.0.0"
@@ -65,13 +65,15 @@
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.14.0",
     "@types/byline": "4.2.36",
+    "@types/command-line-args": "^5.2.3",
     "@types/readable-stream": "4.0.21",
     "@types/urijs": "^1.19.25",
     "@types/ws": "^8.18.1",
     "@types/yargs": "17.0.33",
-    "@typescript-eslint/eslint-plugin": "8.33.1",
-    "@typescript-eslint/parser": "8.33.1",
+    "@typescript-eslint/eslint-plugin": "8.34.0",
+    "@typescript-eslint/parser": "8.34.0",
     "@vitest/coverage-v8": "^3.2.1",
+    "command-line-args": "^6.0.1",
     "eslint-plugin-jsdoc": "50.7.1",
     "globals": "^16.0.0",
     "husky": "^9.1.6",

package/src/fluent/index.ts

@@ -115,7 +115,7 @@ export function K8s<T extends GenericClass, K extends KubernetesObject = Instanc
     }
 
     try {
-      const object = await k8sExec<T, K>(model, filters, FetchMethods.GET);
+      const object = await k8sExec<T, K>(model, filters, { method: FetchMethods.GET });
 
       if (kind !== "Pod") {
         if (kind === "Service") {
@@ -145,7 +145,11 @@ export function K8s<T extends GenericClass, K extends KubernetesObject = Instanc
 
     const podModel = { ...model, name: "V1Pod" };
     const logPromises = podList.map(po =>
-      k8sExec<T, string>(podModel, { ...filters, name: po.metadata!.name! }, FetchMethods.LOG),
+      k8sExec<T, string>(
+        podModel,
+        { ...filters, name: po.metadata!.name! },
+        { method: FetchMethods.LOG },
+      ),
     );
 
     const responses = await Promise.all(logPromises);
@@ -180,7 +184,7 @@ export function K8s<T extends GenericClass, K extends KubernetesObject = Instanc
       filters.name = name;
     }
 
-    return k8sExec<T, K | KubernetesListObject<K>>(model, filters, FetchMethods.GET);
+    return k8sExec<T, K | KubernetesListObject<K>>(model, filters, { method: FetchMethods.GET });
   }
 
   /**
@@ -196,7 +200,7 @@ export function K8s<T extends GenericClass, K extends KubernetesObject = Instanc
 
     try {
       // Try to delete the resource
-      await k8sExec<T, void>(model, filters, FetchMethods.DELETE);
+      await k8sExec<T, void>(model, filters, { method: FetchMethods.DELETE });
     } catch (e) {
       // If the resource doesn't exist, ignore the error
       if (e.status === StatusCodes.NOT_FOUND) {
@@ -216,7 +220,7 @@ export function K8s<T extends GenericClass, K extends KubernetesObject = Instanc
     applyCfg: ApplyCfg = { force: false },
   ): Promise<K> {
     syncFilters(resource as K);
-    return k8sExec(model, filters, FetchMethods.APPLY, resource, applyCfg);
+    return k8sExec(model, filters, { method: FetchMethods.APPLY, payload: resource }, applyCfg);
   }
 
   /**
@@ -225,7 +229,7 @@ export function K8s<T extends GenericClass, K extends KubernetesObject = Instanc
    */
   async function Create(resource: K): Promise<K> {
     syncFilters(resource);
-    return k8sExec(model, filters, FetchMethods.POST, resource);
+    return k8sExec(model, filters, { method: FetchMethods.POST, payload: resource });
   }
 
   /**
@@ -249,7 +253,10 @@ export function K8s<T extends GenericClass, K extends KubernetesObject = Instanc
         },
       };
       // Try to evict the resource
-      await k8sExec<T, void>(model, filters, FetchMethods.POST, evictionPayload);
+      await k8sExec<T, void>(model, filters, {
+        method: FetchMethods.POST,
+        payload: evictionPayload,
+      });
     } catch (e) {
       // If the resource doesn't exist, ignore the error
       if (e.status === StatusCodes.NOT_FOUND) {
@@ -269,7 +276,7 @@ export function K8s<T extends GenericClass, K extends KubernetesObject = Instanc
       throw new Error("No operations specified");
     }
 
-    return k8sExec(model, filters, FetchMethods.PATCH, payload);
+    return k8sExec(model, filters, { method: FetchMethods.PATCH, payload });
   }
 
   /**
@@ -278,7 +285,7 @@ export function K8s<T extends GenericClass, K extends KubernetesObject = Instanc
    */
   async function PatchStatus(resource: PartialDeep<K>): Promise<K> {
     syncFilters(resource as K);
-    return k8sExec(model, filters, FetchMethods.PATCH_STATUS, resource);
+    return k8sExec(model, filters, { method: FetchMethods.PATCH_STATUS, payload: resource });
   }
 
   /**

package/src/fluent/utils.ts

@@ -203,13 +203,66 @@ const isEvictionPayload = (payload: unknown): payload is Eviction =>
   "kind" in payload &&
   (payload as { kind: string }).kind === "Eviction";
 
+/**
+ * Prepares and mutates the request options and URL for Kubernetes PATCH or APPLY operations.
+ *
+ * This function modifies the request's HTTP method, headers, and URL based on the operation type.
+ * It handles the following:
+ *
+ * - `PATCH_STATUS`: Converts the method to `PATCH`, appends `/status` to the path, sets merge patch headers,
+ *   and rewrites the payload to contain only the `status` field.
+ * - `PATCH`: Sets the content type to `application/json-patch+json`.
+ * - `APPLY`: Converts the method to `PATCH`, sets server-side apply headers, and updates the query string
+ *   with field manager and force options.
+ *
+ * @template K
+ * @param methodPayload - The original method and payload. May be mutated if `PATCH_STATUS` is used.
+ * @param opts - The request options.
+ * @param opts.method - The HTTP method (e.g. `PATCH`, `APPLY`, or `PATCH_STATUS`).
+ * @param opts.headers - The headers to be updated with the correct content type.
+ * @param url - The URL to mutate with subresource path or query parameters.
+ * @param applyCfg - Server-side apply options, such as `force`.
+ */
+export function prepareRequestOptions<K>(
+  methodPayload: MethodPayload<K>,
+  opts: { method?: string; headers?: Record<string, string> },
+  url: URL,
+  applyCfg: ApplyCfg,
+): void {
+  switch (opts.method) {
+    // PATCH_STATUS is a special case that uses the PATCH method on status subresources
+    case "PATCH_STATUS":
+      opts.method = "PATCH";
+      url.pathname = `${url.pathname}/status`;
+      (opts.headers as Record<string, string>)["Content-Type"] = PatchStrategy.MergePatch;
+      methodPayload.payload = { status: (methodPayload.payload as { status: unknown }).status };
+      break;
+
+    case "PATCH":
+      (opts.headers as Record<string, string>)["Content-Type"] = PatchStrategy.JsonPatch;
+      break;
+
+    case "APPLY":
+      (opts.headers as Record<string, string>)["Content-Type"] = SSA_CONTENT_TYPE;
+      opts.method = "PATCH";
+      url.searchParams.set("fieldManager", "pepr");
+      url.searchParams.set("fieldValidation", "Strict");
+      url.searchParams.set("force", applyCfg.force ? "true" : "false");
+      break;
+  }
+}
+
+export type MethodPayload<K> = {
+  method: FetchMethods;
+  payload?: K | unknown;
+};
+
 /**
  * Execute a request against the Kubernetes API server.
  *
  * @param model - the model to use for the API
  * @param filters - (optional) filter overrides, can also be chained
- * @param method - the HTTP method to use
- * @param payload - (optional) the payload to send
+ * @param methodPayload - method and payload for the request
  * @param applyCfg - (optional) configuration for the apply method
  *
  * @returns the parsed JSON response
@@ -217,8 +270,7 @@ const isEvictionPayload = (payload: unknown): payload is Eviction =>
 export async function k8sExec<T extends GenericClass, K>(
   model: T,
   filters: Filters,
-  method: FetchMethods,
-  payload?: K | unknown,
+  methodPayload: MethodPayload<K>,
   applyCfg: ApplyCfg = { force: false },
 ) {
   const reconstruct = async (method: FetchMethods): K8sConfigPromise => {
@@ -226,13 +278,15 @@ export async function k8sExec<T extends GenericClass, K>(
     const { opts, serverUrl } = await k8sCfg(configMethod);
 
     // Build the base path once, using excludeName only for standard POST requests
-    const shouldExcludeName = method === "POST" && !(payload && isEvictionPayload(payload));
+    const shouldExcludeName =
+      method === FetchMethods.POST &&
+      !(methodPayload.payload && isEvictionPayload(methodPayload.payload));
     const baseUrl = pathBuilder(serverUrl.toString(), model, filters, shouldExcludeName);
 
     // Append appropriate subresource paths
-    if (payload && isEvictionPayload(payload)) {
+    if (methodPayload.payload && isEvictionPayload(methodPayload.payload)) {
       baseUrl.pathname = `${baseUrl.pathname}/eviction`;
-    } else if (method === "LOG") {
+    } else if (method === FetchMethods.LOG) {
       baseUrl.pathname = `${baseUrl.pathname}/log`;
     }
 
@@ -242,33 +296,18 @@ export async function k8sExec<T extends GenericClass, K>(
     };
   };
 
-  const { opts, serverUrl } = await reconstruct(method);
+  const { opts, serverUrl } = await reconstruct(methodPayload.method);
   const url: URL = serverUrl instanceof URL ? serverUrl : new URL(serverUrl);
 
-  switch (opts.method) {
-    // PATCH_STATUS is a special case that uses the PATCH method on status subresources
-    case "PATCH_STATUS":
-      opts.method = "PATCH";
-      url.pathname = `${url.pathname}/status`;
-      (opts.headers as Record<string, string>)["Content-Type"] = PatchStrategy.MergePatch;
-      payload = { status: (payload as { status: unknown }).status };
-      break;
-
-    case "PATCH":
-      (opts.headers as Record<string, string>)["Content-Type"] = PatchStrategy.JsonPatch;
-      break;
-
-    case "APPLY":
-      (opts.headers as Record<string, string>)["Content-Type"] = SSA_CONTENT_TYPE;
-      opts.method = "PATCH";
-      url.searchParams.set("fieldManager", "pepr");
-      url.searchParams.set("fieldValidation", "Strict");
-      url.searchParams.set("force", applyCfg.force ? "true" : "false");
-      break;
-  }
+  prepareRequestOptions(
+    methodPayload,
+    opts as { method?: string; headers?: Record<string, string> },
+    url,
+    applyCfg,
+  );
 
-  if (payload) {
-    opts.body = JSON.stringify(payload);
+  if (methodPayload.payload) {
+    opts.body = JSON.stringify(methodPayload.payload);
   }
   const resp = await fetch<K>(url, opts);
 
@@ -276,7 +315,7 @@ export async function k8sExec<T extends GenericClass, K>(
     return resp.data;
   }
 
-  if (resp.status === 404 && method === "PATCH_STATUS") {
+  if (resp.status === 404 && methodPayload.method === FetchMethods.PATCH_STATUS) {
     resp.statusText =
       "Not Found" + " (NOTE: This error is expected if the resource has no status subresource)";
   }

package/src/generate.ts

@@ -16,12 +16,12 @@ import { fetch } from "./fetch.js";
 import { K8s } from "./fluent/index.js";
 import { CustomResourceDefinition } from "./upstream.js";
 import { LogFn } from "./types.js";
-
+export type QuicktypeLang = Parameters<typeof quicktype>[0]["lang"];
 export interface GenerateOptions {
   source: string; // URL, file path, or K8s CRD name
   directory?: string; // Output directory path
   plain?: boolean; // Disable fluent client wrapping
-  language?: string | TargetLanguage;
+  language: QuicktypeLang; // Language for type generation (default: "ts")
   npmPackage?: string; // Override NPM package
   logFn: LogFn; // Log function callback
   noPost?: boolean; // Enable/disable post-processing
@@ -73,7 +73,7 @@ export async function convertCRDtoTS(
     opts.logFn(`- Generating ${crd.spec.group}/${match.name} types for ${name}`);
 
     const inputData = await prepareInputData(name, schema);
-    const generatedTypes = await generateTypes(inputData);
+    const generatedTypes = await generateTypes(inputData, opts);
 
     const fileName = `${name.toLowerCase()}-${match.name.toLowerCase()}`;
     writeGeneratedFile(fileName, opts.directory || "", generatedTypes, opts.language || "ts");
@@ -110,15 +110,17 @@ export async function prepareInputData(name: string, schema: string): Promise<In
  * Generates TypeScript types using quicktype.
  *
  * @param inputData - The input data for quicktype.
+ * @param opts - The options for generating the TypeScript types.
  * @returns A promise that resolves to an array of generated TypeScript type lines.
  */
-export async function generateTypes(inputData: InputData): Promise<string[]> {
-  // If the language is not specified, default to TypeScript
-
+export async function generateTypes(
+  inputData: InputData,
+  opts: GenerateOptions,
+): Promise<string[]> {
   // Generate the types
   const out = await quicktype({
     inputData,
-    lang: "ts",
+    lang: opts.language,
     rendererOptions: { "just-types": "true" },
   });