feat: Connect rds

YAPP-Github · Jul 20, 2024 · 022e7db · 022e7db
1 parent 7eabcb4
commit 022e7db
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 35 deletions.
diff --git a/.github/workflows/showpot-dev-cd.yml b/.github/workflows/showpot-dev-cd.yml
@@ -26,13 +26,16 @@ jobs:
       - name: Copy Secrets
         uses: microsoft/variable-substitution@v1
         with:
-          files: './app/src/main/resources/application-dev.yml, ./app/src/main/resources/application-cloud-dev.yml'
+          files: './app/src/main/resources/application-dev.yml, ./app/src/main/resources/application-cloud-dev.yml, ./app/domain/common-domain/src/main/resources/application-domain-dev.yml'
         env:
           token.secret-key: ${{ secrets.TOKEN_SECRET_KEY }}
           cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
           cloud.aws.credentials.secretKey: ${{ secrets.AWS_SECRET_KEY }}
           cloud.aws.region: ${{ secrets.AWS_REGION }}
           cloud.aws.s3.bucket: ${{ secrets.AWS_BUCKET }}
+          spring.datasource.url: ${{ secrets.APPLICATION_DATASOURCE_URL_DEV }}
+          spring.datasource.username: ${{ secrets.APPLICATION_DATASOURCE_USERNAME }}
+          spring.datasource.password: ${{ secrets.APPLICATION_DATASOURCE_PASSWORD }}
 
       - name: Build with Gradle Wrapper
         run: ./gradlew clean build

diff --git a/.github/workflows/showpot-dev-ci.yml b/.github/workflows/showpot-dev-ci.yml
@@ -26,13 +26,16 @@ jobs:
       - name: Copy Secrets
         uses: microsoft/variable-substitution@v1
         with:
-          files: './app/src/main/resources/application-dev.yml, ./app/src/main/resources/application-cloud-dev.yml'
+          files: './app/src/main/resources/application-dev.yml, ./app/src/main/resources/application-cloud-dev.yml, ./app/domain/common-domain/src/main/resources/application-domain-dev.yml'
         env:
           token.secret-key: ${{ secrets.TOKEN_SECRET_KEY }}
           cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
           cloud.aws.credentials.secretKey: ${{ secrets.AWS_SECRET_KEY }}
           cloud.aws.region: ${{ secrets.AWS_REGION }}
           cloud.aws.s3.bucket: ${{ secrets.AWS_BUCKET }}
+          spring.datasource.url: ${{ secrets.APPLICATION_DATASOURCE_URL_DEV }}
+          spring.datasource.username: ${{ secrets.APPLICATION_DATASOURCE_USERNAME }}
+          spring.datasource.password: ${{ secrets.APPLICATION_DATASOURCE_PASSWORD }}
 
       - name: Build with Gradle Wrapper
         run: ./gradlew clean build

diff --git a/.github/workflows/showpot-prod-ci.yml b/.github/workflows/showpot-prod-ci.yml
@@ -26,12 +26,16 @@ jobs:
       - name: Copy Secrets
         uses: microsoft/variable-substitution@v1
         with:
-          files: ./app/src/main/resources/application-cloud-prod.yml
+          files: './app/src/main/resources/application-dev.yml, ./app/src/main/resources/application-cloud-dev.yml, ./app/domain/common-domain/src/main/resources/application-domain-dev.yml'
         env:
+          token.secret-key: ${{ secrets.TOKEN_SECRET_KEY }}
           cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
           cloud.aws.credentials.secretKey: ${{ secrets.AWS_SECRET_KEY }}
           cloud.aws.region: ${{ secrets.AWS_REGION }}
           cloud.aws.s3.bucket: ${{ secrets.AWS_BUCKET }}
+          spring.datasource.url: ${{ secrets.APPLICATION_DATASOURCE_URL_DEV }}
+          spring.datasource.username: ${{ secrets.APPLICATION_DATASOURCE_USERNAME }}
+          spring.datasource.password: ${{ secrets.APPLICATION_DATASOURCE_PASSWORD }}
 
       - name: Build with Gradle Wrapper
         run: ./gradlew clean build

diff --git a/app/domain/common-domain/src/main/resources/application-domain-dev.yml b/app/domain/common-domain/src/main/resources/application-domain-dev.yml
@@ -1,7 +1,10 @@
 spring:
-    jpa:
-        hibernate:
-            ddl-auto: create
-        show-sql: true
-        open-in-view: false
-        generate-ddl: true
+  jpa:
+    hibernate:
+      ddl-auto: none
+    show-sql: true
+  datasource:
+    url: ${APPLICATION_DATASOURCE_URL_DEV}
+    username: ${APPLICATION_DATASOURCE_USERNAME}
+    password: ${APPLICATION_DATASOURCE_PASSWORD}
+    driver-class-name: org.postgresql.Driver
diff --git a/app/domain/common-domain/src/main/resources/application-domain-prod.yml b/app/domain/common-domain/src/main/resources/application-domain-prod.yml
@@ -0,0 +1,10 @@
+spring:
+  jpa:
+    hibernate:
+      ddl-auto: none
+    show-sql: true
+  datasource:
+    url: ${APPLICATION_DATASOURCE_URL_PROD}
+    username: ${APPLICATION_DATASOURCE_USERNAME}
+    password: ${APPLICATION_DATASOURCE_PASSWORD}
+    driver-class-name: org.postgresql.Driver
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
@@ -1,17 +1,4 @@
 services:
-  postgresql:
-    container_name: yapp_postgresql
-    image: postgres:14
-    environment:
-      POSTGRES_DB: yapp
-      POSTGRES_USER: yapp
-      POSTGRES_PASSWORD: yapp
-    ports:
-      - '5432:5432'
-    restart: always
-    networks:
-      - app-network
-
   redis:
     container_name: yapp_redis
     image: redis:alpine

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
@@ -1,17 +1,4 @@
 services:
-  postgresql:
-    container_name: yapp_postgresql
-    image: postgres:14
-    environment:
-      POSTGRES_DB: yapp
-      POSTGRES_USER: yapp
-      POSTGRES_PASSWORD: yapp
-    ports:
-      - '5432:5432'
-    restart: always
-    networks:
-      - app-network
-
   redis:
     container_name: yapp_redis
     image: redis:alpine