pepr 0.45.0-nightly.13 → 0.45.0-nightly.2

package/dist/sdk/sdk.d.ts

@@ -19,12 +19,7 @@ export declare function containers(request: PeprValidateRequest<kind.Pod> | Pepr
  * @param reportingComponent The component that is reporting the event, for example "uds.dev/operator"
  * @param reportingInstance The instance of the component that is reporting the event, for example process.env.HOSTNAME
  */
-export declare function writeEvent(cr: GenericKind, event: Partial<kind.CoreEvent>, options: {
-    eventType: string;
-    eventReason: string;
-    reportingComponent: string;
-    reportingInstance: string;
-}): Promise<void>;
+export declare function writeEvent(cr: GenericKind, event: Partial<kind.CoreEvent>, eventType: string, eventReason: string, reportingComponent: string, reportingInstance: string): Promise<void>;
 /**
  * Get the owner reference for a custom resource
  * @param customResource the custom resource to get the owner reference for

package/dist/sdk/sdk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAO,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAElE;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EACpE,aAAa,CAAC,EAAE,YAAY,GAAG,gBAAgB,GAAG,qBAAqB,GACtE,WAAW,EAAE,CAef;AAED;;;;;;;;;GASG;AAEH,wBAAsB,UAAU,CAC9B,EAAE,EAAE,WAAW,EACf,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAC9B,OAAO,EAAE;IACP,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;CAC3B,GACA,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,cAAc,EAAE,WAAW,EAC3B,kBAAkB,CAAC,EAAE,OAAO,EAC5B,UAAU,CAAC,EAAE,OAAO,GACnB,gBAAgB,EAAE,CAcpB;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAYzD"}
+{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../src/sdk/sdk.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAO,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAElE;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EACpE,aAAa,CAAC,EAAE,YAAY,GAAG,gBAAgB,GAAG,qBAAqB,GACtE,WAAW,EAAE,CAef;AAED;;;;;;;;;GASG;AAEH,wBAAsB,UAAU,CAC9B,EAAE,EAAE,WAAW,EACf,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAC9B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,cAAc,EAAE,WAAW,EAC3B,kBAAkB,CAAC,EAAE,OAAO,EAC5B,UAAU,CAAC,EAAE,OAAO,GACnB,gBAAgB,EAAE,CAcpB;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAYzD"}

package/package.json

@@ -15,7 +15,7 @@
     "!src/**/*.test.ts",
     "!dist/**/*.test.d.ts*"
   ],
-  "version": "0.45.0-nightly.13",
+  "version": "0.45.0-nightly.2",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
   "scripts": {
@@ -25,7 +25,7 @@
     "build": "tsc && node build.mjs && npm pack",
     "build:image": "npm run build && docker buildx build --output type=docker --tag pepr:dev .",
     "set:version": "node scripts/set-version.js",
-    "test": "npm run test:unit && npm run test:journey && npm run test:journey-wasm",
+    "test": "npm run test:unit && npm run test:journey",
     "test:unit": "npm run gen-data-json && jest src --coverage --detectOpenHandles --coverageDirectory=./coverage --testPathIgnorePatterns='cosign.e2e.test.ts'",
     "test:integration": "npm run test:integration:prep && npm run test:integration:run",
     "test:integration:prep": "./integration/prep.sh",
@@ -48,12 +48,12 @@
     "follow-redirects": "1.15.9",
     "http-status-codes": "^2.3.0",
     "json-pointer": "^0.6.2",
-    "kubernetes-fluent-client": "3.4.0",
+    "kubernetes-fluent-client": "3.3.8",
     "pino": "9.6.0",
     "pino-pretty": "13.0.0",
     "prom-client": "15.1.3",
     "ramda": "0.30.1",
-    "sigstore": "3.1.0"
+    "sigstore": "3.0.0"
   },
   "devDependencies": {
     "@commitlint/cli": "19.7.1",
@@ -83,7 +83,7 @@
     "@typescript-eslint/eslint-plugin": "8.23.0",
     "@typescript-eslint/parser": "8.23.0",
     "commander": "13.1.0",
-    "esbuild": "0.25.0",
+    "esbuild": "0.24.2",
     "eslint": "8.57.0",
     "node-forge": "1.3.1",
     "prettier": "3.4.2",

package/src/lib/processors/watch-processor.ts

@@ -4,12 +4,11 @@ import Log from "../telemetry/logger";
 import { Binding } from "../types";
 import { Capability } from "../core/capability";
 import { Event } from "../enums";
-import { K8s, KubernetesObject, WatchCfg, WatchEvent, GenericClass } from "kubernetes-fluent-client";
+import { K8s, KubernetesObject, WatchCfg, WatchEvent } from "kubernetes-fluent-client";
 import { Queue } from "../core/queue";
-import { WatchPhase, WatcherType } from "kubernetes-fluent-client/dist/fluent/types";
-import { KubernetesListObject } from "kubernetes-fluent-client/dist/types";
+import { WatchPhase } from "kubernetes-fluent-client/dist/fluent/types";
 import { filterNoMatchReason } from "../filter/filter";
-import { metricsCollector, MetricsCollectorInstance } from "../telemetry/metrics";
+import { metricsCollector } from "../telemetry/metrics";
 import { removeFinalizer } from "../finalizer";
 
 // stores Queue instances
@@ -158,8 +157,36 @@ async function runBinding(
     }
   }, watchCfg);
 
