feat: update env var names

.env.example

@@ -17,18 +17,18 @@ NEXT_TELEMETRY_DISABLED="true"
 NEXT_PUBLIC_SITE_URL="http://localhost:3000"
 
 # Database
-DATABASE_HOST="localhost"
-DATABASE_PORT="5432"
-DATABASE_USER="user"
-DATABASE_PASSWORD="password"
-DATABASE_NAME="database"
+DB_HOST="localhost"
+DB_PORT="5432"
+DB_USER="user"
+DB_PASSWORD="password"
+DB_NAME="database"
 
 # Storage
-STORAGE_HOST="localhost"
-STORAGE_PORT="9000"
-STORAGE_USER="user"
-STORAGE_PASSWORD="password"
-STORAGE_NAME="images"
+S3_HOST="localhost"
+S3_PORT="9000"
+S3_USER="user"
+S3_PASSWORD="password"
+S3_BUCKETS="images"
 
 # Auth
 FEIDE_CLIENT_ID=" "

compose.local.yml

@@ -3,9 +3,9 @@ services:
     image: postgres:16
     restart: unless-stopped
     environment:
-      POSTGRES_USER: ${DATABASE_USER}
-      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
-      POSTGRES_DB: ${DATABASE_NAME}
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_DB: ${DB_NAME}
     volumes:
       - ./data/db:/var/lib/postgresql/data
     ports:
@@ -14,9 +14,9 @@ services:
     image: bitnami/minio:2024
     restart: unless-stopped
     environment:
-      MINIO_ROOT_USER: ${STORAGE_USER}
-      MINIO_ROOT_PASSWORD: ${STORAGE_PASSWORD}
-      MINIO_DEFAULT_BUCKETS: ${STORAGE_NAME}
+      MINIO_ROOT_USER: ${S3_USER}
+      MINIO_ROOT_PASSWORD: ${S3_PASSWORD}
+      MINIO_DEFAULT_BUCKETS: ${S3_NAME}
     volumes:
       - ./data/s3:/bitnami/minio/data
     ports:

compose.yml

@@ -11,9 +11,9 @@ services:
     image: postgres:16
     restart: unless-stopped
     environment:
-      POSTGRES_USER: ${DATABASE_USER}
-      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
-      POSTGRES_DB: ${DATABASE_NAME}
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_DB: ${DB_NAME}
     volumes:
       - ./data/db:/var/lib/postgresql/data
     networks:
@@ -22,9 +22,9 @@ services:
     image: bitnami/minio:2024
     restart: unless-stopped
     environment:
-      MINIO_ROOT_USER: ${STORAGE_USER}
-      MINIO_ROOT_PASSWORD: ${STORAGE_PASSWORD}
-      MINIO_DEFAULT_BUCKETS: ${STORAGE_NAME}
+      MINIO_ROOT_USER: ${S3_USER}
+      MINIO_ROOT_PASSWORD: ${S3_PASSWORD}
+      MINIO_DEFAULT_BUCKETS: ${S3_NAME}
     volumes:
       - ./data/s3:/bitnami/minio/data
     networks:

drizzle.config.ts

@@ -6,7 +6,7 @@ const config = defineConfig({
   schema: './src/server/db/tables/*.ts',
   dialect: 'postgresql',
   dbCredentials: {
-    url: `postgresql://${env.DATABASE_USER}:${env.DATABASE_PASSWORD}@${env.DATABASE_HOST}:${env.DATABASE_PORT}/${env.DATABASE_NAME}`,
+    url: `postgresql://${env.DB_USER}:${env.DB_PASSWORD}@${env.DB_HOST}:${env.DB_PORT}/${env.DB_NAME}`,
   },
 });
 

src/env.ts

