Merge pull request #486 from boostcampwm-2024/refactor/fix-rabbitmq-env

♻️ refactor: rabbitmq env 관련 변수명 수정

Author: CodeVac513

.github/workflows/deploy_feed-crawler.yml

@@ -81,8 +81,8 @@ jobs:
             echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}"
             echo "AI_API_KEY=${{ secrets.AI_API_KEY }}"
             echo "AI_RATE_LIMIT_COUNT=${{ vars.AI_RATE_LIMIT_COUNT }}"
-            echo "RABBITMQ_USERNAME=${{ secrets.PRODUCT_RABBITMQ_USERNAME }}"
-            echo "RABBITMQ_PASSWORD=${{ secrets.PRODUCT_RABBITMQ_PASSWORD }}"
+            echo "RABBITMQ_DEFAULT_USER=${{ secrets.PRODUCT_RABBITMQ_DEFAULT_USER }}"
+            echo "RABBITMQ_DEFAULT_PASS=${{ secrets.PRODUCT_RABBITMQ_DEFAULT_PASS }}"
             echo "RABBITMQ_HOST=${{ secrets.PRODUCT_RABBITMQ_HOST }}"
             echo "RABBITMQ_PORT=${{ secrets.PRODUCT_RABBITMQ_PORT }}"
           } | sudo tee "$ENV_FILE" >/dev/null
@@ -97,8 +97,8 @@ jobs:
             echo "MYSQL_DATABASE=${{ secrets.PRODUCT_DB_DATABASE }}"
             echo "MYSQL_USER=${{ secrets.PRODUCT_DB_USERNAME }}"
             echo "MYSQL_PASSWORD=${{ secrets.PRODUCT_DB_PASSWORD }}"
-            echo "RABBITMQ_USERNAME=${{ secrets.PRODUCT_RABBITMQ_USERNAME }}"
-            echo "RABBITMQ_PASSWORD=${{ secrets.PRODUCT_RABBITMQ_PASSWORD }}"  
+            echo "RABBITMQ_DEFAULT_USER=${{ secrets.PRODUCT_RABBITMQ_DEFAULT_USER }}"
+            echo "RABBITMQ_DEFAULT_PASS=${{ secrets.PRODUCT_RABBITMQ_DEFAULT_PASS }}"  
             echo "RABBITMQ_HOST=${{ secrets.PRODUCT_RABBITMQ_HOST }}"  
             echo "RABBITMQ_PORT=${{ secrets.PRODUCT_RABBITMQ_PORT }}"  
             echo "RABBITMQ_MANAGEMENT_PORT=${{ secrets.PRODUCT_RABBITMQ_MANAGEMENT_PORT }}"  

.github/workflows/deploy_infra.yml

@@ -29,11 +29,11 @@ jobs:
             echo "MYSQL_DATABASE=${{ secrets.PRODUCT_DB_DATABASE }}"
             echo "MYSQL_USER=${{ secrets.PRODUCT_DB_USERNAME }}"
             echo "MYSQL_PASSWORD=${{ secrets.PRODUCT_DB_PASSWORD }}"
-            echo "RABBITMQ_USERNAME=${{ secrets.PRODUCT_RABBITMQ_USERNAME }}"
-            echo "RABBITMQ_PASSWORD=${{ secrets.PRODUCT_RABBITMQ_PASSWORD }}"
+            echo "RABBITMQ_DEFAULT_USER=${{ secrets.PRODUCT_RABBITMQ_DEFAULT_USER }}"
+            echo "RABBITMQ_DEFAULT_PASS=${{ secrets.PRODUCT_RABBITMQ_DEFAULT_PASS }}"
             echo "RABBITMQ_HOST=${{ secrets.PRODUCT_RABBITMQ_HOST }}"
             echo "RABBITMQ_PORT=${{ secrets.PRODUCT_RABBITMQ_PORT }}"
-            echo "RABBITMQ_MANAGEMENT_PORT=${{ secrets.PRODUCT_RABBITMQ_MANAGEMENT_PORT }}"
+            echo "RABBITMQ_MANAGEMENT_PORT=${{ secrets.PRODUCT_RABBITMQ_MANAGEMENT_PORT }}"  
           } | sudo tee /var/prod_config/infra/.env.prod >/dev/null
 
           sudo chmod +x docker-compose/redis-init.sh

.github/workflows/deploy_server.yml

@@ -90,8 +90,8 @@ jobs:
             echo "GOOGLE_CLIENT_SECRET=${{ secrets.GOOGLE_CLIENT_SECRET }}"
             echo "GITHUB_CLIENT_ID=${{ secrets.GIT_CLIENT_ID }}"
             echo "GITHUB_CLIENT_SECRET=${{ secrets.GIT_CLIENT_SECRET }}"
