pepr 0.2.10 → 0.3.0-rc0

package/dist/fixtures/data/pod2.json

@@ -0,0 +1,257 @@
+{
+    "uid": "e40aafc4-db17-4368-89e9-e7bda15b814d",
+    "kind": {
+        "group": "",
+        "version": "v1",
+        "kind": "Pod"
+    },
+    "resource": {
+        "group": "",
+        "version": "v1",
+        "resource": "pods"
+    },
+    "requestKind": {
+        "group": "",
+        "version": "v1",
+        "kind": "Pod"
+    },
+    "requestResource": {
+        "group": "",
+        "version": "v1",
+        "resource": "pods"
+    },
+    "name": "lifespan-seven",
+    "namespace": "apps",
+    "operation": "CREATE",
+    "userInfo": {
+        "username": "kubernetes-admin",
+        "groups": ["system:masters", "system:authenticated"]
+    },
+    "object": {
+        "kind": "Pod",
+        "apiVersion": "v1",
+        "metadata": {
+            "name": "lifespan-seven",
+            "namespace": "apps",
+            "uid": "6cc7f934-7054-4387-9a69-84fb3dc9fd87",
+            "creationTimestamp": "2023-03-31T18:15:31Z",
+            "labels": {
+                "acme.com/lifespan-requested": "7"
+            },
+            "annotations": {
+                "kubectl.kubernetes.io/last-applied-configuration": {
+                    "apiVersion": "v1",
+                    "kind": "Pod",
+                    "metadata": {
+                        "annotations": {},
+                        "labels": {
+                            "acme.com/lifespan-requested": "7"
+                        },
+                        "name": "lifespan-seven",
+                        "namespace": "apps"
+                    },
+                    "spec": {
+                        "containers": [
+                            {
+                                "args": ["sleep", "3600"],
+                                "image": "busybox",
+                                "name": "lifespan-seven"
+                            }
+                        ],
+                        "restartPolicy": "Always"
+                    }
+                }
+            },
+            "managedFields": [
+                {
+                    "manager": "kubectl-client-side-apply",
+                    "operation": "Update",
+                    "apiVersion": "v1",
+                    "time": "2023-03-31T18:15:31Z",
+                    "fieldsType": "FieldsV1",
+                    "fieldsV1": {
+                        "f:metadata": {
+                            "f:annotations": {
+                                ".": {},
+                                "f:kubectl.kubernetes.io/last-applied-configuration": {}
+                            },
+                            "f:labels": {
+                                ".": {},
+                                "f:acme.com/lifespan-requested": {}
+                            }
+                        },
+                        "f:spec": {
+                            "f:containers": {
+                                "k:{\"name\":\"lifespan-seven\"}": {
+                                    ".": {},
+                                    "f:args": {},
+                                    "f:image": {},
+                                    "f:imagePullPolicy": {},
+                                    "f:name": {},
+                                    "f:resources": {},
+                                    "f:terminationMessagePath": {},
+                                    "f:terminationMessagePolicy": {}
+                                }
+                            },
+                            "f:dnsPolicy": {},
+                            "f:enableServiceLinks": {},
+                            "f:restartPolicy": {},
+                            "f:schedulerName": {},
+                            "f:securityContext": {},
+                            "f:terminationGracePeriodSeconds": {}
+                        }
+                    }
+                }
+            ]
+        },
+        "spec": {
+            "volumes": [
+                {
+                    "name": "kube-api-access-65g4k",
+                    "projected": {
+                        "sources": [
+                            {
+                                "serviceAccountToken": {
+                                    "expirationSeconds": 3607,
+                                    "path": "token"
+                                }
+                            },
+                            {
+                                "configMap": {
+                                    "name": "kube-root-ca.crt",
+                                    "items": [
+                                        {
+                                            "key": "ca.crt",
+                                            "path": "ca.crt"
+                                        }
+                                    ]
+                                }
+                            },
+                            {
+                                "downwardAPI": {
+                                    "items": [
+                                        {
+                                            "path": "namespace",
+                                            "fieldRef": {
+                                                "apiVersion": "v1",
+                                                "fieldPath": "metadata.namespace"
+                                            }
+                                        }
+                                    ]
+                                }
+                            }
+                        ],
+                        "defaultMode": 420
+                    }
+                }
+            ],
+            "containers": [
+                {
+                    "name": "lifespan-seven",
+                    "image": "busybox",
+                    "args": ["sleep", "3600"],
+                    "env": [
+                        {
+                            "name": "KUBE",
+                            "value": "true"
+                        }
+                    ],
+                    "resources": {},
+                    "volumeMounts": [
+                        {
+                            "name": "kube-api-access-65g4k",
+                            "readOnly": true,
+                            "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount"
+                        }
+                    ],
+                    "terminationMessagePath": "/dev/termination-log",
+                    "terminationMessagePolicy": "File",
+                    "imagePullPolicy": "Always"
+                }
+            ],
+            "restartPolicy": "Always",
+            "terminationGracePeriodSeconds": 30,
+            "dnsPolicy": "ClusterFirst",
+            "serviceAccountName": "default",
+            "serviceAccount": "default",
+            "securityContext": {},
+            "schedulerName": "default-scheduler",
+            "tolerations": [
+                {
+                    "key": "node.kubernetes.io/not-ready",
+                    "operator": "Exists",
+                    "effect": "NoExecute",
+                    "tolerationSeconds": 300
+                },
+                {
+                    "key": "node.kubernetes.io/unreachable",
+                    "operator": "Exists",
+                    "effect": "NoExecute",
+                    "tolerationSeconds": 300
+                },
+                {
+                    "key": "acme.com/lifespan-remaining",
+                    "operator": "Equal",
+                    "value": "14",
+                    "effect": "NoSchedule"
+                },
+                {
+                    "key": "acme.com/lifespan-remaining",
+                    "operator": "Equal",
+                    "value": "13",
+                    "effect": "NoSchedule"
+                },
+                {
+                    "key": "acme.com/lifespan-remaining",
+                    "operator": "Equal",
+                    "value": "12",
+                    "effect": "NoSchedule"
+                },
+                {
+                    "key": "acme.com/lifespan-remaining",
+                    "operator": "Equal",
+                    "value": "11",
+                    "effect": "NoSchedule"
+                },
+                {
+                    "key": "acme.com/lifespan-remaining",
+                    "operator": "Equal",
+                    "value": "10",
+                    "effect": "NoSchedule"
+                },
+                {
+                    "key": "acme.com/lifespan-remaining",
+                    "operator": "Equal",
+                    "value": "9",
+                    "effect": "NoSchedule"
+                },
+                {
+                    "key": "acme.com/lifespan-remaining",
+                    "operator": "Equal",
+                    "value": "8",
+                    "effect": "NoSchedule"
+                },
+                {
+                    "key": "acme.com/lifespan-remaining",
+                    "operator": "Equal",
+                    "value": "7",
+                    "effect": "NoSchedule"
+                }
+            ],
+            "priority": 0,
+            "enableServiceLinks": true,
+            "preemptionPolicy": "PreemptLowerPriority"
+        },
+        "status": {
+            "phase": "Pending",
+            "qosClass": "BestEffort"
+        }
+    },
+    "oldObject": null,
+    "dryRun": false,
+    "options": {
+        "kind": "CreateOptions",
+        "apiVersion": "meta.k8s.io/v1",
+        "fieldManager": "kubectl-client-side-apply"
+    }
+}

