@skyhook-io/k8s-ui 1.1.0 → 1.2.0

package/src/utils/navigation.test.ts

@@ -0,0 +1,142 @@
+import { describe, test, expect } from 'vitest'
+import { kindToPlural, pluralToKind, refToSelectedResource } from './navigation'
+
+describe('kindToPlural', () => {
+  test('singular PascalCase to plural lowercase', () => {
+    expect(kindToPlural('Secret')).toBe('secrets')
+    expect(kindToPlural('Deployment')).toBe('deployments')
+    expect(kindToPlural('Pod')).toBe('pods')
+    expect(kindToPlural('Service')).toBe('services')
+    expect(kindToPlural('ConfigMap')).toBe('configmaps')
+    expect(kindToPlural('Node')).toBe('nodes')
+    expect(kindToPlural('Job')).toBe('jobs')
+    expect(kindToPlural('CronJob')).toBe('cronjobs')
+  })
+
+  test('handles kinds ending in s/x/ch/sh (adds -es)', () => {
+    expect(kindToPlural('Ingress')).toBe('ingresses')
+  })
+
+  test('handles kinds ending in consonant+y (changes to -ies)', () => {
+    expect(kindToPlural('NetworkPolicy')).toBe('networkpolicies')
+  })
+
+  test('handles kinds ending in ss (Class-suffix)', () => {
+    expect(kindToPlural('StorageClass')).toBe('storageclasses')
+    expect(kindToPlural('IngressClass')).toBe('ingressclasses')
+    expect(kindToPlural('PriorityClass')).toBe('priorityclasses')
+    expect(kindToPlural('RuntimeClass')).toBe('runtimeclasses')
+    expect(kindToPlural('GatewayClass')).toBe('gatewayclasses')
+    expect(kindToPlural('EC2NodeClass')).toBe('ec2nodeclasses')
+  })
+
+  test('idempotent on known plurals (prevents double-pluralization)', () => {
+    // This was the original bug: "secrets" → "secretses"
+    expect(kindToPlural('secrets')).toBe('secrets')
+    expect(kindToPlural('services')).toBe('services')
+    expect(kindToPlural('ingresses')).toBe('ingresses')
+    expect(kindToPlural('deployments')).toBe('deployments')
+    expect(kindToPlural('pods')).toBe('pods')
+    expect(kindToPlural('configmaps')).toBe('configmaps')
+    expect(kindToPlural('nodes')).toBe('nodes')
+    expect(kindToPlural('storageclasses')).toBe('storageclasses')
+    expect(kindToPlural('networkpolicies')).toBe('networkpolicies')
+    expect(kindToPlural('horizontalpodautoscalers')).toBe('horizontalpodautoscalers')
+  })
+
+  test('handles aliases', () => {
+    expect(kindToPlural('HorizontalPodAutoscaler')).toBe('horizontalpodautoscalers')
+    expect(kindToPlural('pvc')).toBe('persistentvolumeclaims')
+    expect(kindToPlural('PodGroup')).toBe('pods')
+  })
+})
+
+// Demonstrate that the naive .toLowerCase() + 's' pattern used by renderers is broken.
+// These tests prove WHY renderers must use kindToPlural() instead of ad-hoc pluralization.
+describe('naive pluralization (renderer bug demonstration)', () => {
+  const naivePlural = (kind: string) => kind.toLowerCase() + 's'
+
+  test('breaks for Class-suffix kinds (triple-s)', () => {
+    // What HPARenderer, KarpenterNodePoolRenderer, etc. actually produce
+    expect(naivePlural('EC2NodeClass')).toBe('ec2nodeclasss')   // WRONG
+    expect(kindToPlural('EC2NodeClass')).toBe('ec2nodeclasses')  // CORRECT
+  })
+
+  test('breaks for Policy-suffix kinds', () => {
+    expect(naivePlural('NetworkPolicy')).toBe('networkpolicys')  // WRONG
+    expect(kindToPlural('NetworkPolicy')).toBe('networkpolicies') // CORRECT
+  })
+
+  test('breaks for Ingress-like kinds (ending in s)', () => {
+    expect(naivePlural('Ingress')).toBe('ingresss')   // WRONG
+    expect(kindToPlural('Ingress')).toBe('ingresses')  // CORRECT
+  })
+
+  test('breaks for Repository-suffix kinds', () => {
+    expect(naivePlural('GitRepository')).toBe('gitrepositorys')    // WRONG
+    expect(kindToPlural('GitRepository')).toBe('gitrepositories')  // CORRECT
+  })
+})
+
+describe('pluralToKind', () => {
+  test('reverse mapping for known plurals', () => {
+    expect(pluralToKind('secrets')).toBe('Secret')
+    expect(pluralToKind('deployments')).toBe('Deployment')
+    expect(pluralToKind('horizontalpodautoscalers')).toBe('HorizontalPodAutoscaler')
+    expect(pluralToKind('ingresses')).toBe('Ingress')
+    expect(pluralToKind('configmaps')).toBe('ConfigMap')
+    expect(pluralToKind('networkpolicies')).toBe('NetworkPolicy')
+    expect(pluralToKind('storageclasses')).toBe('StorageClass')
+  })
+
+  test('PascalCase input returned as-is', () => {
+    expect(pluralToKind('Deployment')).toBe('Deployment')
+    expect(pluralToKind('Secret')).toBe('Secret')
+  })
+
+  test('fallback de-pluralization for unknown kinds', () => {
+    expect(pluralToKind('widgets')).toBe('Widget')
+  })
+
+  test('fallback handles -ies suffix', () => {
+    // Unknown kind not in the map
+    expect(pluralToKind('batteries')).toBe('Battery')
+  })
+
+  test('fallback handles -ses suffix', () => {
+    // "databases" triggers the -ses rule (strips 2 chars) — a known limitation
+    // of the heuristic fallback. Known kinds use the PLURAL_TO_KIND map instead.
+    expect(pluralToKind('databases')).toBe('Databas')
+  })
+})
+
+describe('refToSelectedResource', () => {
+  test('converts singular kind to plural for navigation', () => {
+    const result = refToSelectedResource({
+      kind: 'Secret',
+      name: 'test-tls',
+      namespace: 'platform',
+    })
+    expect(result).toEqual({
+      kind: 'secrets',
+      name: 'test-tls',
+      namespace: 'platform',
+      group: undefined,
+    })
+  })
+
+  test('preserves group field', () => {
+    const result = refToSelectedResource({
+      kind: 'Certificate',
+      name: 'my-cert',
+      namespace: 'default',
+      group: 'cert-manager.io',
+    })
+    expect(result).toEqual({
+      kind: 'certificates',
+      name: 'my-cert',
+      namespace: 'default',
+      group: 'cert-manager.io',
+    })
+  })
+})

