pepr 0.29.2 → 0.30.0

package/package.json

@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "version": "0.29.2",
+  "version": "0.30.0",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
   "scripts": {
@@ -35,17 +35,17 @@
     "@types/ramda": "0.29.12",
     "express": "4.19.2",
     "fast-json-patch": "3.1.1",
-    "kubernetes-fluent-client": "2.3.1",
-    "pino": "8.20.0",
+    "kubernetes-fluent-client": "2.3.2",
+    "pino": "9.0.0",
     "pino-pretty": "11.0.0",
     "prom-client": "15.1.2",
-    "ramda": "0.29.1"
+    "ramda": "0.30.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "19.2.2",
+    "@commitlint/cli": "19.3.0",
     "@commitlint/config-conventional": "19.2.2",
     "@jest/globals": "29.7.0",
-    "@types/eslint": "8.56.9",
+    "@types/eslint": "8.56.10",
     "@types/express": "4.17.21",
     "@types/node": "18.x.x",
     "@types/node-forge": "1.3.11",

package/src/lib/helpers.ts

@@ -5,9 +5,20 @@ import { promises as fs } from "fs";
 import { K8s, KubernetesObject, kind } from "kubernetes-fluent-client";
 import Log from "./logger";
 import { Binding, CapabilityExport } from "./types";
+import { sanitizeResourceName } from "../sdk/sdk";
 
 export class ValidationError extends Error {}
 
+export function validateCapabilityNames(capabilities: CapabilityExport[] | undefined): void {
+  if (capabilities && capabilities.length > 0) {
+    for (let i = 0; i < capabilities.length; i++) {
+      if (capabilities[i].name !== sanitizeResourceName(capabilities[i].name)) {
+        throw new ValidationError(`Capability name is not a valid Kubernetes resource name: ${capabilities[i].name}`);
+      }
+    }
+  }
+}
+
 export function validateHash(expectedHash: string): void {
   // Require the hash to be a valid SHA-256 hash (64 characters, hexadecimal)
   const sha256Regex = /^[a-f0-9]{64}$/i;

package/src/lib/watch-processor.ts

@@ -10,8 +10,12 @@ import { Binding, Event } from "./types";
 
 // Watch configuration
 const watchCfg: WatchCfg = {
-  retryMax: 5,
-  retryDelaySec: 5,
+  retryMax: process.env.PEPR_RETRYMAX ? parseInt(process.env.PEPR_RETRYMAX, 10) : 5,
+  retryDelaySec: process.env.PEPR_RETRYDELAYSECONDS ? parseInt(process.env.PEPR_RETRYDELAYSECONDS, 10) : 5,
+  resyncIntervalSec: process.env.PEPR_RESYNCINTERVALSECONDS
+    ? parseInt(process.env.PEPR_RESYNCINTERVALSECONDS, 10)
+    : 300,
+  allowWatchBookmarks: process.env.PEPR_ALLOWWATCHBOOKMARKS ? process.env.PEPR_ALLOWWATCHBOOKMARKS === "true" : false,
 };
 
 // Map the event to the watch phase
@@ -47,6 +51,8 @@ async function runBinding(binding: Binding, capabilityNamespaces: string[]) {
   const phaseMatch: WatchPhase[] = eventToPhaseMap[binding.event] || eventToPhaseMap[Event.Any];
 
   // The watch callback is run when an object is received or dequeued
+
+  Log.debug({ watchCfg }, "Effective WatchConfig");
   const watchCallback = async (obj: KubernetesObject, type: WatchPhase) => {
     // First, filter the object based on the phase
     if (phaseMatch.includes(type)) {