pepr 0.2.1 → 0.2.3

package/dist/package.json

@@ -9,7 +9,7 @@
     "engines": {
         "node": ">=18.0.0"
     },
-    "version": "0.2.1",
+    "version": "0.2.3",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "pepr": {
@@ -31,7 +31,7 @@
         "test:e2e:k3d": "k3d cluster delete pepr-dev && k3d cluster create pepr-dev --k3s-arg '--debug@server:0'",
         "test:e2e:build": "npm run build && npm uninstall pepr -g && npm install -g . && pepr",
         "test:e2e:image": "docker buildx build --tag pepr:dev . && k3d image import pepr:dev -c pepr-dev",
-        "test:e2e:run": "ava hack/e2e.test.js --sequential",
+        "test:e2e:run": "ava hack/e2e.test.js --sequential --timeout=2m",
         "format:check": "eslint src && prettier src --check",
         "format:fix": "eslint src --fix && prettier src --write"
     },
@@ -74,6 +74,8 @@
         ],
         "require": [
             "ts-node/register"
-        ]
+        ],
+        "failFast": true,
+        "verbose": true
     }
 }

package/dist/src/cli/build.js

@@ -64,6 +64,14 @@ async function buildModule() {
         const cfg = JSON.parse(moduleText);
         const { uuid } = cfg.pepr;
         const name = `pepr-${uuid}.js`;
+        // Read the module's version from the package.json file
+        if (cfg.dependencies.pepr && cfg.dependencies.pepr !== "file:../") {
+            const versionMatch = /(\d+\.\d+\.\d+)/.exec(cfg.dependencies.pepr);
+            if (!versionMatch || versionMatch.length < 2) {
+                throw new Error("Could not find the Pepr version in package.json");
+            }
+            cfg.pepr.version = versionMatch[1];
+        }
         // Exit if the module's UUID could not be found
         if (!uuid) {
             throw new Error("Could not load the uuid in package.json");

package/dist/src/cli/init/templates.d.ts

@@ -7,7 +7,6 @@ export declare function genPkgJSON(opts: InitOptions, pgkVerOverride?: string):
         keywords: string[];
         pepr: {
             name: any;
-            version: string;
             uuid: string;
             onError: any;
             alwaysIgnore: {

package/dist/src/cli/init/templates.js

@@ -30,7 +30,6 @@ function genPkgJSON(opts, pgkVerOverride) {
         keywords: ["pepr", "k8s", "policy-engine", "pepr-module", "security"],
         pepr: {
             name: opts.name.trim(),
-            version: package_json_1.version,
             uuid: pgkVerOverride ? "static-test" : uuid,
             onError: opts.errorBehavior,
             alwaysIgnore: {
@@ -45,7 +44,7 @@ function genPkgJSON(opts, pgkVerOverride) {
             start: "pepr dev",
         },
         dependencies: {
-            pepr: pgkVerOverride || `^${package_json_1.version}`,
+            pepr: pgkVerOverride || `${package_json_1.version}`,
         },
         devDependencies: {
             typescript,

package/dist/src/lib/k8s/webhook.js

@@ -24,7 +24,7 @@ class Webhook {
         this.config = config;
         this.host = host;
         this.name = `pepr-${config.uuid}`;
-        this.image = `ghcr.io/defenseunicorns/pepr/controller:${config.version}`;
+        this.image = `ghcr.io/defenseunicorns/pepr/controller:v${config.version}`;
         // Generate the ephemeral tls things
         this._tls = (0, tls_1.genTLS)(this.host || `${this.name}.pepr-system.svc`);
     }
@@ -332,7 +332,6 @@ class Webhook {
                 name: this.name,
                 description: `Pepr Module: ${this.config.description}`,
                 url: "https://github.com/defenseunicorns/pepr",
-                version: this.config.version,
             },
             components: [
                 {

package/dist/src/lib/types.d.ts

@@ -73,7 +73,7 @@ export type ModuleConfig = {
     /** The user-defined name for the module */
     name: string;
     /** The version of Pepr that the module was originally generated with */
-    version: string;
+    version?: string;
     /** A unique identifier for this Pepr module. This is automatically generated by Pepr. */
     uuid: string;
     /** A description of the Pepr module and what it does. */

package/package.json

@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "version": "0.2.1",
+  "version": "0.2.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "pepr": {
@@ -31,7 +31,7 @@
     "test:e2e:k3d": "k3d cluster delete pepr-dev && k3d cluster create pepr-dev --k3s-arg '--debug@server:0'",
     "test:e2e:build": "npm run build && npm uninstall pepr -g && npm install -g . && pepr",
     "test:e2e:image": "docker buildx build --tag pepr:dev . && k3d image import pepr:dev -c pepr-dev",
-    "test:e2e:run": "ava hack/e2e.test.js --sequential",
+    "test:e2e:run": "ava hack/e2e.test.js --sequential --timeout=2m",
     "format:check": "eslint src && prettier src --check",
     "format:fix": "eslint src --fix && prettier src --write"
   },
@@ -74,6 +74,8 @@
     ],
     "require": [
       "ts-node/register"
-    ]
+    ],
+    "failFast": true,
+    "verbose": true
   }
 }