package/dist/fixtures/data/svc1.json

@@ -0,0 +1,100 @@
+{
+    "uid": "f7b55ff2-18ef-403c-87fe-bac8435e0ed7",
+    "kind": {
+        "group": "",
+        "version": "v1",
+        "kind": "Service"
+    },
+    "resource": {
+        "group": "",
+        "version": "v1",
+        "resource": "services"
+    },
+    "requestKind": {
+        "group": "",
+        "version": "v1",
+        "kind": "Service"
+    },
+    "requestResource": {
+        "group": "",
+        "version": "v1",
+        "resource": "services"
+    },
+    "name": "my-service",
+    "namespace": "apps",
+    "operation": "CREATE",
+    "userInfo": {
+        "username": "kubernetes-admin",
+        "groups": ["system:masters", "system:authenticated"]
+    },
+    "object": {
+        "kind": "Service",
+        "apiVersion": "v1",
+        "metadata": {
+            "name": "my-service",
+            "namespace": "apps",
+            "creationTimestamp": null,
+            "annotations": {
+                "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"annotations\":{},\"name\":\"my-service\",\"namespace\":\"apps\"},\"spec\":{\"ports\":[{\"port\":80,\"protocol\":\"TCP\",\"targetPort\":9376}],\"selector\":{\"app.kubernetes.io/name\":\"MyApp\"}}}\n"
+            },
+            "managedFields": [
+                {
+                    "manager": "kubectl-client-side-apply",
+                    "operation": "Update",
+                    "apiVersion": "v1",
+                    "time": "2023-03-31T19:08:48Z",
+                    "fieldsType": "FieldsV1",
+                    "fieldsV1": {
+                        "f:metadata": {
+                            "f:annotations": {
+                                ".": {},
+                                "f:kubectl.kubernetes.io/last-applied-configuration": {}
+                            }
+                        },
+                        "f:spec": {
+                            "f:ports": {
+                                ".": {},
+                                "k:{\"port\":80,\"protocol\":\"TCP\"}": {
+                                    ".": {},
+                                    "f:port": {},
+                                    "f:protocol": {},
+                                    "f:targetPort": {}
+                                }
+                            },
+                            "f:selector": {
+                                ".": {},
+                                "f:app.kubernetes.io/name": {}
+                            },
+                            "f:sessionAffinity": {},
+                            "f:type": {}
+                        }
+                    }
+                }
+            ]
+        },
+        "spec": {
+            "ports": [
+                {
+                    "protocol": "TCP",
+                    "port": 80,
+                    "targetPort": 9376
+                }
+            ],
+            "selector": {
+                "app.kubernetes.io/name": "MyApp"
+            },
+            "type": "ClusterIP",
+            "sessionAffinity": "None"
+        },
+        "status": {
+            "loadBalancer": {}
+        }
+    },
+    "oldObject": null,
+    "dryRun": false,
+    "options": {
+        "kind": "CreateOptions",
+        "apiVersion": "meta.k8s.io/v1",
+        "fieldManager": "kubectl-client-side-apply"
+    }
+}

