pepr 0.1.42 → 0.1.44

package/README.md

@@ -20,8 +20,12 @@ pepr init
 
 # Follow the prompts...
 
-# Within the new project dir, start playing with things
+# If you already have a Kind or K3d cluster you want to use, skip this step
+npm run k3d-setup
+
+# Start playing with Pepr now
 pepr dev
+kubectl apply -f capabilities/hello-pepr.samples.yaml 
 
 # Be amazed and ⭐️ this repo
 ```

package/dist/index.d.ts

@@ -5,8 +5,9 @@ import { fetch, fetchRaw } from "./src/lib/fetch";
 import { a } from "./src/lib/k8s";
 import Log from "./src/lib/logger";
 import { PeprModule } from "./src/lib/module";
+import { PeprRequest } from "./src/lib/request";
 import type * as KubernetesClientNode from "@kubernetes/client-node";
 import type * as RamdaUtils from "ramda";
 export { a, 
 /** PeprModule is used to setup a complete Pepr Module: `new PeprModule(cfg, {...capabilities})` */
-PeprModule, Capability, Log, utils, fetch, fetchRaw, k8s, RamdaUtils, KubernetesClientNode, };
+PeprModule, PeprRequest, Capability, Log, utils, fetch, fetchRaw, k8s, RamdaUtils, KubernetesClientNode, };

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.k8s = exports.fetchRaw = exports.fetch = exports.utils = exports.Log = exports.Capability = exports.PeprModule = exports.a = void 0;
+exports.k8s = exports.fetchRaw = exports.fetch = exports.utils = exports.Log = exports.Capability = exports.PeprRequest = exports.PeprModule = exports.a = void 0;
 const client_node_1 = __importDefault(require("@kubernetes/client-node"));
 exports.k8s = client_node_1.default;
 const ramda_1 = __importDefault(require("ramda"));
@@ -19,3 +19,5 @@ const logger_1 = __importDefault(require("./src/lib/logger"));
 exports.Log = logger_1.default;
 const module_1 = require("./src/lib/module");
 Object.defineProperty(exports, "PeprModule", { enumerable: true, get: function () { return module_1.PeprModule; } });
+const request_1 = require("./src/lib/request");
+Object.defineProperty(exports, "PeprRequest", { enumerable: true, get: function () { return request_1.PeprRequest; } });

package/dist/package.json

@@ -9,7 +9,7 @@
     "engines": {
         "node": ">=18.0.0"
     },
-    "version": "0.1.42",
+    "version": "0.1.44",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "pepr": {
@@ -27,20 +27,21 @@
         "prebuild": "rm -fr dist/* && node hack/build-template-data.js",
         "build": "tsc -p tsconfig.build.json",
         "test": "npm run build && ava && node dist/cli.js -V",
+        "test:e2e": "ava hack/e2e.test.js",
+        "test:e2e-setup": "npm run build && npm uninstall pepr -g && npm install -g .",
         "lint": "npx eslint src",
         "lint:fix": "npm run lint -- --fix",
         "prettier": "npx prettier src --check",
         "prettier:fix": "npm run prettier -- --write",
         "prepublishOnly": "npm run lint:fix && npm run prettier:fix && npm run test",
-        "e2e-dev-setup": "k3d cluster delete pepr-dev && k3d cluster create pepr-dev --k3s-arg '--debug@server:0'",
-        "e2e-dev": "npm run build && docker buildx build --tag pepr:dev . && k3d image import pepr:dev -c pepr-dev && node dist/pepr-cli.js deploy -f -i pepr:dev"
+        "e2e-dev-setup": "k3d cluster delete pepr-dev && k3d cluster create pepr-dev --k3s-arg '--debug@server:0'"
     },
     "dependencies": {
         "@kubernetes/client-node": "^0.18.1",
         "@rollup/plugin-json": "^6.0.0",
         "@rollup/plugin-node-resolve": "^15.0.1",
         "@rollup/plugin-typescript": "^11.0.0",
-        "@types/ramda": "^0.28.23",
+        "@types/ramda": "^0.29.0",
         "chokidar": "^3.5.3",
         "commander": "^10.0.0",
         "express": "^4.18.2",

package/dist/src/cli/dev.js

@@ -19,16 +19,19 @@ function default_1(program) {
         .description("Setup a local webhook development environment")
         .option("-d, --dir [directory]", "Pepr module directory", ".")
         .option("-h, --host [host]", "Host to listen on", "host.docker.internal")
+        .option("--confirm", "Skip confirmation prompt")
         .action(async (opts) => {
-        // Prompt the user to confirm
-        const confirm = await (0, prompts_1.prompt)({
-            type: "confirm",
-            name: "confirm",
-            message: "This will remove and redeploy the module. Continue?",
-        });
-        // Exit if the user doesn't confirm
-        if (!confirm.confirm) {
-            process.exit(0);
+        // Prompt the user to confirm if they didn't pass the --confirm flag
+        if (!opts.confirm) {
+            const confirm = await (0, prompts_1.prompt)({
+                type: "confirm",
+                name: "confirm",
+                message: "This will remove and redeploy the module. Continue?",
+            });
+            // Exit if the user doesn't confirm
+            if (!confirm.confirm) {
+                process.exit(0);
+            }
         }
         // Build the module
         const { cfg, path } = await (0, build_1.buildModule)(opts.dir);

package/dist/src/cli/index.js

@@ -12,6 +12,7 @@ const deploy_1 = __importDefault(require("./deploy"));
 const dev_1 = __importDefault(require("./dev"));
 const init_1 = __importDefault(require("./init"));
 const root_1 = require("./root");
+const update_1 = __importDefault(require("./update"));
 const program = new root_1.RootCmd();
 program
     .version(package_json_1.version)
@@ -26,6 +27,7 @@ program
 (0, build_1.default)(program);
 (0, deploy_1.default)(program);
 (0, dev_1.default)(program);
+(0, update_1.default)(program);
 // @todo: finish/re-evaluate these commands
 // test(program);
 // capability(program);

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

@@ -7,6 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 const path_1 = require("path");
+const prompts_1 = __importDefault(require("prompts"));
 const logger_1 = __importDefault(require("../../../src/lib/logger"));
 const templates_1 = require("./templates");
 const utils_1 = require("./utils");
@@ -18,9 +19,15 @@ function default_1(program) {
         // skip auto npm install and git init
         .option("--skip-post-init", "Skip npm install, git init and VSCode launch")
         .action(async (opts) => {
+        let pkgOverride = "";
+        // Overrides for testing. @todo: don't be so gross with Node CLI testing
+        if (process.env.TEST_MODE === "true") {
+            prompts_1.default.inject(["pepr-test-module", "A test module for Pepr", "ignore", "y"]);
+            pkgOverride = "file:../";
+        }
         const response = await (0, walkthrough_1.walkthrough)();
         const dirName = (0, utils_1.sanitizeName)(response.name);
-        const packageJSON = (0, templates_1.genPkgJSON)(response);
+        const packageJSON = (0, templates_1.genPkgJSON)(response, pkgOverride);
         const peprTS = (0, templates_1.genPeprTS)();
         const confirmed = await (0, walkthrough_1.confirm)(dirName, packageJSON, peprTS.path);
         if (confirmed) {

package/dist/src/cli/init/templates/data.json

@@ -1 +1 @@
-{ "gitignore": "# Ignore node_modules and Pepr build artifacts\nnode_modules\ndist\ninsecure*\n", "readme": "# Pepr Module\n\nThis is a Pepr Module. [Pepr](https://github.com/defenseunicorns/pepr) is a Kubernetes tranformation system\nwritten in Typescript.\n\nThe `capabilities` directory contains all the capabilities for this module. By default,\na capability is a single typescript file in the format of `capability-name.ts` that is\nimported in the root `pepr.ts` file as `import { HelloPepr } from \"./capabilities/hello-pepr\";`.\nBecause this is typescript, you can organize this however you choose, e.g. creating a sub-folder\nper-capability or common logic in shared files or folders.\n\nExample Structure:\n\n```\nModule Root\n├── package.json\n├── pepr.ts\n└── capabilities\n    ├── example-one.ts\n    ├── example-three.ts\n    └── example-two.ts\n```\n", "peprTS": "import { PeprModule } from \"pepr\";\nimport { HelloPepr } from \"./capabilities/hello-pepr\";\nimport cfg from \"./package.json\";\n\n/**\n * This is the main entrypoint for the Pepr module. It is the file that is run when the module is started.\n * This is where you register your configurations and capabilities with the module.\n */\nnew PeprModule(cfg, [\n  // \"HelloPepr\" is a demo capability that is included with Pepr. You can remove it if you want.\n  HelloPepr,\n\n  // Your additional capabilities go here\n]);\n", "helloPeprTS": "import { Capability, a } from \"pepr\";\n\n/**\n *  The HelloPepr Capability is an example capability to demonstrate some general concepts of Pepr.\n *  To test this capability you can run `pepr dev` or `npm start` and then run the following command:\n *  `kubectl apply -f capabilities/hello-pepr.samples.yaml`\n */\nexport const HelloPepr = new Capability({\n  name: \"hello-pepr\",\n  description: \"A simple example capability to show how things work.\",\n  namespaces: [\"pepr-demo\"],\n});\n\n// Use the 'When' function to create a new Capability Action\nconst { When } = HelloPepr;\n\n/**\n * This is a single Capability Action. They can be in the same file or imported from other files.\n * In this exmaple, when a ConfigMap is created with the name `example-1`, we add a label and annotation.\n *\n * Equivelant to manually running:\n * `kubectl label configmap example-1 pepr=was-here`\n * `kubectl annotate configmap example-1 pepr.dev=annotations-work-too`\n */\nWhen(a.ConfigMap)\n  .IsCreated()\n  .WithName(\"example-1\")\n  .Then(request => {\n    request.SetLabel(\"pepr\", \"was-here\").SetAnnotation(\"pepr.dev\", \"annotations-work-too\");\n  });\n\n/**\n * This Capabiility Action does the exact same changes for example-2, except this time it uses the `.ThenSet()` feature.\n * You can stack multiple `.Then()` calls, but only a single `.ThenSet()`\n */\nWhen(a.ConfigMap)\n  .IsCreated()\n  .WithName(\"example-2\")\n  .ThenSet({\n    metadata: {\n      labels: {\n        pepr: \"was-here\",\n      },\n      annotations: {\n        \"pepr.dev\": \"annotations-work-too\",\n      },\n    },\n  });\n\n/**\n * This Capability Action combines different styles. Unlike the previous actions, this one will look for any ConfigMap\n * in the `pepr-demo` namespace that has the label `change=by-label` during either CREATE or UPDATE. Note that all\n * conditions added such as `WithName()`, `WithLabel()`, `InNamespace()`, are ANDs so all conditions must be true\n * for the request to be procssed.\n */\nWhen(a.ConfigMap)\n  .IsCreatedOrUpdated()\n  .WithLabel(\"change\", \"by-label\")\n  .Then(request => {\n    // The K8s object e are going to mutate\n    const cm = request.Raw;\n\n    // Get the username and uid of the K8s reuest\n    const { username, uid } = request.Request.userInfo;\n\n    // Store some data about the request in the configmap\n    cm.data[\"username\"] = username;\n    cm.data[\"uid\"] = uid;\n\n    // You can still mix other ways of making changes too\n    request.SetAnnotation(\"pepr.dev\", \"making-waves\");\n  });\n" }
+{ "gitignore": "# Ignore node_modules and Pepr build artifacts\nnode_modules\ndist\ninsecure*\n", "readme": "# Pepr Module\n\nThis is a Pepr Module. [Pepr](https://github.com/defenseunicorns/pepr) is a Kubernetes transformation system\nwritten in Typescript.\n\nThe `capabilities` directory contains all the capabilities for this module. By default,\na capability is a single typescript file in the format of `capability-name.ts` that is\nimported in the root `pepr.ts` file as `import { HelloPepr } from \"./capabilities/hello-pepr\";`.\nBecause this is typescript, you can organize this however you choose, e.g. creating a sub-folder\nper-capability or common logic in shared files or folders.\n\nExample Structure:\n\n```\nModule Root\n├── package.json\n├── pepr.ts\n└── capabilities\n    ├── example-one.ts\n    ├── example-three.ts\n    └── example-two.ts\n```\n", "peprTS": "import { PeprModule } from \"pepr\";\nimport { HelloPepr } from \"./capabilities/hello-pepr\";\nimport cfg from \"./package.json\";\n\n/**\n * This is the main entrypoint for the Pepr module. It is the file that is run when the module is started.\n * This is where you register your configurations and capabilities with the module.\n */\nnew PeprModule(cfg, [\n  // \"HelloPepr\" is a demo capability that is included with Pepr. You can remove it if you want.\n  HelloPepr,\n\n  // Your additional capabilities go here\n]);\n", "helloPeprTS": "import { Capability, PeprRequest, a, fetch } from \"pepr\";\n\n/**\n *  The HelloPepr Capability is an example capability to demonstrate some general concepts of Pepr.\n *  To test this capability you can run `pepr dev` or `npm start` and then run the following command:\n *  `kubectl apply -f capabilities/hello-pepr.samples.yaml`\n */\nexport const HelloPepr = new Capability({\n  name: \"hello-pepr\",\n  description: \"A simple example capability to show how things work.\",\n  namespaces: [\"pepr-demo\"],\n});\n\n// Use the 'When' function to create a new Capability Action\nconst { When } = HelloPepr;\n\n/**\n * ---------------------------------------------------------------------------------------------------\n *                                   CAPABILITY ACTION                                               *\n * ---------------------------------------------------------------------------------------------------\n *\n * This Capability Action removes the label `remove-me` when a Namespace is created.\n * Note we don't need to specify the namespace here, because we've already specified\n * it in the Capability definition above.\n */\nWhen(a.Namespace)\n  .IsCreated()\n  .Then(ns => ns.RemoveLabel(\"remove-me\"));\n\n/**\n * ---------------------------------------------------------------------------------------------------\n *                                   CAPABILITY ACTION                                               *\n * ---------------------------------------------------------------------------------------------------\n *\n * This is a single Capability Action. They can be in the same file or put imported from other files.\n * In this exmaple, when a ConfigMap is created with the name `example-1`, then add a label and annotation.\n *\n * Equivelant to manually running:\n * `kubectl label configmap example-1 pepr=was-here`\n * `kubectl annotate configmap example-1 pepr.dev=annotations-work-too`\n */\nWhen(a.ConfigMap)\n  .IsCreated()\n  .WithName(\"example-1\")\n  .Then(request =>\n    request\n      .SetLabel(\"pepr\", \"was-here\")\n      .SetAnnotation(\"pepr.dev\", \"annotations-work-too\")\n  );\n\n/**\n * ---------------------------------------------------------------------------------------------------\n *                                   CAPABILITY ACTION                                               *\n * ---------------------------------------------------------------------------------------------------\n *\n * This Capabiility Action does the exact same changes for example-2, except this time it uses\n * the `.ThenSet()` feature. You can stack multiple `.Then()` calls, but only a single `.ThenSet()`\n */\nWhen(a.ConfigMap)\n  .IsCreated()\n  .WithName(\"example-2\")\n  .ThenSet({\n    metadata: {\n      labels: {\n        pepr: \"was-here\",\n      },\n      annotations: {\n        \"pepr.dev\": \"annotations-work-too\",\n      },\n    },\n  });\n\n/**\n * ---------------------------------------------------------------------------------------------------\n *                                   CAPABILITY ACTION                                               *\n * ---------------------------------------------------------------------------------------------------\n *\n * This Capability Action combines different styles. Unlike the previous actions, this one will look\n * for any ConfigMap in the `pepr-demo` namespace that has the label `change=by-label` during either\n * CREATE or UPDATE. Note that all conditions added such as `WithName()`, `WithLabel()`, `InNamespace()`,\n * are ANDs so all conditions must be true for the request to be procssed.\n */\nWhen(a.ConfigMap)\n  .IsCreatedOrUpdated()\n  .WithLabel(\"change\", \"by-label\")\n  .Then(request => {\n    // The K8s object e are going to mutate\n    const cm = request.Raw;\n\n    // Get the username and uid of the K8s reuest\n    const { username, uid } = request.Request.userInfo;\n\n    // Store some data about the request in the configmap\n    cm.data[\"username\"] = username;\n    cm.data[\"uid\"] = uid;\n\n    // You can still mix other ways of making changes too\n    request.SetAnnotation(\"pepr.dev\", \"making-waves\");\n  });\n\n/**\n * ---------------------------------------------------------------------------------------------------\n *                                   CAPABILITY ACTION                                               *\n * ---------------------------------------------------------------------------------------------------\n *\n * This Capability Action show how you can use the `Then()` function to make multiple changes to the\n * same object from different functions. This is useful if you want to keep your Capability Actions\n * small and focused on a single task, or if you want to reuse the same function in multiple\n * Capability Actions.\n *\n * Note that the order of the `.Then()` calls matters. The first call will be executed first,\n * then the second, and so on. Also note the functions are not called until the Capability Action\n * is triggered.\n */\nWhen(a.ConfigMap)\n  .IsCreated()\n  .WithName(\"example-5\")\n  .Then(cm => cm.SetLabel(\"pepr.dev/first\", \"true\"))\n  .Then(addSecond)\n  .Then(addThird);\n\n//This function uses the complete type definition, but is not required.\nfunction addSecond(cm: PeprRequest<a.ConfigMap>) {\n  cm.SetLabel(\"pepr.dev/second\", \"true\");\n}\n\n// This function has no type definition, so you won't have intelisense in the function body.\nfunction addThird(cm) {\n  cm.SetLabel(\"pepr.dev/third\", \"true\");\n}\n\n/**\n * ---------------------------------------------------------------------------------------------------\n *                                   CAPABILITY ACTION                                               *\n * ---------------------------------------------------------------------------------------------------\n *\n * This Capability Action is a bit more complex. It will look for any ConfigMap in the `pepr-demo`\n * namespace that has the label `chuck-norris` during CREATE. When it finds one, it will fetch a\n * random Chuck Norris joke from the API and add it to the ConfigMap. This is a great example of how\n * you can use Pepr to make changes to your K8s objects based on external data.\n *\n * Note the use of the `async` keyword. This is required for any Capability Action that uses `await` or `fetch()`.\n *\n * Also note we are passing a type to the `fetch()` function. This is optional, but it will help you\n * avoid mistakes when working with the data returned from the API. You can also use the `as` keyword to\n * cast the data returned from the API.\n *\n * These are equivelant:\n * ```ts\n * const joke = await fetch<TheChuckNorrisJoke>(\"https://api.chucknorris.io/jokes/random?category=dev\");\n * const joke = await fetch(\"https://api.chucknorris.io/jokes/random?category=dev\") as TheChuckNorrisJoke;\n * ```\n *\n * Alternatively, you can drop the type completely:\n *\n * ```ts\n * fetch(\"https://api.chucknorris.io/jokes/random?category=dev\")\n * ```\n */\ninterface TheChuckNorrisJoke {\n  icon_url: string;\n  id: string;\n  url: string;\n  value: string;\n}\n\nWhen(a.ConfigMap)\n  .IsCreated()\n  .WithLabel(\"chuck-norris\")\n  .Then(async change => {\n    const joke = await fetch<TheChuckNorrisJoke>(\n      \"https://api.chucknorris.io/jokes/random?category=dev\"\n    );\n\n    // Add the Chuck Norris joke to the configmap\n    change.Raw.data[\"chuck-says\"] = joke.value;\n  });\n" }

