@skyhook-io/k8s-ui 1.3.2 → 1.4.1

package/src/utils/navigation.test.ts

@@ -1,5 +1,9 @@
-import { describe, test, expect } from 'vitest'
-import { kindToPlural, pluralToKind, refToSelectedResource } from './navigation'
+import { describe, test, expect, afterEach } from 'vitest'
+import { kindToPlural, pluralToKind, refToSelectedResource, initNavigationMap, resetNavigationMap } from './navigation'
+
+afterEach(() => {
+  resetNavigationMap()
+})
 
 describe('kindToPlural', () => {
   test('singular PascalCase to plural lowercase', () => {
@@ -110,6 +114,29 @@ describe('pluralToKind', () => {
   })
 })
 
+describe('initNavigationMap', () => {
+  test('discovered API resources override heuristic pluralization', () => {
+    // Before init, an unknown CRD would hit the heuristic fallback
+    // After init, it uses the discovered plural name
+    initNavigationMap([
+      { group: 'external-secrets.io', version: 'v1', kind: 'SecretStore', name: 'secretstores', namespaced: true, isCrd: true, verbs: ['get'] },
+      { group: 'external-secrets.io', version: 'v1', kind: 'ClusterSecretStore', name: 'clustersecretstores', namespaced: false, isCrd: true, verbs: ['get'] },
+    ])
+    expect(kindToPlural('SecretStore')).toBe('secretstores')
+    expect(kindToPlural('ClusterSecretStore')).toBe('clustersecretstores')
+    expect(pluralToKind('secretstores')).toBe('SecretStore')
+    expect(pluralToKind('clustersecretstores')).toBe('ClusterSecretStore')
+  })
+
+  test('prevents double-pluralization of discovered plurals', () => {
+    initNavigationMap([
+      { group: 'external-secrets.io', version: 'v1', kind: 'SecretStore', name: 'secretstores', namespaced: true, isCrd: true, verbs: ['get'] },
+    ])
+    // Passing an already-plural kind should be idempotent
+    expect(kindToPlural('secretstores')).toBe('secretstores')
+  })
+})
+
 describe('refToSelectedResource', () => {
   test('converts singular kind to plural for navigation', () => {
     const result = refToSelectedResource({

package/src/utils/navigation.ts

@@ -1,4 +1,4 @@
-import type { SelectedResource, ResourceRef } from '../types/core'
+import type { SelectedResource, ResourceRef, APIResource } from '../types/core'
 
 /**
  * Canonical callback type for navigating to a resource.
@@ -6,9 +6,8 @@ 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> = {
+// Fallback map for core K8s resources — used before API discovery completes.
+const BUILTIN_PLURAL_TO_KIND: Record<string, string> = {
   pods: 'Pod',
   services: 'Service',
   deployments: 'Deployment',
@@ -16,11 +15,6 @@ const PLURAL_TO_KIND: Record<string, string> = {
   statefulsets: 'StatefulSet',
   replicasets: 'ReplicaSet',
   ingresses: 'Ingress',
-  gateways: 'Gateway',
-  httproutes: 'HTTPRoute',
-  grpcroutes: 'GRPCRoute',
-  tcproutes: 'TCPRoute',
-  tlsroutes: 'TLSRoute',
   configmaps: 'ConfigMap',
   secrets: 'Secret',
   namespaces: 'Namespace',
@@ -33,24 +27,44 @@ const PLURAL_TO_KIND: Record<string, string> = {
   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',
+}
+
+// Dynamic map built from API discovery — populated by initNavigationMap().
+// Once populated, this is the source of truth for all kind↔plural lookups.
+let discoveredPluralToKind: Record<string, string> | null = null
+let discoveredKindToPlural: Record<string, string> | null = null
+
+/**
+ * Initialize navigation maps from discovered API resources.
+ * Call once when API resources are fetched. After this, kindToPlural/pluralToKind
+ * use the real cluster data instead of heuristics.
+ */
+export function initNavigationMap(resources: APIResource[]) {
+  const p2k: Record<string, string> = { ...BUILTIN_PLURAL_TO_KIND }
+  const k2p: Record<string, string> = {}
+  for (const r of resources) {
+    const plural = r.name.toLowerCase()
+    p2k[plural] = r.kind
+    k2p[r.kind.toLowerCase()] = plural
+  }
+  discoveredPluralToKind = p2k
+  discoveredKindToPlural = k2p
+}
+
+/** Reset navigation maps to builtin-only state. For testing. */
+export function resetNavigationMap() {
+  discoveredPluralToKind = null
+  discoveredKindToPlural = null
+}
+
+function getPluralToKind(): Record<string, string> {
+  return discoveredPluralToKind || BUILTIN_PLURAL_TO_KIND
 }
 
 /**
@@ -61,9 +75,15 @@ const PLURAL_TO_KIND: Record<string, string> = {
  */
 export function kindToPlural(kind: string): string {
   const kindLower = kind.toLowerCase()
+  const pluralToKindMap = getPluralToKind()
 
   // Already a known plural — return as-is to prevent double-pluralization
-  if (kindLower in PLURAL_TO_KIND) return kindLower
+  if (kindLower in pluralToKindMap) return kindLower
+
+  // Lookup from discovered API resources (singular kind → plural name)
+  if (discoveredKindToPlural && kindLower in discoveredKindToPlural) {
+    return discoveredKindToPlural[kindLower]
+  }
 
   // Aliases: abbreviations or mappings to a different resource name
   const aliases: Record<string, string> = {
@@ -73,7 +93,7 @@ export function kindToPlural(kind: string): string {
   }
   if (aliases[kindLower]) return aliases[kindLower]
 
-  // English pluralization rules (covers *Class→*classes, *Policy→*policies, *Repository→*repositories, etc.)
+  // Fallback: English pluralization rules (covers *Class→*classes, *Policy→*policies, *Repository→*repositories, etc.)
   if (kindLower.endsWith('s') || kindLower.endsWith('x') || kindLower.endsWith('ch') || kindLower.endsWith('sh')) {
     return kindLower + 'es'
   }
@@ -90,8 +110,9 @@ export function kindToPlural(kind: string): string {
  */
 export function pluralToKind(plural: string): string {
   const lower = plural.toLowerCase()
+  const pluralToKindMap = getPluralToKind()
 
-  if (PLURAL_TO_KIND[lower]) return PLURAL_TO_KIND[lower]
+  if (pluralToKindMap[lower]) return pluralToKindMap[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-icons.ts

@@ -80,6 +80,9 @@ const KIND_ICON_MAP: Record<string, LucideIcon> = {
   service: Plug,
   ingress: DoorOpen,
   networkpolicy: ShieldCheck,
+  ciliumnetworkpolicy: ShieldCheck,
+  ciliumclusterwidenetworkpolicy: ShieldCheck,
+  clusternetworkpolicy: ShieldCheck,
   endpoints: Radio,
   endpointslice: Radio,
   gateway: DoorOpen,

package/src/utils/skeleton-yaml.ts

@@ -0,0 +1,302 @@
+// Skeleton YAML templates for common Kubernetes resource kinds.
+// Used by the Create Resource dialog to pre-fill the editor.
+
+const skeletons: Record<string, string> = {
+  Pod: `apiVersion: v1
+kind: Pod
+metadata:
+  name: my-pod
+  namespace: default
+spec:
+  containers:
+    - name: app
+      image: nginx:latest
+      ports:
+        - containerPort: 80`,
+
+  Deployment: `apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: my-deployment
+  namespace: default
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: my-deployment
+  template:
+    metadata:
+      labels:
+        app: my-deployment
+    spec:
+      containers:
+        - name: app
+          image: nginx:latest
+          ports:
+            - containerPort: 80`,
+
+  Service: `apiVersion: v1
+kind: Service
+metadata:
+  name: my-service
+  namespace: default
+spec:
+  selector:
+    app: my-app
+  ports:
+    - port: 80
+      targetPort: 80
+  type: ClusterIP`,
+
+  ConfigMap: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: my-configmap
+  namespace: default
+data:
+  key: value`,
+
+  Secret: `apiVersion: v1
+kind: Secret
+metadata:
+  name: my-secret
+  namespace: default
+type: Opaque
+stringData:
+  key: value`,
+
+  Namespace: `apiVersion: v1
+kind: Namespace
+metadata:
+  name: my-namespace`,
+
+  Job: `apiVersion: batch/v1
+kind: Job
+metadata:
+  name: my-job
+  namespace: default
+spec:
+  template:
+    spec:
+      containers:
+        - name: job
+          image: busybox:latest
+          command: ["echo", "hello"]
+      restartPolicy: Never
+  backoffLimit: 3`,
+
+  CronJob: `apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: my-cronjob
+  namespace: default
+spec:
+  schedule: "*/5 * * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+            - name: job
+              image: busybox:latest
+              command: ["echo", "hello"]
+          restartPolicy: Never`,
+
+  Ingress: `apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: my-ingress
+  namespace: default
+spec:
+  rules:
+    - host: example.com
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: my-service
+                port:
+                  number: 80`,
+
+  PersistentVolumeClaim: `apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: my-pvc
+  namespace: default
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi`,
+
+  ServiceAccount: `apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: my-service-account
+  namespace: default`,
+
+  StatefulSet: `apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: my-statefulset
+  namespace: default
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: my-statefulset
+  serviceName: my-statefulset
+  template:
+    metadata:
+      labels:
+        app: my-statefulset
+    spec:
+      containers:
+        - name: app
+          image: nginx:latest
+          ports:
+            - containerPort: 80`,
+
+  DaemonSet: `apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: my-daemonset
+  namespace: default
+spec:
+  selector:
+    matchLabels:
+      app: my-daemonset
+  template:
+    metadata:
+      labels:
+        app: my-daemonset
+    spec:
+      containers:
+        - name: app
+          image: nginx:latest`,
+}
+
+// Returns skeleton YAML for a known kind, or a generic template for unknown kinds.
+export function getSkeletonYaml(kind: string, group?: string): string {
+  const skeleton = skeletons[kind]
+  if (skeleton) return skeleton
+
+  // For unknown/CRD kinds, provide a minimal template
+  let apiVersion = 'v1'
+  if (group) {
+    apiVersion = `${group}/v1`
+  }
+
+  return `apiVersion: ${apiVersion}
+kind: ${kind}
+metadata:
+  name: my-${kind.toLowerCase()}
+  namespace: default`
+}
+
+// Strips cluster-managed metadata from a resource YAML for duplication.
+export function cleanYamlForDuplicate(yamlContent: string): string {
+  const lines = yamlContent.split('\n')
+  const result: string[] = []
+  let skipUntilDedent = false
+  let skipIndent = 0
+
+  const stripTopLevelKeys = new Set([
+    'status:',
+  ])
+
+  const stripMetadataKeys = new Set([
+    'resourceVersion:',
+    'uid:',
+    'creationTimestamp:',
+    'generation:',
+    'managedFields:',
+    'selfLink:',
+  ])
+
+  const stripAnnotationKeys = [
+    'kubectl.kubernetes.io/last-applied-configuration:',
+  ]
+
+  let inMetadata = false
+  let inAnnotations = false
+  let metadataIndent = 0
+  let annotationsIndent = 0
+
+  for (const line of lines) {
+    const trimmed = line.trimStart()
+    const indent = line.length - trimmed.length
+
+    // Handle skip mode (for multi-line values like managedFields or status)
+    if (skipUntilDedent) {
+      if (indent > skipIndent || trimmed === '' || trimmed.startsWith('-')) {
+        continue
+      }
+      skipUntilDedent = false
+    }
+
+    // Track metadata section
+    if (trimmed === 'metadata:') {
+      inMetadata = true
+      metadataIndent = indent
+      result.push(line)
+      continue
+    }
+
+    if (inMetadata && indent <= metadataIndent && trimmed !== '' && trimmed !== 'metadata:') {
+      inMetadata = false
+      inAnnotations = false
+    }
+
+    // Track annotations within metadata
+    if (inMetadata && trimmed === 'annotations:') {
+      inAnnotations = true
+      annotationsIndent = indent
+      result.push(line)
+      continue
+    }
+
+    if (inAnnotations && indent <= annotationsIndent && trimmed !== '' && trimmed !== 'annotations:') {
+      inAnnotations = false
+    }
+
+    // Strip top-level keys (status)
+    if (indent === 0 && stripTopLevelKeys.has(trimmed.split(' ')[0])) {
+      skipUntilDedent = true
+      skipIndent = indent
+      continue
+    }
+
+    // Strip metadata keys
+    if (inMetadata && !inAnnotations) {
+      const key = trimmed.split(' ')[0]
+      if (stripMetadataKeys.has(key)) {
+        if (key === 'managedFields:') {
+          skipUntilDedent = true
+          skipIndent = indent
+        }
+        continue
+      }
+      // Clear the name value (user needs to provide a new one)
+      if (trimmed.startsWith('name:')) {
+        result.push(line.replace(/name:.*/, 'name: '))
+        continue
+      }
+    }
+
+    // Strip specific annotations
+    if (inAnnotations) {
+      const shouldStrip = stripAnnotationKeys.some(key => trimmed.startsWith(key))
+      if (shouldStrip) {
+        continue
+      }
+    }
+
+    result.push(line)
+  }
+
+  return result.join('\n')
+}