1.0.1

.github/workflows/prd-build-deploy.yml

@@ -14,9 +14,24 @@ jobs:
         run: |
           docker-compose -f docker/prd/prd-run-database-job.yml up -d --build
         env:
-          POSTGRES_PASSWORD: ${{ secrets.EXAMPLE_DB_PRD_PASSWORD }}"
+          DB_PRD_USER: ${{ secrets.DB_PRD_USER }}
+          DB_PRD_PASSWORD: ${{ secrets.DB_PRD_PASSWORD }}
       - name: Build and deploy the Docker image
         run: |
           docker-compose -f docker/prd/prd-build-deploy-job.yml up -d --build
         env:
-          POSTGRES_PASSWORD: ${{ secrets.EXAMPLE_DB_PRD_PASSWORD }}"
+          DB_PRD_ADDRESS: ${{ secrets.DB_PRD_ADDRESS }}
+          DB_PRD_USER: ${{ secrets.DB_PRD_USER }}
+          DB_PRD_PASSWORD: ${{ secrets.DB_PRD_PASSWORD }}
+          EUREKA_PRD: ${{ secrets.EUREKA_PRD }}
+          PRD_KEYCLOAK_ISSUER_ID: ${{ secrets.PRD_KEYCLOAK_ISSUER_ID }}
+          PRD_KEYCLOAK_CLIENT_NAME: ${{ secrets.PRD_KEYCLOAK_CLIENT_NAME }}
+          PRD_KEYCLOAK_CLIENT_ID: ${{ secrets.PRD_KEYCLOAK_CLIENT_ID }}
+          PRD_KEYCLOAK_CLIENT_SECRET: ${{ secrets.PRD_KEYCLOAK_CLIENT_SECRET }}
+          PRD_KEYCLOAK_JWK_SET_URI: ${{ secrets.PRD_KEYCLOAK_JWK_SET_URI }}
+          PRD_KEYCLOAK_URI: ${{ secrets.PRD_KEYCLOAK_URI }}
+          PRD_KEYCLOAK_REALM_NAME: ${{ secrets.PRD_KEYCLOAK_REALM_NAME }}
+          PRD_MANAGEMENT_KEYCLOAK_CLIENT_ID: ${{ secrets.PRD_MANAGEMENT_KEYCLOAK_CLIENT_ID }}
+          PRD_MANAGEMENT_KEYCLOAK_CLIENT_SECRET: ${{ secrets.PRD_MANAGEMENT_KEYCLOAK_CLIENT_SECRET }}
+          PRD_OSU_API_CLIENT_ID: ${{ secrets.PRD_OSU_API_CLIENT_ID }}
+          PRD_OSU_API_CLIENT_SECRET: ${{ secrets.PRD_OSU_API_CLIENT_SECRET }}

.github/workflows/stg-build-deploy.yml

@@ -17,9 +17,23 @@ jobs:
         run: |
           docker-compose -f docker/stg/stg-run-database-job.yml up -d --build
         env:
-          POSTGRES_PASSWORD: ${{ secrets.EXAMPLE_DB_STG_PASSWORD }}
+          DB_STG_USER: ${{ secrets.DB_STG_USER }}
+          DB_STG_PASSWORD: ${{ secrets.DB_STG_PASSWORD }}
       - name: Build and deploy the Docker image
         run: |
           docker-compose -f docker/stg/stg-build-deploy-job.yml up -d --build
         env:
-          POSTGRES_PASSWORD: ${{ secrets.EXAMPLE_DB_STG_PASSWORD }}
+          DB_STG_ADDRESS: ${{ secrets.DB_STG_ADDRESS }}
+          DB_STG_USER: ${{ secrets.DB_STG_USER }}
+          DB_STG_PASSWORD: ${{ secrets.DB_STG_PASSWORD }}
+          EUREKA_STG: ${{ secrets.EUREKA_STG }}
+          STG_KEYCLOAK_NAME_ISSUER: ${{ secrets.STG_KEYCLOAK_NAME_ISSUER }}
+          STG_KEYCLOAK_CLIENT_NAME: ${{ secrets.STG_KEYCLOAK_CLIENT_NAME }}
+          STG_KEYCLOAK_CLIENT_ID: ${{ secrets.STG_KEYCLOAK_CLIENT_ID }}
+          STG_KEYCLOAK_CLIENT_SECRET: ${{ secrets.STG_KEYCLOAK_CLIENT_SECRET }}
+          STG_KEYCLOAK_URI: ${{ secrets.STG_KEYCLOAK_URI }}
+          STG_KEYCLOAK_REALM_NAME: ${{ secrets.STG_KEYCLOAK_REALM_NAME }}
+          STG_MANAGEMENT_KEYCLOAK_CLIENT_ID: ${{ secrets.STG_MANAGEMENT_KEYCLOAK_CLIENT_ID }}
+          STG_MANAGEMENT_KEYCLOAK_CLIENT_SECRET: ${{ secrets.STG_MANAGEMENT_KEYCLOAK_CLIENT_SECRET }}
+          STG_OSU_API_CLIENT_ID: ${{ secrets.STG_OSU_API_CLIENT_ID }}
+          STG_OSU_API_CLIENT_SECRET: ${{ secrets.STG_OSU_API_CLIENT_SECRET }}

