Merge pull request #8 from harche/update-api-types

OTA-1972: Update API types to match current agentic.openshift.io CRDs

Author: openshift-merge-bot[bot]

Makefile

@@ -0,0 +1,13 @@
+.PHONY: generate-types build test lint
+
+generate-types:
+	python3 hack/generate-types.py
+
+build:
+	yarn build
+
+test:
+	yarn test
+
+lint:
+	yarn lint

hack/generate-types.py

@@ -0,0 +1,172 @@
+#!/usr/bin/env python3
+"""Generate TypeScript types from Kubernetes CRD OpenAPI schemas.
+
+Usage:
+    python3 hack/generate-types.py                         # from live cluster
+    python3 hack/generate-types.py --from-dir crds/        # from local CRD YAML files
+
+Generates src/models/generated/*.ts with TypeScript interfaces matching
+the CRD spec and status schemas.
+"""
+
+import json
+import os
+import subprocess
+import sys
+import textwrap
+from pathlib import Path
+
+CRDS = {
+    "proposals.agentic.openshift.io": "Proposal",
+    "proposalapprovals.agentic.openshift.io": "ProposalApproval",
+    "approvalpolicies.agentic.openshift.io": "ApprovalPolicy",
+    "analysisresults.agentic.openshift.io": "AnalysisResult",
+}
+
+OUT_DIR = Path(__file__).resolve().parent.parent / "src" / "models" / "generated"
+BANNER = "// Auto-generated from CRD — do not edit manually.\n// Regenerate with: make generate-types\n"
+
+
+def extract_from_cluster() -> dict[str, dict]:
+    schemas = {}
+    for crd_name in CRDS:
+        print(f"  Extracting {crd_name}...")
+        result = subprocess.run(
+            ["oc", "get", "crd", crd_name, "-o",
+             "jsonpath={.spec.versions[0].schema.openAPIV3Schema}"],
+            capture_output=True, text=True, check=True,
+        )
+        schemas[crd_name] = json.loads(result.stdout)
+    return schemas
+
+
+def extract_from_dir(d: str) -> dict[str, dict]:
+    import yaml
+    schemas = {}
+    for crd_name in CRDS:
+        for f in Path(d).glob("*.yaml"):
+            with open(f) as fh:
+                doc = yaml.safe_load(fh)
+            if doc and doc.get("metadata", {}).get("name") == crd_name:
+                schemas[crd_name] = doc["spec"]["versions"][0]["schema"]["openAPIV3Schema"]
+                print(f"  {f.name} -> {crd_name}")
+                break
+        else:
+            print(f"  WARNING: {crd_name} not found in {d}")
+    return schemas
+
+
+def schema_to_ts(schema: dict, indent: int = 0) -> str:
+    """Convert an OpenAPI schema object to a TypeScript type string."""
+    pad = "  " * indent
+
+    if "x-kubernetes-preserve-unknown-fields" in schema:
+        return "Record<string, unknown>"
+
+    typ = schema.get("type", "object")
+
+    if "enum" in schema:
+        return " | ".join(f"'{v}'" for v in schema["enum"])
+
+    if typ == "string":
+        fmt = schema.get("format", "")
+        if fmt in ("date-time", "date"):
+            return "string"
+        return "string"
+
+    if typ == "integer":
+        return "number"
+
+    if typ == "number":
+        return "number"
+
+    if typ == "boolean":
+        return "boolean"
+
+    if typ == "array":
+        items = schema.get("items", {})
+        item_type = schema_to_ts(items, indent)
+        return f"({item_type})[]"
+
+    if typ == "object":
+        props = schema.get("properties", {})
+        if not props:
+            additional = schema.get("additionalProperties")
+            if additional and isinstance(additional, dict):
+                val_type = schema_to_ts(additional, indent)
+                return f"Record<string, {val_type}>"
+            return "Record<string, unknown>"
+
+        required = set(schema.get("required", []))
+        lines = ["{"]
+        for name, prop_schema in sorted(props.items()):
+            desc = prop_schema.get("description", "")
+            optional = "?" if name not in required else ""
+            prop_type = schema_to_ts(prop_schema, indent + 1)
+            if desc:
+                short = desc.replace("\n", " ").strip()
+                if len(short) > 100:
+                    short = short[:97] + "..."
+                lines.append(f"{pad}  /** {short} */")
+            lines.append(f"{pad}  {name}{optional}: {prop_type};")
+        lines.append(f"{pad}}}")
+        return "\n".join(lines)
+
+    return "unknown"
+
+
+def generate_one(crd_name: str, type_name: str, schema: dict) -> str:
+    """Generate TypeScript for a single CRD."""
+    lines = [BANNER, ""]
+
+    props = schema.get("properties", {})
+    spec_schema = props.get("spec", {})
+    status_schema = props.get("status", {})
+
+    # Generate Spec type
+    if spec_schema.get("properties"):
+        spec_ts = schema_to_ts(spec_schema, 0)
+        lines.append(f"export type {type_name}Spec = {spec_ts};\n")
+
+    # Generate Status type
+    if status_schema.get("properties"):
+        status_ts = schema_to_ts(status_schema, 0)
+        lines.append(f"export type {type_name}Status = {status_ts};\n")
+
+    # Generate nested types that are reusable (conditions, steps, etc.)
+    # Extract any deeply nested object types that appear in spec or status
+
+    return "\n".join(lines)
+
+
+def main():
+    if len(sys.argv) > 2 and sys.argv[1] == "--from-dir":
+        schemas = extract_from_dir(sys.argv[2])
+    else:
+        print("Extracting CRD schemas from cluster...")
+        schemas = extract_from_cluster()
+
+    OUT_DIR.mkdir(parents=True, exist_ok=True)
+
+    for crd_name, schema in schemas.items():
+        type_name = CRDS[crd_name]
+        out_file = OUT_DIR / f"{crd_name.split('.')[0]}.ts"
+        print(f"  Generating {out_file.name} ({type_name})...")
+
+        ts_code = generate_one(crd_name, type_name, schema)
+        out_file.write_text(ts_code)
+
+    # Barrel export
+    barrel = OUT_DIR / "index.ts"
+    barrel_lines = [BANNER, ""]
+    for crd_name in schemas:
+        base = crd_name.split(".")[0]
+        barrel_lines.append(f"export * from './{base}';")
+    barrel_lines.append("")
+    barrel.write_text("\n".join(barrel_lines))
+
+    print(f"Done. Generated types in {OUT_DIR}")
+
+
+if __name__ == "__main__":
+    main()