package/dist/fixtures/loader.js

@@ -0,0 +1,60 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NS1 = exports.CM1 = exports.DEPLOYMENT1 = exports.SVC1 = exports.POD2 = exports.POD1 = void 0;
+const cm1 = __importStar(require("./data/cm1.json"));
+const deployment1 = __importStar(require("./data/deployment1.json"));
+const ns1 = __importStar(require("./data/ns1.json"));
+const pod1 = __importStar(require("./data/pod1.json"));
+const pod2 = __importStar(require("./data/pod2.json"));
+const svc1 = __importStar(require("./data/svc1.json"));
+function POD1() {
+    return cloneObject(pod1);
+}
+exports.POD1 = POD1;
+function POD2() {
+    return cloneObject(pod2);
+}
+exports.POD2 = POD2;
+function SVC1() {
+    return cloneObject(svc1);
+}
+exports.SVC1 = SVC1;
+function DEPLOYMENT1() {
+    return cloneObject(deployment1);
+}
+exports.DEPLOYMENT1 = DEPLOYMENT1;
+function CM1() {
+    return cloneObject(cm1);
+}
+exports.CM1 = CM1;
+function NS1() {
+    return cloneObject(ns1);
+}
+exports.NS1 = NS1;
+function cloneObject(obj) {
+    // JSON to avoid funky typescript silliness on jsonmodules
+    return JSON.parse(JSON.stringify(obj));
+}

