@intentius/chant-lexicon-k8s 0.44.7 → 0.44.8

package/dist/describe-resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"describe-resources.d.ts","sourceRoot":"","sources":["../src/describe-resources.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAwD,MAAM,0BAA0B,CAAC;AAGxH,OAAO,KAAK,EAAa,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAmBvE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CA2CvD;AA4FD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS,CAetE;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,SAAS,GAAG;IAClD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAUA;AAQD,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC,CAAC;IAC9E,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,sFAAsF;IACtF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;;;;;;;;;;;;;OAiBG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,EACjC,OAAO,GAAE,YAAkC,GAC1C,OAAO,CAAC,iBAAiB,CAAC,CA6J5B"}
+{"version":3,"file":"describe-resources.d.ts","sourceRoot":"","sources":["../src/describe-resources.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAwD,MAAM,0BAA0B,CAAC;AAGxH,OAAO,KAAK,EAAa,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAmBvE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,CA2CvD;AA4FD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS,CAuBtE;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,SAAS,GAAG;IAClD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAUA;AAQD,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC,CAAC;IAC9E,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,sFAAsF;IACtF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;;;;;;;;;;;;;OAiBG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,EACjC,OAAO,GAAE,YAAkC,GAC1C,OAAO,CAAC,iBAAiB,CAAC,CA6J5B"}

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "136b0cb515682abbfaf9014b9c8f4384b1c3c37f89556f55cc78c98293ea89e1",
+    "manifest.json": "1f650968faca1af0e095cca8ffae3d53597a3bb14013bec3e528d395e9e09b28",
     "meta.json": "f568fb8a0cbd4adf041baccaa3e1164c2e3c5c0090186236f887f0084f5521a8",
     "types/index.d.ts": "ef2c9df6a4d1ebfbe33f96c094fbbe3fc7909522ea38e086666fbf3c8ac477fd",
     "rules/argo-appset-single-project.ts": "afa9f310753aa2d475f35012b13135b2dfaebed2a35d44edbe185ebc07673674",
@@ -54,5 +54,5 @@
     "skills/chant-k8s-argo.md": "b1a0b826559d8c5033a479c5781efaf650320f0aee4419d8841170bd3393cea5",
     "skills/chant-k8s-flux.md": "9670efc2e9854bd14686b5adeb707396b9030a4dcaee6529b30abf56efe2c50c"
   },
-  "composite": "db6ab2e7d8a2f62551ccd99c0cf23e0eaebf1b48d486c3879cd6f826ece4e87b"
+  "composite": "a7892db10dc02e8e856dcd2b7f1d64fd6f59fd2e1b3997e609f6c519a39f07da"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "k8s",
-  "version": "0.44.7",
+  "version": "0.44.8",
   "chantVersion": ">=0.1.0",
   "namespace": "K8s",
   "intrinsics": [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-k8s",
-  "version": "0.44.7",
+  "version": "0.44.8",
   "description": "Kubernetes lexicon for chant — declarative IaC in TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -76,7 +76,7 @@
     "@types/js-yaml": "^4.0.9"
   },
   "optionalDependencies": {
-    "@intentius/chant-k8s-client": "^0.44.7"
+    "@intentius/chant-k8s-client": "^0.44.8"
   },
   "devDependencies": {
     "@intentius/chant": "*",
@@ -84,7 +84,7 @@
   },
   "peerDependencies": {
     "zod": "^4.3.6",
-    "@intentius/chant": "^0.44.7",
+    "@intentius/chant": "^0.44.8",
     "typescript": "^5.9.3"
   }
 }

package/src/describe-resources.test.ts

