Updates

.github/workflows/cleanup-projects.yml

@@ -18,5 +18,5 @@ jobs:
       - name: Cleanup Projects
         env:
           DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          NEON_API_KEY: ${{ secrets.NEON_API_KEY }}
+          INSTANT_POSTGRES_API_KEY: ${{ secrets.INSTANT_POSTGRES_API_KEY }}
         run: bun run packages/db/src/cleanup-projects.ts

.github/workflows/deploy-api.yml

@@ -10,7 +10,7 @@ on:
 env:
   DATABASE_URL: ${{ secrets.DATABASE_URL }}
   COOKIE_SECRET: ${{ secrets.COOKIE_SECRET }}
-  NEON_API_KEY: ${{ secrets.NEON_API_KEY }}
+  INSTANT_POSTGRES_API_KEY: ${{ secrets.INSTANT_POSTGRES_API_KEY }}
   APP_URL: ${{ secrets.APP_URL }}
   CLOUDFLARE_TURNSTILE_SECRET_KEY: ${{ secrets.CLOUDFLARE_TURNSTILE_SECRET_KEY }}
   UPSTASH_REDIS_REST_URL: ${{ secrets.UPSTASH_REDIS_REST_URL }}
@@ -39,7 +39,7 @@ jobs:
           echo "{
             \"DATABASE_URL\": \"${{ secrets.DATABASE_URL }}\",
             \"COOKIE_SECRET\": \"${{ secrets.COOKIE_SECRET }}\",
-            \"NEON_API_KEY\": \"${{ secrets.NEON_API_KEY }}\",
+            \"INSTANT_POSTGRES_API_KEY\": \"${{ secrets.INSTANT_POSTGRES_API_KEY }}\",
             \"APP_URL\": \"${{ secrets.APP_URL }}\",
             \"CLOUDFLARE_TURNSTILE_SECRET_KEY\": \"${{ secrets.CLOUDFLARE_TURNSTILE_SECRET_KEY }}\",
             \"UPSTASH_REDIS_REST_URL\": \"${{ secrets.UPSTASH_REDIS_REST_URL }}\",

apps/api/.dev.vars.example

@@ -1,7 +1,7 @@
 COOKIE_SECRET=
 DATABASE_URL=
-NEON_API_KEY=
 APP_URL=http://localhost:3000
 CLOUDFLARE_TURNSTILE_SECRET_KEY=
 UPSTASH_REDIS_REST_URL=
-UPSTASH_REDIS_REST_TOKEN=
+UPSTASH_REDIS_REST_TOKEN=
+INSTANT_POSTGRES_API_KEY=

apps/api/src/index.ts

@@ -104,7 +104,7 @@ const route = app.post(
 			);
 		}
 
-		const neonApiClient = neon(c.env.NEON_API_KEY);
+		const neonApiClient = neon(c.env.INSTANT_POSTGRES_API_KEY);
 
 		const start = Date.now();
 

apps/api/src/types.ts

@@ -2,12 +2,12 @@ import type { schema } from "@instant-postgres/neon";
 
 export type Bindings = {
 	DATABASE_URL: string;
-	NEON_API_KEY: string;
 	COOKIE_SECRET: string;
 	APP_URL: string;
 	CLOUDFLARE_TURNSTILE_SECRET_KEY: string;
 	UPSTASH_REDIS_REST_URL: string;
 	UPSTASH_REDIS_REST_TOKEN: string;
+	INSTANT_POSTGRES_API_KEY: string;
 };
 
 export type SuccessResponse<ResultType> = {

apps/web/app/components/deploy-button.tsx

@@ -88,7 +88,7 @@ export const DeployButton = () => {
 
 			<Turnstile
 				className="hidden"
-				siteKey="0x4AAAAAAAa4q5vJcjGaJqL7"
+				siteKey={CLOUDFLARE_TURNSTILE_SITE_KEY}
 				onSuccess={(token) => setToken(token)}
 			/>
 		</fetcher.Form>

packages/db/src/cleanup-projects.ts

@@ -5,7 +5,7 @@ import { and, sql } from "drizzle-orm";
 import { db } from ".";
 
 const DATABASE_URL = process.env.DATABASE_URL;
-const NEON_API_KEY = process.env.NEON_API_KEY;
+const INSTANT_POSTGRES_API_KEY = process.env.INSTANT_POSTGRES_API_KEY;
 
 const fetchOldProjects = async (client: NeonDriver["client"]) => {
 	const fiveMinutesAgo = sql`now() - interval '5 minutes'`;
@@ -52,12 +52,14 @@ const markProjectsAsDeleted = async (client: NeonDriver["client"]) => {
 
 const main = async () => {
 	try {
-		if (!DATABASE_URL || !NEON_API_KEY) {
-			throw new Error("Missing DATABASE_URL or NEON_API_KEY env var");
+		if (!DATABASE_URL || !INSTANT_POSTGRES_API_KEY) {
+			throw new Error(
+				"Missing DATABASE_URL or INSTANT_POSTGRES_API_KEY env var",
+			);
 		}
 
 		const client = db(DATABASE_URL);
-		const neonApiClient = neon(NEON_API_KEY);
+		const neonApiClient = neon(INSTANT_POSTGRES_API_KEY);
 
 		const oldProjects = await fetchOldProjects(client);