pepr 0.52.0 → 0.52.1-nightly.1

package/dist/controller.js

@@ -50,7 +50,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" }, files: ["/dist", "/src", "!src/**/*.test.ts", "!src/fixtures/**", "!dist/**/*.test.d.ts*"], version: "0.52.0", main: "dist/lib.js", types: "dist/lib.d.ts", scripts: { build: "tsc -p config/tsconfig.root.json && node build.mjs && npm pack", "build:image": "npm run build && docker buildx build --output type=docker --tag pepr:dev .", "build:image:unicorn": "npm run build && docker buildx build --output type=docker --tag pepr/private:dev $(node scripts/read-unicorn-build-args.mjs) .", ci: "npm ci", "format:check": "npm run format:src && npm run format:tests && npm run format:markdown && npm run format:integration && npm run format:prettier -- --check", "format:fix": "npm run format:src -- --fix && npm run format:markdown -- --fix && npm run format:integration -- --fix && npm run format:prettier -- --write", "format:integration": "eslint --config config/eslint.integration.config.mjs integration/cli integration/helpers", "format:markdown": 'npx -y markdownlint-cli --config config/.markdownlint.json --ignore adr --ignore integration/testroot --ignore pepr-test-module --ignore node_modules "**/*.md"', "format:prettier": "prettier --config config/.prettierrc src integration/cli/**/*.ts integration/helpers/**/*.ts", "format:src": "eslint --config config/eslint.root.config.mjs 'src/**/*.ts' --ignore-pattern '**/*.test.ts' --ignore-pattern 'src/templates/**'", "format:tests": "eslint --config config/eslint.test.config.mjs 'src/**/*.test.ts'", "gen-data-json": "node hack/build-template-data.js", prebuild: "rm -fr dist/* && npm run gen-data-json", prepare: `if [ "$NODE_ENV" != 'production' ]; then husky; fi`, "set:version": "node scripts/set-version.js", test: "npm run test:unit && npm run test:journey && npm run test:journey-wasm", "test:artifacts": "npm run build && vitest run src/build-artifact.test.ts", "test:docs": "vitest run --config=config/vitest.integration.config.ts integration/cli/docs/*.test.ts", "test:integration": "npm run test:integration:prep && npm run test:integration:run", "test:integration:prep": "./integration/prep.sh", "test:integration:run": "vitest run --config=config/vitest.integration.config.ts integration", "test:journey": "npm run test:journey:k3d && npm run build && npm run test:journey:image && npm run test:journey:run", "test:journey-wasm": "npm run test:journey:k3d && npm run build && npm run test:journey:image && npm run test:journey:run-wasm", "test:journey-wasm:unicorn": "npm run test:journey:k3d && npm run build && npm run test:journey:image:unicorn && npm run test:journey:run-wasm", "test:journey:image": "npm run build && docker buildx build --output type=docker --tag pepr:dev . && k3d image import pepr:dev -c pepr-dev", "test:journey:image:unicorn": "npm run build && docker buildx build --output type=docker --tag pepr/private:dev $(node scripts/read-unicorn-build-args.mjs) . && k3d image import pepr/private:dev -c pepr-dev", "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:run": "vitest run --config=config/vitest.journey.config.ts journey/entrypoint.test.ts", "test:journey:run-wasm": "vitest run --config=config/vitest.journey.config.ts journey/entrypoint-wasm.test.ts", "test:journey:unicorn": "npm run test:journey:k3d && npm run test:journey:image:unicorn && npm run test:journey:run", "test:unit": "npm run gen-data-json && NODE_OPTIONS=--no-deprecation vitest --config config/vitest.root.config.ts run --coverage", "test:upgrade:unicorn": "npm run test:journey:k3d && npm run test:journey:image:unicorn && vitest run integration/cluster/upgrade.test.ts", "test:upgrade:upstream": "npm run test:journey:k3d && npm run test:journey:image && vitest run integration/cluster/upgrade.test.ts" }, dependencies: { "@types/ramda": "0.30.2", commander: "14.0.0", express: "5.1.0", "fast-json-patch": "3.1.1", heredoc: "^1.3.1", "http-status-codes": "^2.3.0", "json-pointer": "^0.6.2", "kubernetes-fluent-client": "3.8.1", pino: "9.7.0", "pino-pretty": "13.0.0", "prom-client": "15.1.3", ramda: "0.31.3", sigstore: "3.1.0", "ts-morph": "^26.0.0" }, devDependencies: { "@commitlint/cli": "19.8.1", "@commitlint/config-conventional": "19.8.1", "@fast-check/vitest": "^0.2.1", "@types/eslint": "9.6.1", "@types/express": "5.0.3", "@types/json-pointer": "^1.0.34", "@types/node": "24.x.x", "@types/node-forge": "1.3.13", "@types/uuid": "10.0.0", "@types/ws": "^8.18.1", "@vitest/coverage-v8": "^3.2.3", "fast-check": "^4.0.0", globals: "^16.0.0", husky: "^9.1.6", "js-yaml": "^4.1.0", shellcheck: "^3.0.0", tsx: "^4.20.3", undici: "^7.0.1", vitest: "^3.2.3" }, overrides: { glob: "^9.0.0" }, peerDependencies: { "@types/prompts": "2.4.9", "@typescript-eslint/eslint-plugin": "8.33.0", "@typescript-eslint/parser": "8.33.0", esbuild: "0.25.5", eslint: "^9.26.0", "node-forge": "1.3.1", prettier: "3.5.3", prompts: "2.4.2", typescript: "5.8.3", uuid: "11.1.0" } };
+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" }, files: ["/dist", "/src", "!src/**/*.test.ts", "!src/fixtures/**", "!dist/**/*.test.d.ts*"], version: "0.52.1-nightly.1", main: "dist/lib.js", types: "dist/lib.d.ts", scripts: { build: "tsc -p config/tsconfig.root.json && node build.mjs && npm pack", "build:image": "npm run build && docker buildx build --output type=docker --tag pepr:dev .", "build:image:unicorn": "npm run build && docker buildx build --output type=docker --tag pepr/private:dev $(node scripts/read-unicorn-build-args.mjs) .", ci: "npm ci", "format:check": "npm run format:src && npm run format:tests && npm run format:markdown && npm run format:integration && npm run format:prettier -- --check", "format:fix": "npm run format:src -- --fix && npm run format:markdown -- --fix && npm run format:integration -- --fix && npm run format:prettier -- --write", "format:integration": "eslint --config config/eslint.integration.config.mjs integration/cli integration/helpers", "format:markdown": 'npx -y markdownlint-cli --config config/.markdownlint.json --ignore adr --ignore integration/testroot --ignore pepr-test-module --ignore node_modules "**/*.md"', "format:prettier": "prettier --config config/.prettierrc src integration/cli/**/*.ts integration/helpers/**/*.ts", "format:src": "eslint --config config/eslint.root.config.mjs 'src/**/*.ts' --ignore-pattern '**/*.test.ts' --ignore-pattern 'src/templates/**'", "format:tests": "eslint --config config/eslint.test.config.mjs 'src/**/*.test.ts'", "gen-data-json": "node hack/build-template-data.js", prebuild: "rm -fr dist/* && npm run gen-data-json", prepare: `if [ "$NODE_ENV" != 'production' ]; then husky; fi`, "set:version": "node scripts/set-version.js", test: "npm run test:unit && npm run test:journey && npm run test:journey-wasm", "test:artifacts": "npm run build && vitest run src/build-artifact.test.ts", "test:docs": "vitest run --config=config/vitest.integration.config.ts integration/cli/docs/*.test.ts", "test:integration": "npm run test:integration:prep && npm run test:integration:run", "test:integration:prep": "./integration/prep.sh", "test:integration:run": "vitest run --config=config/vitest.integration.config.ts integration", "test:journey": "npm run test:journey:k3d && npm run build && npm run test:journey:image && npm run test:journey:run", "test:journey-wasm": "npm run test:journey:k3d && npm run build && npm run test:journey:image && npm run test:journey:run-wasm", "test:journey-wasm:unicorn": "npm run test:journey:k3d && npm run build && npm run test:journey:image:unicorn && npm run test:journey:run-wasm", "test:journey:image": "npm run build && docker buildx build --output type=docker --tag pepr:dev . && k3d image import pepr:dev -c pepr-dev", "test:journey:image:unicorn": "npm run build && docker buildx build --output type=docker --tag pepr/private:dev $(node scripts/read-unicorn-build-args.mjs) . && k3d image import pepr/private:dev -c pepr-dev", "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:run": "vitest run --config=config/vitest.journey.config.ts journey/entrypoint.test.ts", "test:journey:run-wasm": "vitest run --config=config/vitest.journey.config.ts journey/entrypoint-wasm.test.ts", "test:journey:unicorn": "npm run test:journey:k3d && npm run test:journey:image:unicorn && npm run test:journey:run", "test:unit": "npm run gen-data-json && NODE_OPTIONS=--no-deprecation vitest --config config/vitest.root.config.ts run --coverage", "test:upgrade:unicorn": "npm run test:journey:k3d && npm run test:journey:image:unicorn && vitest run integration/cluster/upgrade.test.ts", "test:upgrade:upstream": "npm run test:journey:k3d && npm run test:journey:image && vitest run integration/cluster/upgrade.test.ts" }, dependencies: { "@types/ramda": "0.30.2", commander: "14.0.0", express: "5.1.0", "fast-json-patch": "3.1.1", heredoc: "^1.3.1", "http-status-codes": "^2.3.0", "json-pointer": "^0.6.2", "kubernetes-fluent-client": "3.9.0", pino: "9.7.0", "pino-pretty": "13.0.0", "prom-client": "15.1.3", ramda: "0.31.3", sigstore: "3.1.0", "ts-morph": "^26.0.0" }, devDependencies: { "@commitlint/cli": "19.8.1", "@commitlint/config-conventional": "19.8.1", "@fast-check/vitest": "^0.2.1", "@types/eslint": "9.6.1", "@types/express": "5.0.3", "@types/json-pointer": "^1.0.34", "@types/node": "24.x.x", "@types/node-forge": "1.3.13", "@types/uuid": "10.0.0", "@types/ws": "^8.18.1", "@vitest/coverage-v8": "^3.2.3", "fast-check": "^4.0.0", globals: "^16.0.0", husky: "^9.1.6", "js-yaml": "^4.1.0", shellcheck: "^3.0.0", tsx: "^4.20.3", undici: "^7.0.1", vitest: "^3.2.3" }, overrides: { glob: "^9.0.0" }, peerDependencies: { "@types/prompts": "2.4.9", "@typescript-eslint/eslint-plugin": "8.33.0", "@typescript-eslint/parser": "8.33.0", esbuild: "0.25.5", eslint: "^9.26.0", "node-forge": "1.3.1", prettier: "3.5.3", prompts: "2.4.2", typescript: "5.8.3", uuid: "11.1.0" } };
 
 // src/lib/k8s.ts
 var import_kubernetes_fluent_client = require("kubernetes-fluent-client");

package/dist/lib/assets/helm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helm.d.ts","sourceRoot":"","sources":["../../../src/lib/assets/helm.ts"],"names":[],"mappings":"AAGA,KAAK,cAAc,GAAG,WAAW,GAAG,SAAS,CAAC;AAE9C,wBAAgB,mBAAmB,IAAI,MAAM,CAY5C;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAe1C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CA2BpE;AAED,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM,CAgG1F;AAED,wBAAgB,uBAAuB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM,CAoH5F;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM,CA0BjF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM,CAoB1E"}
+{"version":3,"file":"helm.d.ts","sourceRoot":"","sources":["../../../src/lib/assets/helm.ts"],"names":[],"mappings":"AAGA,KAAK,cAAc,GAAG,WAAW,GAAG,SAAS,CAAC;AAE9C,wBAAgB,mBAAmB,IAAI,MAAM,CAY5C;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAe1C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CA2BpE;AAED,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM,CAmG1F;AAED,wBAAgB,uBAAuB,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM,CAuH5F;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM,CA0BjF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM,CAoB1E"}

package/dist/lib/assets/yaml/overridesFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overridesFile.d.ts","sourceRoot":"","sources":["../../../../src/lib/assets/yaml/overridesFile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAK7D,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,gBAAgB,EAAE,CAAC;IACjC,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,wBAAsB,aAAa,CACjC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,cAAc,EACpE,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EAAE,EAC1B,cAAc,GAAE;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAuC,GAC5F,OAAO,CAAC,IAAI,CAAC,CAkKf"}
+{"version":3,"file":"overridesFile.d.ts","sourceRoot":"","sources":["../../../../src/lib/assets/yaml/overridesFile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAK7D,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,gBAAgB,EAAE,CAAC;IACjC,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,wBAAsB,aAAa,CACjC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,cAAc,EACpE,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EAAE,EAC1B,cAAc,GAAE;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAuC,GAC5F,OAAO,CAAC,IAAI,CAAC,CAoKf"}

package/package.json

@@ -16,7 +16,7 @@
     "!src/fixtures/**",
     "!dist/**/*.test.d.ts*"
   ],