package/dist/package.json

@@ -4,29 +4,17 @@
     "author": "Defense Unicorns",
     "homepage": "https://github.com/defenseunicorns/pepr",
     "license": "Apache-2.0",
-    "bin": "dist/cli.js",
+    "bin": "dist/src/cli/index.js",
     "repository": "defenseunicorns/pepr",
     "engines": {
         "node": ">=18.0.0"
     },
-    "version": "0.2.10",
+    "version": "0.3.0-rc0",
     "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "pepr": {
-        "name": "Development Module",
-        "uuid": "20e17cf6-a2e4-46b2-b626-75d88d96c88b",
-        "description": "Development module for pepr",
-        "version": "dev",
-        "onError": "ignore",
-        "alwaysIgnore": {
-            "namespaces": [],
-            "labels": []
-        }
-    },
     "scripts": {
         "prebuild": "rm -fr dist/* && node hack/build-template-data.js",
-        "build": "tsc -p tsconfig.build.json",
-        "test:unit": "npm run build && ava",
+        "build": "tsc",
+        "test:unit": "npm run build && ava dist/**/*.test.js",
         "test:e2e": "npm run test:e2e:k3d && npm run test:e2e:build && npm run test:e2e:image && npm run test:e2e:run",
         "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",
@@ -37,45 +25,39 @@
     },
     "dependencies": {
         "@kubernetes/client-node": "0.18.1",
-        "@rollup/plugin-json": "6.0.0",
-        "@rollup/plugin-node-resolve": "15.0.2",
-        "@rollup/plugin-typescript": "11.1.0",
-        "@types/ramda": "0.29.1",
-        "chokidar": "3.5.3",
-        "commander": "10.0.1",
         "express": "4.18.2",
         "fast-json-patch": "3.1.1",
         "http-status-codes": "2.2.0",
         "node-fetch": "2.6.9",
-        "node-forge": "1.3.1",
-        "prettier": "2.8.8",
-        "prompts": "2.4.2",
-        "ramda": "0.29.0",
-        "rollup": "3.21.4",
-        "ts-node": "10.9.1",
-        "tslib": "2.5.0",
-        "typescript": "5.0.4",
-        "uuid": "9.0.0"
+        "ramda": "0.29.0"
     },
     "devDependencies": {
         "@types/express": "4.17.17",
         "@types/node-fetch": "2.6.3",
         "@types/node-forge": "1.3.2",
         "@types/prompts": "2.4.4",
+        "@types/ramda": "0.29.1",
         "@types/uuid": "9.0.1",
         "@typescript-eslint/eslint-plugin": "5.59.2",
         "@typescript-eslint/parser": "5.59.2",
         "ava": "5.2.0",
-        "eslint": "8.39.0",
-        "nock": "13.3.1"
+        "eslint": "8.40.0",
+        "nock": "13.3.1",
+        "prettier": "2.8.8"
+    },
+    "peerDependencies": {
+        "@rollup/plugin-json": "6.0.0",
+        "@rollup/plugin-node-resolve": "15.0.2",
+        "@rollup/plugin-typescript": "11.1.0",
+        "chokidar": "3.5.3",
+        "commander": "10.0.1",
+        "node-forge": "1.3.1",
+        "prompts": "2.4.2",
+        "rollup": "3.21.5",
+        "typescript": "5.0.4",
+        "uuid": "9.0.0"
     },
     "ava": {
-        "extensions": [
-            "ts"
-        ],
-        "require": [
-            "ts-node/register"
-        ],
         "failFast": true,
         "verbose": true
     }

package/dist/src/cli/build.js

@@ -111,7 +111,9 @@ async function buildModule() {
     catch (e) {
         // On any other error, exit with a non-zero exit code
         logger_1.default.debug(e);
-        logger_1.default.error(e.message);
+        if (e instanceof Error) {
+            logger_1.default.error(e.message);
+        }
         process.exit(1);
     }
 }

package/dist/src/cli/dev.js

