@highstate/k8s 0.9.18 → 0.9.20

package/src/shared.ts

@@ -1,47 +1,44 @@
 import type { PartialKeys } from "@highstate/contract"
 import type { k8s } from "@highstate/library"
-import { interpolate, Output, output, toPromise, type Input, type Unwrap } from "@highstate/pulumi"
-import { core, Provider, types } from "@pulumi/kubernetes"
+import {
+  ComponentResource,
+  type ComponentResourceOptions,
+  type Input,
+  type Inputs,
+  type Output,
+  output,
+  secret,
+  toPromise,
+  type Unwrap,
+} from "@highstate/pulumi"
+import { core, Provider, type types } from "@pulumi/kubernetes"
 import * as images from "../assets/images.json"
 import { Namespace } from "./namespace"
 
-const providers = new Map<string, Provider>()
+const providers = new Map<`${string}.${string}`, Provider>()
 
-export function getProvider(cluster: Input<k8s.Cluster>): Promise<Provider> {
-  const provider = output(cluster).apply(cluster => {
-    const existingProvider = providers.get(cluster.id)
-    if (existingProvider) {
-      return existingProvider
-    }
-
-    const provider = new Provider(`${cluster.name}-${cluster.id}`, {
-      kubeconfig: cluster.kubeconfig,
-    })
-    providers.set(cluster.id, provider)
+export function getProvider(cluster: k8s.Cluster): Provider {
+  const name = `${cluster.name}.${cluster.connectionId}` as const
+  const existing = providers.get(name)
+  if (existing) {
+    return existing
+  }
 
-    return provider
-  })
+  const provider = new Provider(name, { kubeconfig: secret(cluster.kubeconfig) })
+  providers.set(name, provider)
 
-  return toPromise(provider)
+  return provider
 }
 
-export function getProviderSync(cluster: k8s.Cluster): Provider {
-  const existingProvider = providers.get(cluster.id)
-  if (existingProvider) {
-    return existingProvider
-  }
-
-  const provider = new Provider(`${cluster.name}-${cluster.id}`, {
-    kubeconfig: cluster.kubeconfig,
-  })
-  providers.set(cluster.id, provider)
+export async function getProviderAsync(cluster: Input<k8s.Cluster>): Promise<Provider> {
+  const resolvedCluster = await toPromise(cluster)
 
-  return provider
+  return getProvider(resolvedCluster)
 }
 
 export type NamespaceLike = core.v1.Namespace | Namespace | string
 
-export type CommonArgs = {
+export type ScopedResourceArgs = {
   /**
    * The name of the resource.
    */
@@ -50,12 +47,7 @@ export type CommonArgs = {
   /**
    * The namespace to create the resource in.
    */
-  namespace: Input<NamespaceLike | undefined>
-
-  /**
-   * The cluster to create the resource in.
-   */
-  cluster: Input<k8s.Cluster>
+  namespace: Input<Namespace>
 
   /**
    * The metadata to apply to the resource.
@@ -63,17 +55,20 @@ export type CommonArgs = {
   metadata?: Input<types.input.meta.v1.ObjectMeta>
 }
 
-export const commonExtraArgs = ["name", "namespace", "cluster", "metadata"] as const
+export const commonExtraArgs = ["name", "namespace", "metadata"] as const
 
 export function mapMetadata(
-  args: PartialKeys<Unwrap<CommonArgs>, "namespace" | "cluster">,
+  args: PartialKeys<ScopedResourceArgs, "namespace">,
   fallbackName?: string,
-): types.input.meta.v1.ObjectMeta {
-  return {
-    ...args.metadata,
-    name: args.name ?? args.metadata?.name ?? fallbackName,
-    namespace: args.namespace ? mapNamespaceLikeToNamespaceName(args.namespace) : undefined,
-  }
+): Output<Unwrap<types.input.meta.v1.ObjectMeta>> {
+  return output(args.metadata).apply(metadata =>
+    output({
+      ...metadata,
+      name: args.name ?? metadata?.name ?? fallbackName,
+      namespace:
+        metadata?.namespace ?? (args.namespace ? output(args.namespace).metadata.name : undefined),
+    }),
+  )
 }
 
 export type SelectorLike = types.input.meta.v1.LabelSelector | Record<string, Input<string>>
@@ -90,7 +85,7 @@ export function mapSelectorLikeToSelector(
   }
 }
 
-export function mapNamespaceLikeToNamespaceName(namespace: NamespaceLike): Output<string> {
+export function getNamespaceName(namespace: NamespaceLike): Output<string> {
   if (Namespace.isInstance(namespace)) {
     return namespace.metadata.name
   }
@@ -112,35 +107,67 @@ export function mapNamespaceNameToSelector(
   }
 }
 
-export type ResourceId = {
-  name: Input<string>
-  namespace?: Input<NamespaceLike | undefined>
-}
-
-export function resourceIdToString(id: Input<ResourceId>): Output<string> {
-  return output(id).apply(metadata => {
-    const namespaceName = metadata.namespace
-      ? mapNamespaceLikeToNamespaceName(metadata.namespace)
-      : undefined
-
-    return output(namespaceName ? interpolate`${namespaceName}/${metadata.name}` : metadata.name)
-  })
-}
-
-export function withPatchName(
-  resourceType: string,
-  resource: Input<k8s.Resource>,
+export function validateCluster(
+  entity: Input<k8s.Resource>,
   cluster: Input<k8s.Cluster>,
-): Output<string> {
-  return output({ resource, cluster }).apply(({ resource, cluster }) => {
-    if (resource.clusterId !== cluster.id) {
+): Input<k8s.Cluster> {
+  return output({ entity, cluster }).apply(({ entity, cluster }) => {
+    if (entity.clusterId !== cluster.id) {
       throw new Error(
-        `Cluster mismatch when patching ${resourceType} "${resource.metadata.name}": "${resource.clusterId}" != "${cluster.id}"`,
+        `Cluster mismatch for ${entity.type} "${entity.metadata.name}": "${entity.clusterId}" != "${cluster.id}"`,
       )
     }
 
-    return resource.metadata.name
+    return cluster
   })
 }
 
 export { images }
+
+/**
+ * Base class for all Kubernetes scoped resources.
+ *
+ * Provides common functionality for resources that have a cluster, namespace, metadata, and entity.
+ */
+export abstract class ScopedResource extends ComponentResource {
+  protected constructor(
+    type: string,
+    name: string,
+    args: Inputs,
+    opts: ComponentResourceOptions | undefined,
+
+    /**
+     * The Kubernetes API version (e.g., "v1", "apps/v1", "batch/v1").
+     */
+    readonly apiVersion: Output<string>,
+
+    /**
+     * The Kubernetes kind (e.g., "ConfigMap", "Deployment", "CronJob").
+     */
+    readonly kind: Output<string>,
+
+    /**
+     * The namespace where the resource is located.
+     */
+    readonly namespace: Output<Namespace>,
+
+    /**
+     * The metadata of the underlying Kubernetes resource.
+     */
+    readonly metadata: Output<types.output.meta.v1.ObjectMeta>,
+  ) {
+    super(type, name, args, opts)
+  }
+
+  /**
+   * The cluster where the resource is located.
+   */
+  get cluster(): Output<k8s.Cluster> {
+    return this.namespace.cluster
+  }
+
+  /**
+   * The Highstate resource entity.
+   */
+  abstract get entity(): Output<k8s.ScopedResource>
+}