@@ -657,7 +657,7 @@ describe("k8s describeResources", () => {
         cluster.connector,
       );
 
-      const child = result.resources["prod/backup-29157"];
+      const child = result.resources["Job/prod/backup-29157"];
       expect(child).toMatchObject({
         type: "K8s::Batch::Job",
         physicalId: "job-uid",
@@ -683,7 +683,7 @@ describe("k8s describeResources", () => {
         cluster.connector,
       );
 
-      expect(result.resources["prod/hand-made"]).toBeUndefined();
+      expect(result.resources["Job/prod/hand-made"]).toBeUndefined();
     });
 
     // The issue's own estate: a declared MicroVMReplicaSet whose operator
@@ -730,7 +730,7 @@ describe("k8s describeResources", () => {
         cluster.connector,
       );
 
-      expect(result.resources["microvm-demo/kmv-dev-a-vm-42sgf"]).toMatchObject({
+      expect(result.resources["MicroVM/microvm-demo/kmv-dev-a-vm-42sgf"]).toMatchObject({
         type: "K8s::KubeMicroVM::MicroVM",
         physicalId: "vm-uid",
         ownerChain: { root: "declared", entity: "workloadReplicaSet" },
@@ -771,7 +771,7 @@ describe("k8s describeResources", () => {
         cluster.connector,
       );
 
-      expect(result.resources["ray/ml-head"]).toMatchObject({
+      expect(result.resources["Deployment/ray/ml-head"]).toMatchObject({
         type: "K8s::Apps::Deployment",
         physicalId: "head-uid",
         ownerChain: { root: "declared", entity: "ml" },
@@ -834,7 +834,7 @@ describe("k8s describeResources", () => {
         cluster.connector,
       );
 
-      expect(result.resources["cluster:team-a-admin"]).toMatchObject({
+      expect(result.resources["cluster:ClusterRole/team-a-admin"]).toMatchObject({
         type: "K8s::Rbac::ClusterRole",
         physicalId: "role-uid",
         ownerChain: { root: "declared", entity: "team" },
@@ -887,7 +887,7 @@ describe("k8s describeResources", () => {
         cluster.connector,
       );
 
-      expect(result.resources["prod/web"]).toMatchObject({
+      expect(result.resources["Deployment/prod/web"]).toMatchObject({
         type: "K8s::Apps::Deployment",
         ownerChain: { root: "declared", entity: "apps" },
       });
@@ -928,12 +928,62 @@ describe("k8s describeResources", () => {
         cluster.connector,
       );
 
-      expect(result.resources["prod/web"]).toMatchObject({
+      expect(result.resources["Deployment/prod/web"]).toMatchObject({
         type: "K8s::Apps::Deployment",
         ownerChain: { root: "declared", entity: "webApp" },
       });
     });
 
+    // #1643 — the common convention names a workload and its Service alike, so
+    // a kind-less `namespace/name` key made them one row and only whichever
+    // kind swept first survived. Found by behold's argo estate: Application
+    // boxes held Endpoints instead of the Deployment.
+    test("same-named objects of different kinds are all reported — the key carries the kind (#1643)", async () => {
+      const app = {
+        apiVersion: "argoproj.io/v1alpha1",
+        kind: "Application",
+        metadata: { name: "app-a", namespace: "argocd", uid: "app-uid" },
+        status: { health: { status: "Healthy" }, sync: { status: "Synced" } },
+      };
+      const label = { "app.kubernetes.io/instance": "app-a" };
+      const deployment = {
+        apiVersion: "apps/v1",
+        kind: "Deployment",
+        metadata: { name: "app-a", namespace: "app-a", uid: "dep-uid", labels: label },
+      };
+      const service = {
+        apiVersion: "v1",
+        kind: "Service",
+        metadata: { name: "app-a", namespace: "app-a", uid: "svc-uid", labels: label },
+      };
+      const cluster = fakeCluster({
+        objects: {
+          [objectKey("argoproj.io/v1alpha1", "Application", "app-a", "argocd")]: app,
+          [objectKey("apps/v1", "Deployment", "app-a", "app-a")]: deployment,
+          [objectKey("v1", "Service", "app-a", "app-a")]: service,
+        },
+      });
+
+      const result = await describeResources(
+        {
+          environment: "prod",
+          buildOutput: "",
+          entityNames: ["appA"],
+          entities: makeEntities([
+            {
+              name: "appA",
+              entityType: "K8s::Argo::Application",
+              props: { metadata: { name: "app-a", namespace: "argocd" }, spec: { destination: { namespace: "app-a" } } },
+            },
+          ]),
+        },
+        cluster.connector,
+      );
+
+      expect(result.resources["Deployment/app-a/app-a"]).toMatchObject({ type: "K8s::Apps::Deployment", physicalId: "dep-uid" });
+      expect(result.resources["Service/app-a/app-a"]).toMatchObject({ type: "K8s::Core::Service", physicalId: "svc-uid" });
+    });
+
     test("a generic instance label matching NO declared Application claims nothing — not an inventory (#1549)", async () => {
       // `app.kubernetes.io/instance` is also what plain helm sets; on an
       // estate declaring a Flux CR (so the widened sweep runs), a foreign
@@ -967,7 +1017,7 @@ describe("k8s describeResources", () => {
         cluster.connector,
       );
 
-      expect(result.resources["flux-system/cert-manager"]).toBeUndefined();
+      expect(result.resources["Deployment/flux-system/cert-manager"]).toBeUndefined();
     });
 
     test("the sweep's bound is the estate's namespaces, not a kind list — and no cluster-scoped list without a cluster-scoped entity", async () => {
@@ -1047,7 +1097,7 @@ describe("k8s describeResources", () => {
         cluster.connector,
       );
 
-      const child = result.resources["prod/web-7d9f8c9c8-abcde"];
+      const child = result.resources["Pod/prod/web-7d9f8c9c8-abcde"];
       expect(child).toMatchObject({
         type: "K8s::Core::Pod",
         physicalId: "pod-uid",
@@ -1078,7 +1128,7 @@ describe("k8s describeResources", () => {
         cluster.connector,
       );
 
-      expect(result.resources["prod/standalone"]).toMatchObject({
+      expect(result.resources["Pod/prod/standalone"]).toMatchObject({
         type: "K8s::Core::Pod",
         ownerChain: { root: "unowned" },
       });
@@ -1113,7 +1163,7 @@ describe("k8s describeResources", () => {
         cluster.connector,
       );
 
-      expect(result.resources["prod/other-pod"]).toMatchObject({ ownerChain: { root: "foreign" } });
+      expect(result.resources["Pod/prod/other-pod"]).toMatchObject({ ownerChain: { root: "foreign" } });
     });
 
     test("--owned withholds an unrelated Pod, but keeps a runtime child of a declared (owned) entity", async () => {
@@ -1156,8 +1206,8 @@ describe("k8s describeResources", () => {
       );
 
       expect(result.resources.web).toBeDefined(); // the marker let it through
-      expect(result.resources["prod/standalone"]).toBeUndefined();
-      expect(result.resources["prod/web-abc"]).toMatchObject({ ownerChain: { root: "declared", entity: "web" } });
+      expect(result.resources["Pod/prod/standalone"]).toBeUndefined();
+      expect(result.resources["Pod/prod/web-abc"]).toMatchObject({ ownerChain: { root: "declared", entity: "web" } });
     });
 
     test("a Pod that is itself declared is never duplicated as a runtime child", async () => {
@@ -1188,7 +1238,7 @@ describe("k8s describeResources", () => {
       );
 
       expect(result.resources.standalonePod).toBeDefined();
-      expect(result.resources["prod/standalone-pod"]).toBeUndefined();
+      expect(result.resources["Pod/prod/standalone-pod"]).toBeUndefined();
       expect(Object.keys(result.resources)).toHaveLength(2); // web + standalonePod, no synthetic duplicate
     });
 
@@ -1398,6 +1448,34 @@ describe("unhappyConditions (#1401)", () => {
     expect(unhappyConditions({ status: {} } as never)).toBeUndefined();
     expect(unhappyConditions({} as never)).toBeUndefined();
   });
+
+  // #1644 — Argo's ApplicationCondition is {type, message, lastTransitionTime},
+  // no status field, written only for problems. The polarity test has nothing
+  // to read on it; the message IS the report, and it was the one diagnostic
+  // line a broken Application writes.
+  test("a status-less condition with a message passes through — Argo's ComparisonError (#1644)", () => {
+    expect(
+      unhappyConditions({
+        status: {
+          conditions: [
+            {
+              type: "ComparisonError",
+              message: "Failed to load target state: app path does not exist",
+              lastTransitionTime: "2026-08-10T00:00:00Z",
+            },
+          ],
+        },
+      } as never),
+    ).toEqual(["ComparisonError: Failed to load target state: app path does not exist"]);
+  });
+
+  test("a status-less condition with no message stays silent", () => {
+    expect(
+      unhappyConditions({
+        status: { conditions: [{ type: "SomeMarker", lastTransitionTime: "2026-08-10T00:00:00Z" }] },
+      } as never),
+    ).toBeUndefined();
+  });
 });
 
 describe("revisionAttributes — the GitOps convergence fields (#1632)", () => {

package/src/describe-resources.ts

@@ -222,10 +222,18 @@ export function unhappyConditions(obj: K8sObject): string[] | undefined {
   const out: string[] = [];
   for (const c of conditions) {
     const cond = c as { type?: unknown; status?: unknown; reason?: unknown; message?: unknown };
-    if (typeof cond.type !== "string" || typeof cond.status !== "string") continue;
-    const goodWhenFalse = CONDITIONS_GOOD_WHEN_FALSE.test(cond.type);
-    const happy = goodWhenFalse ? cond.status === "False" : cond.status === "True";
-    if (happy) continue;
+    if (typeof cond.type !== "string") continue;
+    if (typeof cond.status === "string") {
+      const goodWhenFalse = CONDITIONS_GOOD_WHEN_FALSE.test(cond.type);
+      const happy = goodWhenFalse ? cond.status === "False" : cond.status === "True";
+      if (happy) continue;
+    } else if (!(typeof cond.message === "string" && cond.message)) {
+      // No status, no message: nothing to say. But a status-less condition
+      // WITH a message is an object speaking — Argo's ApplicationCondition is
+      // `{type, message, lastTransitionTime}`, written only for problems, and
+      // the polarity test above has nothing to read on it (#1644).
+      continue;
+    }
     const reason = typeof cond.reason === "string" && cond.reason ? `=${cond.reason}` : "";
     const message = typeof cond.message === "string" && cond.message ? `: ${cond.message}` : "";
     out.push(`${cond.type}${reason}${message}`);
@@ -701,8 +709,11 @@ async function addRuntimeChildren(
       const uid = obj.metadata?.uid;
       const name = obj.metadata?.name;
       if (!uid || !name || declaredByUid.has(uid)) return; // declared directly, or unaddressable
-      const key = namespace ? `${namespace}/${name}` : `cluster:${name}`;
-      if (resources[key]) return; // already reported by an earlier kind
+      // The kind is part of the identity: a Deployment, Service and Endpoints
+      // all named `app-a` in namespace `app-a` are three objects, and a
+      // kind-less key reported only whichever kind swept first (#1643).
+      const key = namespace ? `${swept.kind}/${namespace}/${name}` : `cluster:${swept.kind}/${name}`;
+      if (resources[key]) return; // re-swept object, not a new report
 
       let ownerChain = await resolveK8sOwnerChain(obj, { declaredByUid, reader: client, namespace });
       // The label channel (#1549) — only when the chain itself said nothing: