@eudiplo/cli 7.6.1-main.8bbb627 → 7.6.1-main.b6900cb

package/dist/services/kubectl.js

@@ -0,0 +1,150 @@
+/**
+ * Every kubectl invocation carries an explicit context and namespace so a
+ * command can never fall through to whatever the user's current kubeconfig
+ * happens to point at.
+ */
+function scopeArgs(scope) {
+    return [
+        "--context",
+        scope.context,
+        "--namespace",
+        scope.namespace,
+    ];
+}
+export function resolveScope(instance, instanceName) {
+    if (!instance.context) {
+        throw new Error(`Instance ${instanceName} does not define a Kubernetes context.`);
+    }
+    if (!instance.namespace) {
+        throw new Error(`Instance ${instanceName} does not define a Kubernetes namespace.`);
+    }
+    return { context: instance.context, namespace: instance.namespace };
+}
+/**
+ * Workload names from deployment/k8s/base, used when an instance is registered
+ * without an explicit --workload map.
+ */
+export const defaultWorkloads = {
+    backend: "deployment/eudiplo",
+    client: "deployment/eudiplo-client",
+};
+/**
+ * Resolves a `--service` value against the configured workload map. Refuses
+ * to guess: with several workloads configured and no service named, the
+ * caller has to be explicit.
+ */
+export function resolveWorkload(instance, service) {
+    const workloads = instance.workloads ?? {};
+    const names = Object.keys(workloads).sort();
+    if (names.length === 0) {
+        throw new Error("No workloads are configured for this instance. Add them with: eudiplo instance add --workload <service>=<kind>/<name>");
+    }
+    if (service === undefined) {
+        if (names.length === 1) {
+            return workloads[names[0]];
+        }
+        throw new Error(`Several workloads are configured (${names.join(", ")}). Name one with --service.`);
+    }
+    const workload = workloads[service];
+    if (!workload) {
+        throw new Error(`Unknown service ${service}. Configured services: ${names.join(", ")}.`);
+    }
+    return workload;
+}
+export function resolveWorkloads(instance, service) {
+    if (service !== undefined) {
+        return [resolveWorkload(instance, service)];
+    }
+    const workloads = instance.workloads ?? {};
+    return Object.keys(workloads)
+        .sort()
+        .map((name) => workloads[name]);
+}
+export function buildGetPodsArgs(scope) {
+    return ["get", "pods", ...scopeArgs(scope), "--output", "wide"];
+}
+export function buildGetWorkloadArgs(scope, workload) {
+    return ["get", workload, ...scopeArgs(scope), "--output", "json"];
+}
+export function buildLogsArgs(scope, workload, options = {}) {
+    const args = ["logs", workload, ...scopeArgs(scope)];
+    if (options.follow === true) {
+        args.push("--follow");
+    }
+    if (options.tail !== undefined) {
+        args.push("--tail", String(options.tail));
+    }
+    return args;
+}
+export function buildRestartArgs(scope, workload) {
+    return ["rollout", "restart", workload, ...scopeArgs(scope)];
+}
+export function buildRolloutStatusArgs(scope, workload) {
+    return ["rollout", "status", workload, ...scopeArgs(scope)];
+}
+export function buildCanIArgs(scope, verb, resource) {
+    return ["auth", "can-i", verb, resource, ...scopeArgs(scope)];
+}
+/**
+ * EndpointSlice rather than Endpoints: the v1 Endpoints API is deprecated from
+ * Kubernetes 1.33 and reading it makes the API server emit a deprecation
+ * warning on every call.
+ */
+export function buildGetEndpointSlicesArgs(scope) {
+    return ["get", "endpointslices", ...scopeArgs(scope), "--output", "json"];
+}
+const dns1123Label = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/;
+const workloadReference = /^[a-z][a-z0-9.-]*\/[a-z0-9]([a-z0-9.-]*[a-z0-9])?$/;
+/**
+ * Namespaces are DNS-1123 labels, which cannot start with a hyphen. Checking
+ * the shape here means a configured value can never be read by kubectl as a
+ * flag rather than as an argument.
+ */
+export function assertNamespace(value, label) {
+    if (!dns1123Label.test(value) || value.length > 63) {
+        throw new Error(`${label} must be a lowercase DNS-1123 label (letters, digits and hyphens, not starting or ending with a hyphen).`);
+    }
+}
+/**
+ * Context names are freer-form than namespaces, so this only rules out the
+ * shapes that would be ambiguous on a command line.
+ */
+export function assertContextName(value, label) {
+    if (value.length === 0 || value.startsWith("-") || /\s/.test(value)) {
+        throw new Error(`${label} must not be empty, start with a hyphen or contain whitespace.`);
+    }
+}
+export function assertWorkloadReference(value, label) {
+    if (!workloadReference.test(value)) {
+        throw new Error(`${label} must be a workload reference of the form <kind>/<name>, for example deployment/eudiplo.`);
+    }
+}
+/**
+ * Parses `backend=deployment/eudiplo,client=deployment/eudiplo-client` into a
+ * workload map, validating each reference as it goes.
+ */
+export function parseWorkloadMap(value) {
+    const workloads = {};
+    for (const entry of value.split(",")) {
+        const trimmed = entry.trim();
+        if (trimmed.length === 0) {
+            continue;
+        }
+        const separator = trimmed.indexOf("=");
+        if (separator <= 0) {
+            throw new Error(`Workload ${trimmed} must be given as <service>=<kind>/<name>.`);
+        }
+        const service = trimmed.slice(0, separator).trim();
+        const reference = trimmed.slice(separator + 1).trim();
+        if (Object.hasOwn(workloads, service)) {
+            throw new Error(`Workload ${service} was given more than once.`);
+        }
+        assertWorkloadReference(reference, `Workload ${service}`);
+        workloads[service] = reference;
+    }
+    if (Object.keys(workloads).length === 0) {
+        throw new Error("At least one workload must be given.");
+    }
+    return workloads;
+}
+//# sourceMappingURL=kubectl.js.map