package/dist/src/cli/init/templates/samples.json

@@ -3,7 +3,11 @@
         "apiVersion": "v1",
         "kind": "Namespace",
         "metadata": {
-            "name": "pepr-demo"
+            "name": "pepr-demo",
+            "labels": {
+                "keep-me": "please",
+                "remove-me": "please"
+            }
         }
     },
     {
@@ -41,5 +45,27 @@
         "data": {
             "key": "ex-3-val"
         }
+    },
+    {
+        "apiVersion": "v1",
+        "kind": "ConfigMap",
+        "metadata": {
+            "name": "example-4",
+            "namespace": "pepr-demo",
+            "labels": {
+                "chuck-norris": "test"
+            }
+        },
+        "data": {
+            "key": "ex-4-val"
+        }
+    },
+    {
+        "apiVersion": "v1",
+        "kind": "ConfigMap",
+        "metadata": {
+            "name": "example-5",
+            "namespace": "pepr-demo"
+        }
     }
 ]

package/dist/src/cli/init/templates/tsconfig.module.json

@@ -0,0 +1,12 @@
+{
+    "compilerOptions": {
+        "esModuleInterop": true,
+        "lib": ["ES2020"],
+        "moduleResolution": "node",
+        "resolveJsonModule": true,
+        "rootDir": ".",
+        "strict": false,
+        "target": "ES2020"
+    },
+    "include": ["**/*.ts"]
+}

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