-            echo "RABBITMQ_USERNAME=${{ secrets.PRODUCT_RABBITMQ_USERNAME }}"
-            echo "RABBITMQ_PASSWORD=${{ secrets.PRODUCT_RABBITMQ_PASSWORD }}"
+            echo "RABBITMQ_DEFAULT_USER=${{ secrets.PRODUCT_RABBITMQ_DEFAULT_USER }}"
+            echo "RABBITMQ_DEFAULT_PASS=${{ secrets.PRODUCT_RABBITMQ_DEFAULT_PASS }}"
             echo "RABBITMQ_HOST=${{ secrets.PRODUCT_RABBITMQ_HOST }}"
             echo "RABBITMQ_PORT=${{ secrets.PRODUCT_RABBITMQ_PORT }}"
           } | sudo tee "$ENV_FILE" >/dev/null
@@ -106,8 +106,8 @@ jobs:
             echo "MYSQL_DATABASE=${{ secrets.PRODUCT_DB_DATABASE }}"
             echo "MYSQL_USER=${{ secrets.PRODUCT_DB_USERNAME }}"
             echo "MYSQL_PASSWORD=${{ secrets.PRODUCT_DB_PASSWORD }}"
-            echo "RABBITMQ_USERNAME=${{ secrets.PRODUCT_RABBITMQ_USERNAME }}"
-            echo "RABBITMQ_PASSWORD=${{ secrets.PRODUCT_RABBITMQ_PASSWORD }}"  
+            echo "RABBITMQ_DEFAULT_USER=${{ secrets.PRODUCT_RABBITMQ_DEFAULT_USER }}"
+            echo "RABBITMQ_DEFAULT_PASS=${{ secrets.PRODUCT_RABBITMQ_DEFAULT_PASS }}" 
             echo "RABBITMQ_HOST=${{ secrets.PRODUCT_RABBITMQ_HOST }}"  
             echo "RABBITMQ_PORT=${{ secrets.PRODUCT_RABBITMQ_PORT }}"  
             echo "RABBITMQ_MANAGEMENT_PORT=${{ secrets.PRODUCT_RABBITMQ_MANAGEMENT_PORT }}"  

docker-compose/docker-compose.prod.infra.yml

@@ -85,9 +85,6 @@ services:
       - "15672:15672"
     env_file:
       - /var/prod_config/infra/.env.prod
-    environment:
-      RABBITMQ_DEFAULT_USER: ${RABBITMQ_USERNAME}
-      RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
     volumes:
       - denamu-rabbitmq:/var/lib/rabbitmq
     healthcheck:

feed-crawler/env/.env.local

@@ -10,7 +10,7 @@ REDIS_USERNAME=denamu-redis-user
 REDIS_PASSWORD=denamu-redis-pw
 AI_API_KEY=?
 AI_RATE_LIMIT_COUNT=5
-RABBITMQ_USERNAME=denamu-rabbitmq-user
-RABBITMQ_PASSWORD=denamu-rabbitmq-password
+RABBITMQ_DEFAULT_USER=denamu-rabbitmq-user
+RABBITMQ_DEFAULT_PASS=denamu-rabbitmq-password
 RABBITMQ_HOST=rabbitmq
 RABBITMQ_PORT=5672

feed-crawler/src/common/rmq-access.ts

@@ -18,8 +18,8 @@ export class RabbitMQConnection {
       protocol: 'amqp',
       hostname: process.env.RABBITMQ_HOST,
       port: Number.parseInt(process.env.RABBITMQ_PORT),
-      username: process.env.RABBITMQ_USERNAME,
-      password: process.env.RABBITMQ_PASSWORD,
+      username: process.env.RABBITMQ_DEFAULT_USER,
+      password: process.env.RABBITMQ_DEFAULT_PASS,
     });
   }
 }

server/env/.env.local

@@ -17,7 +17,7 @@ REFRESH_TOKEN_EXPIRE=7d
 ACCESS_TOKEN_EXPIRE=1h
 GOOGLE_CLIENT_ID=?
 GOOGLE_CLIENT_SECRET=?
-RABBITMQ_USERNAME=denamu-rabbitmq-user
-RABBITMQ_PASSWORD=denamu-rabbitmq-password
+RABBITMQ_DEFAULT_USER=denamu-rabbitmq-user
+RABBITMQ_DEFAULT_PASS=denamu-rabbitmq-password
 RABBITMQ_HOST=rabbitmq
 RABBITMQ_PORT=5672

server/src/common/rabbitmq/rabbitmq.module.ts

@@ -15,8 +15,8 @@ import { RabbitMQService } from './rabbitmq.service';
           protocol: 'amqp',
           hostname: configService.get<string>('RABBITMQ_HOST'),
           port: configService.get<number>('RABBITMQ_PORT'),
-          username: configService.get<string>('RABBITMQ_USERNAME'),
-          password: configService.get<string>('RABBITMQ_PASSWORD'),
+          username: configService.get<string>('RABBITMQ_DEFAULT_USER'),
+          password: configService.get<string>('RABBITMQ_DEFAULT_PASS'),
         });
       },
     },