pepr 0.52.2 → 0.52.3-nightly.1

package/src/cli/monitor.ts

@@ -81,7 +81,7 @@ export function getK8sLogFromKubeConfig(): K8sLog {
   return new K8sLog(kc);
 }
 
-function createLogStream(): stream.PassThrough {
+export function createLogStream(): stream.PassThrough {
   const logStream = new stream.PassThrough();
 
   logStream.on("data", async chunk => {
@@ -97,7 +97,7 @@ function createLogStream(): stream.PassThrough {
   return logStream;
 }
 
-function processLogLine(line: string): void {
+export function processLogLine(line: string): void {
   try {
     const payload: LogPayload = JSON.parse(line.trim());
     const isMutate = payload.res.patchType || payload.res.warnings;

package/src/cli/types.ts

@@ -1,3 +1,29 @@
+import { BuildResult, BuildOptions } from "esbuild";
 import { Answers } from "prompts";
+import { ModuleConfig } from "../lib/types";
 
 export type InitOptions = Answers<"name" | "description" | "errorBehavior" | "uuid">;
+
+export type Reloader = (opts: BuildResult<BuildOptions>) => void | Promise<void>;
+
+export type PeprConfig = Omit<ModuleConfig, keyof PeprNestedFields> & {
+  pepr: PeprNestedFields & {
+    includedFiles: string[];
+  };
+  description: string;
+  version: string;
+};
+
+type PeprNestedFields = Pick<
+  ModuleConfig,
+  | "uuid"
+  | "onError"
+  | "webhookTimeout"
+  | "customLabels"
+  | "alwaysIgnore"
+  | "env"
+  | "rbac"
+  | "rbacMode"
+> & {
+  peprVersion: string;
+};

package/src/cli/uuid.ts

@@ -13,12 +13,11 @@ export default function (program: Command): void {
       const deployments = await getPeprDeploymentsByUUID(uuid);
       const uuidTable = buildUUIDTable(deployments);
 
-      console.log("UUID\t\tDescription");
-      console.log("--------------------------------------------");
-
-      Object.entries(uuidTable).forEach(([uuid, description]) => {
-        console.log(`${uuid}\t${description}`);
-      });
+      const uuidTableEntries = Object.entries(uuidTable).map(([uuid, description]) => ({
+        UUID: uuid,
+        Description: description,
+      }));
+      console.table(uuidTableEntries);
     });
 }
 

package/src/lib/assets/assets.ts

@@ -27,7 +27,7 @@ import { storeRole, storeRoleBinding, clusterRoleBinding, serviceAccount } from
 import { tlsSecret, apiPathSecret } from "./networking";
 import { WebhookType } from "../enums";
 import { kind } from "kubernetes-fluent-client";
-
+import Log from "../telemetry/logger";
 export function norWatchOrAdmission(capabilities: CapabilityExport[]): boolean {
   return !isAdmission(capabilities) && !isWatcher(capabilities);
 }
@@ -134,6 +134,10 @@ export class Assets {
     imagePullSecret?: string,
   ): Promise<string> => {
     this.capabilities = await loadCapabilities(this.path);
+    this.capabilities.flatMap(capability => {
+      Log.info(`Module ${this.config.uuid} has capability: ${capability.name}`);
+      Log.info(`Registered Pepr Capability "${capability.name}"`);
+    });
     // give error if namespaces are not respected
     for (const capability of this.capabilities) {
       // until deployment, Pepr does not distinguish between watch and admission

package/src/lib/assets/deploy.ts

@@ -100,7 +100,7 @@ export async function deployWebhook(
   // Create the validating webhook configuration if it is needed
   await handleWebhookConfiguration(assets, WebhookType.VALIDATE, webhookTimeout, force);
 
-  Log.info("Applying the Pepr Store CRD if it doesn't exist");
+  Log.debug("Applying the Pepr Store CRD if it doesn't exist");
   await K8s(kind.CustomResourceDefinition).Apply(peprStoreCRD, { force });
 
   if (assets.host) return; // Skip resource deployment if a host is already specified

package/src/lib/assets/environment.ts

@@ -1,6 +1,13 @@
 import { V1EnvVar } from "@kubernetes/client-node";
 import { ModuleConfig } from "../types";
 
+export function getLogLevel(config: ModuleConfig): string {
+  const fromEnv = process.env.LOG_LEVEL;
+  if (fromEnv) {
+    return fromEnv;
+  }
+  return config.logLevel || "info";
+}
 export function genEnv(
   config: ModuleConfig,
   watchMode = false,
@@ -8,7 +15,7 @@ export function genEnv(
 ): V1EnvVar[] {
   const noWatchDef = {
     PEPR_PRETTY_LOG: "false",
-    LOG_LEVEL: config.logLevel || "info",
+    LOG_LEVEL: getLogLevel(config),
   };
 
   const def = {

package/src/lib/assets/loader.ts

@@ -26,12 +26,6 @@ export function loadCapabilities(path: string): Promise<CapabilityExport[]> {
     program.on("message", message => {
       // Cast the message to the ModuleCapabilities type
       const capabilities = message.valueOf() as CapabilityExport[];
-
-      // Iterate through the capabilities and generate the rules
-      for (const capability of capabilities) {
-        console.info(`Registered Pepr Capability "${capability.name}"`);
-      }
-
       resolve(capabilities);
     });
 

package/src/lib/assets/webhooks.ts

@@ -12,7 +12,6 @@ import { resolveIgnoreNamespaces } from "./ignoredNamespaces";
 import { Assets } from "./assets";
 import { Event, WebhookType } from "../enums";
 import { Binding } from "../types";
-import Log from "../telemetry/logger";
 
 export const peprIgnoreNamespaces: string[] = ["kube-system", "pepr-system"];
 
@@ -47,15 +46,13 @@ export async function generateWebhookRules(
   assets: Assets,
   isMutateWebhook: boolean,
 ): Promise<V1RuleWithOperations[]> {
-  const { config, capabilities } = assets;
+  const { capabilities } = assets;
 
-  const rules = capabilities.flatMap(capability => {
-    Log.info(`Module ${config.uuid} has capability: ${capability.name}`);
-
-    return capability.bindings
+  const rules = capabilities.flatMap(capability =>
+    capability.bindings
       .map(binding => validateRule(binding, isMutateWebhook))
-      .filter((rule): rule is V1RuleWithOperations => !!rule);
-  });
+      .filter((rule): rule is V1RuleWithOperations => !!rule),
+  );
 
   return uniqWith(equals, rules);
 }

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

@@ -23,7 +23,7 @@ type services = {
   watch: V1Service | null;
 };
 
-export function pushControllerManifests(
+function pushControllerManifests(
   resources: KubernetesObject[],
   deployments: deployments,
   services: services,

package/src/lib/controller/index.ts

@@ -57,10 +57,10 @@ export class Controller {
       if (typeof onReady === "function") {
         onReady();
       }
-      Log.info("✅ Controller startup complete");
+      Log.debug("Controller startup complete");
       // Initialize the schedule store for each capability
       new StoreController(capabilities, `pepr-${config.uuid}-schedule`, () => {
-        Log.info("✅ Scheduling processed");
+        Log.debug("Scheduling processed");
       });
     });
 
@@ -112,7 +112,7 @@ export class Controller {
 
     // Handle server listening event
     server.on("listening", () => {
-      Log.info(`Server listening on port ${port}`);
+      Log.debug(`Server listening on port ${port}`);
       // Track that the server is running
       this.#running = true;
     });

package/src/lib/controller/store.ts

@@ -138,7 +138,7 @@ export class StoreController {
   };
 
   #createStoreResource = async (e: unknown): Promise<void> => {
-    Log.info(`Pepr store not found, creating...`);
+    Log.debug(`Pepr store not found, creating...`);
     Log.debug(e);
 
     try {

package/src/lib/core/capability.ts

@@ -133,7 +133,7 @@ export class Capability implements CapabilityExport {
     this.#namespaces = cfg.namespaces;
     this.hasSchedule = false;
 
-    Log.info(`Capability ${this.#name} registered`);
+    Log.debug(`Capability ${this.#name} registered`);
     Log.debug(cfg);
   }
 
@@ -141,7 +141,7 @@ export class Capability implements CapabilityExport {
    * Register the store with the capability. This is called automatically by the Pepr controller.
    */
   registerScheduleStore = (): Storage => {
-    Log.info(`Registering schedule store for ${this.#name}`);
+    Log.debug(`Registering schedule store for ${this.#name}`);
 
     if (this.#scheduleRegistered) {
       throw new Error(`Schedule store already registered for ${this.#name}`);
@@ -159,7 +159,7 @@ export class Capability implements CapabilityExport {
    * @param store
    */
   registerStore = (): Storage => {
-    Log.info(`Registering store for ${this.#name}`);
+    Log.debug(`Registering store for ${this.#name}`);
 
     if (this.#registered) {
       throw new Error(`Store already registered for ${this.#name}`);

package/src/lib/core/storage.ts

@@ -6,7 +6,7 @@ import pointer from "json-pointer";
 export type DataOp = "add" | "remove";
 export type DataStore = Record<string, string>;
 export type DataSender = (op: DataOp, keys: string[], value?: string) => void;
-export type DataReceiver = (data: DataStore) => void;
+type DataReceiver = (data: DataStore) => void;
 export type Unsubscribe = () => void;
 
 const MAX_WAIT_TIME = 15000;

package/src/lib/filter/adjudicators/binding.ts

@@ -74,7 +74,8 @@ export const definedCategory = (binding: Partial<Binding>): string => {
 
   return Object.keys(categories).find(key => categories[key]) || "";
 };
-export type DefinedCallbackReturnType =
+
+type DefinedCallbackReturnType =
   | FinalizeAction<GenericClass, InstanceType<GenericClass>>
   | WatchLogAction<GenericClass, InstanceType<GenericClass>>
   | MutateAction<GenericClass, InstanceType<GenericClass>>

package/src/lib/filter/adjudicators/kubernetesObject.ts

@@ -4,7 +4,7 @@
 import { __, allPass, complement, defaultTo, equals, length, gt, not, nthArg, pipe } from "ramda";
 import { KubernetesObject } from "kubernetes-fluent-client";
 
-export const carriesDeletionTimestamp = pipe(
+const carriesDeletionTimestamp = pipe(
   kubernetesObject => !!kubernetesObject.metadata?.deletionTimestamp,
   defaultTo(false),
 );

package/src/lib/processors/mutate-processor.ts

@@ -30,7 +30,7 @@ export interface Bindable {
   actMeta: Record<string, string>;
 }
 
-export interface Result {
+interface Result {
   wrapped: PeprMutateRequest<KubernetesObject>;
   response: MutateResponse;
 }

package/src/lib/types.ts

@@ -68,10 +68,6 @@ export type WhenSelector<T extends GenericClass> = {
   /** Register an action to be executed when a Kubernetes resource is deleted. */
   IsDeleted: () => BindingAll<T>;
 };
-export interface RegExpFilter {
-  obj: RegExp;
-  source: string;
-}
 
 export type Filters = {
   annotations: Record<string, string>;

package/src/runtime/controller.ts

@@ -18,16 +18,12 @@ function runModule(expectedHash: string): void {
   const gzPath = `/app/load/module-${expectedHash}.js.gz`;
   const jsPath = `/app/module-${expectedHash}.js`;
 
-  // Set the log level
-  Log.level = "info";
-
   // Check if the path is a valid file
   if (!fs.existsSync(gzPath)) {
     throw new Error(`File not found: ${gzPath}`);
   }
-
   try {
-    Log.info(`Loading module ${gzPath}`);
+    Log.debug(`Loading module ${gzPath}`);
 
     // Extract the code from the file
     const codeGZ = fs.readFileSync(gzPath);
@@ -42,8 +38,7 @@ function runModule(expectedHash: string): void {
     if (!crypto.timingSafeEqual(Buffer.from(expectedHash, "hex"), Buffer.from(actualHash, "hex"))) {
       throw new Error(`File hash does not match, expected ${expectedHash} but got ${actualHash}`);
     }
-
-    Log.info(`File hash matches, running module`);
+    Log.debug(`File hash matches, running module`);
 
     // Write the code to a file
     fs.writeFileSync(jsPath, code);
@@ -55,13 +50,10 @@ function runModule(expectedHash: string): void {
   }
 }
 
-Log.info(`Pepr Controller (v${version})`);
-
-const hash = process.argv[2];
-
-const startup = async (): Promise<void> => {
+export const startup = async (hash: string): Promise<void> => {
   try {
-    Log.info("Applying the Pepr Store CRD if it doesn't exist");
+    Log.debug(`Pepr Controller (v${version})`);
+    Log.debug("Applying the Pepr Store CRD if it doesn't exist");
     await K8s(kind.CustomResourceDefinition).Apply(peprStoreCRD, { force: true });
 
     validateHash(hash);
@@ -72,4 +64,6 @@ const startup = async (): Promise<void> => {
   }
 };
 
-startup().catch(err => Log.error(err, `Error starting Pepr Controller`));
+// Start the controller
+const hash = process.argv[2];
+startup(hash).catch(err => Log.error(err, `Error starting Pepr Controller`));

package/dist/cli/build.d.ts

@@ -1,34 +0,0 @@
-import { BuildContext, BuildOptions, BuildResult } from "esbuild";
-import { Command } from "commander";
-import { ModuleConfig } from "../lib/types";
-export type Reloader = (opts: BuildResult<BuildOptions>) => void | Promise<void>;
-export type PeprNestedFields = Pick<ModuleConfig, "uuid" | "onError" | "webhookTimeout" | "customLabels" | "alwaysIgnore" | "env" | "rbac" | "rbacMode"> & {
-    peprVersion: string;
-};
-export type PeprConfig = Omit<ModuleConfig, keyof PeprNestedFields> & {
-    pepr: PeprNestedFields & {
-        includedFiles: string[];
-    };
-    description: string;
-    version: string;
-};
-type LoadModuleReturn = {
-    cfg: PeprConfig;
-    entryPointPath: string;
-    modulePath: string;
-    name: string;
-    path: string;
-    uuid: string;
-};
-type BuildModuleReturn = {
-    ctx: BuildContext<BuildOptions>;
-    path: string;
-    cfg: PeprConfig;
-    uuid: string;
-};
-export default function (program: Command): void;
-export declare function loadModule(entryPoint?: string): Promise<LoadModuleReturn>;
-export declare function buildModule(reloader?: Reloader, entryPoint?: string, embed?: boolean): Promise<BuildModuleReturn | void>;
-export declare function checkFormat(): Promise<void>;
-export {};
-//# sourceMappingURL=build.d.ts.map

package/dist/cli/build.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAmB,MAAM,SAAS,CAAC;AAKnF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAc5C,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,YAAY,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACjF,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,YAAY,EACV,MAAM,GACN,SAAS,GACT,gBAAgB,GAChB,cAAc,GACd,cAAc,GACd,KAAK,GACL,MAAM,GACN,UAAU,CACb,GAAG;IACF,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,gBAAgB,CAAC,GAAG;IACpE,IAAI,EAAE,gBAAgB,GAAG;QACvB,aAAa,EAAE,MAAM,EAAE,CAAC;KACzB,CAAC;IACF,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,GAAG,EAAE,UAAU,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,GAAG,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,UAAU,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,OAAO,GAAG,IAAI,CA8H/C;AAWD,wBAAsB,UAAU,CAAC,UAAU,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAuC/E;AAED,wBAAsB,WAAW,CAC/B,QAAQ,CAAC,EAAE,QAAQ,EACnB,UAAU,SAAS,EACnB,KAAK,UAAO,GACX,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAwEnC;AA6CD,wBAAsB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CASjD"}

package/dist/cli/build.helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"build.helpers.d.ts","sourceRoot":"","sources":["../../src/cli/build.helpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAW,YAAY,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAc9C,UAAU,YAAY;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AACD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAe9D;AAED,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,YAAY,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACjF;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,EAC3B,GAAG,EAAE;IAAE,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACnC,MAAM,CAaR;AAED;;;;GAIG;AAEH,wBAAsB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS9E;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAI/F;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAStE;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAQf;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAQjF;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAC7B,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAarC;AAED,wBAAsB,0BAA0B,CAAC,GAAG,EAAE;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,IAAI,CAAC,CAiChB"}

package/dist/cli/deploy.d.ts

@@ -1,21 +0,0 @@
-import { CapabilityExport } from "../lib/types";
-import { Assets } from "../lib/assets/assets";
-import { Command } from "commander";
-export interface ImagePullSecretDetails {
-    pullSecret?: string;
-    dockerServer?: string;
-    dockerUsername?: string;
-    dockerEmail?: string;
-    dockerPassword?: string;
-}
-export declare function validateImagePullSecretDetails(details: ImagePullSecretDetails): {
-    valid: boolean;
-    error?: string;
-};
-export type ValidatedImagePullSecretDetails = Required<ImagePullSecretDetails>;
-export declare function getUserConfirmation(opts: {
-    yes: boolean;
-}): Promise<boolean>;
-export default function (program: Command): void;
-export declare function validateNamespaces(capability: CapabilityExport, webhook: Assets): void;
-//# sourceMappingURL=deploy.d.ts.map

package/dist/cli/deploy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cli/deploy.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,sBAAsB,GAAG;IAC/E,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAmCA;AAED,MAAM,MAAM,+BAA+B,GAAG,QAAQ,CAAC,sBAAsB,CAAC,CAAC;AAkB/E,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAalF;AAkCD,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,OAAO,GAAG,IAAI,CA8B/C;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAQtF"}