@@ -1,5 +1,5 @@
 import { InitOptions } from "./walkthrough";
-export declare function genPkgJSON(opts: InitOptions): {
+export declare function genPkgJSON(opts: InitOptions, pgkVerOverride?: string): {
     data: {
         name: string;
         version: string;
@@ -25,6 +25,7 @@ export declare function genPkgJSON(opts: InitOptions): {
         };
         devDependencies: {
             typescript: string;
+            "ts-node": string;
         };
     };
     path: string;

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

@@ -10,19 +10,19 @@ const client_node_1 = require("@kubernetes/client-node");
 const util_1 = require("util");
 const uuid_1 = require("uuid");
 const package_json_1 = require("../../../package.json");
+const _prettierrc_json_1 = __importDefault(require("./templates/.prettierrc.json"));
 const data_json_1 = __importDefault(require("./templates/data.json"));
 const pepr_code_snippets_json_1 = __importDefault(require("./templates/pepr.code-snippets.json"));
-const prettierrc_json_1 = __importDefault(require("./templates/prettierrc.json"));
 const samples_json_1 = __importDefault(require("./templates/samples.json"));
-const tsconfig_json_1 = __importDefault(require("./templates/tsconfig.json"));
+const tsconfig_module_json_1 = __importDefault(require("./templates/tsconfig.module.json"));
 const utils_1 = require("./utils");
-function genPkgJSON(opts) {
+function genPkgJSON(opts, pgkVerOverride) {
     // Generate a random UUID for the module based on the module name
     const uuid = (0, uuid_1.v5)(opts.name, (0, uuid_1.v4)());
     // Generate a name for the module based on the module name
     const name = (0, utils_1.sanitizeName)(opts.name);
     // Make typescript a dev dependency
-    const { typescript } = package_json_1.dependencies;
+    const { typescript, "ts-node": tsNode } = package_json_1.dependencies;
     const data = {
         name,
         version: "0.0.1",
@@ -31,7 +31,7 @@ function genPkgJSON(opts) {
         pepr: {
             name: opts.name.trim(),
             version: package_json_1.version,
-            uuid,
+            uuid: pgkVerOverride ? "static-test" : uuid,
             onError: opts.errorBehavior,
             alwaysIgnore: {
                 namespaces: [],
@@ -44,10 +44,11 @@ function genPkgJSON(opts) {
             start: "pepr dev",
         },
         dependencies: {
-            pepr: `^${package_json_1.version}`,
+            pepr: pgkVerOverride || `^${package_json_1.version}`,
         },
         devDependencies: {
             typescript,
+            "ts-node": tsNode,
         },
     };
     return {
@@ -86,9 +87,9 @@ exports.snippet = {
 };
 exports.tsConfig = {
     path: "tsconfig.json",
-    data: tsconfig_json_1.default,
+    data: tsconfig_module_json_1.default,
 };
 exports.prettierRC = {
     path: ".prettierrc",
-    data: prettierrc_json_1.default,
+    data: _prettierrc_json_1.default,
 };

package/dist/src/cli/update.d.ts

@@ -0,0 +1,2 @@
+import { RootCmd } from "./root";
+export default function (program: RootCmd): void;

package/dist/src/cli/update.js

@@ -0,0 +1,56 @@
+"use strict";
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023-Present The Pepr Authors
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+const path_1 = require("path");
+const prompts_1 = require("prompts");
+const logger_1 = __importDefault(require("../../src/lib/logger"));
+const templates_1 = require("./init/templates");
+const utils_1 = require("./init/utils");
+function default_1(program) {
+    program
+        .command("update")
+        .description("Update this Pepr module")
+        .option("--skip-template-update", "Skip updating the template files`")
+        .action(async (opts) => {
+        if (!opts.skipTemplateUpdate) {
+            const { confirm } = await (0, prompts_1.prompt)({
+                type: "confirm",
+                name: "confirm",
+                message: "This will overwrite previously auto-generated files inluding the capabilities/HelloPepr.ts file.\n" +
+                    "Are you sure you want to continue?",
+            });
+            // If the user doesn't confirm, exit
+            if (!confirm) {
+                return;
+            }
+        }
+        console.log("Updating the Pepr module...");
+        try {
+            await (0, utils_1.write)((0, path_1.resolve)(templates_1.prettierRC.path), templates_1.prettierRC.data);
+            await (0, utils_1.write)((0, path_1.resolve)(templates_1.tsConfig.path), templates_1.tsConfig.data);
+            await (0, utils_1.write)((0, path_1.resolve)(".vscode", templates_1.snippet.path), templates_1.snippet.data);
+            await (0, utils_1.write)((0, path_1.resolve)("capabilities", templates_1.samplesYaml.path), templates_1.samplesYaml.data);
+            await (0, utils_1.write)((0, path_1.resolve)("capabilities", templates_1.helloPeprTS.path), templates_1.helloPeprTS.data);
+            // Update Pepr for the module
+            (0, child_process_1.execSync)("npm install pepr@latest", {
+                stdio: "inherit",
+            });
+            // Update Pepr globally
+            (0, child_process_1.execSync)("npm install -g pepr@latest", {
+                stdio: "inherit",
+            });
+            console.log(`Module updated!`);
+        }
+        catch (e) {
+            logger_1.default.debug(e);
+            logger_1.default.error(e.message);
+            process.exit(1);
+        }
+    });
+}
+exports.default = default_1;

package/dist/src/lib/filter.js

@@ -15,34 +15,59 @@ const logger_1 = __importDefault(require("./logger"));
  * @returns
  */
 function shouldSkipRequest(binding, req) {
-    const { group, kind, version } = binding.kind;
-    const { namespaces, labels, annotations } = binding.filters;
-    const { metadata } = req.object;
+    const { group, kind, version } = binding.kind || {};
+    const { namespaces, labels, annotations, name } = binding.filters || {};
+    const { metadata } = req.object || {};
+    // Test name first, since it's the most specific
+    if (name && name !== req.name) {
+        return true;
+    }
+    // Test for matching kinds
     if (kind !== req.kind.kind) {
         return true;
     }
+    // Test for matching groups
     if (group && group !== req.kind.group) {
         return true;
     }
+    // Test for matching versions
     if (version && version !== req.kind.version) {
         return true;
     }
+    // Test for matching namespaces
     if (namespaces.length && !namespaces.includes(req.namespace || "")) {
         logger_1.default.debug("Namespace does not match");
         return true;
     }
+    // Test for matching lables
     for (const [key, value] of Object.entries(labels)) {
-        if (metadata?.labels?.[key] !== value) {
-            logger_1.default.debug(`${metadata?.labels?.[key]} does not match ${value}`);
+        const testKey = metadata?.labels?.[key];
+        // First check if the label exists
+        if (!testKey) {
+            logger_1.default.debug(`Label ${key} does not exist`);
+            return true;
+        }
+        // Then check if the value matches, if specified
+        if (value && testKey !== value) {
+            logger_1.default.debug(`${testKey} does not match ${value}`);
             return true;
         }
     }
+    // Test for matching annotations
     for (const [key, value] of Object.entries(annotations)) {
-        if (metadata?.annotations?.[key] !== value) {
-            logger_1.default.debug(`${metadata?.annotations?.[key]} does not match ${value}`);
+        const testKey = metadata?.annotations?.[key];
+        // First check if the annotation exists
+        if (!testKey) {
+            logger_1.default.debug(`Annotation ${key} does not exist`);
+            return true;
+        }
+        // Then check if the value matches, if specified
+        if (value && testKey !== value) {
+            logger_1.default.debug(`${testKey} does not match ${value}`);
             return true;
         }
     }
+    // No failed filters, so we should not skip this request
     return false;
 }
 exports.shouldSkipRequest = shouldSkipRequest;

package/dist/src/lib/processor.js

@@ -11,7 +11,7 @@ const filter_1 = require("./filter");
 const logger_1 = __importDefault(require("./logger"));
 const request_1 = require("./request");
 async function processor(config, capabilities, req) {
-    const wrapped = new request_1.RequestWrapper(req);
+    const wrapped = new request_1.PeprRequest(req);
     const response = {
         uid: req.uid,
         warnings: [],

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

@@ -4,7 +4,7 @@ import { DeepPartial } from "./types";
  * The RequestWrapper class provides methods to modify Kubernetes objects in the context
  * of a mutating webhook request.
  */
-export declare class RequestWrapper<T extends KubernetesObject> {
+export declare class PeprRequest<T extends KubernetesObject> {
     private _input;
     Raw: T;
     get PermitSideEffects(): boolean;

package/dist/src/lib/request.js

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequestWrapper = void 0;
+exports.PeprRequest = void 0;
 const ramda_1 = __importDefault(require("ramda"));
 /**
  * The RequestWrapper class provides methods to modify Kubernetes objects in the context
  * of a mutating webhook request.
  */
-class RequestWrapper {
+class PeprRequest {
     get PermitSideEffects() {
         return !this._input.dryRun;
     }
@@ -121,4 +121,4 @@ class RequestWrapper {
         return this.Raw?.metadata?.annotations?.[key] !== undefined;
     }
 }
-exports.RequestWrapper = RequestWrapper;
+exports.PeprRequest = PeprRequest;

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

@@ -1,5 +1,5 @@
 import { GroupVersionKind, KubernetesObject, WebhookIgnore } from "./k8s";
-import { RequestWrapper } from "./request";
+import { PeprRequest } from "./request";
 /**
  * The behavior of this module when an error occurs.
  */
@@ -184,4 +184,4 @@ export type BindToActionOrSet<T extends GenericClass> = BindToAction<T> & {
      */
     ThenSet: (val: DeepPartial<InstanceType<T>>) => BindToAction<T>;
 };
-export type CapabilityAction<T extends GenericClass, K extends KubernetesObject = InstanceType<T>> = (req: RequestWrapper<K>) => Promise<void> | void | Promise<RequestWrapper<K>> | RequestWrapper<K>;
+export type CapabilityAction<T extends GenericClass, K extends KubernetesObject = InstanceType<T>> = (req: PeprRequest<K>) => Promise<void> | void | Promise<PeprRequest<K>> | PeprRequest<K>;

package/package.json

@@ -9,7 +9,7 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "version": "0.1.42",
+  "version": "0.1.44",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "pepr": {
@@ -27,20 +27,21 @@
     "prebuild": "rm -fr dist/* && node hack/build-template-data.js",
     "build": "tsc -p tsconfig.build.json",
     "test": "npm run build && ava && node dist/cli.js -V",
+    "test:e2e": "ava hack/e2e.test.js",
+    "test:e2e-setup": "npm run build && npm uninstall pepr -g && npm install -g .",
     "lint": "npx eslint src",
     "lint:fix": "npm run lint -- --fix",
     "prettier": "npx prettier src --check",
     "prettier:fix": "npm run prettier -- --write",
     "prepublishOnly": "npm run lint:fix && npm run prettier:fix && npm run test",
-    "e2e-dev-setup": "k3d cluster delete pepr-dev && k3d cluster create pepr-dev --k3s-arg '--debug@server:0'",
-    "e2e-dev": "npm run build && docker buildx build --tag pepr:dev . && k3d image import pepr:dev -c pepr-dev && node dist/pepr-cli.js deploy -f -i pepr:dev"
+    "e2e-dev-setup": "k3d cluster delete pepr-dev && k3d cluster create pepr-dev --k3s-arg '--debug@server:0'"
   },
   "dependencies": {
     "@kubernetes/client-node": "^0.18.1",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-typescript": "^11.0.0",
-    "@types/ramda": "^0.28.23",
+    "@types/ramda": "^0.29.0",
     "chokidar": "^3.5.3",
     "commander": "^10.0.0",
     "express": "^4.18.2",

package/hack/build-template-data.js

@@ -1,23 +0,0 @@
-// This is a helper script to collect the contents of the template files before building the CLI
-
-/* eslint-disable */
-const fs = require("fs");
-const path = require("path");
-
-const baseDir = path.join(__dirname, "..", "src", "cli", "init", "templates");
-
-// Read the text file
-const gitignore = fs.readFileSync(path.join(baseDir, "gitignore"), "utf8");
-const readme = fs.readFileSync(path.join(baseDir, "README.md"), "utf8");
-const peprTS = fs.readFileSync(path.join(baseDir, "pepr.ts"), "utf8");
-const helloPeprTS = fs.readFileSync(path.join(baseDir, "hello-pepr.ts"), "utf8");
-
-fs.writeFileSync(
-  path.join(baseDir, "data.json"),
-  JSON.stringify({
-    gitignore,
-    readme,
-    peprTS,
-    helloPeprTS,
-  })
-);

package/tsconfig.build.json

@@ -1,4 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "exclude": ["node_modules", "dist", "fixtures", "**/*.test.ts", "src/cli/init/templates"]
-}