package/src/utils/navigation.ts

@@ -6,14 +6,65 @@ import type { SelectedResource, ResourceRef } from '../types/core'
  */
 export type NavigateToResource = (resource: SelectedResource) => void
 
+// Known plural API resource names → singular PascalCase kind.
+// Shared between kindToPlural (idempotency guard) and pluralToKind (reverse lookup).
+const PLURAL_TO_KIND: Record<string, string> = {
+  pods: 'Pod',
+  services: 'Service',
+  deployments: 'Deployment',
+  daemonsets: 'DaemonSet',
+  statefulsets: 'StatefulSet',
+  replicasets: 'ReplicaSet',
+  ingresses: 'Ingress',
+  gateways: 'Gateway',
+  httproutes: 'HTTPRoute',
+  grpcroutes: 'GRPCRoute',
+  tcproutes: 'TCPRoute',
+  tlsroutes: 'TLSRoute',
+  configmaps: 'ConfigMap',
+  secrets: 'Secret',
+  namespaces: 'Namespace',
+  events: 'Event',
+  nodes: 'Node',
+  jobs: 'Job',
+  cronjobs: 'CronJob',
+  horizontalpodautoscalers: 'HorizontalPodAutoscaler',
+  persistentvolumeclaims: 'PersistentVolumeClaim',
+  persistentvolumes: 'PersistentVolume',
+  storageclasses: 'StorageClass',
+  poddisruptionbudgets: 'PodDisruptionBudget',
+  rollouts: 'Rollout',
+  applications: 'Application',
+  kustomizations: 'Kustomization',
+  helmreleases: 'HelmRelease',
+  gitrepositories: 'GitRepository',
+  certificates: 'Certificate',
+  roles: 'Role',
+  clusterroles: 'ClusterRole',
+  rolebindings: 'RoleBinding',
+  clusterrolebindings: 'ClusterRoleBinding',
+  serviceaccounts: 'ServiceAccount',
+  networkpolicies: 'NetworkPolicy',
+  verticalpodautoscalers: 'VerticalPodAutoscaler',
+  virtualservices: 'VirtualService',
+  destinationrules: 'DestinationRule',
+  serviceentries: 'ServiceEntry',
+  peerauthentications: 'PeerAuthentication',
+  authorizationpolicies: 'AuthorizationPolicy',
+}
+
 /**
  * Convert a singular kind (e.g., "Deployment") to plural API resource name (e.g., "deployments").
  * Single source of truth — uses English pluralization rules with a small alias map for
  * abbreviations and special mappings that aren't simple plurals.
+ * Idempotent: already-plural inputs (e.g., "secrets") are returned as-is.
  */
 export function kindToPlural(kind: string): string {
   const kindLower = kind.toLowerCase()
 
+  // Already a known plural — return as-is to prevent double-pluralization
+  if (kindLower in PLURAL_TO_KIND) return kindLower
+
   // Aliases: abbreviations or mappings to a different resource name
   const aliases: Record<string, string> = {
     horizontalpodautoscaler: 'horizontalpodautoscalers',
@@ -40,53 +91,7 @@ export function kindToPlural(kind: string): string {
 export function pluralToKind(plural: string): string {
   const lower = plural.toLowerCase()
 
-  // Explicit reverse mappings for irregular/aliased plurals
-  const reverseMap: Record<string, string> = {
-    pods: 'Pod',
-    services: 'Service',
-    deployments: 'Deployment',
-    daemonsets: 'DaemonSet',
-    statefulsets: 'StatefulSet',
-    replicasets: 'ReplicaSet',
-    ingresses: 'Ingress',
-    gateways: 'Gateway',
-    httproutes: 'HTTPRoute',
-    grpcroutes: 'GRPCRoute',
-    tcproutes: 'TCPRoute',
-    tlsroutes: 'TLSRoute',
-    configmaps: 'ConfigMap',
-    secrets: 'Secret',
-    namespaces: 'Namespace',
-    events: 'Event',
-    nodes: 'Node',
-    jobs: 'Job',
-    cronjobs: 'CronJob',
-    horizontalpodautoscalers: 'HorizontalPodAutoscaler',
-    persistentvolumeclaims: 'PersistentVolumeClaim',
-    persistentvolumes: 'PersistentVolume',
-    storageclasses: 'StorageClass',
-    poddisruptionbudgets: 'PodDisruptionBudget',
-    rollouts: 'Rollout',
-    applications: 'Application',
-    kustomizations: 'Kustomization',
-    helmreleases: 'HelmRelease',
-    gitrepositories: 'GitRepository',
-    certificates: 'Certificate',
-    roles: 'Role',
-    clusterroles: 'ClusterRole',
-    rolebindings: 'RoleBinding',
-    clusterrolebindings: 'ClusterRoleBinding',
-    serviceaccounts: 'ServiceAccount',
-    networkpolicies: 'NetworkPolicy',
-    verticalpodautoscalers: 'VerticalPodAutoscaler',
-    virtualservices: 'VirtualService',
-    destinationrules: 'DestinationRule',
-    serviceentries: 'ServiceEntry',
-    peerauthentications: 'PeerAuthentication',
-    authorizationpolicies: 'AuthorizationPolicy',
-  }
-
-  if (reverseMap[lower]) return reverseMap[lower]
+  if (PLURAL_TO_KIND[lower]) return PLURAL_TO_KIND[lower]
 
   // If it already looks like a singular PascalCase kind (starts with uppercase), return as-is
   if (plural[0] === plural[0].toUpperCase() && plural[0] !== plural[0].toLowerCase()) {

package/src/utils/resource-hierarchy.ts

@@ -143,6 +143,8 @@ function nodeIdToLaneId(nodeId: string): string | null {
     middlewaretcp: 'MiddlewareTCP', traefikservice: 'TraefikService',
     serverstransport: 'ServersTransport', serverstransporttcp: 'ServersTransportTCP',
     tlsoption: 'TLSOption', tlsstore: 'TLSStore',
+    // Contour
+    httpproxy: 'HTTPProxy',
   }
   return `${kindMap[kind] || kind}/${namespace}/${name}`
 }
@@ -417,6 +419,7 @@ export function buildResourceHierarchy(options: HierarchyOptions): ResourceLane[
       'KnativeService', 'KnativeConfiguration', 'KnativeRevision', 'KnativeRoute',
       'Broker', 'Trigger',
       'IngressRoute', 'IngressRouteTCP', 'IngressRouteUDP',
+      'HTTPProxy', // Contour
     ])
 
     // Group lanes by app label
@@ -448,6 +451,7 @@ export function buildResourceHierarchy(options: HierarchyOptions): ResourceLane[
         PingSource: 3, ApiServerSource: 3, ContainerSource: 3, SinkBinding: 3,
         IngressRoute: 2, IngressRouteTCP: 2, IngressRouteUDP: 2,
         TraefikService: 3, Middleware: 4, MiddlewareTCP: 4,
+        HTTPProxy: 2, // Contour
       }
 
       const sorted = [...laneIds].sort((a, b) => {
@@ -510,6 +514,7 @@ export function buildResourceHierarchy(options: HierarchyOptions): ResourceLane[
           PingSource: 3, ApiServerSource: 3, ContainerSource: 3, SinkBinding: 3,
           IngressRoute: 1, IngressRouteTCP: 1, IngressRouteUDP: 1,
           TraefikService: 2, Middleware: 3, MiddlewareTCP: 3,
+          HTTPProxy: 1, // Contour
         }
         lane.children.sort((a, b) => {
           const aPriority = kindPriority[a.kind] || 10

package/src/utils/resource-icons.ts

@@ -184,6 +184,9 @@ const KIND_ICON_MAP: Record<string, LucideIcon> = {
   tlsoption: Lock,
   tlsstore: Lock,
 
+  // Contour
+  httpproxy: Globe,
+
   // Trivy Operator
   vulnerabilityreport: Shield,
   configauditreport: ShieldCheck,