Simplify relay infrastructure resource composition

Co-authored-by: codex <codex@users.noreply.github.com>

Author: juliusmarminge

infra/relay/alchemy.run.ts

@@ -4,19 +4,11 @@ import * as Cloudflare from "alchemy/Cloudflare";
 import * as Drizzle from "alchemy/Drizzle";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as Output from "alchemy/Output";
 import * as Planetscale from "alchemy/Planetscale";
 import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
 
 import { PlanetscaleDatabase, RelayHyperdrive } from "./src/db.ts";
 import Api from "./src/worker.ts";
-import { ImportedCloudflareZoneProvider } from "./src/infra/ImportedCloudflareZone.ts";
-import {
-  MANAGED_ENDPOINT_ZONE,
-  RELAY_PUBLIC_SUBDOMAIN,
-  relayWorkerDomainDnsTokenPolicies,
-} from "./src/infra/ManagedEndpointStackConfig.ts";
-import { WorkerCustomDomain, WorkerCustomDomainProvider } from "./src/infra/WorkerCustomDomain.ts";
 
 export default Alchemy.Stack(
   "T3CodeRelay",
@@ -28,36 +20,19 @@ export default Alchemy.Stack(
       Drizzle.providers(),
       Planetscale.providers(),
       FetchHttpClient.layer,
-      ImportedCloudflareZoneProvider(),
-      WorkerCustomDomainProvider(),
     ),
     state: Cloudflare.state(),
   },
   Effect.gen(function* () {
     const db = yield* PlanetscaleDatabase;
     const hyperdrive = yield* RelayHyperdrive;
     const api = yield* Api;
-    const relayWorkerDomainDnsToken = yield* Cloudflare.AccountApiToken(
-      "RelayWorkerDomainDnsToken",
-      {
-        name: "t3-code-relay-worker-domain-dns",
-        policies: relayWorkerDomainDnsTokenPolicies({
-          zoneId: MANAGED_ENDPOINT_ZONE.zoneId,
-        }),
-      },
-    );
-    const relayDomain = yield* WorkerCustomDomain("RelayWorkerDomain", {
-      zoneId: MANAGED_ENDPOINT_ZONE.zoneId,
-      workerName: api.workerName,
-      subdomain: RELAY_PUBLIC_SUBDOMAIN,
-      dnsApiToken: relayWorkerDomainDnsToken.value,
-    });
 
     return {
       databaseName: db.database.name,
       hyperdriveName: hyperdrive.name,
       workerName: api.workerName,
-      url: Output.interpolate`https://${relayDomain.hostname}`,
+      url: api.url,
     };
   }),
 );

infra/relay/src/db.ts

@@ -12,7 +12,6 @@ export interface RelayDatabase extends EffectPgDatabase {
 
 export class RelayDb extends Context.Service<RelayDb, RelayDatabase>()("RelayDb") {}
 
-const relayPostgresDatabaseName = "t3coderelay-relaypostgresdatabase-dev-julius-qcduwqxl7fi3rjlx";
 export const relayPostgresDatabaseRegion = { slug: "us-west" } as const;
 
 export const RelaySchema = Drizzle.Schema("RelaySchema", {
@@ -24,7 +23,6 @@ export const RelaySchema = Drizzle.Schema("RelaySchema", {
 export const PlanetscaleDatabase = Effect.gen(function* () {
   const schema = yield* RelaySchema;
   const database = yield* Planetscale.PostgresDatabase("RelayPostgresDatabase", {
-    name: relayPostgresDatabaseName,
     region: relayPostgresDatabaseRegion,
     clusterSize: "PS_5",
     migrationsDir: schema.out,
@@ -33,7 +31,7 @@ export const PlanetscaleDatabase = Effect.gen(function* () {
   });
 
   const runtimeRole = yield* Planetscale.PostgresRole("RelayPostgresRuntimeRole", {
-    database: relayPostgresDatabaseName,
+    database,
     inheritedRoles: ["pg_read_all_data", "pg_write_all_data"],
   });
 

infra/relay/src/infra/ImportedCloudflareZone.ts

@@ -1,22 +1,12 @@
 export const MANAGED_ENDPOINT_ZONE = {
+  name: "ineededadomain.com",
   zoneId: "fcea40a6915723b0f5c4a9480eb3507b",
-  baseSubdomain: "tunnels",
+  accountId: "1468bbd99811cdaccfbb707dc725421a",
 } as const;
 
-const relayPublicSubdomain = "t3code-relay";
-
-export const RELAY_PUBLIC_SUBDOMAIN = relayPublicSubdomain;
-
-export const relayPublicDomain = (zone: { readonly name: string }) =>
-  `${relayPublicSubdomain}.${zone.name}`;
-
-export const relayPublicOrigin = (zone: { readonly name: string }) =>
-  `https://${relayPublicDomain(zone)}`;
-
-export const managedEndpointBaseDomain = (zone: {
-  readonly name: string;
-  readonly baseSubdomain?: string;
-}) => zone.name;
+export const RELAY_PUBLIC_DOMAIN = `t3code-relay.${MANAGED_ENDPOINT_ZONE.name}`;
+export const RELAY_PUBLIC_ORIGIN = `https://${RELAY_PUBLIC_DOMAIN}`;
+export const MANAGED_ENDPOINT_BASE_DOMAIN = MANAGED_ENDPOINT_ZONE.name;
 
 export function managedEndpointProvisionerTokenPolicies(input: {
   readonly accountId: string;
@@ -39,20 +29,3 @@ export function managedEndpointProvisionerTokenPolicies(input: {
     },
   ];
 }
-
-export function relayWorkerDomainDnsTokenPolicies(input: { readonly zoneId: string }) {
-  return [
-    {
-      effect: "allow" as const,
-      permissionGroups: [
-        "DNS Read" as const,
-        "DNS Write" as const,
-        "Workers Routes Read" as const,
-        "Workers Routes Write" as const,
-      ],
-      resources: {
-        [`com.cloudflare.api.account.zone.${input.zoneId}`]: "*",
-      },
-    },
-  ];
-}