fixup! WIP

src/declaration/kubernetes-address.ts

@@ -1,3 +1,7 @@
+import {
+  applyConstraints,
+  type DeclarationConstraintOptions,
+} from "../constraint.js";
 import { createHostnameConstraint } from "../constraint/hostname.js";
 import { createNetworkPortNumberConstraint } from "../constraint/network-port-number.js";
 import {
@@ -8,7 +12,7 @@ import {
   type ExactOptions,
 } from "../declaration.js";
 import { registerVariable } from "../environment.js";
-import { SpecError, normalize } from "../error.js";
+import { SpecError, ValueError, normalize } from "../error.js";
 import { resolveExamples, type Example } from "../example.js";
 import { Maybe, map, resolve } from "../maybe.js";
 import {
@@ -24,10 +28,11 @@ export type KubernetesAddress = {
   readonly port: number;
 };
 
-export type Options = DeclarationOptions<KubernetesAddress> & {
-  readonly examples?: KubernetesAddressExamples;
-  readonly portName?: string;
-};
+export type Options = DeclarationOptions<KubernetesAddress> &
+  DeclarationConstraintOptions<KubernetesAddress> & {
+    readonly examples?: KubernetesAddressExamples;
+    readonly portName?: string;
+  };
 
 type KubernetesAddressExamples = {
   readonly host?: Example<string>[];
@@ -39,6 +44,7 @@ export function kubernetesAddress<O extends Options>(
   options: ExactOptions<O, Options> = {} as ExactOptions<O, Options>,
 ): Declaration<KubernetesAddress, O> {
   const {
+    constraints = [],
     examples: { host: hostExamples, port: portExamples } = {},
     isSensitive = false,
     portName,
@@ -56,7 +62,24 @@ export function kubernetesAddress<O extends Options>(
       const host = resolve(hostVar.nativeValue());
       const port = resolve(portVar.nativeValue());
 
-      if (host != null && port != null) return { host, port };
+      if (host != null && port != null) {
+        const address = { host, port };
+
+        try {
+          applyConstraints(constraints, address);
+        } catch (error) {
+          // TODO: Figure out how to associate the error with the host AND port
+          // TODO: Get the original value in a better way
+          throw new ValueError(
+            hName,
+            isSensitive,
+            hostVar.marshal(host),
+            normalize(error),
+          );
+        }
+
+        return address;
+      }
 
       if (host != null) throw new PartiallyDefinedError(hName, pName);
       if (port != null) throw new PartiallyDefinedError(pName, hName);
@@ -73,7 +96,7 @@ function registerHost(
   def: Maybe<KubernetesAddress | undefined>,
 ): Variable<string> {
   const hostDef = map(def, (address) => address?.host);
-  const schema = createString("hostname", [createHostnameConstraint()]);
+  const schema = createHostSchema();
   let envName: string;
 
   try {
@@ -92,6 +115,10 @@ function registerHost(
   });
 }
 
+function createHostSchema(): ScalarSchema<string> {
+  return createString("hostname", [createHostnameConstraint()]);
+}
+
 function buildHostExamples(): Example<string>[] {
   return [
     {

test/suite/declaration/kubernetes-address.spec.ts

@@ -603,4 +603,82 @@ describe("Kubernetes address declarations", () => {
       });
     },
   );
+
+  describe("when the declaration has constraints", () => {
+    beforeEach(() => {
+      declaration = kubernetesAddress("austenite-svc", {
+        constraints: [
+          {
+            description: "<constraint A>",
+            constrain: (v) =>
+              v.host === "example.org" || "host must be example.org",
+          },
+          {
+            description: "<constraint B>",
+            constrain: (v) => v.port === 12345 || "port must be 12345",
+          },
+        ],
+        examples: {
+          host: [{ value: "example.org", label: "example" }],
+          port: [{ value: 12345, label: "example" }],
+        },
+      });
+    });
+
+    describe("when the value satisfies the constraints", () => {
+      beforeEach(() => {
+        process.env.AUSTENITE_SVC_SERVICE_HOST = "example.org";
+        process.env.AUSTENITE_SVC_SERVICE_PORT = "12345";
+
+        initialize({ onInvalid: noop });
+      });
+
+      describe(".value()", () => {
+        it("returns the value", () => {
+          expect(declaration.value()).toEqual({
+            host: "example.org",
+            port: 12345,
+          });
+        });
+      });
+    });
+
+    describe("when the value violates the first constraint", () => {
+      beforeEach(() => {
+        process.env.AUSTENITE_SVC_SERVICE_HOST = "example.com";
+        process.env.AUSTENITE_SVC_SERVICE_PORT = "12345";
+
+        initialize({ onInvalid: noop });
+      });
+
+      describe(".value()", () => {
+        it("throws", () => {
+          expect(() => {
+            declaration.value();
+          }).toThrow(
+            "value of AUSTENITE_SVC_SERVICE_HOST (example.com) is invalid: host must be example.org",
+          );
+        });
+      });
+    });
+
+    describe("when the value violates the second constraint", () => {
+      beforeEach(() => {
+        process.env.AUSTENITE_SVC_SERVICE_HOST = "example.org";
+        process.env.AUSTENITE_SVC_SERVICE_PORT = "54321";
+
+        initialize({ onInvalid: noop });
+      });
+
+      describe(".value()", () => {
+        it("throws", () => {
+          expect(() => {
+            declaration.value();
+          }).toThrow(
+            "value of AUSTENITE_SVC_SERVICE_HOST (example.org) is invalid: port must be 12345",
+          );
+        });
+      });
+    });
+  });
 });