DO NOT MERGE, pull request for testing

.github/scripts/akto-cicd.sh

@@ -15,11 +15,7 @@ echo "### Akto test summary" >> $GITHUB_STEP_SUMMARY
 while true; do
   current_time=$(date +%s)
   elapsed_time=$((current_time - start_time))
-
-  if ((elapsed_time >= MAX_POLL_INTERVAL)); then
-    echo "Max poll interval reached. Exiting."
-    break
-  fi
+
 
   current_time=$(date +%s)
   recency_period=$((60 * 24 * 60 * 60))
@@ -36,13 +32,21 @@ while true; do
       }")
 
   state=$(echo "$response" | jq -r '.testingRunResultSummaries[0].state // empty')
+  testingRunSummaryhexId=$(echo "$response" | jq -r '.testingRunResultSummaries[0].hexId // empty')
 
   if [[ "$state" == "COMPLETED" ]]; then
     count=$(echo "$response" | jq -r '.testingRunResultSummaries[0].countIssues // empty')
     high=$(echo "$response" | jq -r '.testingRunResultSummaries[0].countIssues.HIGH // empty')
     medium=$(echo "$response" | jq -r '.testingRunResultSummaries[0].countIssues.MEDIUM // empty')
     low=$(echo "$response" | jq -r '.testingRunResultSummaries[0].countIssues.LOW // empty')
 
+    publishGithubCommentResponse = $(curl -s "$AKTO_DASHBOARD_URL/api/publishGithubComments" \
+          --header 'content-type: application/json' \
+          --header "X-API-KEY: $AKTO_API_KEY" \
+          --data "{
+              \"testingRunSummaryHexId\": \"$testingRunSummaryhexId\"
+          }")
+
     echo "[Results]($AKTO_DASHBOARD_URL/dashboard/testing/$AKTO_TEST_ID/results)" >> $GITHUB_STEP_SUMMARY
     echo "HIGH: $high" >> $GITHUB_STEP_SUMMARY
     echo "MEDIUM: $medium" >> $GITHUB_STEP_SUMMARY
@@ -55,11 +59,28 @@ while true; do
     fi
     break
   elif [[ "$state" == "STOPPED" ]]; then
+    publishGithubCommentResponse = $(curl -s "$AKTO_DASHBOARD_URL/api/publishGithubComments" \
+          --header 'content-type: application/json' \
+          --header "X-API-KEY: $AKTO_API_KEY" \
+          --data "{
+              \"testingRunSummaryHexId\": \"$testingRunSummaryhexId\"
+          }")
     echo "Test stopped" >> $GITHUB_STEP_SUMMARY
     exit 1
     break
   else
     echo "Waiting for akto test to be completed..."
     sleep 5  # Adjust the polling interval as needed
   fi
+
+  if ((elapsed_time >= MAX_POLL_INTERVAL)); then
+    publishGithubCommentResponse = $(curl -s "$AKTO_DASHBOARD_URL/api/publishGithubComments" \
+          --header 'content-type: application/json' \
+          --header "X-API-KEY: $AKTO_API_KEY" \
+          --data "{
+              \"testingRunSummaryHexId\": \"$testingRunSummaryhexId\"
+          }")
+    echo "Max poll interval reached. Exiting."
+    break
+  fi
 done

.github/workflows/staging.yml

@@ -53,7 +53,8 @@ jobs:
           node-version: '17'
       - name: Convert github branch name to be compatible with docker tag name convention and generate tag name
         id: docker_tag
-        run: echo "IMAGE_TAG=${{ github.event.inputs.Tag }}_$(echo ${{ github.ref_name }} | sed 's/[^a-zA-Z0-9]/_/g')" >> $GITHUB_OUTPUT
+        #        run: echo "IMAGE_TAG=${{ github.event.inputs.Tag }}_$(echo ${{ github.ref_name }} | sed 's/[^a-zA-Z0-9]/_/g')" >> $GITHUB_OUTPUT
+        run: echo "IMAGE_TAG=akto_staging1_feature_github_comments_cicd_test" >> $GITHUB_OUTPUT
       - name: Download Akto templates zip
         working-directory: ./apps/dashboard/src/main/resources
         run: wget -O test-library-master.zip https://github.com/akto-api-security/tests-library/archive/refs/heads/master.zip
@@ -64,30 +65,30 @@ jobs:
         working-directory: ./apps/dashboard/web/polaris_web
         run: npm install && export RELEASE_VERSION=${{steps.docker_tag.outputs.IMAGE_TAG}} && npm run build
       - name: Configure AWS Credentials
