Merge pull request #250 from hyeeyoung/dev-settings-redis

[mod] redis 패스워드 설정 추가
hyeeyoung · Mar 19, 2023 · e854e07 · e854e07
2 parents c496fd3 + 1b82ffa
commit e854e07
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/developDeploy.yml b/.github/workflows/developDeploy.yml
@@ -45,6 +45,7 @@ jobs:
           echo DB_PORT=${{ secrets.DB_PORT }} >> .env
           echo REDIS_HOST=${{ secrets.REDIS_HOST }} >> .env
           echo REDIS_PORT=${{ secrets.REDIS_PORT }} >> .env
+          echo REDIS_DEV_PASSWORD=${{ secrets.REDIS_DEV_PASSWORD }} >> .env
 
           echo WISHBOARD_GMAIL_ID=${{ secrets.WISHBOARD_GMAIL_ID }} >> .env
           echo WISHBOARD_GMAIL_PW=${{ secrets.WISHBOARD_GMAIL_PW }} >> .env
@@ -78,7 +79,7 @@ jobs:
 
       - name: deploy with AWS codeDeploy
         run: aws deploy create-deployment
-          --application-name wishboard-dev-codedeploy
+          --application-name wishboard-dev-codedeploy1
           --deployment-config-name CodeDeployDefault.OneAtATime
           --deployment-group-name GROUP
           --s3-location bucket=wishboard-dev-build,bundleType=zip,key=deploy/wishboard-dev.zip
diff --git a/.github/workflows/prCheck.yml b/.github/workflows/prCheck.yml
@@ -46,6 +46,7 @@ jobs:
           echo DB_PORT=${{ secrets.DB_PORT }} >> .env
           echo REDIS_HOST=${{ secrets.REDIS_HOST }} >> .env
           echo REDIS_PORT=${{ secrets.REDIS_PORT }} >> .env
+          echo REDIS_DEV_PASSWORD=${{ secrets.REDIS_DEV_PASSWORD }} >> .env
 
           echo WISHBOARD_GMAIL_ID=${{ secrets.WISHBOARD_GMAIL_ID }} >> .env
           echo WISHBOARD_GMAIL_PW=${{ secrets.WISHBOARD_GMAIL_PW }} >> .env

diff --git a/.github/workflows/productDeploy.yml b/.github/workflows/productDeploy.yml
@@ -45,6 +45,7 @@ jobs:
           echo DB_PORT=${{ secrets.DB_PORT }} >> .env
           echo REDIS_HOST=${{ secrets.REDIS_HOST }} >> .env
           echo REDIS_PORT=${{ secrets.REDIS_PORT }} >> .env
+          echo REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }} >> .env
 
           echo WISHBOARD_GMAIL_ID=${{ secrets.WISHBOARD_GMAIL_ID }} >> .env
           echo WISHBOARD_GMAIL_PW=${{ secrets.WISHBOARD_GMAIL_PW }} >> .env

diff --git a/src/config/redis.js b/src/config/redis.js
@@ -2,16 +2,22 @@ const Redis = require('ioredis');
 const logger = require('./winston');
 require('dotenv').config({ path: '../.env' });
 
-const REDIS_HOST = process.env.REDIS_HOST;
-const REDIS_PORT = process.env.REDIS_PORT;
+const nodeEnv = process.env.NODE_ENV;
 
+let redisPassword = process.env.REDIS_DEV_PASSWORD;
+if (nodeEnv === 'production') {
+  redisPassword = process.env.REDIS_PASSWORD;
+}
+
+logger.info(redisPassword);
 let redis;
 
 const redisConnect = () => {
   try {
     redis = new Redis({
       host: process.env.REDIS_HOST,
       port: process.env.REDIS_PORT,
+      password: redisPassword,
       showFriendlyErrorStack: true,
     });
     logger.info(`redis(${REDIS_HOST}:${REDIS_PORT}) connect success!`);

diff --git a/webpack.config.js b/webpack.config.js
@@ -25,6 +25,9 @@ module.exports = {
       'process.env.DB_DEV_NAME': JSON.stringify(process.env.DB_DEV_NAME),
       'process.env.REDIS_HOST': JSON.stringify(process.env.REDIS_HOST),
       'process.env.REDIS_PORT': JSON.stringify(process.env.REDIS_PORT),
+      'process.env.REDIS_DEV_PASSWORD': JSON.stringify(
+        process.env.REDIS_DEV_PASSWORD,
+      ),
       'process.env.JWT_SECRET_KEY': JSON.stringify(process.env.JWT_SECRET_KEY),
       'process.env.WISHBOARD_GMAIL_ID': JSON.stringify(
         process.env.WISHBOARD_GMAIL_ID,

diff --git a/webpack.prod.config.js b/webpack.prod.config.js
@@ -23,6 +23,7 @@ module.exports = {
       'process.env.DB_NAME': JSON.stringify(process.env.DB_NAME),
       'process.env.REDIS_HOST': JSON.stringify(process.env.REDIS_HOST),
       'process.env.REDIS_PORT': JSON.stringify(process.env.REDIS_PORT),
+      'process.env.REDIS_PASSWORD': JSON.stringify(process.env.REDIS_PASSWORD),
       'process.env.JWT_SECRET_KEY': JSON.stringify(process.env.JWT_SECRET_KEY),
       'process.env.WISHBOARD_GMAIL_ID': JSON.stringify(
         process.env.WISHBOARD_GMAIL_ID,