Feature/optimize integration tests(AST-124988)

.github/workflows/ci-tests-optimized.yml

@@ -0,0 +1,210 @@
+name: Continuous Integration Tests (Optimized)
+
+on:
+  pull_request:
+
+jobs:
+  unit-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 #v4.0.0
+      - name: Set up Go version
+        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4
+        with:
+          go-version-file: go.mod
+      - run: go version
+      - name: go test with coverage
+        run: |
+          sudo chmod +x ./internal/commands/.scripts/up.sh
+          ./internal/commands/.scripts/up.sh
+      - name: Check if total coverage is greater then 77.7
+        shell: bash
+        run: |
+          CODE_COV=$(go tool cover -func cover.out | grep total | awk '{print substr($3, 1, length($3)-1)}')
+          EXPECTED_CODE_COV=77.7
+          var=$(awk 'BEGIN{ print "'$CODE_COV'"<"'$EXPECTED_CODE_COV'" }')
+          if [ "$var" -eq 1 ];then
+            echo "Your code coverage is too low. Coverage precentage is: $CODE_COV"
+            exit 1
+          else
+            echo "Your code coverage test passed! Coverage precentage is: $CODE_COV"
+            exit 0
+          fi
+
+  integration-tests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 40
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 #v4.0.0
+
+      - name: Set up Go version
+        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4
+        with:
+          go-version-file: go.mod
+
+      - run: go version
+
+      - name: Go Build
+        run: go build -o ./bin/cx ./cmd
+
+      - name: Install gocovmerge
+        run: go install github.com/wadey/gocovmerge@latest
+
+      - name: Cache ScaResolver
+        uses: actions/cache@v3
+        with:
+          path: /tmp/ScaResolver
+          key: ${{ runner.os }}-scaresolver-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-scaresolver-
+
+      - name: Cache Go modules
+        uses: actions/cache@v3
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: Run All Integration Tests (Grouped)
+        shell: bash
+        env:
+          CX_BASE_URI: ${{ secrets.CX_BASE_URI }}
+          CX_CLIENT_ID: ${{ secrets.CX_CLIENT_ID }}
+          CX_CLIENT_SECRET: ${{ secrets.CX_CLIENT_SECRET }}
+          CX_BASE_AUTH_URI: ${{ secrets.CX_BASE_AUTH_URI }}
+          CX_AST_USERNAME: ${{ secrets.CX_AST_USERNAME }}
+          CX_AST_PASSWORD: ${{ secrets.CX_AST_PASSWORD }}
+          CX_APIKEY: ${{ secrets.CX_APIKEY }}
+          CX_TENANT: ${{ secrets.CX_TENANT }}
+          CX_SCAN_SSH_KEY: ${{ secrets.CX_SCAN_SSH_KEY }}
+          CX_ORIGIN: "cli-tests"
+          PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          PROXY_HOST: localhost
+          PROXY_PORT: 3128
+          PROXY_USERNAME: ${{ secrets.PROXY_USER }}
+          PROXY_PASSWORD: ${{ secrets.PROXY_PASSWORD }}
+          PR_GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          PR_GITHUB_NAMESPACE: "checkmarx"
+          PR_GITHUB_REPO_NAME: "ast-cli"
+          PR_GITHUB_NUMBER: 983
+          PR_GITLAB_TOKEN: ${{ secrets.PR_GITLAB_TOKEN }}
+          PR_GITLAB_NAMESPACE: ${{ secrets.PR_GITLAB_NAMESPACE }}
+          PR_GITLAB_REPO_NAME: ${{ secrets.PR_GITLAB_REPO_NAME }}
+          PR_GITLAB_PROJECT_ID: ${{ secrets.PR_GITLAB_PROJECT_ID }}
+          PR_GITLAB_IID: ${{ secrets.PR_GITLAB_IID }}
+          AZURE_ORG: ${{ secrets.AZURE_ORG }}
+          AZURE_PROJECT: ${{ secrets.AZURE_PROJECT }}
+          AZURE_REPOS: ${{ secrets.AZURE_REPOS }}
+          AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
+          AZURE_NEW_ORG: ${{ secrets.AZURE_NEW_ORG }}
+          AZURE_PROJECT_NAME: ${{ secrets.AZURE_PROJECT_NAME }}
+          AZURE_PR_NUMBER: 1
+          AZURE_NEW_TOKEN: ${{ secrets.AZURE_NEW_TOKEN }}
+          BITBUCKET_WORKSPACE: ${{ secrets.BITBUCKET_WORKSPACE }}
+          BITBUCKET_REPOS: ${{ secrets.BITBUCKET_REPOS }}
+          BITBUCKET_USERNAME: ${{ secrets.BITBUCKET_USERNAME }}
+          BITBUCKET_PASSWORD: ${{ secrets.BITBUCKET_PASSWORD }}
+          GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
+          GITHUB_ACTOR: ${{ github.actor }}
+          PR_BITBUCKET_TOKEN: ${{ secrets.PR_BITBUCKET_TOKEN }}
+          PR_BITBUCKET_NAMESPACE: "AstSystemTest"
+          PR_BITBUCKET_REPO_NAME: "cliIntegrationTest"
+          PR_BITBUCKET_ID: 1
+        run: |
+          sudo chmod +x ./internal/commands/.scripts/integration_up_grouped.sh ./internal/commands/.scripts/integration_down.sh
+          ./internal/commands/.scripts/integration_up_grouped.sh
+          ./internal/commands/.scripts/integration_down.sh
+
+      - name: Upload coverage report
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 #v4
+        if: always()
+        with:
+          name: ${{ runner.os }}-coverage-latest
+          path: coverage.html
+          retention-days: 7
+
+      - name: Check if total coverage is greater than 75
+        shell: bash
+        run: |
+          CODE_COV=$(go tool cover -func cover.out | grep total | awk '{print substr($3, 1, length($3)-1)}')
+          EXPECTED_CODE_COV=75
+          var=$(awk 'BEGIN{ print "'$CODE_COV'"<"'$EXPECTED_CODE_COV'" }')
+          if [ "$var" -eq 1 ];then
+            echo "Your code coverage is too low. Coverage precentage is: $CODE_COV"
+            exit 1
+          else
+            echo "Your code coverage test passed! Coverage precentage is: $CODE_COV"
+            exit 0
+          fi
+
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 #v4.0.0
+      - name: Set up Go version
+        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4
+        with:
+          go-version-file: go.mod
+      - run: go version
+      - run: go mod tidy
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc #v3
+        with:
+          skip-pkg-cache: true
+          version: v1.64.2
+          args: -c .golangci.yml
+            --timeout 5m
+          only-new-issues: true
+
+  govulncheck:
+    runs-on: ubuntu-latest
+    name: govulncheck
+    steps:
+      - id: govulncheck
+        uses: golang/govulncheck-action@7da72f730e37eeaad891fcff0a532d27ed737cd4 #v1
+        continue-on-error: true
+        with:
+          go-version-file: go.mod
+          go-package: ./...
+
+  checkDockerImage:
+    runs-on: ubuntu-latest
+    name: scan Docker Image with Trivy
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598 #2.0.0
+
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@cf09c5c41b299b55c366aff30022701412eb6ab0 #v1.0.0
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@49ed152c8eca782a232dede0303416e8f356c37b #v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build the project
+        run: go build -o ./cx ./cmd
+      - name: Build Docker image
+        run: docker build -t ast-cli:${{ github.sha }} .
+      - name: Run Trivy scanner without downloading DBs
+        uses: aquasecurity/trivy-action@915b19bbe73b92a6cf82a1bc12b087c9a19a5fe2 #v0.28.0
+        with:
+          scan-type: 'image'
+          image-ref: ast-cli:${{ github.sha }}
+          format: 'table'
+          exit-code: '1'
+          ignore-unfixed: true
+          vuln-type: 'os,library'
+          output: './trivy-image-results.txt'
+        env:
+          TRIVY_SKIP_JAVA_DB_UPDATE: true
+
+      - name: Inspect action report
+        if: always()
+        shell: bash
+        run: cat ./trivy-image-results.txt
+