-        if: ${{ github.event.inputs.Environment == 'prod' }}
+#        if: ${{ github.event.inputs.Environment == 'prod' }}
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{secrets.AWS_ACCESS_KEY_ID}}
           aws-secret-access-key: ${{secrets.AWS_SECRET_ACCESS_KEY}}
           aws-region: ap-south-1
 
       - name: Deploy static site to S3 bucket
-        if: ${{ github.event.inputs.Environment == 'prod' }}
+#        if: ${{ github.event.inputs.Environment == 'prod' }}
         run: aws s3 sync ./apps/dashboard/web/dist s3://dashboard-on-cdn/web/${{steps.docker_tag.outputs.IMAGE_TAG}}/dist --delete
       - name: Deploy polaris site to S3 bucket
-        if: ${{ github.event.inputs.Environment == 'prod' }}
+#        if: ${{ github.event.inputs.Environment == 'prod' }}
         run: aws s3 sync ./apps/dashboard/web/polaris_web/web/dist s3://dashboard-on-cdn/polaris_web/${{steps.docker_tag.outputs.IMAGE_TAG}}/dist --delete
 
       - run: mvn package -Dakto-image-tag=${{ github.event.inputs.Tag }} -Dakto-build-time=$(eval "date +%s") -Dakto-release-version=${{steps.docker_tag.outputs.IMAGE_TAG}}
       - name: DockerHub login
-        if: ${{ github.event.inputs.Environment == 'prod' }}
+#        if: ${{ github.event.inputs.Environment == 'prod' }}
         env:
           DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
           DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
         run: |
           docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
       - name: Build, tag, and push the image to DockerHub
-        if: ${{ github.event.inputs.Environment == 'prod' }}
+#        if: ${{ github.event.inputs.Environment == 'prod' }}
         id: build-image-dockerhub
         env:
           ECR_REGISTRY: aktosecurity
@@ -98,10 +99,10 @@ jobs:
           IMAGE_TAG_TESTING_CLI: ${{ github.event.inputs.Deploy == 'true' && '-t aktosecurity/akto-api-testing-cli:flash' || '' }}
         run: |
           docker buildx create --use
-          # Build a docker container and push it to DockerHub 
+          # Build a docker container and push it to DockerHub
           cd apps/dashboard
           docker buildx build --platform linux/arm64/v8,linux/amd64 -t $ECR_REGISTRY/$ECR_REPOSITORY-dashboard:$IMAGE_TAG $IMAGE_TAG_DASHBOARD . --push
-          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY-dashboard:$IMAGE_TAG"   
+          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY-dashboard:$IMAGE_TAG"
           cd ../testing
           docker buildx build --platform linux/arm64/v8,linux/amd64 -t $ECR_REGISTRY/akto-api-testing:$IMAGE_TAG $IMAGE_TAG_TESTING . --push
           echo "::set-output name=image::$ECR_REGISTRY/akto-api-testing:$IMAGE_TAG"
@@ -127,53 +128,54 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
   deploy:
-    if: ${{ github.event.inputs.Environment == 'prod' && github.event.inputs.Deploy == 'true' }}
+    #    if: ${{ github.event.inputs.Environment == 'prod' && github.event.inputs.Deploy == 'true' }}
     needs: build
     runs-on: ubuntu-latest
     environment: Dev
     permissions:
       id-token: write
       contents: read
     steps:
-    - uses: actions/checkout@v2
-    - uses: aws-actions/configure-aws-credentials@v1
-      with:
-        role-to-assume: ${{ secrets.IAMROLE_GITHUB }}
-        role-session-name: GitHub-Action-Role
-        aws-region: ${{ vars.AWS_REGION }}
-    - name: Deploy to flash
-      run: |
-        echo "Deploying branch ${{ env.GITHUB_REF }} to ${{ github.event.inputs.environment }}"
-        commit_hash=`git rev-parse HEAD`
-        aws deploy create-deployment --application-name flash-deploy --deployment-group-name flash-deployment-group --github-location repository=$GITHUB_REPOSITORY,commitId=$commit_hash --ignore-application-stop-failures
-      
+      - uses: actions/checkout@v2
+      - uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: ${{ secrets.IAMROLE_GITHUB }}
+          role-session-name: GitHub-Action-Role
+          aws-region: ${{ vars.AWS_REGION }}
+      - name: Deploy to flash
+        run: |
+          echo "Deploying branch ${{ env.GITHUB_REF }} to ${{ github.event.inputs.environment }}"
+          commit_hash=`git rev-parse HEAD`
+          aws deploy create-deployment --application-name flash-deploy --deployment-group-name flash-deployment-group --github-location repository=$GITHUB_REPOSITORY,commitId=$commit_hash --ignore-application-stop-failures
+
   test:
-    if: ${{ github.event.inputs.Environment == 'prod' && github.event.inputs.Deploy == 'true' }}
+    #    if: ${{ github.event.inputs.Environment == 'prod' && github.event.inputs.Deploy == 'true' }}
     needs: deploy
     runs-on: ubuntu-latest
     steps:
 
       - uses: actions/checkout@v2
-
-      - name: Run testsigma end to end tests
-        env:
-            TESTSIGMA_API_KEY: ${{ secrets.TESTSIGMA_API_KEY }}
-            TESTSIGMA_TEST_PLAN_ID: 789
-            TS_DASHBOARD_URL: ${{vars.TS_DASHBOARD_URL}}
-        run: bash ./.github/scripts/akto-testsigma.sh
 
+      #      - name: Run testsigma end to end tests
+      #        env:
+      #            TESTSIGMA_API_KEY: ${{ secrets.TESTSIGMA_API_KEY }}
+      #            TESTSIGMA_TEST_PLAN_ID: 789
+      #            TS_DASHBOARD_URL: ${{vars.TS_DASHBOARD_URL}}
+      #        run: bash ./.github/scripts/akto-testsigma.sh
+      #
       - name: Run Akto CI/CD tests
-        uses: akto-api-security/run-scan@v1.0.3
+        uses: shivam-rawat-akto/run-scan@v1.0.13
         with:
           AKTO_DASHBOARD_URL: https://flash.staging.akto.io
-          AKTO_API_KEY: ${{secrets.AKTO_API_KEY}}
-          AKTO_TEST_ID: 650d5bcb7bd5e15e3360553f
+          AKTO_API_KEY: ${{secrets.TEST_ACCOUNT_SECRET_KEY}}
+          AKTO_TEST_ID: 6544c94711a3300fd70210dd
+          GITHUB_COMMIT_ID: ${{github.event.pull_request.head.sha}}
 
       - name: Check for Akto test completion
         env:
-            AKTO_DASHBOARD_URL: https://flash.staging.akto.io
-            AKTO_API_KEY: ${{secrets.AKTO_API_KEY}}
-            AKTO_TEST_ID: 650d5bcb7bd5e15e3360553f
+          AKTO_DASHBOARD_URL: https://flash.staging.akto.io
+          AKTO_API_KEY: ${{secrets.TEST_ACCOUNT_SECRET_KEY}}
+          AKTO_TEST_ID: 6544c94711a3300fd70210dd
         run: bash ./.github/scripts/akto-cicd.sh
 
       - name: Check Vulnerable API's

apps/dashboard/pom.xml

@@ -66,6 +66,12 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.12.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.kohsuke/github-api -->
+        <dependency>
+            <groupId>org.kohsuke</groupId>
+            <artifactId>github-api</artifactId>
+            <version>1.316</version>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-servlets -->
         <dependency>
             <groupId>org.eclipse.jetty</groupId>

apps/dashboard/src/main/java/com/akto/action/testing/StartTestAction.java

@@ -36,13 +36,7 @@
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
 
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class StartTestAction extends UserAction {
@@ -203,7 +197,8 @@ public String startTest() {
                 loggerMaker.infoAndAddToDb("CICD test triggered at " + Context.now(), LogDb.DASHBOARD);
                 summary.setMetadata(metadata);
             }
-            TestingRunResultSummariesDao.instance.insertOne(summary);
+            testingRunResultSummaryHexId = Objects.requireNonNull(TestingRunResultSummariesDao.instance.insertOne(summary).getInsertedId())
+                    .asObjectId().getValue().toHexString();
         }
 
         this.startTimestamp = 0;
@@ -612,6 +607,9 @@ public List<TestingRunResultSummary> getTestingRunResultSummaries() {
         return this.testingRunResultSummaries;
     }
 
+    public String getTestingRunResultSummaryHexId() {
+        return this.testingRunResultSummaryHexId;
+    }
     public void setTestingRunResultSummaryHexId(String testingRunResultSummaryHexId) {
         this.testingRunResultSummaryHexId = testingRunResultSummaryHexId;
     }