package/dist/services/kubectl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kubectl.js","sourceRoot":"","sources":["../../src/services/kubectl.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-export type DeploymentTarget = "compose" | "external";
+export type DeploymentTarget = "compose" | "external" | "kubernetes";
 type CliInstallationMethod = "npm" | "standalone";
 export interface InstanceConfig {
     target: DeploymentTarget;
@@ -10,6 +10,10 @@ export interface InstanceConfig {
     envFile?: string;
     projectName?: string;
     projectDirectory?: string;
+    context?: string;
+    namespace?: string;
+    workloads?: Record<string, string>;
+    readOnly?: boolean;
 }
 export interface CliConfig {
     defaultInstance?: string;
@@ -29,14 +33,23 @@ export interface DriverCommandOptions {
     instanceName: string;
     instance: InstanceConfig;
     args: string[];
+    flags: Record<string, string | boolean>;
     context: CommandContext;
 }
+export type CheckStatus = "pass" | "warn" | "fail";
+export interface DoctorCheck {
+    name: string;
+    status: CheckStatus;
+    message: string;
+}
 export interface DeploymentDriver {
     target: DeploymentTarget;
-    diagnostics(instance: InstanceConfig, context: CommandContext): Promise<string[]>;
+    diagnostics(instance: InstanceConfig, context: CommandContext): Promise<DoctorCheck[]>;
     up?(options: DriverCommandOptions): Promise<number>;
     down?(options: DriverCommandOptions): Promise<number>;
     logs?(options: DriverCommandOptions): Promise<number>;
+    ps?(options: DriverCommandOptions): Promise<number>;
+    restart?(options: DriverCommandOptions): Promise<number>;
 }
 export interface ParsedArgs {
     command?: string;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,UAAU,CAAC;AACtD,KAAK,qBAAqB,GAAG,KAAK,GAAG,YAAY,CAAC;AAElD,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,gBAAgB,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,SAAS;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,cAAc;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,kBAAkB,CAAC,EAAE,qBAAqB,CAAC;IAC3C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1C,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1C,KAAK,EAAE,OAAO,KAAK,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,cAAc,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,gBAAgB,CAAC;IACzB,WAAW,CACP,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,cAAc,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrB,EAAE,CAAC,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,IAAI,CAAC,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,IAAI,CAAC,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,UAAU;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;CAC3C"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eudiplo/cli",
-    "version": "7.6.1-main.8bbb627",
+    "version": "7.6.1-main.b6900cb",
     "description": "Deployment-aware command line tools for EUDIPLO",
     "private": false,
     "type": "module",
@@ -49,6 +49,7 @@
         "access": "public"
     },
     "dependencies": {
+        "@eudiplo/config-format": "workspace:*",
         "ajv": "^8.20.0",
         "ajv-formats": "^3.0.1",
         "commander": "^15.0.0",
@@ -56,7 +57,7 @@
         "jsonc-parser": "^3.3.1"
     },
     "devDependencies": {
-        "@biomejs/biome": "2.5.12",
+        "@biomejs/biome": "2.5.13",
         "@types/node": "^26.4.0",
         "esbuild": "^0.28.2",
         "tsx": "^4.23.13",

package/templates/demo-config/attribute-providers/claims-provider.json

@@ -1,9 +1,15 @@
 {
+  "$schema": "https://eudiplo.dev/schemas/v1/AttributeProviderConfigFile.schema.json",
+  "metadata": {
+    "generation": 1
+  },
+  "spec": {
     "id": "claims-provider",
     "name": "Claims Provider",
     "description": "Provides dynamic claim values during credential issuance",
     "url": "${ATTRIBUTE_PROVIDER_URL:http://localhost:8787}",
     "auth": {
-        "type": "none"
+      "type": "none"
     }
-}
+  }
+}

package/templates/demo-config/clients/presentation-test.json

@@ -1,9 +1,15 @@
 {
+  "$schema": "https://eudiplo.dev/schemas/v1/ClientConfigFile.schema.json",
+  "metadata": {
+    "generation": 1
+  },
+  "spec": {
     "clientId": "presentation-test",
     "secret": "${PRESENTATION_TEST_CLIENT_SECRET:presentation-test-secret}",
     "description": "Load test client for OID4VP presentation scenarios",
     "roles": [
-        "presentation:request",
-        "presentation:manage"
+      "presentation:request",
+      "presentation:manage"
     ]
+  }
 }

package/templates/demo-config/clients/test.json

@@ -1,12 +1,18 @@
 {
+  "$schema": "https://eudiplo.dev/schemas/v1/ClientConfigFile.schema.json",
+  "metadata": {
+    "generation": 1
+  },
+  "spec": {
     "clientId": "test-client",
     "secret": "${TEST_CLIENT_SECRET:test-client-secret}",
     "description": "Test client",
     "roles": [
-        "clients:manage",
-        "issuance:offer",
-        "issuance:manage",
-        "presentation:request",
-        "presentation:manage"
+      "clients:manage",
+      "issuance:offer",
+      "issuance:manage",
+      "presentation:request",
+      "presentation:manage"
     ]
-}
+  }
+}

package/templates/demo-config/info.json

@@ -1,4 +1,10 @@
 {
+  "$schema": "https://eudiplo.dev/schemas/v1/TenantConfigFile.schema.json",
+  "metadata": {
+    "generation": 1
+  },
+  "spec": {
     "name": "Demo Tenant",
     "description": "The demo tenant for the EUDI Wallet"
-}
+  }
+}