.github/workflows/ci-tests.yml

@@ -1,4 +1,4 @@
-name: Continuous Integration Tests
+name: Continuous Integration Tests (Optimized)
 
 on:
   pull_request:
@@ -31,25 +31,54 @@ jobs:
             echo "Your code coverage test passed! Coverage precentage is: $CODE_COV"
             exit 0
           fi
+
   integration-tests:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        test-group: [
+          "fast-validation",
+          "scan-core", 
+          "scan-engines",
+          "scm-integration",
+          "realtime-features",
+          "advanced-features"
+        ]
     steps:
       - name: Checkout the repository
         uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 #v4.0.0
+
       - name: Set up Go version
         uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4
         with:
           go-version-file: go.mod
+
       - run: go version
+
       - name: Go Build
         run: go build -o ./bin/cx ./cmd
+
       - name: Install gocovmerge
         run: go install github.com/wadey/gocovmerge@latest
-      - name: Install pre-commit
-        run: |
-          pip install pre-commit
-          pre-commit install
-      - name: Go Integration test
+
+      - name: Cache ScaResolver
+        uses: actions/cache@v3
+        with:
+          path: /tmp/ScaResolver
+          key: ${{ runner.os }}-scaresolver-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-scaresolver-
+
+      - name: Cache Go modules
+        uses: actions/cache@v3
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: Go Integration test - ${{ matrix.test-group }}
         shell: bash
         env:
           CX_BASE_URI: ${{ secrets.CX_BASE_URI }}
