pepr 0.28.3 → 0.28.5

package/dist/controller.js

@@ -49,7 +49,7 @@ if (process.env.LOG_LEVEL) {
 var logger_default = Log;
 
 // src/templates/data.json
-var packageJSON = { name: "pepr", description: "Kubernetes application engine", author: "Defense Unicorns", homepage: "https://github.com/defenseunicorns/pepr", license: "Apache-2.0", bin: "dist/cli.js", repository: "defenseunicorns/pepr", engines: { node: ">=18.0.0" }, version: "0.28.3", main: "dist/lib.js", types: "dist/lib.d.ts", scripts: { "gen-data-json": "node hack/build-template-data.js", prebuild: "rm -fr dist/* && npm run gen-data-json", build: "tsc && node build.mjs", test: "npm run test:unit && npm run test:journey", "test:unit": "npm run gen-data-json && jest src --coverage --detectOpenHandles --coverageDirectory=./coverage", "test:journey": "npm run test:journey:k3d && npm run test:journey:build && npm run test:journey:image && npm run test:journey:run", "test:journey:prep": "if [ ! -d ./pepr-upgrade-test ]; then git clone https://github.com/defenseunicorns/pepr-upgrade-test.git ; fi", "test:journey-wasm": "npm run test:journey:k3d && npm run test:journey:build && npm run test:journey:image && npm run test:journey:run-wasm", "test:journey:k3d": "k3d cluster delete pepr-dev && k3d cluster create pepr-dev --k3s-arg '--debug@server:0' --wait && kubectl rollout status deployment -n kube-system", "test:journey:build": "npm run build && npm pack", "test:journey:image": "docker buildx build --tag pepr:dev . && k3d image import pepr:dev -c pepr-dev", "test:journey:run": "jest --detectOpenHandles journey/entrypoint.test.ts && npm run test:journey:prep && npm run test:journey:upgrade", "test:journey:run-wasm": "jest --detectOpenHandles journey/entrypoint-wasm.test.ts", "test:journey:upgrade": "npm run test:journey:k3d && npm run test:journey:image && jest --detectOpenHandles journey/pepr-upgrade.test.ts", "format:check": "eslint src && prettier src --check", "format:fix": "eslint src --fix && prettier src --write" }, dependencies: { "@types/ramda": "0.29.11", express: "4.18.3", "fast-json-patch": "3.1.1", "kubernetes-fluent-client": "2.2.3", pino: "8.19.0", "pino-pretty": "10.3.1", "prom-client": "15.1.0", ramda: "0.29.1" }, devDependencies: { "@commitlint/cli": "19.1.0", "@commitlint/config-conventional": "19.1.0", "@jest/globals": "29.7.0", "@types/eslint": "8.56.5", "@types/express": "4.17.21", "@types/node": "18.x.x", "@types/node-forge": "1.3.11", "@types/prompts": "2.4.9", "@types/uuid": "9.0.8", jest: "29.7.0", nock: "13.5.4", "ts-jest": "29.1.2" }, peerDependencies: { "@typescript-eslint/eslint-plugin": "6.15.0", "@typescript-eslint/parser": "6.15.0", commander: "11.1.0", esbuild: "0.19.10", eslint: "8.56.0", "node-forge": "1.3.1", prettier: "3.1.1", prompts: "2.4.2", typescript: "5.3.3", uuid: "9.0.1" } };
+var packageJSON = { name: "pepr", description: "Kubernetes application engine", author: "Defense Unicorns", homepage: "https://github.com/defenseunicorns/pepr", license: "Apache-2.0", bin: "dist/cli.js", repository: "defenseunicorns/pepr", engines: { node: ">=18.0.0" }, version: "0.28.5", main: "dist/lib.js", types: "dist/lib.d.ts", scripts: { "gen-data-json": "node hack/build-template-data.js", prebuild: "rm -fr dist/* && npm run gen-data-json", build: "tsc && node build.mjs", test: "npm run test:unit && npm run test:journey", "test:unit": "npm run gen-data-json && jest src --coverage --detectOpenHandles --coverageDirectory=./coverage", "test:journey": "npm run test:journey:k3d && npm run test:journey:build && npm run test:journey:image && npm run test:journey:run", "test:journey:prep": "if [ ! -d ./pepr-upgrade-test ]; then git clone https://github.com/defenseunicorns/pepr-upgrade-test.git ; fi", "test:journey-wasm": "npm run test:journey:k3d && npm run test:journey:build && npm run test:journey:image && npm run test:journey:run-wasm", "test:journey:k3d": "k3d cluster delete pepr-dev && k3d cluster create pepr-dev --k3s-arg '--debug@server:0' --wait && kubectl rollout status deployment -n kube-system", "test:journey:build": "npm run build && npm pack", "test:journey:image": "docker buildx build --tag pepr:dev . && k3d image import pepr:dev -c pepr-dev", "test:journey:run": "jest --detectOpenHandles journey/entrypoint.test.ts && npm run test:journey:prep && npm run test:journey:upgrade", "test:journey:run-wasm": "jest --detectOpenHandles journey/entrypoint-wasm.test.ts", "test:journey:upgrade": "npm run test:journey:k3d && npm run test:journey:image && jest --detectOpenHandles journey/pepr-upgrade.test.ts", "format:check": "eslint src && prettier src --check", "format:fix": "eslint src --fix && prettier src --write" }, dependencies: { "@types/ramda": "0.29.11", express: "4.19.1", "fast-json-patch": "3.1.1", "kubernetes-fluent-client": "2.3.0", pino: "8.19.0", "pino-pretty": "11.0.0", "prom-client": "15.1.0", ramda: "0.29.1" }, devDependencies: { "@commitlint/cli": "19.2.1", "@commitlint/config-conventional": "19.1.0", "@jest/globals": "29.7.0", "@types/eslint": "8.56.6", "@types/express": "4.17.21", "@types/node": "18.x.x", "@types/node-forge": "1.3.11", "@types/prompts": "2.4.9", "@types/uuid": "9.0.8", jest: "29.7.0", nock: "13.5.4", "ts-jest": "29.1.2" }, peerDependencies: { "@typescript-eslint/eslint-plugin": "6.15.0", "@typescript-eslint/parser": "6.15.0", commander: "11.1.0", esbuild: "0.19.10", eslint: "8.56.0", "node-forge": "1.3.1", prettier: "3.1.1", prompts: "2.4.2", typescript: "5.3.3", uuid: "9.0.1" } };
 
 // src/lib/k8s.ts
 var import_kubernetes_fluent_client = require("kubernetes-fluent-client");

package/dist/lib/filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../src/lib/filter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAa,MAAM,OAAO,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAS,MAAM,SAAS,CAAC;AAEzC;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,EAAE,WA8FxG"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../src/lib/filter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAa,MAAM,OAAO,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAS,MAAM,SAAS,CAAC;AAEzC;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,EAAE,WA+FxG"}