-  // Register event handlers
-  registerWatchEventHandlers(watcher, logEvent, metricsCollector);
+  // If failure continues, log and exit
+  watcher.events.on(WatchEvent.GIVE_UP, err => {
+    Log.error(err, "Watch failed after 5 attempts, giving up");
+    process.exit(1);
+  });
+
+  watcher.events.on(WatchEvent.CONNECT, url => logEvent(WatchEvent.CONNECT, url));
+
+  watcher.events.on(WatchEvent.DATA_ERROR, err => logEvent(WatchEvent.DATA_ERROR, err.message));
+  watcher.events.on(WatchEvent.RECONNECT, retryCount =>
+    logEvent(WatchEvent.RECONNECT, `Reconnecting after ${retryCount} attempt${retryCount === 1 ? "" : "s"}`),
+  );
+  watcher.events.on(WatchEvent.RECONNECT_PENDING, () => logEvent(WatchEvent.RECONNECT_PENDING));
+  watcher.events.on(WatchEvent.GIVE_UP, err => logEvent(WatchEvent.GIVE_UP, err.message));
+  watcher.events.on(WatchEvent.ABORT, err => logEvent(WatchEvent.ABORT, err.message));
+  watcher.events.on(WatchEvent.OLD_RESOURCE_VERSION, err => logEvent(WatchEvent.OLD_RESOURCE_VERSION, err));
+  watcher.events.on(WatchEvent.NETWORK_ERROR, err => logEvent(WatchEvent.NETWORK_ERROR, err.message));
+  watcher.events.on(WatchEvent.LIST_ERROR, err => logEvent(WatchEvent.LIST_ERROR, err.message));
+  watcher.events.on(WatchEvent.LIST, list => logEvent(WatchEvent.LIST, JSON.stringify(list, undefined, 2)));
+  watcher.events.on(WatchEvent.CACHE_MISS, windowName => {
+    metricsCollector.incCacheMiss(windowName);
+  });
+
+  watcher.events.on(WatchEvent.INIT_CACHE_MISS, windowName => {
+    metricsCollector.initCacheMissWindow(windowName);
+  });
+
+  watcher.events.on(WatchEvent.INC_RESYNC_FAILURE_COUNT, retryCount => {
+    metricsCollector.incRetryCount(retryCount);
+  });
 
   // Start the watch
   try {
@@ -178,55 +205,3 @@ export function logEvent(event: WatchEvent, message: string = "", obj?: Kubernet
     Log.debug(logMessage);
   }
 }
