Merge branch 'main' into feat/collab/ai-chat-enhancements

Author: dylkaw

.env.sample

@@ -1,34 +1,37 @@
 ## Common variables
 COMPOSE_PATH_SEPARATOR=:
 # Replace string between '...compose.' and '.yml' with 'dev' or 'prod'
-COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml
+COMPOSE_FILE=docker-compose.yml:docker-compose.prod.yml
 
 ## Frontend variables
-FRONTEND_PORT=3000
+FRONTEND_SERVICE_PORT=3000
 # BASE_URI only needs to be provided if hosting outside of cluster
 BASE_URI=
 
 ## Question service variables
-QUESTION_SVC_PORT=
+QUESTION_SERVICE_SERVICE_PORT=8000
 QUESTION_SVC_DB_URI=
 
 ## User service variables
-USER_SVC_PORT=
+USER_SERVICE_SERVICE_PORT=3001
 USER_SVC_DB_URI=
 JWT_SECRET=
 EMAIL_ADDRESS=
 EMAIL_PASSWORD=
 
 ## Matching service variables
-MATCHING_SVC_PORT=6969
+MATCHING_SERVICE_SERVICE_PORT=6969
 
 ## Collab service variables
-COLLAB_SVC_PORT=3002
+COLLAB_SERVICE_SERVICE_PORT=3002
 COLLAB_SVC_DB_URI=
 OPENAI_API_KEY=
 
 ## Redis variables
-REDIS_PORT=6379
+REDIS_SERVICE_PORT=6379
 
 ## Redisinsight variables
-REDIS_INSIGHT_PORT=5540
+REDIS_INSIGHT_PORT=5540
+
+## API Gateway variables
+API_GATEWAY_SERVICE_PORT=

.gitignore

@@ -1 +1,2 @@
 .env
+kubernetes/secrets.yaml

api-gateway/Dockerfile

@@ -0,0 +1,3 @@
+FROM nginx:1.26
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY templates /etc/nginx/templates

api-gateway/nginx.conf

@@ -0,0 +1,40 @@
+user  nginx;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log notice;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    add_header 'Access-Control-Allow-Origin' '*' always;
+    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+    add_header 'Access-Control-Allow-Headers' 'Origin, X-Requested-With, Content-Type, Accept' always;
+
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        ''      close;
+    }
+
+    include /etc/nginx/conf.d/*.conf;
+}

api-gateway/templates/api_conf.d/admin_conf.d/matching_service.conf.template

@@ -0,0 +1,2 @@
+location /admin/matching-service/ {
+}

api-gateway/templates/api_conf.d/admin_conf.d/question_service.conf.template

@@ -0,0 +1,5 @@
+location /admin/question-service/ {
+    location /admin/question-service/questions {
+        proxy_pass http://question-service/questions;
+    }
+}

api-gateway/templates/api_conf.d/api_backends.conf.template

@@ -0,0 +1,19 @@
+upstream user-service {
+    server $USER_SERVICE_SERVICE_HOST:$USER_SERVICE_SERVICE_PORT;
+}
+
+upstream question-service {
+    server $QUESTION_SERVICE_SERVICE_HOST:$QUESTION_SERVICE_SERVICE_PORT;
+}
+
+upstream matching-service {
+    server $MATCHING_SERVICE_SERVICE_HOST:$MATCHING_SERVICE_SERVICE_PORT;
+}
+
+upstream collab-service {
+    server $COLLAB_SERVICE_SERVICE_HOST:$COLLAB_SERVICE_SERVICE_PORT;
+}
+
+upstream frontend {
+    server $FRONTEND_SERVICE_HOST:$FRONTEND_SERVICE_PORT;
+}

api-gateway/templates/api_conf.d/auth.conf.template

@@ -0,0 +1,23 @@
+location /verify-token {
+    internal;
+
+    proxy_pass_request_body off; 
+    proxy_set_header Content-Length "";
+    proxy_pass http://user-service/auth/verify-token;
+}
+
+location /verify-owner {
+    internal;
+
+    proxy_pass_request_body off; 
+    proxy_set_header Content-Length "";
+    proxy_pass http://user-service/auth/verify-owner;
+}
+
+location /verify-admin {
+    internal;
+
+    proxy_pass_request_body off; 
+    proxy_set_header Content-Length "";
+    proxy_pass http://user-service/auth/verify-admin;
+}

api-gateway/templates/api_conf.d/frontend.conf.template

@@ -0,0 +1,3 @@
+location / {
+    proxy_pass http://frontend;
+}

api-gateway/templates/api_conf.d/owner_conf.d/matching_service.conf.template

@@ -0,0 +1,2 @@
+location /owner/matching-service/ {
+}