@@ -47,23 +47,38 @@ function default_1(program) {
         try {
             await webhook.deploy(code);
             logger_1.default.info(`Module deployed successfully`);
-            const moduleFiles = (0, path_1.resolve)(".", "**", "*.ts");
-            const watcher = (0, chokidar_1.watch)(moduleFiles);
-            const peprTS = (0, path_1.resolve)(".", "pepr.ts");
-            let program;
-            // Run the module once to start the server
-            runDev(peprTS);
+            const moduleFiles = [
+                (0, path_1.resolve)(".", "pepr.ts"),
+                (0, path_1.resolve)(".", "capabilities", "*.ts"),
+                (0, path_1.resolve)(".", "capabilities", "**", "*.ts"),
+            ];
+            const watcher = (0, chokidar_1.watch)(moduleFiles, {
+                awaitWriteFinish: {
+                    stabilityThreshold: 3000,
+                    pollInterval: 500,
+                },
+            });
             // Watch for changes
-            watcher.on("ready", () => {
+            watcher.on("ready", async () => {
+                let building = false;
+                // Run the module once to start the server
+                let program = await runDev();
                 logger_1.default.info(`Watching for changes in ${moduleFiles}`);
                 watcher.on("all", async (event, path) => {
                     logger_1.default.debug({ event, path }, "File changed");
-                    // Kill the running process
-                    if (program) {
-                        program.kill("SIGKILL");
+                    // If we're already building, skip this event
+                    if (building) {
+                        return;
                     }
-                    // Start the process again
-                    program = runDev(peprTS);
+                    // Set building to true
+                    building = true;
+                    // Don't start a new process until the old one exits
+                    program.once("exit", async () => {
+                        program = await runDev();
+                        building = false;
+                    });
+                    // Kill the running process
+                    program.kill();
                 });
             });
         }
@@ -74,9 +89,11 @@ function default_1(program) {
     });
 }
 exports.default = default_1;
-function runDev(path) {
+async function runDev() {
     try {
-        const program = (0, child_process_1.spawn)("./node_modules/.bin/ts-node", [path], {
+        const { path } = await (0, build_1.buildModule)();
+        logger_1.default.info(`Running module ${path}`);
+        const program = (0, child_process_1.fork)(path, {
             env: {
                 ...process.env,
                 LOG_LEVEL: "debug",
@@ -84,11 +101,6 @@ function runDev(path) {
                 SSL_CERT_PATH: "insecure-tls.crt",
             },
         });
-        program.stdout.on("data", data => console.log(data.toString()));
-        program.stderr.on("data", data => console.error(data.toString()));
-        program.on("close", code => {
-            logger_1.default.info(`Process exited with code ${code}`);
-        });
         return program;
     }
     catch (e) {

package/dist/src/cli/index.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 "use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Pepr Authors

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

@@ -70,7 +70,9 @@ function default_1(program) {
             }
             catch (e) {
                 logger_1.default.debug(e);
-                logger_1.default.error(e.message);
+                if (e instanceof Error) {
+                    logger_1.default.error(e.message);
+                }
                 process.exit(1);
             }
         }

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

@@ -22,7 +22,8 @@ function genPkgJSON(opts, pgkVerOverride) {
     // 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, "ts-node": tsNode } = package_json_1.dependencies;
+    const { typescript } = package_json_1.peerDependencies;
+    const { prettier } = package_json_1.devDependencies;
     const data = {
         name,
         version: "0.0.1",
@@ -47,8 +48,8 @@ function genPkgJSON(opts, pgkVerOverride) {
             pepr: pgkVerOverride || `${package_json_1.version}`,
         },
         devDependencies: {
+            prettier,
             typescript,
-            "ts-node": tsNode,
         },
     };
     return {

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

@@ -31,7 +31,7 @@ async function createDir(dir) {
     }
     catch (err) {
         // The directory already exists
-        if (err.code === "EEXIST") {
+        if (err && err.code === "EEXIST") {
             throw new Error(`Directory ${dir} already exists`);
         }
         else {