update env pointers

Author: Kurtyjlee

.github/workflows/deploy.yml

@@ -31,8 +31,7 @@ jobs:
         env:
           NEXT_PUBLIC_QUESTION_SERVICE_URL: ${{ secrets.NEXT_PUBLIC_QUESTION_SERVICE_URL }}
           NEXT_PUBLIC_AUTH_SERVICE_URL: ${{ secrets.NEXT_PUBLIC_AUTH_SERVICE_URL }}
-          NEXT_PUBLIC_USER_SERVICE_URL: ${{ secrets.NEXT_PUBLIC_USER_SERVICE_URL }}
-          USER_SERVICE_URL: ${{ secrets.USER_SERVICE_URL }}
+          AUTH_SERVICE_URL: ${{ secrets.AUTH_SERVICE_URL }}
           QUESTION_SERVICE_URL: ${{ secrets.QUESTION_SERVICE_URL }}
         run: |
           gcloud builds submit --config cloudbuild.yaml \

cloudbuild.yaml

@@ -13,9 +13,7 @@ steps:
         "--build-arg",
         "NEXT_PUBLIC_AUTH_SERVICE_URL=${_NEXT_PUBLIC_AUTH_SERVICE_URL}",
         "--build-arg",
-        "NEXT_PUBLIC_USER_SERVICE_URL=${_NEXT_PUBLIC_USER_SERVICE_URL}",
-        "--build-arg",
-        "USER_SERVICE_URL=${_USER_SERVICE_URL}",
+        "AUTH_SERVICE_URL=${_AUTH_SERVICE_URL}",
         "--build-arg",
         "QUESTION_SERVICE_URL=${_QUESTION_SERVICE_URL}",
         "-f",

k8s/peerprep-config.yml

@@ -6,3 +6,5 @@ type: Opaque
 stringData:
   NEXT_PUBLIC_QUESTION_SERVICE_URL: "${_NEXT_PUBLIC_QUESTION_SERVICE_URL}"
   NEXT_PUBLIC_AUTH_SERVICE_URL: "${_NEXT_PUBLIC_AUTH_SERVICE_URL}"
+  AUTH_SERVICE_URL: "${_AUTH_SERVICE_URL}"
+  QUESTION_SERVICE_URL: "${_QUESTION_SERVICE_URL}"

peerprep-fe/Dockerfile

@@ -33,10 +33,14 @@ ENV PORT=3000
 # Accept build arguments
 ARG NEXT_PUBLIC_QUESTION_SERVICE_URL
 ARG NEXT_PUBLIC_AUTH_SERVICE_URL
+ARG AUTH_SERVICE_URL
+ARG QUESTION_SERVICE_URL
 
 # Set environment variables
 ENV NEXT_PUBLIC_QUESTION_SERVICE_URL=$NEXT_PUBLIC_QUESTION_SERVICE_URL
 ENV NEXT_PUBLIC_AUTH_SERVICE_URL=$NEXT_PUBLIC_AUTH_SERVICE_URL
+ENV AUTH_SERVICE_URL=$AUTH_SERVICE_URL
+ENV QUESTION_SERVICE_URL=$QUESTION_SERVICE_URL
 
 COPY . .
 RUN pnpm build

peerprep-fe/next.config.mjs

@@ -5,6 +5,8 @@ const nextConfig = {
     NEXT_PUBLIC_QUESTION_SERVICE_URL:
       process.env.NEXT_PUBLIC_QUESTION_SERVICE_URL,
     NEXT_PUBLIC_AUTH_SERVICE_URL: process.env.NEXT_PUBLIC_AUTH_SERVICE_URL,
+    AUTH_SERVICE_URL: process.env.AUTH_SERVICE_URL,
+    QUESTION_SERVICE_URL: process.env.QUESTION_SERVICE_URL,
   },
 };
 

peerprep-fe/src/middleware.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from 'next/server';
 import type { NextRequest } from 'next/server';
 
-const baseURL = process.env.USER_SERVICE_URL || 'http://172.17.0.1:3001/api/v1';
+const baseURL = process.env.AUTH_SERVICE_URL || 'http://172.17.0.1:3001/api/v1';
 
 // This function can be marked `async` if using `await` inside
 export async function middleware(request: NextRequest) {

peerprep-fe/src/network/axiosClient.ts

@@ -12,7 +12,7 @@ const axiosQuestionClient = axios.create({
 
 const axiosAuthClient = axios.create({
   baseURL:
-    process.env.NEXT_PUBLIC_USER_SERVICE_URL || 'http://localhost:3001/api/v1',
+    process.env.NEXT_PUBLIC_AUTH_SERVICE_URL || 'http://localhost:3001/api/v1',
   headers: {
     'Content-Type': 'application/json',
   },

peerprep-fe/src/network/axiosServer.ts

@@ -10,7 +10,7 @@ const axiosQuestionServer = axios.create({
 });
 
 const axiosAuthServer = axios.create({
-  baseURL: process.env.USER_SERVICE_URL || 'http://172.17.0.1:3001/api/v1',
+  baseURL: process.env.AUTH_SERVICE_URL || 'http://172.17.0.1:3001/api/v1',
   headers: {
     'Content-Type': 'application/json',
   },