fixup! WIP

ezzatron · Mar 25, 2024 · 5104165 · 5104165
1 parent faad409
commit 5104165
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 139 deletions.
diff --git a/src/declaration/kubernetes-address.ts b/src/declaration/kubernetes-address.ts
@@ -1,7 +1,3 @@
-import {
-  applyConstraints,
-  type DeclarationConstraintOptions,
-} from "../constraint.js";
 import { createHostnameConstraint } from "../constraint/hostname.js";
 import { createNetworkPortNumberConstraint } from "../constraint/network-port-number.js";
 import {
@@ -12,7 +8,7 @@ import {
   type ExactOptions,
 } from "../declaration.js";
 import { registerVariable } from "../environment.js";
-import { SpecError, ValueError, normalize } from "../error.js";
+import { SpecError, normalize } from "../error.js";
 import { resolveExamples, type Example } from "../example.js";
 import { Maybe, map, resolve } from "../maybe.js";
 import {
@@ -28,11 +24,10 @@ export type KubernetesAddress = {
   readonly port: number;
 };
 
-export type Options = DeclarationOptions<KubernetesAddress> &
-  DeclarationConstraintOptions<KubernetesAddress> & {
-    readonly examples?: KubernetesAddressExamples;
-    readonly portName?: string;
-  };
+export type Options = DeclarationOptions<KubernetesAddress> & {
+  readonly examples?: KubernetesAddressExamples;
+  readonly portName?: string;
+};
 
 type KubernetesAddressExamples = {
   readonly host?: Example<string>[];
@@ -44,7 +39,6 @@ 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,
@@ -62,24 +56,7 @@ export function kubernetesAddress<O extends Options>(
       const host = resolve(hostVar.nativeValue());
       const port = resolve(portVar.nativeValue());
 
-      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 && port != null) return { host, port };
 
       if (host != null) throw new PartiallyDefinedError(hName, pName);
       if (port != null) throw new PartiallyDefinedError(pName, hName);

diff --git a/test/suite/declaration/kubernetes-address.spec.ts b/test/suite/declaration/kubernetes-address.spec.ts
@@ -603,82 +603,4 @@ 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",
-          );
-        });
-      });
-    });
-  });
 });
diff --git a/test/suite/summary.spec.ts b/test/suite/summary.spec.ts
@@ -382,38 +382,6 @@ describe("Validation summary", () => {
     expect(exitCode).toBeGreaterThan(0);
   });
 
-  it("summarizes variables that violate explicit constraints", async () => {
-    Object.assign(process.env, {
-      AUSTENITE_SVC_SERVICE_HOST: "example.org",
-      AUSTENITE_SVC_SERVICE_PORT: "8002",
-    });
-
-    kubernetesAddress("austenite-svc", {
-      constraints: [
-        {
-          description: "must be on the allow list",
-          constrain({ host, port }) {
-            if (host === "example.org" && port === 8001) return undefined;
-            if (host === "example.com" && port === 8002) return undefined;
-
-            return "not allowed";
-          },
-        },
-      ],
-      examples: {
-        host: [{ value: "example.org", label: "example" }],
-        port: [{ value: 8001, label: "example" }],
-      },
-    });
-
-    initialize();
-
-    await expect(mockConsole.readStderr()).toMatchFileSnapshot(
-      fixturePath("explicit-constraint-violation"),
-    );
-    expect(exitCode).toBeGreaterThan(0);
-  });
-
   it("summarizes sensitive variables", async () => {
     Object.assign(process.env, {
       AUSTENITE_BINARY: "QmVlcCBib29wIQ==",