ADM-940 [frontend][backend]: fix report file bug

.github/workflows/Release.yaml

@@ -22,9 +22,9 @@ jobs:
           java-version: ${{ vars.JAVA_VERSION || 19 }}
           distribution: "adopt"
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/wrapper-validation-action@v3
       - name: Set up Gradle
-        uses: gradle/gradle-build-action@v3.2.1
+        uses: gradle/gradle-build-action@v3.3.2
       - name: Build
         run: ./gradlew clean build
       - uses: actions/upload-artifact@v4

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

@@ -89,9 +89,9 @@ jobs:
           java-version: ${{ vars.JAVA_VERSION }}
           distribution: "adopt"
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/wrapper-validation-action@v3
       - name: Set up Gradle
-        uses: gradle/gradle-build-action@v3.2.1
+        uses: gradle/gradle-build-action@v3.3.2
       - name: Test and check
         run: ./gradlew clean check
       - name: Build
@@ -118,9 +118,9 @@ jobs:
           java-version: ${{ vars.JAVA_VERSION }}
           distribution: "adopt"
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/wrapper-validation-action@v3
       - name: Set up Gradle
-        uses: gradle/gradle-build-action@v3.2.1
+        uses: gradle/gradle-build-action@v3.3.2
       - name: License check
         run: ./gradlew clean checkLicense
       - uses: actions/upload-artifact@v4
@@ -446,59 +446,172 @@ jobs:
       #       export SPRING_PROFILES_ACTIVE="e2e"
       #       docker-compose up -d frontend
 
-  e2e:
-    runs-on: ubuntu-latest
+  buildkite-check:
+    runs-on: macos-latest
     needs:
       - deploy-e2e
-    container:
-      image: mcr.microsoft.com/playwright:latest
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
-        with:
-          node-version: ${{ vars.NODE_VERSION }}
-      - name: Install
-        run: |
-          npm install -g pnpm
-      - name: Set env
-        run: echo "HOME=/root" >> $GITHUB_ENV
-      - name: Install shell deps
-        run: |
-          apt-get update && apt-get install -y jq
-          jq --version
       - name: Check e2e deployment
         env:
           BUILDKITE_TOKEN: ${{ secrets.BUILDKITE_TOKEN }}
           COMMIT_SHA: ${{ github.sha }}
         run: ./ops/check.sh buildkite-e2e-deployed
+
+  e2e-google-chrome:
+    runs-on: macos-latest
+    needs:
+      - buildkite-check
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install
+        run: |
+          npm install -g pnpm
       - name: Run E2E
         env:
           APP_ORIGIN: ${{ vars.APP_HTTP_SCHEDULE }}://${{ secrets.AWS_EC2_IP_E2E }}:${{ secrets.AWS_EC2_IP_E2E_FRONTEND_PORT }}
           E2E_TOKEN_JIRA: ${{ secrets.E2E_TOKEN_JIRA }}
           E2E_TOKEN_BUILD_KITE: ${{ secrets.E2E_TOKEN_BUILD_KITE }}
           E2E_TOKEN_GITHUB: ${{ secrets.E2E_TOKEN_GITHUB }}
           E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE: ${{ secrets.E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE }}
+          E2E_PROJECT: "Google Chrome"
         shell: bash {0}
         run: ./ops/check.sh e2e
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: playwright-report
+          name: playwright-report-google-chrome
           path: frontend/e2e/reports/
           retention-days: 30
-      - name: Slack Notification
-        uses: rtCamp/action-slack-notify@v2
+
+  e2e-microsoft-edge:
+    runs-on: macos-latest
+    env:
+      E2E_PLATFORM: "Microsoft Edge"
+    needs:
+      - buildkite-check
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install
+        run: |
+          npm install -g pnpm
+      - name: Run E2E
+        env:
+          APP_ORIGIN: ${{ vars.APP_HTTP_SCHEDULE }}://${{ secrets.AWS_EC2_IP_E2E }}:${{ secrets.AWS_EC2_IP_E2E_FRONTEND_PORT }}
+          E2E_TOKEN_JIRA: ${{ secrets.E2E_TOKEN_JIRA }}
+          E2E_TOKEN_BUILD_KITE: ${{ secrets.E2E_TOKEN_BUILD_KITE }}
+          E2E_TOKEN_GITHUB: ${{ secrets.E2E_TOKEN_GITHUB }}
+          E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE: ${{ secrets.E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE }}
+          E2E_PROJECT: ${{ env.E2E_PLATFORM }}
+        shell: bash {0}
+        run: ./ops/check.sh e2e
+      - uses: actions/upload-artifact@v4
         if: always()