locales/en/plugin__cluster-update-console-plugin.json

@@ -1,111 +1,73 @@
 {
-  "{{count}} incompatible with target_one": "{{count}} incompatible with target_one",
-  "{{count}} incompatible with target_other": "{{count}} incompatible with target_other",
-  "{{count}} manual approval_one": "{{count}} manual approval_one",
-  "{{count}} manual approval_other": "{{count}} manual approval_other",
-  "{{count}} pending upgrade_one": "{{count}} pending upgrade_one",
-  "{{count}} pending upgrade_other": "{{count}} pending upgrade_other",
-  "{{passed}}/{{total}} checks passed": "{{passed}}/{{total}} checks passed",
-  "{{passed}}/{{total}} checks passed, {{failures}} failed": "{{passed}}/{{total}} checks passed, {{failures}} failed",
-  "{{passed}}/{{total}} checks passed, {{warnings}} warnings": "{{passed}}/{{total}} checks passed, {{warnings}} warnings",
-  "{{total}} operators managed by OLM": "{{total}} operators managed by OLM",
   "Action failed": "Action failed",
   "Active update plans": "Active update plans",
-  "Activity summary and the current proposed plan - {{channel}} channel": "Activity summary and the current proposed plan - {{channel}} channel",
-  "Affected: {{resources}}": "Affected: {{resources}}",
   "Age": "Age",
-  "Agent target version": "Agent target version",
+  "AI agent is analysing cluster readiness...": "AI agent is analysing cluster readiness...",
   "AI Assessment": "AI Assessment",
-  "AI is analyzing your cluster for upgrade readiness...": "AI is analyzing your cluster for upgrade readiness...",
-  "AI Update Agent": "AI Update Agent",
-  "All Clear": "All Clear",
+  "Analyse": "Analyse",
+  "Analysis data not available.": "Analysis data not available.",
+  "Analysis failed": "Analysis failed",
+  "Analysis result not yet available.": "Analysis result not yet available.",
   "Analyzing": "Analyzing",
-  "API Deprecations": "API Deprecations",
-  "Approval": "Approval",
   "Approve & upgrade": "Approve & upgrade",
   "Awaiting Decision": "Awaiting Decision",
   "Channel": "Channel",
   "Check": "Check",
   "Close": "Close",
-  "Cluster Metrics": "Cluster Metrics",
   "Cluster Update": "Cluster Update",
+  "Compatible": "Compatible",
   "Completed": "Completed",
   "Confirm approve & upgrade": "Confirm approve & upgrade",
   "Confirm reject": "Confirm reject",
-  "CPU utilization": "CPU utilization",
-  "Detail": "Detail",
+  "Details": "Details",
   "Duration": "Duration",
-  "ends {{date}}": "ends {{date}}",
   "Error loading cluster version": "Error loading cluster version",
-  "Estimated Duration": "Estimated Duration",
-  "Estimated Impact": "Estimated Impact",
-  "etcd fsync p99": "etcd fsync p99",
-  "Failed to create plan": "Failed to create plan",
-  "Findings": "Findings",
-  "Findings table": "Findings table",
-  "Generate plan": "Generate plan",
   "Generated": "Generated",
-  "In the OCP 5.0 agent led experience, the update agent proposes plans and drives execution. OpenShift Lightspeed can still run a pre-check on cluster and operator readiness before you approve, so risks and prerequisites stay visible alongside automated planning.": "In the OCP 5.0 agent led experience, the update agent proposes plans and drives execution. OpenShift Lightspeed can still run a pre-check on cluster and operator readiness before you approve, so risks and prerequisites stay visible alongside automated planning.",
+  "Lifecycle": "Lifecycle",
   "Lightspeed proposals unavailable": "Lightspeed proposals unavailable",
   "Loading": "Loading",
-  "Maintenance Details": "Maintenance Details",
-  "Memory utilization": "Memory utilization",
   "Minor": "Minor",
-  "Monitor Command": "Monitor Command",
   "Name": "Name",
+  "No": "No",
   "No active update plans": "No active update plans",
-  "No deprecated APIs in use": "No deprecated APIs in use",
-  "No issues found — all readiness checks passed.": "No issues found — all readiness checks passed.",
-  "No maintenance details available.": "No maintenance details available.",
   "No update history available": "No update history available",
-  "Not reversible": "Not reversible",
-  "OCP Compat": "OCP Compat",
-  "OLM Operator Lifecycle": "OLM Operator Lifecycle",
-  "OLM operators table": "OLM operators table",
+  "No update proposals available.": "No update proposals available.",
+  "OLM operators": "OLM operators",
+  "OLM Operators": "OLM Operators",
   "Operator": "Operator",
   "Pending": "Pending",
   "Phase": "Phase",
-  "Pick a target from your channel (updates AI Assessment), then click Generate plan to build or refresh the proposed update below.": "Pick a target from your channel (updates AI Assessment), then click Generate plan to build or refresh the proposed update below.",
   "Plan ready — approving will start the cluster upgrade. You will be redirected to the cluster settings page to monitor progress.": "Plan ready — approving will start the cluster upgrade. You will be redirected to the cluster settings page to monitor progress.",
-  "Plans Created": "Plans Created",
-  "Pre-check with AI": "Pre-check with AI",
-  "Prerequisites": "Prerequisites",
+  "Prerequisite:": "Prerequisite:",
   "Proposed Update: {{current}}": "Proposed Update: {{current}}",
+  "Re-analyse": "Re-analyse",
+  "Re-analyse failed": "Re-analyse failed",
+  "Readiness checks": "Readiness checks",
   "Readiness Checks": "Readiness Checks",
-  "Readiness data not yet available.": "Readiness data not yet available.",
-  "Ready to proceed": "Ready to proceed",
   "Reject plan": "Reject plan",
-  "Reversibility": "Reversibility",
-  "Reversible": "Reversible",
   "Review available versions, assess operator compatibility, and plan how this cluster version is newer OpenShift releases. Use Updates plan to prepare or start an update, Active update plans for in-flight work, and Update history for completed ones.": "Review available versions, assess operator compatibility, and plan how this cluster version is newer OpenShift releases. Use Updates plan to prepare or start an update, Active update plans for in-flight work, and Update history for completed ones.",
-  "Risk assessment not yet available.": "Risk assessment not yet available.",
-  "Risk Level": "Risk Level",
+  "Sandbox: {{name}}": "Sandbox: {{name}}",
   "Schedule for later": "Schedule for later",
-  "Select a version": "Select a version",
-  "Severity": "Severity",
+  "Select proposal": "Select proposal",
+  "Select Update Path": "Select Update Path",
   "Started": "Started",
+  "Starting analysis — waiting for agent sandbox...": "Starting analysis — waiting for agent sandbox...",
   "Status": "Status",
-  "Support": "Support",
-  "Target version": "Target version",
   "Target Version": "Target Version",
   "Target version {{version}} not found in available updates": "Target version {{version}} not found in available updates",
   "The Lightspeed Proposal CRD is not installed on this cluster. AI-driven update planning features are disabled.": "The Lightspeed Proposal CRD is not installed on this cluster. AI-driven update planning features are disabled.",
   "There are no update plans currently in progress.": "There are no update plans currently in progress.",
   "This cluster has no recorded update history.": "This cluster has no recorded update history.",
   "unknown": "unknown",
+  "Unknown error": "Unknown error",
   "Update": "Update",
   "Update history": "Update history",
+  "Update to {{version}}": "Update to {{version}}",
   "Update Type": "Update Type",
-  "Updates Executed": "Updates Executed",
   "Updates plan": "Updates plan",
-  "Upgrade Command": "Upgrade Command",
-  "upgrade pending": "upgrade pending",
-  "upgrade to {{version}}": "upgrade to {{version}}",
   "Verified": "Verified",
   "Version": "Version",
-  "Version {{version}}, {{count}} available_one": "Version {{version}}, {{count}} available_one",
-  "Version {{version}}, {{count}} available_other": "Version {{version}}, {{count}} available_other",
-  "View etcd pods": "View etcd pods",
-  "View monitoring": "View monitoring",
+  "View pod logs": "View pod logs",
+  "Yes": "Yes",
   "z-stream": "z-stream"
 }