cribl-control-plane 0.5.0-beta.13 → 0.5.0-beta.14

package/src/models/collectorscript.ts

@@ -6,76 +6,24 @@ import * as z from "zod/v3";
 import { safeParse } from "../lib/schemas.js";
 import { Result as SafeParseResult } from "../types/fp.js";
 import { SDKValidationError } from "./errors/sdkvalidationerror.js";
+import {
+  ScriptCollectorConf,
+  ScriptCollectorConf$inboundSchema,
+  ScriptCollectorConf$Outbound,
+  ScriptCollectorConf$outboundSchema,
+} from "./scriptcollectorconf.js";
 
-export type EnvVar = {
-  /**
-   * Environment variable name
-   */
-  name: string;
-  /**
-   * JavaScript expression to compute environment variable's value, enclosed in quotes or backticks. (Can evaluate to a constant.)
-   */
-  value: string;
-};
-
+/**
+ * Script collector configuration
+ */
 export type CollectorScript = {
   /**
-   * Collector type: script
+   * Collector type
    */
   type: "script";
-  /**
-   * Script to discover what to collect. Should output one task per line in stdout.
-   */
-  discoverScript: string;
-  /**
-   * Script to run to perform data collections. Task passed in as $CRIBL_COLLECT_ARG. Should output results to stdout.
-   */
-  collectScript: string;
-  /**
-   * Shell to use to execute scripts.
-   */
-  shell?: string | undefined;
-  /**
-   * Environment variables to expose to the discover and collect scripts.
-   */
-  envVars?: Array<EnvVar> | undefined;
+  conf: ScriptCollectorConf;
 };
 
-/** @internal */
-export const EnvVar$inboundSchema: z.ZodType<EnvVar, z.ZodTypeDef, unknown> = z
-  .object({
-    name: z.string(),
-    value: z.string(),
-  });
-/** @internal */
-export type EnvVar$Outbound = {
-  name: string;
-  value: string;
-};
-
-/** @internal */
-export const EnvVar$outboundSchema: z.ZodType<
-  EnvVar$Outbound,
-  z.ZodTypeDef,
-  EnvVar
-> = z.object({
-  name: z.string(),
-  value: z.string(),
-});
-
-export function envVarToJSON(envVar: EnvVar): string {
-  return JSON.stringify(EnvVar$outboundSchema.parse(envVar));
-}
-export function envVarFromJSON(
-  jsonString: string,
-): SafeParseResult<EnvVar, SDKValidationError> {
-  return safeParse(
-    jsonString,
-    (x) => EnvVar$inboundSchema.parse(JSON.parse(x)),
-    `Failed to parse 'EnvVar' from JSON`,
-  );
-}
-
 /** @internal */
 export const CollectorScript$inboundSchema: z.ZodType<
   CollectorScript,
@@ -83,18 +31,12 @@ export const CollectorScript$inboundSchema: z.ZodType<
   unknown
 > = z.object({
   type: z.literal("script"),
-  discoverScript: z.string(),
-  collectScript: z.string(),
-  shell: z.string().default("/bin/bash"),
-  envVars: z.array(z.lazy(() => EnvVar$inboundSchema)).optional(),
+  conf: ScriptCollectorConf$inboundSchema,
 });
 /** @internal */
 export type CollectorScript$Outbound = {
   type: "script";
-  discoverScript: string;
-  collectScript: string;
-  shell: string;
-  envVars?: Array<EnvVar$Outbound> | undefined;
+  conf: ScriptCollectorConf$Outbound;
 };
 
 /** @internal */
@@ -104,10 +46,7 @@ export const CollectorScript$outboundSchema: z.ZodType<
   CollectorScript
 > = z.object({
   type: z.literal("script"),
-  discoverScript: z.string(),
-  collectScript: z.string(),
-  shell: z.string().default("/bin/bash"),
-  envVars: z.array(z.lazy(() => EnvVar$outboundSchema)).optional(),
+  conf: ScriptCollectorConf$outboundSchema,
 });
 
 export function collectorScriptToJSON(