@@ -8,16 +8,16 @@ export const env = createEnv({
    */
   server: {
     NODE_ENV: z.enum(['development', 'test', 'production']),
-    DATABASE_HOST: z.string(),
-    DATABASE_PORT: z.string(),
-    DATABASE_USER: z.string(),
-    DATABASE_PASSWORD: z.string(),
-    DATABASE_NAME: z.string(),
-    STORAGE_HOST: z.string(),
-    STORAGE_PORT: z.string(),
-    STORAGE_USER: z.string(),
-    STORAGE_PASSWORD: z.string(),
-    STORAGE_NAME: z.string(),
+    DB_HOST: z.string(),
+    DB_PORT: z.string(),
+    DB_USER: z.string(),
+    DB_PASSWORD: z.string(),
+    DB_NAME: z.string(),
+    S3_HOST: z.string(),
+    S3_PORT: z.string(),
+    S3_USER: z.string(),
+    S3_PASSWORD: z.string(),
+    S3_BUCKETS: z.string(),
     FEIDE_CLIENT_ID: z.string(),
     FEIDE_CLIENT_SECRET: z.string(),
     FEIDE_AUTHORIZATION_ENDPOINT: z.string(),
@@ -40,16 +40,16 @@ export const env = createEnv({
    */
   runtimeEnv: {
     NODE_ENV: process.env.NODE_ENV,
-    DATABASE_HOST: process.env.DATABASE_HOST,
-    DATABASE_PORT: process.env.DATABASE_PORT,
-    DATABASE_USER: process.env.DATABASE_USER,
-    DATABASE_PASSWORD: process.env.DATABASE_PASSWORD,
-    DATABASE_NAME: process.env.DATABASE_NAME,
-    STORAGE_HOST: process.env.STORAGE_HOST,
-    STORAGE_PORT: process.env.STORAGE_PORT,
-    STORAGE_USER: process.env.STORAGE_USER,
-    STORAGE_PASSWORD: process.env.STORAGE_PASSWORD,
-    STORAGE_NAME: process.env.STORAGE_NAME,
+    DB_HOST: process.env.DB_HOST,
+    DB_PORT: process.env.DB_PORT,
+    DB_USER: process.env.DB_USER,
+    DB_PASSWORD: process.env.DB_PASSWORD,
+    DB_NAME: process.env.DB_NAME,
+    S3_HOST: process.env.S3_HOST,
+    S3_PORT: process.env.S3_PORT,
+    S3_USER: process.env.S3_USER,
+    S3_PASSWORD: process.env.S3_PASSWORD,
+    S3_BUCKETS: process.env.S3_BUCKETS,
     FEIDE_CLIENT_ID: process.env.FEIDE_CLIENT_ID,
     FEIDE_CLIENT_SECRET: process.env.FEIDE_CLIENT_SECRET,
     FEIDE_AUTHORIZATION_ENDPOINT: process.env.FEIDE_AUTHORIZATION_ENDPOINT,

src/server/db/index.ts

@@ -15,7 +15,7 @@ const globalForDb = globalThis as unknown as {
 const connection =
   globalForDb.connection ??
   postgres(
-    `postgresql://${env.DATABASE_USER}:${env.DATABASE_PASSWORD}@${env.DATABASE_HOST}:${env.DATABASE_PORT}/${env.DATABASE_NAME}`,
+    `postgresql://${env.DB_USER}:${env.DB_PASSWORD}@${env.DB_HOST}:${env.DB_PORT}/${env.DB_NAME}`,
   );
 if (env.NODE_ENV !== 'production') globalForDb.connection = connection;
 

src/server/s3/index.ts

@@ -5,7 +5,7 @@ import {
   S3Client,
 } from '@aws-sdk/client-s3';
 
-const endpoint = `http://${env.STORAGE_HOST}:${env.STORAGE_PORT}`;
+const endpoint = `http://${env.S3_HOST}:${env.S3_PORT}`;
 
 // Cache the S3 client in development. This avoids creating a new client on every HMR update.
 const globalForS3 = globalThis as unknown as {
@@ -16,8 +16,8 @@ const s3 =
   globalForS3.s3 ??
   new S3Client({
     credentials: {
-      accessKeyId: env.STORAGE_USER,
-      secretAccessKey: env.STORAGE_PASSWORD,
+      accessKeyId: env.S3_USER,
+      secretAccessKey: env.S3_PASSWORD,
     },
     endpoint: endpoint,
     forcePathStyle: true,
@@ -26,7 +26,7 @@ const s3 =
 
 if (env.NODE_ENV !== 'production') globalForS3.s3 = s3;
 
-const buckets = env.STORAGE_NAME.split(',');
+const buckets = env.S3_BUCKETS.split(',');
 const imageBucket = buckets[0];
 
 export { s3, endpoint, imageBucket, PutObjectCommand, DeleteObjectCommand };