@@ -94,12 +123,53 @@ jobs:
           PR_BITBUCKET_NAMESPACE: "AstSystemTest"
           PR_BITBUCKET_REPO_NAME: "cliIntegrationTest"
           PR_BITBUCKET_ID: 1
+          TEST_GROUP: ${{ matrix.test-group }}
         run: |
-          sudo chmod +x ./internal/commands/.scripts/integration_up.sh ./internal/commands/.scripts/integration_down.sh
-          ./internal/commands/.scripts/integration_up.sh
+          sudo chmod +x ./internal/commands/.scripts/integration_up_parallel.sh ./internal/commands/.scripts/integration_down.sh
+          ./internal/commands/.scripts/integration_up_parallel.sh
           ./internal/commands/.scripts/integration_down.sh
 
-      - name: Coverage report
+      - name: Upload coverage for ${{ matrix.test-group }}
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 #v4
+        if: always()
+        with:
+          name: coverage-${{ matrix.test-group }}
+          path: cover.out
+          retention-days: 1
+
+  merge-coverage:
+    needs: integration-tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@1e31de5234b9f8995739874a8ce0492dc87873e2 #v4.0.0
+
+      - name: Set up Go version
+        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 #v4
+        with:
+          go-version-file: go.mod
+
+      - name: Install gocovmerge
+        run: go install github.com/wadey/gocovmerge@latest
+
+      - name: Download all coverage artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: coverage-*
+          path: coverage-reports
+
+      - name: Merge coverage reports
+        run: |
+          find coverage-reports -name "cover.out" -exec echo {} \; > coverage-files.txt
+          if [ -s coverage-files.txt ]; then
+            gocovmerge $(cat coverage-files.txt) > merged-cover.out
+            go tool cover -html=merged-cover.out -o coverage.html
+          else
+            echo "No coverage files found"
+            exit 1
+          fi
+
+      - name: Upload merged coverage report
         uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 #v4
         with:
           name: ${{ runner.os }}-coverage-latest
@@ -108,7 +178,7 @@ jobs:
       - name: Check if total coverage is greater then 75
         shell: bash
         run: |
-          CODE_COV=$(go tool cover -func cover.out | grep total | awk '{print substr($3, 1, length($3)-1)}')
+          CODE_COV=$(go tool cover -func merged-cover.out | grep total | awk '{print substr($3, 1, length($3)-1)}')
           EXPECTED_CODE_COV=75
           var=$(awk 'BEGIN{ print "'$CODE_COV'"<"'$EXPECTED_CODE_COV'" }')
           if [ "$var" -eq 1 ];then
@@ -118,6 +188,7 @@ jobs:
             echo "Your code coverage test passed! Coverage precentage is: $CODE_COV"
             exit 0
           fi
+
   lint:
     name: lint
     runs-on: ubuntu-latest
@@ -156,7 +227,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598 #2.0.0
 
-
       - name: Set up Docker
         uses: docker/setup-buildx-action@cf09c5c41b299b55c366aff30022701412eb6ab0 #v1.0.0
 
@@ -186,3 +256,4 @@ jobs:
         if: always()
         shell: bash
         run: cat ./trivy-image-results.txt
+