@crossdelta/infrastructure 0.6.1 → 0.6.3

package/dist/index.cjs

@@ -970,21 +970,26 @@ var resolveStreams = (definitions, policies = {}, defaults = DEFAULT_POLICY) =>
 var generateSetupScript = (streams) => {
   const streamCommands = streams.map((s) => {
     const subjects = s.subjects.join(",");
-    const args = [
+    const addArgs = [
       `--retention ${s.retention}`,
       `--storage ${s.storage}`,
       `--max-age ${s.maxAge}`,
       `--replicas ${s.replicas}`,
       `--max-msg-size ${s.maxMsgSize}`
     ].join(" ");
+    const editArgs = [
+      `--max-age ${s.maxAge}`,
+      `--replicas ${s.replicas}`,
+      `--max-msg-size ${s.maxMsgSize}`
+    ].join(" ");
     return [
       `echo "Processing stream: ${s.stream} (${subjects})"`,
       `if nats $NATS_OPTS stream info "${s.stream}" > /dev/null 2>&1; then`,
       `  echo "  Updating existing stream..."`,
-      `  nats $NATS_OPTS stream edit "${s.stream}" --subjects "${subjects}" ${args} --force`,
+      `  nats $NATS_OPTS stream edit "${s.stream}" --subjects "${subjects}" ${editArgs} --force`,
       `else`,
       `  echo "  Creating new stream..."`,
-      `  nats $NATS_OPTS stream add "${s.stream}" --subjects "${subjects}" ${args} --defaults`,
+      `  nats $NATS_OPTS stream add "${s.stream}" --subjects "${subjects}" ${addArgs} --defaults`,
       `fi`,
       `echo "  ✅ ${s.stream} ready"`,
       ``
@@ -1172,6 +1177,26 @@ function createVPC(config) {
 // lib/runtimes/doks/workloads.ts
 var k8s6 = __toESM(require("@pulumi/kubernetes"));
 var pulumi6 = __toESM(require("@pulumi/pulumi"));
+
+// lib/runtimes/doks/probes.ts
+var buildProbe = (path, port, config) => path ? { ...config, httpGet: { path, port } } : { ...config, tcpSocket: { port } };
+var buildHealthProbes = (healthCheck, primaryPort, defaults) => {
+  const probeConfig = {
+    initialDelaySeconds: healthCheck.initialDelaySeconds ?? defaults.initialDelaySeconds,
+    periodSeconds: healthCheck.periodSeconds ?? defaults.periodSeconds,
+    failureThreshold: healthCheck.failureThreshold ?? defaults.failureThreshold,
+    successThreshold: healthCheck.successThreshold ?? defaults.successThreshold,
+    timeoutSeconds: healthCheck.timeoutSeconds ?? defaults.timeoutSeconds
+  };
+  const port = healthCheck.port ?? primaryPort;
+  const readinessPath = healthCheck.readinessPath ?? healthCheck.httpPath;
+  return {
+    livenessProbe: buildProbe(healthCheck.httpPath, port, probeConfig),
+    readinessProbe: buildProbe(readinessPath, port, probeConfig)
+  };
+};
+
+// lib/runtimes/doks/workloads.ts
 var normalizeK8sConfig = (config) => {
   if (config.ports) {
     return config;
@@ -1290,24 +1315,11 @@ var createServiceVolumes = (provider, namespace, config, labels) => {
   }));
   return { pvcs, volumeMounts, volumes };
 };
-var buildHealthProbes = (config) => {
+var buildHealthProbes2 = (config) => {
   if (!config.healthCheck) {
     return {};
   }
-  const { healthCheck } = config;
-  const probeConfig = {
-    initialDelaySeconds: healthCheck.initialDelaySeconds ?? DEFAULTS.healthCheck.initialDelaySeconds,
-    periodSeconds: healthCheck.periodSeconds ?? DEFAULTS.healthCheck.periodSeconds,
-    failureThreshold: healthCheck.failureThreshold ?? DEFAULTS.healthCheck.failureThreshold,
-    successThreshold: healthCheck.successThreshold ?? DEFAULTS.healthCheck.successThreshold,
-    timeoutSeconds: healthCheck.timeoutSeconds ?? DEFAULTS.healthCheck.timeoutSeconds
-  };
-  const port = healthCheck.port ?? config.ports.primary.port;
-  const probe = healthCheck.httpPath ? { httpGet: { path: healthCheck.httpPath, port } } : { tcpSocket: { port } };
-  return {
-    livenessProbe: { ...probeConfig, ...probe },
-    readinessProbe: { ...probeConfig, ...probe }
-  };
+  return buildHealthProbes(config.healthCheck, config.ports.primary.port, DEFAULTS.healthCheck);
 };
 var buildContainerPorts = (config) => {
   const normalizeProtocol = (protocol) => protocol === "HTTP" || protocol === "HTTPS" || protocol === "GRPC" ? "TCP" : protocol ?? "TCP";
@@ -1406,7 +1418,7 @@ var deployK8sService = (provider, namespace, config) => {
   const secret = createServiceSecret(provider, namespace, normalizedConfig, labels);
   const envVars = buildEnvVars(normalizedConfig);
   const { pvcs, volumeMounts, volumes } = createServiceVolumes(provider, namespace, normalizedConfig, labels);
-  const { livenessProbe, readinessProbe } = buildHealthProbes(normalizedConfig);
+  const { livenessProbe, readinessProbe } = buildHealthProbes2(normalizedConfig);
   const containerPorts = buildContainerPorts(normalizedConfig);
   const servicePorts = buildServicePorts(normalizedConfig);
   const deployment = new k8s6.apps.v1.Deployment(`${normalizedConfig.name}-deployment`, {

package/dist/index.js

@@ -876,21 +876,26 @@ var resolveStreams = (definitions, policies = {}, defaults = DEFAULT_POLICY) =>
 var generateSetupScript = (streams) => {
   const streamCommands = streams.map((s) => {
     const subjects = s.subjects.join(",");
-    const args = [
+    const addArgs = [
       `--retention ${s.retention}`,
       `--storage ${s.storage}`,
       `--max-age ${s.maxAge}`,
       `--replicas ${s.replicas}`,
       `--max-msg-size ${s.maxMsgSize}`
     ].join(" ");
+    const editArgs = [
+      `--max-age ${s.maxAge}`,
+      `--replicas ${s.replicas}`,
+      `--max-msg-size ${s.maxMsgSize}`
+    ].join(" ");
     return [
       `echo "Processing stream: ${s.stream} (${subjects})"`,
       `if nats $NATS_OPTS stream info "${s.stream}" > /dev/null 2>&1; then`,
       `  echo "  Updating existing stream..."`,
-      `  nats $NATS_OPTS stream edit "${s.stream}" --subjects "${subjects}" ${args} --force`,
+      `  nats $NATS_OPTS stream edit "${s.stream}" --subjects "${subjects}" ${editArgs} --force`,
       `else`,
       `  echo "  Creating new stream..."`,
-      `  nats $NATS_OPTS stream add "${s.stream}" --subjects "${subjects}" ${args} --defaults`,
+      `  nats $NATS_OPTS stream add "${s.stream}" --subjects "${subjects}" ${addArgs} --defaults`,
       `fi`,
       `echo "  ✅ ${s.stream} ready"`,
       ``
@@ -1078,6 +1083,26 @@ function createVPC(config) {
 // lib/runtimes/doks/workloads.ts
 import * as k8s6 from "@pulumi/kubernetes";
 import * as pulumi6 from "@pulumi/pulumi";
+
+// lib/runtimes/doks/probes.ts
+var buildProbe = (path, port, config) => path ? { ...config, httpGet: { path, port } } : { ...config, tcpSocket: { port } };
+var buildHealthProbes = (healthCheck, primaryPort, defaults) => {
+  const probeConfig = {
+    initialDelaySeconds: healthCheck.initialDelaySeconds ?? defaults.initialDelaySeconds,
+    periodSeconds: healthCheck.periodSeconds ?? defaults.periodSeconds,
+    failureThreshold: healthCheck.failureThreshold ?? defaults.failureThreshold,
+    successThreshold: healthCheck.successThreshold ?? defaults.successThreshold,
+    timeoutSeconds: healthCheck.timeoutSeconds ?? defaults.timeoutSeconds
+  };
+  const port = healthCheck.port ?? primaryPort;
+  const readinessPath = healthCheck.readinessPath ?? healthCheck.httpPath;
+  return {
+    livenessProbe: buildProbe(healthCheck.httpPath, port, probeConfig),
+    readinessProbe: buildProbe(readinessPath, port, probeConfig)
+  };
+};
+
+// lib/runtimes/doks/workloads.ts
 var normalizeK8sConfig = (config) => {
   if (config.ports) {
     return config;
@@ -1196,24 +1221,11 @@ var createServiceVolumes = (provider, namespace, config, labels) => {
   }));
   return { pvcs, volumeMounts, volumes };
 };
-var buildHealthProbes = (config) => {
+var buildHealthProbes2 = (config) => {
   if (!config.healthCheck) {
     return {};
   }
-  const { healthCheck } = config;
-  const probeConfig = {
-    initialDelaySeconds: healthCheck.initialDelaySeconds ?? DEFAULTS.healthCheck.initialDelaySeconds,
-    periodSeconds: healthCheck.periodSeconds ?? DEFAULTS.healthCheck.periodSeconds,
-    failureThreshold: healthCheck.failureThreshold ?? DEFAULTS.healthCheck.failureThreshold,
-    successThreshold: healthCheck.successThreshold ?? DEFAULTS.healthCheck.successThreshold,
-    timeoutSeconds: healthCheck.timeoutSeconds ?? DEFAULTS.healthCheck.timeoutSeconds
-  };
-  const port = healthCheck.port ?? config.ports.primary.port;
-  const probe = healthCheck.httpPath ? { httpGet: { path: healthCheck.httpPath, port } } : { tcpSocket: { port } };
-  return {
-    livenessProbe: { ...probeConfig, ...probe },
-    readinessProbe: { ...probeConfig, ...probe }
-  };
+  return buildHealthProbes(config.healthCheck, config.ports.primary.port, DEFAULTS.healthCheck);
 };
 var buildContainerPorts = (config) => {
   const normalizeProtocol = (protocol) => protocol === "HTTP" || protocol === "HTTPS" || protocol === "GRPC" ? "TCP" : protocol ?? "TCP";
@@ -1312,7 +1324,7 @@ var deployK8sService = (provider, namespace, config) => {
   const secret = createServiceSecret(provider, namespace, normalizedConfig, labels);
   const envVars = buildEnvVars(normalizedConfig);
   const { pvcs, volumeMounts, volumes } = createServiceVolumes(provider, namespace, normalizedConfig, labels);
-  const { livenessProbe, readinessProbe } = buildHealthProbes(normalizedConfig);
+  const { livenessProbe, readinessProbe } = buildHealthProbes2(normalizedConfig);
   const containerPorts = buildContainerPorts(normalizedConfig);
   const servicePorts = buildServicePorts(normalizedConfig);
   const deployment = new k8s6.apps.v1.Deployment(`${normalizedConfig.name}-deployment`, {

package/dist/runtimes/doks/probes.d.ts

@@ -0,0 +1,32 @@
+import type { K8sHealthCheck } from './types';
+export interface ProbeHttp {
+    httpGet: {
+        path: string;
+        port: number;
+    };
+}
+export interface ProbeTcp {
+    tcpSocket: {
+        port: number;
+    };
+}
+export interface ProbeConfig {
+    initialDelaySeconds: number;
+    periodSeconds: number;
+    failureThreshold: number;
+    successThreshold: number;
+    timeoutSeconds: number;
+}
+export type Probe = ProbeConfig & (ProbeHttp | ProbeTcp);
+export interface HealthProbes {
+    livenessProbe?: Probe;
+    readinessProbe?: Probe;
+}
+/**
+ * Builds liveness and readiness probes from a service health check config.
+ *
+ * - `httpPath` → liveness probe
+ * - `readinessPath` → readiness probe (falls back to `httpPath` when omitted)
+ * - Neither → tcpSocket probe on the primary port
+ */
+export declare const buildHealthProbes: (healthCheck: K8sHealthCheck, primaryPort: number, defaults: ProbeConfig) => HealthProbes;

package/dist/runtimes/doks/types.d.ts

@@ -96,8 +96,10 @@ export interface K8sResourceConfig {
  * Health check configuration for Kubernetes probes.
  */
 export interface K8sHealthCheck {
-    /** HTTP path for health check (e.g., '/health') */
+    /** HTTP path for liveness probe (e.g., '/health') */
     httpPath?: string;
+    /** HTTP path for readiness probe — if omitted, falls back to httpPath (e.g., '/health/ready') */
+    readinessPath?: string;
     /** Port for health check (defaults to containerPort) */
     port?: number;
     /** Initial delay before starting probes in seconds (default: 10) */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crossdelta/infrastructure",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "type": "module",
   "license": "MIT",
   "publishConfig": {