.github/workflows/stg-check-build.yml

@@ -5,6 +5,8 @@ on:
     branches: [ "stage" ]
   pull_request:
     branches: [ "stage" ]
+  workflow_dispatch:
+    branches: [ "stage" ]
 
 jobs:
   build:
@@ -17,4 +19,32 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
       - name: Maven Verify
-        run: mvn --batch-mode --update-snapshots verify
+        run: mvn --batch-mode --update-snapshots verify -Pstg
+      - name: Upload coverage
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-case reports
+          path: target/site/jacoco
+  codacy-coverage-reporter:
+    runs-on: ubuntu-latest
+    name: codacy-coverage-reporter
+    needs: [ build ]
+    steps:
+      - uses: actions/checkout@v3
+      - name: download reports
+        uses: actions/download-artifact@v3
+        with:
+          name: test-case reports
+          path: target/site/jacoco
+      - name: Display structure of downloaded files
+        run: ls -R
+      - name: Run codacy-coverage-reporter
+        uses: codacy/codacy-coverage-reporter-action@v1
+        env:
+          CODACY_API_TOKEN: ${{ secrets.CODACY_API_TOKEN }}
+          CODACY_ORGANIZATION_PROVIDER: gh
+          CODACY_USERNAME: AimCup
+          CODACY_PROJECT_NAME: ${{ github.event.repository.name }}
+        with:
+          api-token: $CODACY_API_TOKEN
+          coverage-reports: ${{ github.workspace }}/target/site/jacoco/jacoco.xml

docker/dev/dev-run-database-job.yml

@@ -0,0 +1,17 @@
+version: '3.8'
+
+services:
+  db-user-microservice:
+    image: postgres:15.1
+    restart: always
+    environment:
+      POSTGRES_USER: testUser
+      POSTGRES_PASSWORD: testPassword
+      POSTGRES_DB: user
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U testUser user" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    ports:
+      - "5432:5432"

docker/prd/prd-build-deploy-job.yml

@@ -1,14 +1,28 @@
 version: '3.8'
 
 services:
-  example-microservice:
+  user-microservice:
     build:
       context: ../..
       dockerfile: docker/prd/prd-build-deploy.Dockerfile
     ports:
-      - "8101:8101"
+      - "8501:8501"
     environment:
-      - EXAMPLE_DB_PRD_PASSWORD=${POSTGRES_PASSWORD}
+      - DB_PRD_ADDRESS=${DB_PRD_ADDRESS}
+      - DB_PRD_USER=${DB_PRD_USER}
+      - DB_PRD_PASSWORD=${DB_PRD_PASSWORD}
+      - EUREKA_PRD=${EUREKA_PRD}
+      - PRD_KEYCLOAK_ISSUER_ID=${PRD_KEYCLOAK_ISSUER_ID}
+      - PRD_KEYCLOAK_CLIENT_NAME=${PRD_KEYCLOAK_CLIENT_NAME}
+      - PRD_KEYCLOAK_CLIENT_ID=${PRD_KEYCLOAK_CLIENT_ID}
+      - PRD_KEYCLOAK_CLIENT_SECRET=${PRD_KEYCLOAK_CLIENT_SECRET}
+      - PRD_KEYCLOAK_JWK_SET_URI=${PRD_KEYCLOAK_JWK_SET_URI}
+      - PRD_KEYCLOAK_URI = ${PRD_KEYCLOAK_URI}
+      - PRD_KEYCLOAK_REALM_NAME = ${PRD_KEYCLOAK_REALM_NAME}
+      - PRD_MANAGEMENT_KEYCLOAK_CLIENT_ID = ${PRD_MANAGEMENT_KEYCLOAK_CLIENT_ID}
+      - PRD_MANAGEMENT_KEYCLOAK_CLIENT_SECRET = ${PRD_MANAGEMENT_KEYCLOAK_CLIENT_SECRET}
+      - PRD_OSU_API_CLIENT_SECRET = ${PRD_OSU_API_CLIENT_SECRET}
+      - PRD_OSU_API_CLIENT_ID = ${PRD_OSU_API_CLIENT_ID}
 
 networks:
   default:

docker/prd/prd-build-deploy.Dockerfile