+        with:
+          name: playwright-report-${{ env.E2E_PLATFORM }}
+          path: frontend/e2e/reports/
+          retention-days: 30
+
+  e2e-webkit:
+    runs-on: macos-latest
+    env:
+      E2E_PLATFORM: webkit
+    needs:
+      - buildkite-check
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install
+        run: |
+          npm install -g pnpm
+
+      - name: Run E2E
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_ICON_EMOJI: ":heart-beat:"
-          SLACK_COLOR: ${{ job.status }}
-          SLACK_USERNAME: "Heartbeat E2E Status"
+          APP_ORIGIN: ${{ vars.APP_HTTP_SCHEDULE }}://${{ secrets.AWS_EC2_IP_E2E }}:${{ secrets.AWS_EC2_IP_E2E_FRONTEND_PORT }}
+          E2E_TOKEN_JIRA: ${{ secrets.E2E_TOKEN_JIRA }}
+          E2E_TOKEN_BUILD_KITE: ${{ secrets.E2E_TOKEN_BUILD_KITE }}
+          E2E_TOKEN_GITHUB: ${{ secrets.E2E_TOKEN_GITHUB }}
+          E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE: ${{ secrets.E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE }}
+          E2E_PROJECT: ${{ env.E2E_PLATFORM }}
+        shell: bash {0}
+        run: ./ops/check.sh e2e
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: playwright-report-${{ env.E2E_PLATFORM }}
+          path: frontend/e2e/reports/
+          retention-days: 30
+
+  e2e-firefox:
+    runs-on: macos-latest
+    env:
+      E2E_PLATFORM: firefox
+    needs:
+      - buildkite-check
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install
+        run: |
+          npm install -g pnpm
+
+      - name: Run E2E
+        env:
+          APP_ORIGIN: ${{ vars.APP_HTTP_SCHEDULE }}://${{ secrets.AWS_EC2_IP_E2E }}:${{ secrets.AWS_EC2_IP_E2E_FRONTEND_PORT }}
+          E2E_TOKEN_JIRA: ${{ secrets.E2E_TOKEN_JIRA }}
+          E2E_TOKEN_BUILD_KITE: ${{ secrets.E2E_TOKEN_BUILD_KITE }}
+          E2E_TOKEN_GITHUB: ${{ secrets.E2E_TOKEN_GITHUB }}
+          E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE: ${{ secrets.E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE }}
+          E2E_PROJECT: ${{ env.E2E_PLATFORM }}
+        shell: bash {0}
+        run: ./ops/check.sh e2e
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: playwright-report-${{ env.E2E_PLATFORM }}
+          path: frontend/e2e/reports/
+          retention-days: 30
+
+  e2e-chromium:
+    runs-on: macos-latest
+    env:
+      E2E_PLATFORM: chromium
+    needs:
+      - buildkite-check
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install
+        run: |
+          npm install -g pnpm
+      - name: Run E2E
+        env:
+          APP_ORIGIN: ${{ vars.APP_HTTP_SCHEDULE }}://${{ secrets.AWS_EC2_IP_E2E }}:${{ secrets.AWS_EC2_IP_E2E_FRONTEND_PORT }}
+          E2E_TOKEN_JIRA: ${{ secrets.E2E_TOKEN_JIRA }}
+          E2E_TOKEN_BUILD_KITE: ${{ secrets.E2E_TOKEN_BUILD_KITE }}
+          E2E_TOKEN_GITHUB: ${{ secrets.E2E_TOKEN_GITHUB }}
+          E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE: ${{ secrets.E2E_TOKEN_PIPELINE_NO_ORG_CONFIG_BUILDKITE }}
+          E2E_PROJECT: ${{ env.E2E_PLATFORM }}
+        shell: bash {0}
+        run: ./ops/check.sh e2e
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: playwright-report-${{ env.E2E_PLATFORM }}
+          path: frontend/e2e/reports/
+          retention-days: 30
 
   deploy:
     runs-on: ubuntu-latest
     needs:
-      - e2e
+      - e2e-chromium
+      - e2e-webkit
+      - e2e-firefox
+      - e2e-microsoft-edge
+      - e2e-google-chrome
     steps:
       - name: Checkout repo
         # uses: actions/checkout@v4

.trivyignore

@@ -14,3 +14,8 @@ CVE-2024-0567
 CVE-2024-22201
 CVE-2024-22259
 CVE-2024-28085
+CVE-2024-22262
+CVE-2024-2961
+CVE-2024-33599
+CVE-2019-10744
+CVE-2024-33599

