feat(webapp): Private Links PR review improvements

Author: 0ski

apps/webapp/app/env.server.ts

@@ -1385,6 +1385,10 @@ const EnvironmentSchema = z
     REALTIME_STREAMS_S2_WAIT_SECONDS: z.coerce.number().int().default(60),
     REALTIME_STREAMS_DEFAULT_VERSION: z.enum(["v1", "v2"]).default("v1"),
     WAIT_UNTIL_TIMEOUT_MS: z.coerce.number().int().default(600_000),
+
+    // Private connections
+    PRIVATE_CONNECTIONS_ENABLED: z.string().optional(),
+    PRIVATE_CONNECTIONS_AWS_ACCOUNT_IDS: z.string().optional(),
   })
   .and(GithubAppEnvSchema)
   .and(S2EnvSchema);

apps/webapp/app/features.server.ts

@@ -1,3 +1,4 @@
+import { env } from "./env.server";
 import { requestUrl } from "./utils/requestUrl.server";
 
 export type TriggerFeatures = {
@@ -15,7 +16,7 @@ function isManagedCloud(host: string): boolean {
 }
 
 function hasPrivateConnections(host: string): boolean {
-  if (process.env.PRIVATE_CONNECTIONS_ENABLED === "1") {
+  if (env.PRIVATE_CONNECTIONS_ENABLED === "1") {
     return isManagedCloud(host);
   }
   return false;

apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections._index/route.tsx

@@ -1,7 +1,7 @@
 import { LinkButton } from "~/components/primitives/Buttons";
 import { Form, useFetcher, useRevalidator, type MetaFunction } from "@remix-run/react";
 import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { tryCatch } from "@trigger.dev/core";
+import { tryCatch } from "@trigger.dev/core/utils";
 import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
 import {
   MainHorizontallyCenteredContainer,
@@ -14,6 +14,7 @@ import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/Page
 import { Paragraph } from "~/components/primitives/Paragraph";
 import { prisma } from "~/db.server";
 import { featuresForRequest } from "~/features.server";
+import { logger } from "~/services/logger.server";
 import { getPrivateLinks } from "~/services/platform.v3.server";
 import { requireUserId } from "~/services/session.server";
 import {
@@ -58,7 +59,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
 
   const [error, connections] = await tryCatch(getPrivateLinks(organization.id));
   if (error) {
-    console.error("Error loading private link connections", error);
+    logger.error("Error loading private link connections", { error, organizationId: organization.id });
   }
 
   return typedjson({

apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections.new/route.tsx

@@ -2,7 +2,7 @@ import { conform, useForm } from "@conform-to/react";
 import { parse } from "@conform-to/zod";
 import { Form, useActionData, useParams, type MetaFunction } from "@remix-run/react";
 import { json, type ActionFunction, type LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { tryCatch } from "@trigger.dev/core";
+import { tryCatch } from "@trigger.dev/core/utils";
 import { useState } from "react";
 import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
@@ -23,11 +23,13 @@ import { NavBar, PageTitle } from "~/components/primitives/PageHeader";
 import { Paragraph } from "~/components/primitives/Paragraph";
 import { Select, SelectItem } from "~/components/primitives/Select";
 import { prisma } from "~/db.server";
+import { env } from "~/env.server";
 import { featuresForRequest } from "~/features.server";
 import {
   redirectWithErrorMessage,
   redirectWithSuccessMessage,
 } from "~/models/message.server";
+import type { CreatePrivateLinkConnectionBody } from "@trigger.dev/platform";
 import {
   createPrivateLink,
   getPrivateLinkRegions,
@@ -69,7 +71,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
 
   const [error, regions] = await tryCatch(getPrivateLinkRegions(organization.id));
 
-  const awsAccountIds = process.env.PRIVATE_CONNECTIONS_AWS_ACCOUNT_IDS?.split(",").filter(Boolean) ?? [];
+  const awsAccountIds = env.PRIVATE_CONNECTIONS_AWS_ACCOUNT_IDS?.split(",").filter(Boolean) ?? [];
 
   return typedjson({
     availableRegions: regions?.availableRegions ?? ["us-east-1", "eu-central-1"],
@@ -128,7 +130,10 @@ export const action: ActionFunction = async ({ request, params }) => {
   }
 
   const [error] = await tryCatch(
-    createPrivateLink(organization.id, { ...rest, targetRegion: selectedRegion })
+    createPrivateLink(organization.id, {
+      ...rest,
+      targetRegion: selectedRegion as CreatePrivateLinkConnectionBody["targetRegion"],
+    })
   );
 
   if (error) {

apps/webapp/app/services/platform.v3.server.ts

@@ -667,18 +667,18 @@ export async function createPrivateLink(
   organizationId: string,
   body: CreatePrivateLinkConnectionBody
 ): Promise<PrivateLinkConnection | undefined> {
-  if (!client) return undefined;
+  if (!client) throw new Error("Platform client not configured");
 
   const [error, result] = await tryCatch(client.createPrivateLink(organizationId, body));
 
   if (error) {
     logger.error("Error creating private link", { organizationId, error });
-    return undefined;
+    throw error;
   }
 
   if (!result.success) {
     logger.error("Error creating private link - no success", { organizationId, error: result.error });
-    return undefined;
+    throw new Error(result.error ?? "Failed to create private link");
   }
 
   return result;
@@ -688,18 +688,18 @@ export async function deletePrivateLink(
   organizationId: string,
   connectionId: string
 ): Promise<void> {
-  if (!client) return;
+  if (!client) throw new Error("Platform client not configured");
 
   const [error, result] = await tryCatch(client.deletePrivateLink(organizationId, connectionId));
 
   if (error) {
     logger.error("Error deleting private link", { organizationId, connectionId, error });
-    return;
+    throw error;
   }
 
   if (!result.success) {
     logger.error("Error deleting private link - no success", { organizationId, connectionId, error: result.error });
-    return;
+    throw new Error(result.error ?? "Failed to delete private link");
   }
 }