-  "version": "0.52.0",
+  "version": "0.52.1-nightly.1",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
   "scripts": {
@@ -62,7 +62,7 @@
     "heredoc": "^1.3.1",
     "http-status-codes": "^2.3.0",
     "json-pointer": "^0.6.2",
-    "kubernetes-fluent-client": "3.8.1",
+    "kubernetes-fluent-client": "3.9.0",
     "pino": "9.7.0",
     "pino-pretty": "13.0.0",
     "prom-client": "15.1.3",
@@ -106,4 +106,4 @@
     "typescript": "5.8.3",
     "uuid": "11.1.0"
   }
-}
+}

package/src/cli/crd/{create.ts → create/createCRDscaffold.ts}

@@ -1,44 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Pepr Authors
 
-import { Command, Option } from "commander";
-import { createDirectoryIfNotExists } from "../../lib/filesystemService";
-import { promises as fs } from "fs";
-import path from "path";
-
-// Scaffolds a new CRD TypeScript definition
-const create = new Command("create")
-  .description("Create a new CRD TypeScript definition")
-  .addOption(
-    new Option(
-      "-S, --scope <scope>",
-      "Whether the resulting custom resource is cluster- or namespace-scoped",
-    )
-      .choices(["Namespaced", "Cluster"])
-      .default("Namespaced"),
-  )
-  .option("-d, --domain <domain>", "Optional domain for CRD (e.g. pepr.dev)", "pepr.dev")
-  .requiredOption("-g, --group <group>", "API group (e.g. cache)")
-  .requiredOption("-k, --kind <kind>", "Kind name (e.g. memcached)")
-  .option("-p, --plural <plural>", "Plural name for CRD (e.g. memcacheds)")
-  .requiredOption("-s, --short-name <name>", "Short name for CRD (e.g. mc)", "")
-  .requiredOption("-v, --version <version>", "API version (e.g. v1alpha1)")
-  .action(async ({ group, version, kind, domain, scope, plural, shortName }) => {
-    console.log("This feature is currently in alpha.");
-    const outputDir = path.resolve(`./api/${version}`);
-    await createDirectoryIfNotExists(outputDir);
-
-    // create file in directory with kind
-    await fs.writeFile(
-      `./api/${version}/${kind.toLowerCase()}_types.ts`,
-      generateCRDScaffold(group, version, kind, { domain, scope, plural, shortName }),
-    );
-    console.log(`✔ Created ${kind} TypeScript definition in ${outputDir}`);
-  });
-
-export default create;
-
-export const generateCRDScaffold = (
+export const createCRDscaffold = (
   group: string,
   version: string,
   kind: string,

package/src/cli/crd/create/index.ts

@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023-Present The Pepr Authors
+
+import { Command, Option } from "commander";
+import { createDirectoryIfNotExists } from "../../../lib/filesystemService";
+import { promises as fs } from "fs";
+import Log from "../../../lib/telemetry/logger";
+import { createCRDscaffold } from "./createCRDscaffold";
+import path from "path";
+
+// Scaffolds a new CRD TypeScript definition
+export default function (): Command {
+  return new Command("create")
+    .description("Create a new CRD TypeScript definition")
+    .addOption(
+      new Option(
+        "-S, --scope <scope>",
+        "Whether the resulting custom resource is cluster- or namespace-scoped",
+      )
+        .choices(["Namespaced", "Cluster"])
+        .default("Namespaced"),
+    )
+    .option("-d, --domain <domain>", "Optional domain for CRD (e.g. pepr.dev)", "pepr.dev")
+    .requiredOption("-g, --group <group>", "API group (e.g. cache)")
+    .requiredOption("-k, --kind <kind>", "Kind name (e.g. memcached)")
+    .option("-p, --plural <plural>", "Plural name for CRD (e.g. memcacheds)")
+    .requiredOption("-s, --short-name <name>", "Short name for CRD (e.g. mc)")
+    .requiredOption("-v, --version <version>", "API version (e.g. v1alpha1)")
+    .action(async ({ group, version, kind, domain, scope, plural, shortName }) => {
+      Log.warn("This feature is currently in alpha.");
+      const outputDir = path.resolve(`./api/${version}`);
+      await createDirectoryIfNotExists(outputDir);
+
+      // create file in directory with kind
+      await fs.writeFile(
+        `./api/${version}/${kind.toLowerCase()}_types.ts`,
+        createCRDscaffold(group, version, kind, { domain, scope, plural, shortName }),
+      );
+      Log.info(`✔ Created ${kind} TypeScript definition in ${outputDir}`);
+    });
+}

package/src/cli/crd/{generate.ts → generate/generators.ts}

@@ -1,10 +1,6 @@
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-FileCopyrightText: 2023-Present The Pepr Authors
-
-import { Command } from "commander";
 import fs from "fs";
 import path from "path";
-import Log from "../../lib/telemetry/logger";
+import Log from "../../../lib/telemetry/logger";
 import { stringify } from "yaml";
 import {
   Project,
@@ -15,18 +11,11 @@ import {
   SourceFile,
   Type,
 } from "ts-morph";
-import { createDirectoryIfNotExists } from "../../lib/filesystemService";
+import { createDirectoryIfNotExists } from "../../../lib/filesystemService";
 import { kind as k } from "kubernetes-fluent-client";
 import { V1JSONSchemaProps } from "@kubernetes/client-node";
 import { WarningMessages, ErrorMessages } from "./messages";
 
-export default new Command("generate")
-  .description(
-    "Generate CRD manifests from TypeScript definitions stored in 'api/' of the current directory.",
-  )
-  .option("-o, --output <directory>", "Output directory for generated CRDs", "./crds")
-  .action(generateCRDs);
-
 export function extractCRDDetails(
   content: string,
   sourceFile: SourceFile,

package/src/cli/crd/generate/index.ts

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023-Present The Pepr Authors
+
+import { Command } from "commander";
+import { generateCRDs } from "./generators";
+
+export default function (): Command {
+  return new Command("generate")
+    .description(
+      "Generate CRD manifests from TypeScript definitions stored in 'api/' of the current directory.",
+    )
+    .option("-o, --output <directory>", "Output directory for generated CRDs", "./crds")
+    .action(options => generateCRDs(options));
+}

package/src/cli/crd/{messages.ts → generate/messages.ts}

@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023-Present The Pepr Authors
+
 export const ErrorMessages = {
   MISSING_DETAILS: "Missing 'details' variable declaration.",
   INVALID_SCOPE: (scope: string): string =>

package/src/cli/crd/index.ts

@@ -2,14 +2,12 @@
 // SPDX-FileCopyrightText: 2023-Present The Pepr Authors
 
 import { Command } from "commander";
-import createCmd from "./create";
-import generateCmd from "./generate";
+import generate from "./generate/";
+import create from "./create";
 
-export default function (program: Command): void {
-  const crd = program
-    .command("crd")
-    .description("Scaffold and generate Kubernetes CRDs from structured TypeScript definitions");
-
-  crd.addCommand(createCmd);
-  crd.addCommand(generateCmd);
+export default function (): Command {
+  return new Command("crd")
+    .description("Scaffold and generate Kubernetes CRDs from structured TypeScript definitions")
+    .addCommand(create())
+    .addCommand(generate());
 }

package/src/cli/format/index.ts

@@ -16,7 +16,7 @@ export default function (program: Command): void {
       const success = await peprFormat(opts.validateOnly);
 
       if (success) {
-        console.info("✅ Module formatted");
+        Log.info("Module formatted");
       } else {
         process.exit(1);
       }
@@ -59,8 +59,8 @@ export async function peprFormat(validateOnly: boolean): Promise<boolean> {
       hasFailure = hasFailure || (await formatWithPrettier(results, validateOnly));
 
       return !hasFailure;
-    } catch (e) {
-      console.error(`Error formatting module:`, e);
+    } catch (error) {
+      Log.error(error, `Error formatting module:`);
       return false;
     }
   }

package/src/cli/init/index.ts

@@ -3,7 +3,6 @@
 
 import { execSync } from "child_process";
 import { resolve } from "path";
-import prompts from "prompts";
 
 import { Command } from "commander";
 import {
@@ -28,7 +27,7 @@ import { Option } from "commander";
 
 export default function (program: Command): void {
   let response = {} as PromptOptions;
-  let pkgOverride = "";
+
   program
     .command("init")
     .description("Initialize a new Pepr Module")
@@ -50,26 +49,12 @@ export default function (program: Command): void {
     )
     .option("-y, --yes", "Skip verification prompt when creating a new module.")
     .hook("preAction", async thisCommand => {
-      // TODO: Overrides for testing. Don't be so gross with Node CLI testing
-      // TODO: See pepr/#1140
-      if (process.env.TEST_MODE === "true") {
-        prompts.inject([
-          "pepr-test-module",
-          "A test module for Pepr",
-          "ignore",
-          "static-test",
-          "y",
-        ]);
-        pkgOverride = "file:../pepr-0.0.0-development.tgz";
-        response = await walkthrough();
-      } else {
-        response = await walkthrough(thisCommand.opts());
-        Object.entries(response).map(([key, value]) => thisCommand.setOptionValue(key, value));
-      }
+      response = await walkthrough(thisCommand.opts());
+      Object.entries(response).map(([key, value]) => thisCommand.setOptionValue(key, value));
     })
     .action(async opts => {
       const dirName = sanitizeName(response.name);
-      const packageJSON = genPkgJSON(response, pkgOverride);
+      const packageJSON = genPkgJSON(response);
 
       const confirmed = await confirm(dirName, packageJSON, peprTSTemplate.path, opts.yes);
 

package/src/cli/init/templates.ts

@@ -49,7 +49,7 @@ export type peprPackageJSON = {
   print: string;
 };
 
-export function genPkgJSON(opts: InitOptions, pgkVerOverride?: string): peprPackageJSON {
+export function genPkgJSON(opts: InitOptions): peprPackageJSON {
   // Generate a random UUID for the module based on the module name if it is not provided
   const uuid = !opts.uuid ? uuidv4() : opts.uuid;
   // Generate a name for the module based on the module name
@@ -57,11 +57,6 @@ export function genPkgJSON(opts: InitOptions, pgkVerOverride?: string): peprPack
   // Make typescript a dev dependency
   const { typescript } = peerDependencies;
 
-  const testEnv = {
-    MY_CUSTOM_VAR: "example-value",
-    ZARF_VAR: "###ZARF_VAR_THING###",
-  };
-
   const data = {
     name,
     version: "0.0.1",
@@ -71,7 +66,7 @@ export function genPkgJSON(opts: InitOptions, pgkVerOverride?: string): peprPack
       node: ">=20.0.0",
     },
     pepr: {
-      uuid: pgkVerOverride ? "static-test" : uuid,
+      uuid: uuid,
       onError: opts.errorBehavior,
       webhookTimeout: 10,
       customLabels: {
@@ -93,13 +88,13 @@ export function genPkgJSON(opts: InitOptions, pgkVerOverride?: string): peprPack
         },
       },
       includedFiles: [],
-      env: pgkVerOverride ? testEnv : {},
+      env: {},
     },
     scripts: {
       "k3d-setup": scripts["test:journey:k3d"],
     },
     dependencies: {
-      pepr: pgkVerOverride || version,
+      pepr: version,
       undici: "^7.0.1",
     },
     devDependencies: {

package/src/cli/uuid.ts

@@ -10,29 +10,8 @@ export default function (program: Command): void {
     .command("uuid [uuid]")
     .description("Module UUID(s) currently deployed in the cluster")
     .action(async uuid => {
-      const uuidTable: Record<string, string> = {};
-      let deployments: KubernetesListObject<kind.Deployment>;
-
-      if (!uuid) {
-        deployments = await K8s(kind.Deployment)
-          .InNamespace("pepr-system")
-          .WithLabel("pepr.dev/uuid")
-          .Get();
-      } else {
-        deployments = await K8s(kind.Deployment)
-          .InNamespace("pepr-system")
-          .WithLabel("pepr.dev/uuid", uuid)
-          .Get();
-      }
-
-      // Populate the uuidTable with the UUID and description
-      deployments.items.map(deploy => {
-        const uuid = deploy.metadata?.labels?.["pepr.dev/uuid"] || "";
-        const description = deploy.metadata?.annotations?.["pepr.dev/description"] || "";
-        if (uuid !== "") {
-          uuidTable[uuid] = description;
-        }
-      });
+      const deployments = await getPeprDeploymentsByUUID(uuid);
+      const uuidTable = buildUUIDTable(deployments);
 
       console.log("UUID\t\tDescription");
       console.log("--------------------------------------------");
@@ -42,3 +21,41 @@ export default function (program: Command): void {
       });
     });
 }
+
+export async function getPeprDeploymentsByUUID(
+  uuid?: string,
+): Promise<KubernetesListObject<kind.Deployment>> {
+  const k8sQuery = K8s(kind.Deployment).InNamespace("pepr-system");
+
+  let deployments = uuid
+    ? await k8sQuery.WithLabel("pepr.dev/uuid", uuid).Get()
+    : await k8sQuery.WithLabel("pepr.dev/uuid").Get();
+
+  if (uuid) {
+    deployments = {
+      ...deployments,
+      items: deployments.items.filter(
+        deploy => deploy.metadata?.labels?.["pepr.dev/uuid"] === uuid,
+      ),
+    };
+  }
+
+  return deployments;
+}
+
+export function buildUUIDTable(
+  deployments: KubernetesListObject<kind.Deployment>,
+): Record<string, string> {
+  const uuidTable: Record<string, string> = {};
+
+  deployments.items.forEach(deploy => {
+    const uuid = deploy.metadata?.labels?.["pepr.dev/uuid"] || "";
+    const description = deploy.metadata?.annotations?.["pepr.dev/description"] || "";
+
+    if (uuid !== "") {
+      uuidTable[uuid] = description;
+    }
+  });
+
+  return uuidTable;
+}

package/src/cli.ts

@@ -29,6 +29,7 @@ program
   .enablePositionalOptions()
   .version(version)
   .description(`Pepr (v${version}) - Type safe K8s middleware for humans`)
+  .addCommand(crd())
   .action(() => {
     if (program.args.length < 1) {
       console.log(banner);
@@ -49,5 +50,4 @@ format(program);
 monitor(program);
 uuid(program);
 kfc(program);
-crd(program);
 program.parse();

package/src/lib/assets/helm.ts

@@ -93,6 +93,9 @@ export function watcherDeployTemplate(buildTimestamp: string, type: ControllerTy
             labels:
               app: {{ .Values.uuid }}-watcher
               pepr.dev/controller: watcher
+              {{- if .Values.watcher.podLabels }}
+              {{- toYaml .Values.watcher.podLabels | nindent 8 }}
+              {{- end }}
           spec:
             terminationGracePeriodSeconds: {{ .Values.watcher.terminationGracePeriodSeconds }}
             serviceAccountName: {{ .Values.uuid }}
@@ -189,6 +192,9 @@ export function admissionDeployTemplate(buildTimestamp: string, type: Controller
             labels:
               app: {{ .Values.uuid }}
               pepr.dev/controller: admission
+              {{- if .Values.admission.podLabels }}
+              {{- toYaml .Values.admission.podLabels | nindent 8 }}
+              {{- end }}
           spec:
             {{- if or .Values.admission.antiAffinity .Values.admission.affinity }}
             affinity:

package/src/lib/assets/yaml/overridesFile.ts

@@ -100,6 +100,7 @@ export async function overridesFile(
         },
       },
       podAnnotations: {},
+      podLabels: {},
       nodeSelector: {},
       tolerations: [],
       extraVolumeMounts: [],
@@ -172,6 +173,7 @@ export async function overridesFile(
       extraVolumes: [],
       affinity: {},
       podAnnotations: {},
+      podLabels: {},
       serviceMonitor: {
         enabled: false,
         labels: {},

package/dist/cli/crd/create.d.ts

@@ -1,10 +0,0 @@
-import { Command } from "commander";
-declare const create: Command;
-export default create;
-export declare const generateCRDScaffold: (group: string, version: string, kind: string, data: {
-    domain: string;
-    plural: string;
-    scope: string;
-    shortName: string;
-}) => string;
-//# sourceMappingURL=create.d.ts.map

package/dist/cli/crd/create.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/cli/crd/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAM5C,QAAA,MAAM,MAAM,SA2BR,CAAC;AAEL,eAAe,MAAM,CAAC;AAEtB,eAAO,MAAM,mBAAmB,GAC9B,OAAO,MAAM,EACb,SAAS,MAAM,EACf,MAAM,MAAM,EACZ,MAAM;IACJ,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,KACA,MA8EF,CAAC"}

package/dist/cli/crd/generate.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/cli/crd/generate.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,OAAO,EACL,OAAO,EACP,oBAAoB,EACpB,oBAAoB,EAEpB,IAAI,EACJ,UAAU,EACV,IAAI,EACL,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,IAAI,IAAI,CAAC,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;;AAG5D,wBAKwB;AAExB,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,GACrB;IACD,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,SAAS,GAAG,YAAY,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAYA;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAe7E;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAExD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,UAAU,EAAE,CAInF;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAChB,IAAI,CAiCN;AAGD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAI3F;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,GAAG,YAAY,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;CACnB,CA2BA;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAQtD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,oBAAoB,GAAG,oBAAoB,GAAG;IACpF,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC9C,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAuBA;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,CAc7D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,iBAAiB,CA0B/D;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,WAAW,IAAI;IAC7B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC9C,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAEA;AAED,UAAU,SAAS;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,GAAG,YAAY,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;IACjD,eAAe,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;CACvD;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,CAAC,CAAC,wBAAwB,CA0DtE"}

package/dist/cli/crd/messages.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/cli/crd/messages.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa;;2BAED,MAAM,KAAG,MAAM;kCAER,MAAM,KAAG,MAAM;CAE9C,CAAC;AAEF,eAAO,MAAM,eAAe;;qCAEO,MAAM,KAAG,MAAM;kCAElB,MAAM,QAAQ,MAAM,KAAG,MAAM;CAE5D,CAAC"}