package/templates/demo-config/issuance/credentials/citizen.json

@@ -1,41 +1,47 @@
 {
-  "id": "citizen",
-  "description": "Citizen issuance with IAE flow",
-  "config": {
-    "format": "dc+sd-jwt",
-    "display": [
+  "$schema": "https://eudiplo.dev/schemas/v1/CredentialConfigFile.schema.json",
+  "metadata": {
+    "generation": 1
+  },
+  "spec": {
+    "id": "citizen",
+    "description": "Citizen issuance with IAE flow",
+    "config": {
+      "format": "dc+sd-jwt",
+      "display": [
+        {
+          "name": "Citizen Pass",
+          "background_color": "#FFFFFF",
+          "background_image": {
+            "uri": "credential.png"
+          },
+          "description": "A pass for this citizen",
+          "locale": "en-US",
+          "text_color": "#000000"
+        }
+      ]
+    },
+    "iaeActions": [
+      {
+        "type": "openid4vp_presentation",
+        "presentationConfigId": "pid",
+        "label": "KYC process"
+      }
+    ],
+    "vct": {
+      "name": "Citizen",
+      "description": "This is our development version of the education credential. Don't panic."
+    },
+    "fields": [
       {
-        "name": "Citizen Pass",
-        "background_color": "#FFFFFF",
-        "background_image": {
-          "uri": "credential.png"
-        },
-        "description": "A pass for this citizen",
-        "locale": "en-US",
-        "text_color": "#000000"
+        "path": [
+          "town"
+        ],
+        "type": "string",
+        "defaultValue": "BERLIN",
+        "mandatory": true,
+        "disclosable": false
       }
     ]
-  },
-  "iaeActions": [
-    {
-      "type": "openid4vp_presentation",
-      "presentationConfigId": "pid",
-      "label": "KYC process"
-    }
-  ],
-  "vct": {
-    "name": "Citizen",
-    "description": "This is our development version of the education credential. Don't panic."
-  },
-  "fields": [
-    {
-      "path": [
-        "town"
-      ],
-      "type": "string",
-      "defaultValue": "BERLIN",
-      "mandatory": true,
-      "disclosable": false
-    }
-  ]
-}
+  }
+}