From 95a19502413514f83b9444c12764e95a237f592d Mon Sep 17 00:00:00 2001
From: atridadl <me@atri.dad>
Date: Tue, 21 Nov 2023 09:11:19 -0700
Subject: [PATCH] env fixes

---
 .github/workflows/fly.yml |  7 ++-----
 Dockerfile                | 14 ++++----------
 package.json              |  7 ++-----
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/fly.yml b/.github/workflows/fly.yml
index 0cf6daa..34a4031 100644
--- a/.github/workflows/fly.yml
+++ b/.github/workflows/fly.yml
@@ -14,9 +14,7 @@ jobs:
           flyctl deploy --remote-only \
           --build-secret NEXT_PUBLIC_APP_ENV=${{ secrets.NEXT_PUBLIC_APP_ENV }} \
           --build-secret APP_ENV=${{ secrets.APP_ENV }} \
-          --build-secret UPSTASH_RATELIMIT_SECONDS=${{ secrets.UPSTASH_RATELIMIT_SECONDS }} \
-          --build-secret UPSTASH_RATELIMIT_REQUESTS=${{ secrets.UPSTASH_RATELIMIT_REQUESTS }} \
-          --build-secret UPSTASH_REDIS_EXPIRY_SECONDS=${{ secrets.UPSTASH_REDIS_EXPIRY_SECONDS }} \
+          --build-secret REDIS_EXPIRY_SECONDS=${{ secrets.REDIS_EXPIRY_SECONDS }} \
           --build-secret UNKEY_ROOT_KEY=${{ secrets.UNKEY_ROOT_KEY }} \
           --build-secret CLERK_SECRET_KEY=${{ secrets.CLERK_SECRET_KEY }} \
           --build-secret NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=${{ secrets.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY }} \
@@ -26,8 +24,7 @@ jobs:
           --build-secret ABLY_API_KEY=${{ secrets.ABLY_API_KEY }} \
           --build-secret DATABASE_AUTH_TOKEN=${{ secrets.DATABASE_AUTH_TOKEN }} \
           --build-secret DATABASE_URL=${{ secrets.DATABASE_URL }} \
-          --build-secret UPSTASH_REDIS_REST_URL=${{ secrets.UPSTASH_REDIS_REST_URL }} \
-          --build-secret UPSTASH_REDIS_REST_TOKEN=${{ secrets.UPSTASH_REDIS_REST_TOKEN }} \
+          --build-secret REDIS_URL=${{ secrets.REDIS_URL }} \
 
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
index 82a68f7..169fdea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,9 +34,7 @@ COPY --link . .
 # Build application
 RUN --mount=type=secret,id=NEXT_PUBLIC_APP_ENV \
     --mount=type=secret,id=APP_ENV \
-    --mount=type=secret,id=UPSTASH_RATELIMIT_SECONDS \
-    --mount=type=secret,id=UPSTASH_RATELIMIT_REQUESTS \
-    --mount=type=secret,id=UPSTASH_REDIS_EXPIRY_SECONDS \
+    --mount=type=secret,id=REDIS_EXPIRY_SECONDS \
     --mount=type=secret,id=UNKEY_ROOT_KEY \
     --mount=type=secret,id=CLERK_SECRET_KEY \
     --mount=type=secret,id=NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY \
@@ -46,13 +44,10 @@ RUN --mount=type=secret,id=NEXT_PUBLIC_APP_ENV \
     --mount=type=secret,id=ABLY_API_KEY \
     --mount=type=secret,id=DATABASE_AUTH_TOKEN \
     --mount=type=secret,id=DATABASE_URL \
-    --mount=type=secret,id=UPSTASH_REDIS_REST_URL \
-    --mount=type=secret,id=UPSTASH_REDIS_REST_TOKEN \
+    --mount=type=secret,id=REDIS_URL \
     NEXT_PUBLIC_APP_ENV="$(cat /run/secrets/NEXT_PUBLIC_APP_ENV)" \
     APP_ENV="$(cat /run/secrets/APP_ENV)" \
-    UPSTASH_RATELIMIT_SECONDS="$(cat /run/secrets/UPSTASH_RATELIMIT_SECONDS)" \
-    UPSTASH_RATELIMIT_REQUESTS="$(cat /run/secrets/UPSTASH_RATELIMIT_REQUESTS)" \
-    UPSTASH_REDIS_EXPIRY_SECONDS="$(cat /run/secrets/UPSTASH_REDIS_EXPIRY_SECONDS)" \
+    REDIS_EXPIRY_SECONDS="$(cat /run/secrets/REDIS_EXPIRY_SECONDS)" \
     UNKEY_ROOT_KEY="$(cat /run/secrets/UNKEY_ROOT_KEY)" \
     CLERK_SECRET_KEY="$(cat /run/secrets/CLERK_SECRET_KEY)" \
     NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY="$(cat /run/secrets/NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY)" \
@@ -62,8 +57,7 @@ RUN --mount=type=secret,id=NEXT_PUBLIC_APP_ENV \
     ABLY_API_KEY="$(cat /run/secrets/ABLY_API_KEY)" \
     DATABASE_AUTH_TOKEN="$(cat /run/secrets/DATABASE_AUTH_TOKEN)" \
     DATABASE_URL="$(cat /run/secrets/DATABASE_URL)" \
-    UPSTASH_REDIS_REST_URL="$(cat /run/secrets/UPSTASH_REDIS_REST_URL)" \
-    UPSTASH_REDIS_REST_TOKEN="$(cat /run/secrets/UPSTASH_REDIS_REST_TOKEN)" \
+    REDIS_URL="$(cat /run/secrets/REDIS_URL)" \
     pnpm run build
 
 # Remove development dependencies
diff --git a/package.json b/package.json
index dfcd7f0..aeb84a3 100644
--- a/package.json
+++ b/package.json
@@ -58,9 +58,7 @@
     "secrets": [
       "NEXT_PUBLIC_APP_ENV",
       "APP_ENV",
-      "UPSTASH_RATELIMIT_SECONDS",
-      "UPSTASH_RATELIMIT_REQUESTS",
-      "UPSTASH_REDIS_EXPIRY_SECONDS",
+      "REDIS_EXPIRY_SECONDS",
       "UNKEY_ROOT_KEY",
       "CLERK_SECRET_KEY",
       "NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY",
@@ -70,8 +68,7 @@
       "ABLY_API_KEY",
       "DATABASE_AUTH_TOKEN",
       "DATABASE_URL",
-      "UPSTASH_REDIS_REST_URL",
-      "UPSTASH_REDIS_REST_TOKEN"
+      "REDIS_URL"
     ]
   }
 }