-
-export type WatchEventArgs<K extends WatchEvent, T extends GenericClass> = {
-  [WatchEvent.LIST]: KubernetesListObject<InstanceType<T>>;
-  [WatchEvent.RECONNECT]: number;
-  [WatchEvent.CACHE_MISS]: string;
-  [WatchEvent.INIT_CACHE_MISS]: string;
-  [WatchEvent.GIVE_UP]: Error;
-  [WatchEvent.ABORT]: Error;
-  [WatchEvent.OLD_RESOURCE_VERSION]: string;
-  [WatchEvent.NETWORK_ERROR]: Error;
-  [WatchEvent.LIST_ERROR]: Error;
-  [WatchEvent.DATA_ERROR]: Error;
-  [WatchEvent.CONNECT]: string;
-  [WatchEvent.RECONNECT_PENDING]: undefined;
-  [WatchEvent.DATA]: undefined;
-  [WatchEvent.INC_RESYNC_FAILURE_COUNT]: number;
-}[K];
-
-export type LogEventFunction = (event: WatchEvent, message?: string) => void;
-export function registerWatchEventHandlers(
-  watcher: WatcherType<GenericClass>,
-  logEvent: LogEventFunction,
-  metricsCollector: MetricsCollectorInstance,
-): void {
-  const eventHandlers: {
-    [K in WatchEvent]?: (arg: WatchEventArgs<K, GenericClass>) => void;
-  } = {
-    [WatchEvent.DATA]: () => null,
-    [WatchEvent.GIVE_UP]: err => {
-      // If failure continues, log and exit
-      logEvent(WatchEvent.GIVE_UP, err.message);
-      process.exit(1);
-    },
-    [WatchEvent.CONNECT]: url => logEvent(WatchEvent.CONNECT, url),
-    [WatchEvent.DATA_ERROR]: err => logEvent(WatchEvent.DATA_ERROR, err.message),
-    [WatchEvent.RECONNECT]: retryCount =>
-      logEvent(WatchEvent.RECONNECT, `Reconnecting after ${retryCount} attempt${retryCount === 1 ? "" : "s"}`),
-    [WatchEvent.RECONNECT_PENDING]: () => logEvent(WatchEvent.RECONNECT_PENDING),
-    [WatchEvent.ABORT]: err => logEvent(WatchEvent.ABORT, err.message),
-    [WatchEvent.OLD_RESOURCE_VERSION]: errMessage => logEvent(WatchEvent.OLD_RESOURCE_VERSION, errMessage),
-    [WatchEvent.NETWORK_ERROR]: err => logEvent(WatchEvent.NETWORK_ERROR, err.message),
-    [WatchEvent.LIST_ERROR]: err => logEvent(WatchEvent.LIST_ERROR, err.message),
-    [WatchEvent.LIST]: list => logEvent(WatchEvent.LIST, JSON.stringify(list, undefined, 2)),
-    [WatchEvent.CACHE_MISS]: windowName => metricsCollector.incCacheMiss(windowName),
-    [WatchEvent.INIT_CACHE_MISS]: windowName => metricsCollector.initCacheMissWindow(windowName),
-    [WatchEvent.INC_RESYNC_FAILURE_COUNT]: retryCount => metricsCollector.incRetryCount(retryCount),
-  };
-
-  Object.entries(eventHandlers).forEach(([event, handler]) => {
-    watcher.events.on(event, handler);
-  });
-}

package/src/lib/telemetry/metrics.ts

@@ -9,7 +9,7 @@ import Log from "./logger";
 
 const loggingPrefix = "MetricsCollector";
 
-export type MetricsCollectorInstance = InstanceType<typeof MetricsCollector>;
+type MetricsCollectorInstance = InstanceType<typeof MetricsCollector>;
 interface MetricNames {
   errors: string;
   alerts: string;
@@ -148,8 +148,8 @@ export class MetricsCollector {
    * Increments the retry count gauge.
    * @param count - The count to increment by.
    */
-  incRetryCount = (count: number): void => {
-    this.incGauge(this.#metricNames.resyncFailureCount, { count: count.toString() });
+  incRetryCount = (count: string): void => {
+    this.incGauge(this.#metricNames.resyncFailureCount, { count });
   };
 
   /**

package/src/sdk/sdk.ts

@@ -46,15 +46,11 @@ export function containers(
 export async function writeEvent(
   cr: GenericKind,
   event: Partial<kind.CoreEvent>,
-  options: {
-    eventType: string;
-    eventReason: string;
-    reportingComponent: string;
-    reportingInstance: string;
-  },
+  eventType: string,
+  eventReason: string,
+  reportingComponent: string,
+  reportingInstance: string,
 ): Promise<void> {
-  const { eventType, eventReason, reportingComponent, reportingInstance } = options;
-
   await K8s(kind.CoreEvent).Create({
     type: eventType,
     reason: eventReason,