@@ -5,5 +5,5 @@ RUN mvn -f /acservice/pom.xml clean package -P prd
 
 FROM arm32v7/eclipse-temurin:17
 COPY --from=build /acservice/target/*.jar app.jar
-EXPOSE 8101
+EXPOSE 8501
 ENTRYPOINT ["java","-Dspring.profiles.active=prd","-jar","/app.jar"]

docker/prd/prd-run-database-job.yml

@@ -1,20 +1,20 @@
 version: '3.8'
 
 services:
-  db-example-microservice:
+  db-user-microservice:
     image: postgres:15.1
     restart: always
     environment:
-      POSTGRES_USER: example-db-username
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_DB: example-db-name
+      POSTGRES_USER: ${DB_PRD_USER}
+      POSTGRES_PASSWORD: ${DB_PRD_PASSWORD}
+      POSTGRES_DB: user
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
+      test: [ "CMD-SHELL", "pg_isready -U $$DB_PRD_USER user" ]
       interval: 5s
       timeout: 5s
       retries: 5
     ports:
-      - "5401:5432"
+      - "5701:5432"
 
 networks:
   default:

docker/stg/stg-build-deploy-job.yml

@@ -1,15 +1,28 @@
 version: '3.8'
 
 services:
-  example-microservice:
+  user-microservice:
     build:
       context: ../..
       dockerfile: docker/stg/stg-build-deploy.Dockerfile
     ports:
-      - "8201:8201"
+      - "8502:8502"
     environment:
-      - EXAMPLE_DB_STG_PASSWORD=${POSTGRES_PASSWORD}
-
+      - DB_STG_ADDRESS=${DB_STG_ADDRESS}
+      - DB_STG_USER=${DB_STG_USER}
+      - DB_STG_PASSWORD=${DB_STG_PASSWORD}
+      - EUREKA_STG=${EUREKA_STG}
+      - STG_KEYCLOAK_NAME_ISSUER=${STG_KEYCLOAK_NAME_ISSUER}
+      - STG_KEYCLOAK_CLIENT_NAME=${STG_KEYCLOAK_CLIENT_NAME}
+      - STG_KEYCLOAK_CLIENT_ID=${STG_KEYCLOAK_CLIENT_ID}
+      - STG_KEYCLOAK_CLIENT_SECRET=${STG_KEYCLOAK_CLIENT_SECRET}
+      - STG_KEYCLOAK_JWK_SET_URI=${STG_KEYCLOAK_JWK_SET_URI}
+      - STG_KEYCLOAK_URI = ${STG_KEYCLOAK_URI}
+      - STG_KEYCLOAK_REALM_NAME = ${STG_KEYCLOAK_REALM_NAME}
+      - STG_MANAGEMENT_KEYCLOAK_CLIENT_ID = ${STG_MANAGEMENT_KEYCLOAK_CLIENT_ID}
+      - STG_MANAGEMENT_KEYCLOAK_CLIENT_SECRET = ${STG_MANAGEMENT_KEYCLOAK_CLIENT_SECRET}
+      - STG_OSU_API_CLIENT_SECRET = ${STG_OSU_API_CLIENT_SECRET}
+      - STG_OSU_API_CLIENT_ID = ${STG_OSU_API_CLIENT_ID}
 
 networks:
   default:

docker/stg/stg-build-deploy.Dockerfile

@@ -1,9 +1,9 @@
-FROM arm32v7/maven:3.9.3-eclipse-temurin-17 AS build
+FROM maven:3.9.3-eclipse-temurin-17-focal AS build
 COPY src /acservice/src
 COPY pom.xml /acservice
 RUN mvn -f /acservice/pom.xml clean package -P stg
 
-FROM arm32v7/eclipse-temurin:17
+FROM eclipse-temurin:17.0.8_7-jre-focal
 COPY --from=build /acservice/target/*.jar app.jar
-EXPOSE 8201
+EXPOSE 8502
 ENTRYPOINT ["java","-Dspring.profiles.active=stg","-jar","/app.jar"]

docker/stg/stg-run-database-job.yml

@@ -1,20 +1,20 @@
 version: '3.8'
 
 services:
-  db-example-microservice:
+  db-user-microservice:
     image: postgres:15.1
     restart: always
     environment:
-      POSTGRES_USER: example-db-username
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_DB: example-db-name
+      POSTGRES_USER: ${DB_STG_USER}
+      POSTGRES_PASSWORD: ${DB_STG_PASSWORD}
+      POSTGRES_DB: user
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
+      test: [ "CMD-SHELL", "pg_isready -U $$DB_STG_USER user" ]
       interval: 5s
       timeout: 5s
       retries: 5
     ports:
-      - "5501:5432"
+      - "5702:5432"
 
 networks:
   default: