Merge pull request #503 from Kernel360/develop

[merge] develop into main

Author: mooncw

.github/workflows/cd-dev.yml

@@ -14,68 +14,29 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-
-#      - run: touch ./domain-mysql/src/main/resources/application.yml
-      - run: echo "${{ secrets.APPLICATION }}" > ./domain-mysql/src/main/resources/application.yml
-      - uses: actions/upload-artifact@v2
-        with:
-          name: application.yml
-          path: ./domain-mysql/src/main/resources/application.yml
-
-      - run: echo "${{ secrets.MEMBER_APPLICATION }}" > ./member-api/src/main/resources/application.yml
-      - uses: actions/upload-artifact@v2
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
-          name: application.yml
-          path: ./member-api/src/main/resources/application.yml
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           java-version: '21'
           distribution: 'temurin'
 
-#      - name: Set up member-api application.yml
-#        uses: microsoft/variable-substitution@v1
-#        with:
-#          files: ./member-api/src/main/resources/application.yml
-#        env:
-#          spring.datasource.url: ${{ secrets.LOCAL_DB_URL }}
-#          spring.datasource.username: ${{ secrets.LOCAL_DB_HOST }}
-#          spring.datasource.password: ${{ secrets.LOCAL_DB_PASSWORD }}
-#          spring.redis.host: ${{ secrets.REDIS_HOST }}
-#          spring.redis.port: ${{ secrets.REDIS_PORT }}
-#          spring.data.mongodb.uri: ${{ secrets.MONGO_URI }}
-#          spring.security.jwt.secret: ${{ secrets.JWT_SECRET_KEY }}
-#          cloud.aws.s3.bucket: ${{ secrets.S3_BUCKET_NAME }}
-#          cloud.aws.region.static: ${{ secrets.S3_REGION }}
-#          cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
-#          cloud.aws.credentials.secretKey: ${{ secrets.AWS_ACCESS_SECRET }}
-#          kafka.url: ${{ secrets.KAFKA_URL }}
-#          custom.domain.image.baseUrl: ${{ secrets.BASE_URL }}
-#          chatgpt.rest-api-key: ${{ secrets.CHAT_GPT_API_KEY }}
-
-#      - name: Set up domain-mysql application.yml
-#        uses: microsoft/variable-substitution@v1
-#        with:
-#          files: ./domain-mysql/src/main/resources/application.yml
-#        env:
-#          spring.datasource.url: ${{ secrets.LOCAL_DB_URL }}
-#          spring.datasource.username: ${{ secrets.LOCAL_DB_HOST }}
-#          spring.datasource.password: ${{ secrets.LOCAL_DB_PASSWORD }}
-
-      - name: Set up domain-mongodb application.yml
+      - name: Set up member-api application-common.yml
         uses: microsoft/variable-substitution@v1
         with:
-          files: ./domain-mongodb/src/main/resources/application.yml
+          files: ./member-api/src/main/resources/application-common.yml
         env:
-          spring.data.mongodb.uri: ${{ secrets.MONGO_URI }}
+          jasypt.password: ${{ secrets.JASYPT_PASSWORD }}
 
       - name: Build member-api with Gradle
         run : |
           cd member-api
           chmod +x ./gradlew
-          ./gradlew clean build
+          ./gradlew build
 
       - name: Login to DockerHub
         uses: docker/login-action@v1

.github/workflows/cd.yml

@@ -23,31 +23,40 @@ jobs:
           java-version: '21'
           distribution: 'temurin'
 
+      - name: Set up DataHub with Docker
+        run: |
+          echo "${{ secrets.CI_DOCKER_COMPOSE }}" > docker-compose.yml
+          docker-compose up -d
+          docker ps
+
+      - name: Test domain-mysql with Gradle
+        run: |
+          cd domain-mysql
+          chmod +x ./gradlew
+          ./gradlew test
+
       - name: Set up domain-mongodb test application.yml
         uses: microsoft/variable-substitution@v1
         with:
           files: ./domain-mongodb/src/test/resources/application.yml
         env:
-          spring.data.mongodb.uri: ${{ secrets.MONGO_TEST_URI }}
+          jasypt.password: ${{ secrets.JASYPT_PASSWORD }}
+
+      - name: Test domain-mongodb with Gradle
+        run: |
+          cd domain-mongodb
+          chmod +x ./gradlew
+          ./gradlew test
 
-      - name: Set up member-api test application.yml
+      - name: Set up member-api application-common.yml
         uses: microsoft/variable-substitution@v1
         with:
-          files: ./member-api/src/test/resources/application.yml
+          files: ./member-api/src/main/resources/application-common.yml
         env:
-          spring.datasource.url: ${{ secrets.TEST_DB_URL }}
-          spring.datasource.username: ${{ secrets.TEST_DB_HOST }}
-          spring.datasource.password: ${{ secrets.TEST_DB_PASSWORD }}
-          spring.security.jwt.secret: ${{ secrets.JWT_SECRET_KEY }}
-          spring.data.mongodb.uri: ${{ secrets.MONGO_TEST_URI }}
-          custom.domain.image.baseUrl: ${{ secrets.BASE_URL }}
-          cloud.aws.s3.bucket: ${{ secrets.S3_BUCKET_NAME }}
-          cloud.aws.region.static: ${{ secrets.S3_REGION }}
-          cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
-          cloud.aws.credentials.secretKey: ${{ secrets.AWS_ACCESS_SECRET }}
-
-      - name: Run chmod to make gradlew executable
-        run: chmod +x ./gradlew
-
-      - name: Test with Gradle
-        run: ./gradlew test
+          jasypt.password: ${{ secrets.JASYPT_PASSWORD }}
+
+      - name: Build member-api with Gradle
+        run: |
+          cd member-api
+          chmod +x ./gradlew
+          ./gradlew build

.github/workflows/ci.yml

@@ -14,6 +14,10 @@ member-api/logs/**
 
 member-api/member-api/logs/**
 
+member-api/src/main/resources/application-local.yml
+
+core/src/test/java/com/kernelsqaure/core/config/JasyptConfigTest.java
+
 ### STS ###
 .apt_generated
 .classpath