README.md

@@ -294,10 +294,12 @@ _Image 3-19，Settings for Pipeline_
 They are sharing the similar settings which you need to specify the pipeline step so that Heartbeat will know in which pipeline and step, team consider it as deploy to PROD. So that we could use it to calculate metrics.
 
 | Items         | Description                                       |
-| ------------- --|----------------------------------------------------------------- |
+|---------------|---------------------------------------------------|
 | Organization  | The organization for your pipelines               |
 | Pipeline Name | Your pipeline name                                |
-| Steps         | The pipeline step that consider as deploy to PROD || Branches      | Your selected branches                            |
+| Steps         | The pipeline step that consider as deploy to PROD |
+| Branches      | Your selected branches                            |
+| Crew setting  | Your selected author from github                  |
 
 ## 3.3 Export and import config info
 

README.zh-CN.md

@@ -127,11 +127,12 @@ _Image 3-6，Classification Settings_
 ![Image 3-7](https://user-images.githubusercontent.com/995849/89784260-f6a08800-db4a-11ea-8ce2-87983363aa18.png)\
 _Image 3-7，Settings for Pipeline_
 
-| Items         | Description              |
-| ------------- | ------------------------ |
-| Organization  | 您的部署流水线所属的组织 |
-| Pipeline Name | 您的流水线名             |
-| Steps         | 流水线步骤名             |
+| Items         | Description  |
+| ------------- |--------------|
+| Organization  | 你的部署流水线所属的组织 |
+| Pipeline Name | 你的流水线名       |
+| Steps         | 流水线步骤名       |
+| Crew setting  | 代码提交者        |
 
 ## 3.2 导入导出配置信息
 

backend/build.gradle

@@ -5,8 +5,8 @@ plugins {
   id 'org.springframework.boot' version '3.1.9'
   id 'io.spring.dependency-management' version '1.1.4'
   id "io.spring.javaformat" version "0.0.41"
-  id 'com.github.jk1.dependency-license-report' version '2.6'
-  id "org.sonarqube" version "4.4.1.3373"
+  id 'com.github.jk1.dependency-license-report' version '2.7'
+  id "org.sonarqube" version "5.0.0.4638"
 }
 
 group = 'com.tw'
@@ -29,15 +29,15 @@ dependencies {
   implementation 'org.springframework.boot:spring-boot-starter-actuator'
   implementation 'org.springframework.boot:spring-boot-starter-log4j2'
   implementation 'org.springframework.boot:spring-boot-starter-validation'
-  implementation 'org.springframework:spring-core:6.1.5'
+  implementation 'org.springframework:spring-core:6.1.6'
   implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.0.2") {
     exclude group: 'commons-fileupload', module: 'commons-fileupload'
   }
-  implementation ("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.4") {
+  implementation ("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0") {
     exclude group: 'org.yaml', module: 'snakeyaml'
   }
   implementation 'commons-fileupload:commons-fileupload:1.5'
-  implementation 'org.yaml:snakeyaml:2.0'
+  implementation 'org.yaml:snakeyaml:2.2'
   implementation 'org.springframework.boot:spring-boot-starter-cache'
   implementation 'org.ehcache:ehcache:3.10.8'
   implementation 'javax.annotation:javax.annotation-api:1.3.2'
@@ -51,7 +51,7 @@ dependencies {
   testAnnotationProcessor 'org.projectlombok:lombok:1.18.32'
   implementation 'com.opencsv:opencsv:5.9'
   implementation 'org.apache.commons:commons-text:1.11.0'
-  implementation 'org.awaitility:awaitility:3.1.6'
+  implementation 'org.awaitility:awaitility:4.2.1'
 }
 
 tasks.named('test') {
@@ -63,7 +63,7 @@ tasks.named('test') {
 }
 
 pmd {
-  toolVersion = '6.55.0'
+  toolVersion = '7.0.0'
   ruleSets = ['java-basic']
   ruleSetConfig = resources.text.fromFile("src/main/resources/pmd.xml")
 }

backend/src/main/java/heartbeat/client/dto/codebase/github/LeadTime.java

@@ -25,8 +25,19 @@ public class LeadTime {
 
 	private long jobFinishTime;
 
+	private long jobStartTime;
+
+	@Nullable
+	private Long noPRCommitTime;
+
+	@Nullable
+	private Long firstCommitTime;
+
 	private long pipelineCreateTime;
 
+	@Nullable
+	private Boolean isRevert;
+
 	@Nullable
 	private Long prLeadTime;