@distilled.cloud/kubernetes 0.16.9 → 0.18.0

package/lib/credentials.d.ts

@@ -1,6 +1,6 @@
+import * as Context from "effect/Context";
 import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
-import * as Context from "effect/Context";
 import { ConfigError } from "@distilled.cloud/core/errors";
 export interface Config {
     /**

package/lib/credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,MAAM,WAAW,MAAM;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAE1C;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;;AAED,qBAAa,WAAY,SAAQ,gBAEhC;CAAG;AAEJ;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,8CAyB9B,CAAC"}
+{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,MAAM,WAAW,MAAM;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAE1C;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;;AAED,qBAAa,WAAY,SAAQ,gBAEhC;CAAG;AAOJ;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,8CAkB9B,CAAC"}

package/lib/credentials.js

@@ -1,10 +1,15 @@
+import * as EffectConfig from "effect/Config";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
-import * as Context from "effect/Context";
 import { ConfigError } from "@distilled.cloud/core/errors";
 export class Credentials extends Context.Service()("KubernetesCredentials") {
 }
+const envConfig = EffectConfig.all({
+    token: EffectConfig.string("KUBERNETES_TOKEN"),
+    apiBaseUrl: EffectConfig.string("KUBERNETES_API_URL"),
+});
 /**
  * Build a credentials layer from environment variables.
  *
@@ -13,22 +18,13 @@ export class Credentials extends Context.Service()("KubernetesCredentials") {
  * | `KUBERNETES_TOKEN` | yes | Bearer token for authentication |
  * | `KUBERNETES_API_URL` | yes | API server URL (e.g. from `kubectl cluster-info`) |
  */
-export const CredentialsFromEnv = Layer.effect(Credentials, Effect.gen(function* () {
-    const token = process.env.KUBERNETES_TOKEN;
-    const apiBaseUrl = process.env.KUBERNETES_API_URL;
-    if (!token) {
-        return yield* new ConfigError({
-            message: "KUBERNETES_TOKEN environment variable is required. " +
-                "Set it to a bearer token for your Kubernetes cluster.",
-        });
-    }
-    if (!apiBaseUrl) {
-        return yield* new ConfigError({
-            message: "KUBERNETES_API_URL environment variable is required. " +
-                "Set it to the API server URL for your Kubernetes cluster " +
-                "(e.g. from `kubectl cluster-info` or the EKS cluster endpoint).",
-        });
-    }
-    return { token: Redacted.make(token), apiBaseUrl };
-}));
+export const CredentialsFromEnv = Layer.effect(Credentials, envConfig.asEffect().pipe(Effect.mapError(() => new ConfigError({
+    message: "KUBERNETES_TOKEN and KUBERNETES_API_URL environment variables are required. " +
+        "Set KUBERNETES_TOKEN to a bearer token for your Kubernetes cluster, " +
+        "and KUBERNETES_API_URL to the API server URL (e.g. from `kubectl cluster-info` " +
+        "or the EKS cluster endpoint).",
+})), Effect.map(({ token, apiBaseUrl }) => ({
+    token: Redacted.make(token),
+    apiBaseUrl,
+}))));
 //# sourceMappingURL=credentials.js.map

package/lib/credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAqB3D,MAAM,OAAO,WAAY,SAAQ,OAAO,CAAC,OAAO,EAAuB,CACrE,uBAAuB,CACxB;CAAG;AAEJ;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAC5C,WAAW,EACX,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;IAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IAElD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC,CAAC,IAAI,WAAW,CAAC;YAC5B,OAAO,EACL,qDAAqD;gBACrD,uDAAuD;SAC1D,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,KAAK,CAAC,CAAC,IAAI,WAAW,CAAC;YAC5B,OAAO,EACL,uDAAuD;gBACvD,2DAA2D;gBAC3D,iEAAiE;SACpE,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;AACrD,CAAC,CAAC,CACH,CAAC"}
+{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAqB3D,MAAM,OAAO,WAAY,SAAQ,OAAO,CAAC,OAAO,EAAuB,CACrE,uBAAuB,CACxB;CAAG;AAEJ,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC;IACjC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,kBAAkB,CAAC;IAC9C,UAAU,EAAE,YAAY,CAAC,MAAM,CAAC,oBAAoB,CAAC;CACtD,CAAC,CAAC;AAEH;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAC5C,WAAW,EACX,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,CACvB,MAAM,CAAC,QAAQ,CACb,GAAG,EAAE,CACH,IAAI,WAAW,CAAC;IACd,OAAO,EACL,8EAA8E;QAC9E,sEAAsE;QACtE,iFAAiF;QACjF,+BAA+B;CAClC,CAAC,CACL,EACD,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;IACrC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;IAC3B,UAAU;CACX,CAAC,CAAC,CACJ,CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distilled.cloud/kubernetes",
-  "version": "0.16.9",
+  "version": "0.18.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/alchemy-run/distilled",
@@ -74,8 +74,7 @@
     "specs:update": "git -C specs/kubernetes fetch && git -C specs/kubernetes checkout master && git -C specs/kubernetes pull"
   },
   "dependencies": {
-    "@distilled.cloud/core": "0.16.9",
-    "effect": ">=4.0.0-beta.60 || >=4.0.0"
+    "@distilled.cloud/core": "0.18.0"
   },
   "devDependencies": {
     "@types/bun": "^1.3.0",

package/src/credentials.ts

@@ -1,7 +1,8 @@
+import * as EffectConfig from "effect/Config";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
-import * as Context from "effect/Context";
 import { ConfigError } from "@distilled.cloud/core/errors";
 
 export interface Config {
@@ -27,6 +28,11 @@ export class Credentials extends Context.Service<Credentials, Config>()(
   "KubernetesCredentials",
 ) {}
 
+const envConfig = EffectConfig.all({
+  token: EffectConfig.string("KUBERNETES_TOKEN"),
+  apiBaseUrl: EffectConfig.string("KUBERNETES_API_URL"),
+});
+
 /**
  * Build a credentials layer from environment variables.
  *
@@ -37,27 +43,20 @@ export class Credentials extends Context.Service<Credentials, Config>()(
  */
 export const CredentialsFromEnv = Layer.effect(
   Credentials,
-  Effect.gen(function* () {
-    const token = process.env.KUBERNETES_TOKEN;
-    const apiBaseUrl = process.env.KUBERNETES_API_URL;
-
-    if (!token) {
-      return yield* new ConfigError({
-        message:
-          "KUBERNETES_TOKEN environment variable is required. " +
-          "Set it to a bearer token for your Kubernetes cluster.",
-      });
-    }
-
-    if (!apiBaseUrl) {
-      return yield* new ConfigError({
-        message:
-          "KUBERNETES_API_URL environment variable is required. " +
-          "Set it to the API server URL for your Kubernetes cluster " +
-          "(e.g. from `kubectl cluster-info` or the EKS cluster endpoint).",
-      });
-    }
-
-    return { token: Redacted.make(token), apiBaseUrl };
-  }),
+  envConfig.asEffect().pipe(
+    Effect.mapError(
+      () =>
+        new ConfigError({
+          message:
+            "KUBERNETES_TOKEN and KUBERNETES_API_URL environment variables are required. " +
+            "Set KUBERNETES_TOKEN to a bearer token for your Kubernetes cluster, " +
+            "and KUBERNETES_API_URL to the API server URL (e.g. from `kubectl cluster-info` " +
+            "or the EKS cluster endpoint).",
+        }),
+    ),
+    Effect.map(({ token, apiBaseUrl }) => ({
+      token: Redacted.make(token),
+      apiBaseUrl,
+    })),
+  ),
 );