package/dist/lib/queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/lib/queue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAS3D;;GAEG;AACH,qBAAa,KAAK,CAAC,CAAC,SAAS,gBAAgB;;;IAS3C,YAAY,CAAC,SAAS,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC;IAG7D;;;;;;OAMG;IACH,OAAO,CAAC,IAAI,EAAE,CAAC;CA2ChB"}
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/lib/queue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAS3D;;GAEG;AACH,qBAAa,KAAK,CAAC,CAAC,SAAS,gBAAgB;;;IAS3C,YAAY,CAAC,SAAS,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC;IAG7D;;;;;;OAMG;IACH,OAAO,CAAC,IAAI,EAAE,CAAC;CAoDhB"}

package/dist/lib/watch-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch-processor.d.ts","sourceRoot":"","sources":["../../src/lib/watch-processor.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAS1C,wBAAgB,UAAU,CAAC,YAAY,EAAE,UAAU,EAAE,QAMpD"}
+{"version":3,"file":"watch-processor.d.ts","sourceRoot":"","sources":["../../src/lib/watch-processor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,wBAAgB,UAAU,CAAC,YAAY,EAAE,UAAU,EAAE,QAMpD"}

package/dist/lib.js

@@ -190,6 +190,7 @@ function shouldSkipRequest(binding, req, capabilityNamespaces) {
   const { group, kind: kind3, version } = binding.kind || {};
   const { namespaces, labels, annotations, name } = binding.filters || {};
   const operation = req.operation.toUpperCase();
+  const uid = req.uid;
   const srcObject = operation === "DELETE" /* DELETE */ ? req.oldObject : req.object;
   const { metadata } = srcObject || {};
   const combinedNamespaces = [...namespaces, ...capabilityNamespaces];
@@ -221,28 +222,28 @@ function shouldSkipRequest(binding, req, capabilityNamespaces) {
       type = "Watch";
       label = binding.watchCallback.name;
     }
-    logger_default.debug(`${type} binding (${label}) does not match request namespace "${req.namespace}"`);
+    logger_default.debug({ uid }, `${type} binding (${label}) does not match request namespace "${req.namespace}"`);
     return true;
   }
   for (const [key, value] of Object.entries(labels)) {
     const testKey = metadata?.labels?.[key];
     if (!testKey) {
-      logger_default.debug(`Label ${key} does not exist`);
+      logger_default.debug({ uid }, `Label ${key} does not exist`);
       return true;
     }
     if (value && testKey !== value) {
-      logger_default.debug(`${testKey} does not match ${value}`);
+      logger_default.debug({ uid }, `${testKey} does not match ${value}`);
       return true;
     }
   }
   for (const [key, value] of Object.entries(annotations)) {
     const testKey = metadata?.annotations?.[key];
     if (!testKey) {
-      logger_default.debug(`Annotation ${key} does not exist`);
+      logger_default.debug({ uid }, `Annotation ${key} does not exist`);
       return true;
     }
     if (value && testKey !== value) {
-      logger_default.debug(`${testKey} does not match ${value}`);
+      logger_default.debug({ uid }, `${testKey} does not match ${value}`);
       return true;
     }
   }
@@ -646,9 +647,9 @@ var PeprControllerStore = class {
       }
     } else {
       for (const { name: name2, registerStore } of capabilities) {
-        const { store: store2 } = registerStore();
-        store2.registerSender(this.#send(name2));
-        this.#stores[name2] = store2;
+        const { store } = registerStore();
+        store.registerSender(this.#send(name2));
+        this.#stores[name2] = store;
       }
     }
     setTimeout(
@@ -660,10 +661,10 @@ var PeprControllerStore = class {
     const watcher = (0, import_kubernetes_fluent_client2.K8s)(PeprStore, { name: this.#name, namespace }).Watch(this.#receive);
     watcher.start().catch((e) => logger_default.error(e, "Error starting Pepr store watch"));
   };
-  #receive = (store2) => {
-    logger_default.debug(store2, "Pepr Store update");
+  #receive = (store) => {
+    logger_default.debug(store, "Pepr Store update");
     const debounced = () => {
-      const data = store2.data || {};
+      const data = store.data || {};
       for (const name of Object.keys(this.#stores)) {
         const offset = `${name}-`.length;
         const filtered = {};
@@ -903,7 +904,7 @@ var Controller = class _Controller {
         const responseList = Array.isArray(response) ? response : [response];
         responseList.map((res2) => {
           this.#afterHook && this.#afterHook(res2);
-          logger_default.debug({ ...reqMetadata, res: res2 }, "Check response");
+          logger_default.info({ ...reqMetadata, res: res2 }, "Check response");
         });
         let kubeAdmissionResponse;
         if (admissionKind === "Mutate") {
@@ -980,7 +981,6 @@ var Controller = class _Controller {
 };
 
 // src/lib/watch-processor.ts
-var import_crypto = require("crypto");
 var import_kubernetes_fluent_client4 = require("kubernetes-fluent-client");
 var import_types2 = require("kubernetes-fluent-client/dist/fluent/types");
 
@@ -1015,20 +1015,27 @@ var Queue = class {
    * @returns A promise that resolves when the webapp is reconciled
    */
   async #dequeue() {
-    if (this.#pendingPromise)
+    if (this.#pendingPromise) {
+      logger_default.debug("Pending promise, not dequeuing");
       return false;
+    }
     const element = this.#queue.shift();
-    if (!element)
+    if (!element) {
+      logger_default.debug("No element, not dequeuing");
       return false;
+    }
     try {
       this.#pendingPromise = true;
       if (this.#reconcile) {
+        logger_default.debug(`Reconciling ${element.item.metadata.name}`);
         await this.#reconcile(element.item);
       }
       element.resolve();
     } catch (e) {
+      logger_default.debug(`Error reconciling ${element.item.metadata.name}`, { error: e });
       element.reject(e);
     } finally {
+      logger_default.debug("Resetting pending promise and dequeuing");
       this.#pendingPromise = false;
       await this.#dequeue();
     }
@@ -1090,7 +1097,6 @@ var filterMatcher = (binding, obj, capabilityNamespaces) => {
 };
 
 // src/lib/watch-processor.ts
-var store = {};
 function setupWatch(capabilities) {
   capabilities.map(
     (capability) => capability.bindings.filter((binding) => binding.isWatch).forEach((bindingElement) => runBinding(bindingElement, capability.namespaces))
@@ -1145,18 +1151,11 @@ async function runBinding(binding, capabilityNamespaces) {
       }
     }, watchCfg);
   }
-  const cacheSuffix = (0, import_crypto.createHash)("sha224").update(binding.watchCallback.toString()).digest("hex").substring(0, 5);
-  const cacheID = [watcher.getCacheID(), cacheSuffix].join("-");
   watcher.events.on(import_kubernetes_fluent_client4.WatchEvent.GIVE_UP, (err) => {
     logger_default.error(err, "Watch failed after 5 attempts, giving up");
     process.exit(1);
   });
   try {
-    const resourceVersion = store[cacheID];
-    if (resourceVersion) {
-      logger_default.debug(`Starting watch ${binding.model.name} from version ${resourceVersion}`);
-      watcher.resourceVersion = resourceVersion;
-    }
     await watcher.start();
   } catch (err) {
     logger_default.error(err, "Error starting watch");
@@ -1354,8 +1353,8 @@ var OnSchedule = class {
     this.startTime = schedule?.startTime;
     this.completions = schedule?.completions;
   }
-  setStore(store2) {
-    this.store = store2;
+  setStore(store) {
+    this.store = store;
     this.startInterval();
   }
   startInterval() {