kubernetes-fluent-client 3.5.5 → 3.6.0

package/dist/cli.js

@@ -1,19 +1,13 @@
 #!/usr/bin/env node
-"use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const helpers_1 = require("yargs/helpers");
-const yargs_1 = __importDefault(require("yargs/yargs"));
-const generate_1 = require("./generate");
-const package_json_1 = require("../package.json");
-const postProcessing_1 = require("./postProcessing");
-const fileSystem_1 = require("./fileSystem"); // Import your new file system
-void (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
-    .version("version", "Display version number", `kubernetes-fluent-client v${package_json_1.version}`)
+import { hideBin } from "yargs/helpers";
+import yargs from "yargs/yargs";
+import { generate } from "./generate";
+import { version } from "../package.json";
+import { postProcessing } from "./postProcessing";
+void yargs(hideBin(process.argv))
+    .version("version", "Display version number", `kubernetes-fluent-client v${version}`)
     .alias("version", "V")
     .command("crd [source] [directory]", "generate usable types from a K8s CRD", yargs => {
     return yargs
@@ -49,16 +43,15 @@ void (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     // Pass the `post` flag to opts
     opts.noPost = argv.noPost;
     // Use NodeFileSystem as the file system for post-processing
-    const fileSystem = new fileSystem_1.NodeFileSystem(); // Create an instance of NodeFileSystem
     if (!opts.noPost) {
         console.log("\n✅ Post-processing has been enabled.\n");
     }
     try {
         // Capture the results returned by generate
-        const allResults = await (0, generate_1.generate)(opts);
+        const allResults = await generate(opts);
         // If noPost is false, run post-processing
         if (!opts.noPost) {
-            await (0, postProcessing_1.postProcessing)(allResults, opts, fileSystem); // Pass the file system to postProcessing
+            await postProcessing(allResults, opts); // Pass the file system to postProcessing
         }
     }
     catch (e) {

package/dist/fetch.js

@@ -1,10 +1,7 @@
-"use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetch = fetch;
-const http_status_codes_1 = require("http-status-codes");
-const undici_1 = require("undici");
+import { StatusCodes } from "http-status-codes";
+import { fetch as undiciFetch } from "undici";
 /**
  * Perform an async HTTP call and return the parsed JSON response, optionally
  * as a specific type.
@@ -18,10 +15,10 @@ const undici_1 = require("undici");
  * @param init Additional options for the request
  * @returns The parsed JSON response
  */
-async function fetch(url, init) {
+export async function fetch(url, init) {
     let data = undefined;
     try {
-        const resp = await (0, undici_1.fetch)(url, init);
+        const resp = await undiciFetch(url, init);
         const contentType = resp.headers.get("content-type") || "";
         // Parse the response as JSON if the content type is JSON
         if (contentType.includes("application/json")) {
@@ -39,7 +36,7 @@ async function fetch(url, init) {
         };
     }
     catch (e) {
-        const status = parseInt(e?.code) || http_status_codes_1.StatusCodes.BAD_REQUEST;
+        const status = parseInt(e?.code) || StatusCodes.BAD_REQUEST;
         const statusText = e?.message || "Unknown error";
         return {
             data,

package/dist/fluent/index.d.ts

@@ -1,6 +1,7 @@
 import { KubernetesObject } from "@kubernetes/client-node";
 import { GenericClass } from "../types";
-import { Filters, K8sInit } from "./types";
+import { K8sInit } from "./types";
+import { Filters } from "./shared-types";
 /**
  * Kubernetes fluent API inspired by Kubectl. Pass in a model, then call filters and actions on it.
  *

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,UAAU,CAAC;AACxC,OAAO,EAA0B,OAAO,EAAE,OAAO,EAAsB,MAAM,SAAS,CAAC;AAKvF;;;;;;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,UAAU,CAAC;AACxC,OAAO,EAAE,OAAO,EAAS,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,OAAO,EAAuC,MAAM,gBAAgB,CAAC;AAK9E;;;;;;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"}

package/dist/fluent/index.js

@@ -1,15 +1,13 @@
-"use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.K8s = K8s;
-const http_status_codes_1 = require("http-status-codes");
-const fetch_1 = require("../fetch");
-const kinds_1 = require("../kinds");
-const utils_1 = require("./utils");
-const watch_1 = require("./watch");
-const helpers_1 = require("../helpers");
-const upstream_1 = require("../upstream");
+import { StatusCodes } from "http-status-codes";
+import { fetch } from "../fetch";
+import { modelToGroupVersionKind } from "../kinds";
+import { FetchMethods } from "./shared-types";
+import { k8sCfg, k8sExec } from "./utils";
+import { Watcher } from "./watch";
+import { hasLogs } from "../helpers";
+import { Pod } from "../upstream";
 /**
  * Kubernetes fluent API inspired by Kubectl. Pass in a model, then call filters and actions on it.
  *
@@ -17,9 +15,9 @@ const upstream_1 = require("../upstream");
  * @param filters - (optional) filter overrides, can also be chained
  * @returns a fluent API for the model
  */
-function K8s(model, filters = {}) {
+export function K8s(model, filters = {}) {
     const withFilters = { WithField, WithLabel, Get, Delete, Evict, Watch, Logs };
-    const matchedKind = filters.kindOverride || (0, kinds_1.modelToGroupVersionKind)(model.name);
+    const matchedKind = filters.kindOverride || modelToGroupVersionKind(model.name);
     /**
      * @inheritdoc
      * @see {@link K8sInit.InNamespace}
@@ -90,11 +88,11 @@ function K8s(model, filters = {}) {
         if (!namespace) {
             throw new Error("Namespace must be defined");
         }
-        if (!(0, helpers_1.hasLogs)(kind)) {
+        if (!hasLogs(kind)) {
             throw new Error("Kind must be Pod or have a selector");
         }
         try {
-            const object = await (0, utils_1.k8sExec)(model, filters, "GET");
+            const object = await k8sExec(model, filters, FetchMethods.GET);
             if (kind !== "Pod") {
                 if (kind === "Service") {
                     const svc = object;
@@ -107,7 +105,7 @@ function K8s(model, filters = {}) {
                     const rs = object;
                     labels = rs.spec.selector.matchLabels ?? {};
                 }
-                const list = await K8s(upstream_1.Pod, { namespace: filters.namespace, labels }).Get();
+                const list = await K8s(Pod, { namespace: filters.namespace, labels }).Get();
                 list.items.forEach(item => {
                     return podList.push(item);
                 });
@@ -120,7 +118,7 @@ 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 => (0, utils_1.k8sExec)(podModel, { ...filters, name: po.metadata.name }, "LOG"));
+        const logPromises = podList.map(po => k8sExec(podModel, { ...filters, name: po.metadata.name }, FetchMethods.LOG));
         const responses = await Promise.all(logPromises);
         const combinedString = responses.reduce((accumulator, currentString, i) => {
             const prefixedLines = currentString
@@ -144,7 +142,7 @@ function K8s(model, filters = {}) {
             }
             filters.name = name;
         }
-        return (0, utils_1.k8sExec)(model, filters, "GET");
+        return k8sExec(model, filters, FetchMethods.GET);
     }
     /**
      * @inheritdoc
@@ -159,11 +157,11 @@ function K8s(model, filters = {}) {
         }
         try {
             // Try to delete the resource
-            await (0, utils_1.k8sExec)(model, filters, "DELETE");
+            await k8sExec(model, filters, FetchMethods.DELETE);
         }
         catch (e) {
             // If the resource doesn't exist, ignore the error
-            if (e.status === http_status_codes_1.StatusCodes.NOT_FOUND) {
+            if (e.status === StatusCodes.NOT_FOUND) {
                 return;
             }
             throw e;
@@ -175,7 +173,7 @@ function K8s(model, filters = {}) {
      */
     async function Apply(resource, applyCfg = { force: false }) {
         syncFilters(resource);
-        return (0, utils_1.k8sExec)(model, filters, "APPLY", resource, applyCfg);
+        return k8sExec(model, filters, FetchMethods.APPLY, resource, applyCfg);
     }
     /**
      * @inheritdoc
@@ -183,7 +181,7 @@ function K8s(model, filters = {}) {
      */
     async function Create(resource) {
         syncFilters(resource);
-        return (0, utils_1.k8sExec)(model, filters, "POST", resource);
+        return k8sExec(model, filters, FetchMethods.POST, resource);
     }
     /**
      * @inheritdoc
@@ -206,11 +204,11 @@ function K8s(model, filters = {}) {
                 },
             };
             // Try to evict the resource
-            await (0, utils_1.k8sExec)(model, filters, "POST", evictionPayload);
+            await k8sExec(model, filters, FetchMethods.POST, evictionPayload);
         }
         catch (e) {
             // If the resource doesn't exist, ignore the error
-            if (e.status === http_status_codes_1.StatusCodes.NOT_FOUND) {
+            if (e.status === StatusCodes.NOT_FOUND) {
                 return;
             }
             throw e;
@@ -225,7 +223,7 @@ function K8s(model, filters = {}) {
         if (payload.length < 1) {
             throw new Error("No operations specified");
         }
-        return (0, utils_1.k8sExec)(model, filters, "PATCH", payload);
+        return k8sExec(model, filters, FetchMethods.PATCH, payload);
     }
     /**
      * @inheritdoc
@@ -233,23 +231,23 @@ function K8s(model, filters = {}) {
      */
     async function PatchStatus(resource) {
         syncFilters(resource);
-        return (0, utils_1.k8sExec)(model, filters, "PATCH_STATUS", resource);
+        return k8sExec(model, filters, FetchMethods.PATCH_STATUS, resource);
     }
     /**
      * @inheritdoc
      * @see {@link K8sInit.Watch}
      */
     function Watch(callback, watchCfg) {
-        return new watch_1.Watcher(model, filters, callback, watchCfg);
+        return new Watcher(model, filters, callback, watchCfg);
     }
     /**
      * @inheritdoc
      * @see {@link K8sInit.Raw}
      */
-    async function Raw(url, method = "GET") {
-        const thing = await (0, utils_1.k8sCfg)(method);
+    async function Raw(url, method = FetchMethods.GET) {
+        const thing = await k8sCfg(method);
         const { opts, serverUrl } = thing;
-        const resp = await (0, fetch_1.fetch)(`${serverUrl}${url}`, opts);
+        const resp = await fetch(`${serverUrl}${url}`, opts);
         if (resp.ok) {
             return resp.data;
         }

package/dist/fluent/shared-types.d.ts

@@ -0,0 +1,49 @@
+import { GenericClass, GroupVersionKind } from "../types";
+import { RequestInit } from "undici";
+import { KubernetesObject } from "@kubernetes/client-node";
+/**
+ * Fetch options and server URL
+ */
+export type K8sConfigPromise = Promise<{
+    opts: RequestInit;
+    serverUrl: string | URL;
+}>;
+/**
+ * The Phase matched when using the K8s Watch API.
+ */
+export declare enum WatchPhase {
+    Added = "ADDED",
+    Modified = "MODIFIED",
+    Deleted = "DELETED",
+    Bookmark = "BOOKMARK",
+    Error = "ERROR"
+}
+export type WatchAction<T extends GenericClass, K extends KubernetesObject = InstanceType<T>> = (update: K, phase: WatchPhase) => Promise<void> | void;
+export interface Filters {
+    kindOverride?: GroupVersionKind;
+    fields?: Record<string, string>;
+    labels?: Record<string, string>;
+    name?: string;
+    namespace?: string;
+}
+/**
+ * Configuration for the apply function.
+ */
+export type ApplyCfg = {
+    /**
+     * Force the apply to be a create.
+     */
+    force?: boolean;
+};
+export declare enum FetchMethods {
+    APPLY = "APPLY",
+    DELETE = "DELETE",
+    GET = "GET",
+    LOG = "LOG",
+    PATCH = "PATCH",
+    PATCH_STATUS = "PATCH_STATUS",
+    POST = "POST",
+    PUT = "PUT",
+    WATCH = "WATCH"
+}
+//# sourceMappingURL=shared-types.d.ts.map

package/dist/fluent/shared-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared-types.d.ts","sourceRoot":"","sources":["../../src/fluent/shared-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAC,CAAC;AAEvF;;GAEG;AACH,oBAAY,UAAU;IACpB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,KAAK,UAAU;CAChB;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAC9F,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,UAAU,KACd,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAE1B,MAAM,WAAW,OAAO;IACtB,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,oBAAY,YAAY;IACtB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,KAAK,UAAU;IACf,YAAY,iBAAiB;IAC7B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,KAAK,UAAU;CAChB"}

package/dist/fluent/shared-types.js

@@ -0,0 +1,23 @@
+/**
+ * The Phase matched when using the K8s Watch API.
+ */
+export var WatchPhase;
+(function (WatchPhase) {
+    WatchPhase["Added"] = "ADDED";
+    WatchPhase["Modified"] = "MODIFIED";
+    WatchPhase["Deleted"] = "DELETED";
+    WatchPhase["Bookmark"] = "BOOKMARK";
+    WatchPhase["Error"] = "ERROR";
+})(WatchPhase || (WatchPhase = {}));
+export var FetchMethods;
+(function (FetchMethods) {
+    FetchMethods["APPLY"] = "APPLY";
+    FetchMethods["DELETE"] = "DELETE";
+    FetchMethods["GET"] = "GET";
+    FetchMethods["LOG"] = "LOG";
+    FetchMethods["PATCH"] = "PATCH";
+    FetchMethods["PATCH_STATUS"] = "PATCH_STATUS";
+    FetchMethods["POST"] = "POST";
+    FetchMethods["PUT"] = "PUT";
+    FetchMethods["WATCH"] = "WATCH";
+})(FetchMethods || (FetchMethods = {}));

package/dist/fluent/types.d.ts

@@ -1,19 +1,12 @@
 import { KubernetesListObject, KubernetesObject } from "@kubernetes/client-node";
 import { Operation } from "fast-json-patch";
 import type { PartialDeep } from "type-fest";
-import { RequestInit } from "undici";
-import { GenericClass, GroupVersionKind } from "../types";
+import { GenericClass } from "../types";
 import { WatchCfg, Watcher } from "./watch";
 import https from "https";
 import { SecureClientSessionOptions } from "http2";
+import { WatchAction, FetchMethods, ApplyCfg } from "./shared-types";
 export type WatcherType<T extends GenericClass> = Watcher<T>;
-/**
- * Fetch options and server URL
- */
-export type K8sConfigPromise = Promise<{
-    opts: RequestInit;
-    serverUrl: string | URL;
-}>;
 /**
  * Agent options for the the http2Watch
  */
@@ -26,24 +19,6 @@ export interface Options {
         options?: AgentOptions;
     };
 }
-/**
- * The Phase matched when using the K8s Watch API.
- */
-export declare enum WatchPhase {
-    Added = "ADDED",
-    Modified = "MODIFIED",
-    Deleted = "DELETED",
-    Bookmark = "BOOKMARK",
-    Error = "ERROR"
-}
-export type FetchMethods = "APPLY" | "DELETE" | "GET" | "LOG" | "PATCH" | "PATCH_STATUS" | "POST" | "PUT" | "WATCH";
-export interface Filters {
-    kindOverride?: GroupVersionKind;
-    fields?: Record<string, string>;
-    labels?: Record<string, string>;
-    name?: string;
-    namespace?: string;
-}
 /**
  * Get the resource or resources matching the filters.
  * If no filters are specified, all resources will be returned.
@@ -189,15 +164,6 @@ export type K8sWithFilters<T extends GenericClass, K extends KubernetesObject> =
      */
     WithLabel: (key: string, value?: string) => K8sWithFilters<T, K>;
 };
-/**
- * Configuration for the apply function.
- */
-export type ApplyCfg = {
-    /**
-     * Force the apply to be a create.
-     */
-    force?: boolean;
-};
 export type K8sInit<T extends GenericClass, K extends KubernetesObject> = K8sWithFilters<T, K> & K8sUnfilteredActions<K> & {
     /**
      * Set the namespace filter.
@@ -207,7 +173,6 @@ export type K8sInit<T extends GenericClass, K extends KubernetesObject> = K8sWit
      */
     InNamespace: (namespace: string) => K8sWithFilters<T, K>;
 };
-export type WatchAction<T extends GenericClass, K extends KubernetesObject = InstanceType<T>> = (update: K, phase: WatchPhase) => Promise<void> | void;
 type Join<K, P> = K extends string | number ? P extends string | number ? `${K}${"" extends P ? "" : "."}${P}` : never : never;
 export type Paths<T, D extends number = 10> = [D] extends [never] ? never : T extends object ? {
     [K in keyof T]-?: K extends string | number ? `${K}` | Join<K, Paths<T[K]>> : never;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fluent/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fluent/types.ts"],"names":[],"mappings":"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"}

package/dist/fluent/types.js

@@ -1,16 +1,3 @@
-"use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WatchPhase = void 0;
-/**
- * The Phase matched when using the K8s Watch API.
- */
-var WatchPhase;
-(function (WatchPhase) {
-    WatchPhase["Added"] = "ADDED";
-    WatchPhase["Modified"] = "MODIFIED";
-    WatchPhase["Deleted"] = "DELETED";
-    WatchPhase["Bookmark"] = "BOOKMARK";
-    WatchPhase["Error"] = "ERROR";
-})(WatchPhase || (exports.WatchPhase = WatchPhase = {}));
+export {};

package/dist/fluent/utils.d.ts

@@ -2,7 +2,7 @@ import { RequestInit } from "node-fetch";
 import { URL } from "url";
 import { Dispatcher } from "undici";
 import { GenericClass } from "../types";
-import { ApplyCfg, FetchMethods, Filters, K8sConfigPromise } from "./types";
+import { ApplyCfg, Filters, K8sConfigPromise, FetchMethods } from "./shared-types";
 /**
  * Get the headers for a request
  *

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,UAAU,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAM5E;;;;;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,UAAU,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAMnF;;;;;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"}

package/dist/fluent/utils.js

@@ -1,23 +1,13 @@
-"use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHeaders = getHeaders;
-exports.getHTTPSAgent = getHTTPSAgent;
-exports.getToken = getToken;
-exports.pathBuilder = pathBuilder;
-exports.k8sCfg = k8sCfg;
-exports.k8sExec = k8sExec;
-const client_node_1 = require("@kubernetes/client-node");
-const url_1 = require("url");
-const undici_1 = require("undici");
-const https_1 = require("https");
-const fetch_1 = require("../fetch");
-const kinds_1 = require("../kinds");
-const fs_1 = __importDefault(require("fs"));
+import { KubeConfig, PatchStrategy } from "@kubernetes/client-node";
+import { URL } from "url";
+import { Agent } from "undici";
+import { Agent as httpsAgent } from "https";
+import { fetch } from "../fetch";
+import { modelToGroupVersionKind } from "../kinds";
+import { FetchMethods } from "./shared-types";
+import fs from "fs";
 const SSA_CONTENT_TYPE = "application/apply-patch+yaml";
 const K8S_SA_TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
 /**
@@ -26,7 +16,7 @@ const K8S_SA_TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
  * @param token - the token from @kubernetes/client-node
  * @returns the headers for undici
  */
-async function getHeaders(token) {
+export async function getHeaders(token) {
     let saToken = "";
     if (!token) {
         saToken = await getToken();
@@ -49,9 +39,9 @@ async function getHeaders(token) {
  * @param opts - the request options from node-fetch
  * @returns the agent for undici
  */
-function getHTTPSAgent(opts) {
+export function getHTTPSAgent(opts) {
     // In cluster there will be agent - testing or dev no
-    const agentOptions = opts.agent instanceof https_1.Agent
+    const agentOptions = opts.agent instanceof httpsAgent
         ? {
             ca: opts.agent.options.ca,
             cert: opts.agent.options.cert,
@@ -62,7 +52,7 @@ function getHTTPSAgent(opts) {
             cert: undefined,
             key: undefined,
         };
-    return new undici_1.Agent({
+    return new Agent({
         keepAliveMaxTimeout: 600000,
         keepAliveTimeout: 600000,
         bodyTimeout: 0,
@@ -74,9 +64,9 @@ function getHTTPSAgent(opts) {
  *
  * @returns token or null
  */
-async function getToken() {
+export async function getToken() {
     try {
-        return (await fs_1.default.promises.readFile(K8S_SA_TOKEN_PATH, "utf8")).trim();
+        return (await fs.promises.readFile(K8S_SA_TOKEN_PATH, "utf8")).trim();
     }
     catch {
         return null;
@@ -91,8 +81,8 @@ async function getToken() {
  * @param excludeName - (optional) exclude the name from the path
  * @returns the path to the resource
  */
-function pathBuilder(serverUrl, model, filters, excludeName = false) {
-    const matchedKind = filters.kindOverride || (0, kinds_1.modelToGroupVersionKind)(model.name);
+export function pathBuilder(serverUrl, model, filters, excludeName = false) {
+    const matchedKind = filters.kindOverride || modelToGroupVersionKind(model.name);
     // If the kind is not specified and the model is not a KubernetesObject, throw an error
     if (!matchedKind) {
         throw new Error(`Kind not specified for ${model.name}`);
@@ -114,7 +104,7 @@ function pathBuilder(serverUrl, model, filters, excludeName = false) {
     // Build the complete path to the resource
     const path = [base, namespace, plural, name].filter(Boolean).join("/");
     // Generate the URL object
-    const url = new url_1.URL(path, serverUrl);
+    const url = new URL(path, serverUrl);
     // Add field selectors to the query params
     if (filters.fields) {
         const fieldSelector = Object.entries(filters.fields)
@@ -144,8 +134,8 @@ function pathBuilder(serverUrl, model, filters, excludeName = false) {
  * @param method - the HTTP method to use
  * @returns the fetch options and server URL
  */
-async function k8sCfg(method) {
-    const kubeConfig = new client_node_1.KubeConfig();
+export async function k8sCfg(method) {
+    const kubeConfig = new KubeConfig();
     kubeConfig.loadFromDefault();
     const cluster = kubeConfig.getCurrentCluster();
     if (!cluster) {
@@ -185,9 +175,9 @@ const isEvictionPayload = (payload) => payload !== null &&
  *
  * @returns the parsed JSON response
  */
-async function k8sExec(model, filters, method, payload, applyCfg = { force: false }) {
+export async function k8sExec(model, filters, method, payload, applyCfg = { force: false }) {
     const reconstruct = async (method) => {
-        const configMethod = method === "LOG" ? "GET" : 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));
@@ -205,17 +195,17 @@ async function k8sExec(model, filters, method, payload, applyCfg = { force: fals
         };
     };
     const { opts, serverUrl } = await reconstruct(method);
-    const url = serverUrl instanceof url_1.URL ? serverUrl : new url_1.URL(serverUrl);
+    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"] = client_node_1.PatchStrategy.MergePatch;
+            opts.headers["Content-Type"] = PatchStrategy.MergePatch;
             payload = { status: payload.status };
             break;
         case "PATCH":
-            opts.headers["Content-Type"] = client_node_1.PatchStrategy.JsonPatch;
+            opts.headers["Content-Type"] = PatchStrategy.JsonPatch;
             break;
         case "APPLY":
             opts.headers["Content-Type"] = SSA_CONTENT_TYPE;
@@ -228,7 +218,7 @@ async function k8sExec(model, filters, method, payload, applyCfg = { force: fals
     if (payload) {
         opts.body = JSON.stringify(payload);
     }
-    const resp = await (0, fetch_1.fetch)(url, opts);
+    const resp = await fetch(url, opts);
     if (resp.ok) {
         return resp.data;
     }

package/dist/fluent/watch.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from "events";
 import { GenericClass } from "../types";
-import { Filters, WatchAction } from "./types";
+import { WatchAction, Filters } from "./shared-types";
 export declare enum WatchEvent {
     /** Watch is connected successfully */
     CONNECT = "connect",
@@ -67,13 +67,6 @@ export declare class Watcher<T extends GenericClass> {
     start(): Promise<AbortController>;
     /** Close the watch. Also available on the AbortController returned by {@link Watcher.start}. */
     close(): void;
-    /**
-     * Get a unique ID for the watch based on the model and filters.
-     * This is useful for caching the watch data or resource versions.
-     *
-     * @returns the watch CacheID
-     */
-    getCacheID(): string;
     /**
      * Subscribe to watch events. This is an EventEmitter that emits the following events:
      *

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

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,YAAY,EAAwB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,WAAW,EAAgC,MAAM,SAAS,CAAC;AAI7E,oBAAY,UAAU;IACpB,sCAAsC;IACtC,OAAO,YAAY;IACnB,2BAA2B;IAC3B,aAAa,kBAAkB;IAC/B,kDAAkD;IAClD,UAAU,eAAe;IACzB,0BAA0B;IAC1B,SAAS,cAAc;IACvB,8BAA8B;IAC9B,OAAO,YAAY;IACnB,sBAAsB;IACtB,KAAK,UAAU;IACf,mCAAmC;IACnC,IAAI,SAAS;IACb,wCAAwC;IACxC,oBAAoB,yBAAyB;IAC7C,qCAAqC;IACrC,iBAAiB,sBAAsB;IACvC,kCAAkC;IAClC,IAAI,SAAS;IACb,2BAA2B;IAC3B,UAAU,eAAe;IACzB,mBAAmB;IACnB,UAAU,eAAe;IACzB,qCAAqC;IACrC,wBAAwB,6BAA6B;IACrD,iCAAiC;IACjC,eAAe,oBAAoB;CACpC;AAED,4CAA4C;AAC5C,MAAM,MAAM,QAAQ,GAAG;IACrB,+HAA+H;IAC/H,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+FAA+F;IAC/F,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,wHAAwH;IACxH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAKF,iDAAiD;AACjD,qBAAa,OAAO,CAAC,CAAC,SAAS,YAAY;;IAyBzC,YAAY,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAc9B;;;;;;;;;;;OAWG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,GAAE,QAAa;IA0CzF;;;;OAIG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAO9C,gGAAgG;IACzF,KAAK;IAQZ;;;;;OAKG;IACI,UAAU;IAWjB;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;CA0VF"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,YAAY,EAAwB,MAAM,UAAU,CAAC;AAG9D,OAAO,EAAgC,WAAW,EAAE,OAAO,EAAgB,MAAM,gBAAgB,CAAC;AAClG,oBAAY,UAAU;IACpB,sCAAsC;IACtC,OAAO,YAAY;IACnB,2BAA2B;IAC3B,aAAa,kBAAkB;IAC/B,kDAAkD;IAClD,UAAU,eAAe;IACzB,0BAA0B;IAC1B,SAAS,cAAc;IACvB,8BAA8B;IAC9B,OAAO,YAAY;IACnB,sBAAsB;IACtB,KAAK,UAAU;IACf,mCAAmC;IACnC,IAAI,SAAS;IACb,wCAAwC;IACxC,oBAAoB,yBAAyB;IAC7C,qCAAqC;IACrC,iBAAiB,sBAAsB;IACvC,kCAAkC;IAClC,IAAI,SAAS;IACb,2BAA2B;IAC3B,UAAU,eAAe;IACzB,mBAAmB;IACnB,UAAU,eAAe;IACzB,qCAAqC;IACrC,wBAAwB,6BAA6B;IACrD,iCAAiC;IACjC,eAAe,oBAAoB;CACpC;AAED,4CAA4C;AAC5C,MAAM,MAAM,QAAQ,GAAG;IACrB,+HAA+H;IAC/H,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+FAA+F;IAC/F,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,wHAAwH;IACxH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAKF,iDAAiD;AACjD,qBAAa,OAAO,CAAC,CAAC,SAAS,YAAY;;IAyBzC,YAAY,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAc9B;;;;;;;;;;;OAWG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,GAAE,QAAa;IA0CzF;;;;OAIG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAO9C,gGAAgG;IACzF,KAAK;IAQZ;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;CA0VF"}