fix:snowflake-key-pair-auth-private-key-does-not-get-removed-upon-rem…

.github/workflows/build-client-server-count.yml

@@ -16,6 +16,7 @@ jobs:
       runId: ${{steps.args.outputs.runId}}
       matrix_count: ${{steps.matrix.outputs.matrix_count}}
       run_count: ${{ steps.countArgs.outputs.run_count }}
+      is-pg-build: ${{steps.args.outputs.is-pg-build}}
     steps:
       - name: Checkout the head commit of the branch
         uses: actions/checkout@v4
@@ -29,6 +30,7 @@ jobs:
         id: args
         run: |
           echo "pr=${{ github.event.client_payload.pull_request.number }}" >> $GITHUB_OUTPUT
+          echo "is-pg-build=${{ github.event.client_payload.pull_request.base.ref == 'pg' }}" >> $GITHUB_OUTPUT
           checkArg=${{ github.event.client_payload.slash_command.args.named.runId }}
           if [[ -z "$checkArg" ]]; then
               echo "runId=0" >> $GITHUB_OUTPUT
@@ -106,6 +108,7 @@ jobs:
     with:
       pr: ${{fromJson(needs.file-check.outputs.pr)}}
       skip-tests: "true"
+      is-pg-build: ${{fromJson(needs.file-check.outputs.is-pg-build)}}
 
   client-build:
     name: client-build
@@ -252,6 +255,18 @@ jobs:
           echo "$new_failed_spec_env" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
 
+      - name: Download the client build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: cypress-repeat-logs
+          path: app/client
+
+      - name: Read and Set File Content as ENV Variable
+        id: set-summary-content
+        run: |
+            summary_content=$(cat app/client/cy-repeat-summary.txt | tr '\n' ' ')
+            echo "summary_content=$summary_content" >> $GITHUB_ENV     
+
       - name: Add a comment on the PR with new CI failures
         if: needs.ci-test-limited.result != 'success' && needs.file-check.outputs.pr != '0'
         uses: peter-evans/create-or-update-comment@v3
@@ -262,6 +277,9 @@ jobs:
             Cypress dashboard: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank"> Click here!</a>
             The following are new failures, please fix them before merging the PR: ${{env.new_failed_spec_env}}
             To know the list of identified flaky tests - <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">Refer here</a>
+            ```
+            ${{ env.summary_content }}
+            ```
 
       - name: Add a comment on the PR when ci-test-limited is success
         if: needs.ci-test-limited.result == 'success' && needs.file-check.outputs.pr != '0'
@@ -272,6 +290,9 @@ jobs:
             Workflow run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>.
             Cypress dashboard url: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}" target="_blank">Click here!</a>
             All cypress tests have passed 🎉🎉🎉
+            ```
+            ${{ env.summary_content }}
+            ```
 
       - name: Check ci-test-limited set status
         if: needs.ci-test-limited.result != 'success'
@@ -369,6 +390,19 @@ jobs:
           echo "new_failed_spec_env<<EOF" >> $GITHUB_ENV
           echo "$new_failed_spec_env" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
+
+      - name: Download the client build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: cypress-repeat-logs
+          path: app/client
+
+      - name: Read and Set File Content as ENV Variable
+        id: set-summary-content
+        run: |
+            summary_content=$(cat app/client/cy-repeat-summary.txt | tr '\n' ' ')
+            echo "summary_content=$summary_content" >> $GITHUB_ENV     
+
 
       - name: Add a comment on the PR with new CI failures
         if: needs.ci-test-limited-existing-docker-image.result != 'success' && needs.file-check.outputs.pr != '0'
@@ -380,6 +414,9 @@ jobs:
             Cypress dashboard: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank"> Click here!</a>
             The following are new failures, please fix them before merging the PR: ${{env.new_failed_spec_env}}
             To know the list of identified flaky tests - <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">Refer here</a>
+            ```
+            ${{ env.summary_content }}
+            ```
 
       - name: Add a comment on the PR when ci-test-limited-existing-docker-image is success
         if: needs.ci-test-limited-existing-docker-image.result == 'success' && needs.file-check.outputs.pr != '0'
@@ -390,7 +427,10 @@ jobs:
             Workflow run: <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>.
             Cypress dashboard url: <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=${{ github.run_id }}&attempt=${{ github.run_attempt }}" target="_blank">Click here!</a>
             All cypress tests have passed 🎉🎉🎉
-
+            ```
+            ${{ env.summary_content }}
+            ```
+
       - name: Check ci-test-limited-existing-docker-image set status
         if: needs.ci-test-limited-existing-docker-image.result != 'success'
         run: exit 1

.github/workflows/build-client-server.yml

@@ -14,6 +14,7 @@ jobs:
       pr: ${{steps.args.outputs.pr}}
       runId: ${{steps.args.outputs.runId}}
       matrix_count: ${{steps.matrix.outputs.matrix_count}}
+      is-pg-build: ${{steps.args.outputs.is-pg-build}}
     steps:
       - name: Checkout the head commit of the branch
         uses: actions/checkout@v4
@@ -27,6 +28,7 @@ jobs:
         id: args
         run: |
           echo "pr=${{ github.event.client_payload.pull_request.number }}" >> $GITHUB_OUTPUT
+          echo "is-pg-build=${{ github.event.client_payload.pull_request.base.ref == 'pg' }}" >> $GITHUB_OUTPUT
           checkArg=`echo '${{toJSON(github.event.client_payload.slash_command.args.named)}}' | jq 'has("runId")'`
           if [[ $checkArg == 'true' ]]; then
             echo "runId=${{ github.event.client_payload.slash_command.args.named.runId }}" >> $GITHUB_OUTPUT
@@ -92,6 +94,7 @@ jobs:
     with:
       pr: ${{fromJson(needs.file-check.outputs.pr)}}
       skip-tests: "true"
+      is-pg-build: ${{fromJson(needs.file-check.outputs.is-pg-build)}}
 
   client-build:
     name: client-build

.github/workflows/ci-test-limited-with-count.yml

@@ -346,15 +346,29 @@ jobs:
             NODE_ENV: development
         run: |
             cd app/client
-            npx cypress-repeat run -n ${{ inputs.run_count }} --force \
+            npx cypress-repeat-pro run -n ${{ inputs.run_count }} --force \
                 --spec ${{ env.specs_to_run }} \
-                --config-file "cypress_ci_custom.config.ts"   
+                --config-file "cypress_ci_custom.config.ts"
+            cat cy-repeat-summary.txt  
+            # Check if "Total Failed: 0" is present
+            if ! grep -q "Total Failed: 0" cy-repeat-summary.txt; then
+              echo "Tests failed, failing the GitHub Action."
+              exit 1  # Fails the step if tests failed
+            fi     
 
       - name: Trim number of cypress log files
         if: failure()
         run: |
           find ${{ github.workspace }}/app/client/cypress/cypress-logs -name '*.json' -type f | tail -n +11 | xargs -I {} rm -- {}
 
+      - name: Upload repeat-pro logs artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: cypress-repeat-logs
+          path: ${{ github.workspace }}/app/client/cy-repeat-summary.txt
+          overwrite: true
+
       - name: Upload failed test cypress logs artifact
         if: failure()
         uses: actions/upload-artifact@v4

.github/workflows/sync-release-to-pg.yml

@@ -14,26 +14,26 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: release  # Checkout the release branch
+          fetch-depth: 0
 
-      - name: Fetch all branches
-        run: git fetch origin pg
+      - name: Set Git config values
+        run: |
+          git config pull.rebase false
+          git config user.email "automated@github.com"
+          git config user.name "Automated Github Action"
 
       - name: Checkout pg branch
         run: git checkout pg
 
       - name: Merge release to pg
         id: merge_commits
         run: |
-
           PG_HEAD=$(git rev-parse pg)
           RELEASE_HEAD=$(git rev-parse release)
 
           echo "PG_HEAD=$PG_HEAD"
           echo "RELEASE_HEAD=$RELEASE_HEAD"
 
-          # Checkout the pg branch
-          git checkout pg
-
           # Attempt to merge release into pg
           if ! git merge release; then
             echo "Merge conflict detected during merge"
@@ -42,7 +42,6 @@ jobs:
             CONFLICTING_COMMIT=$(git log -1 --pretty=format:"%H")
             echo "CONFLICTING_COMMIT=$CONFLICTING_COMMIT" >> $GITHUB_ENV
 
-            git merge --abort
             echo "MERGE_CONFLICT=true" >> $GITHUB_ENV
           else
             echo "MERGE_CONFLICT=false" >> $GITHUB_ENV
@@ -68,6 +67,8 @@ jobs:
           # This unwieldy horror of a sed command, converts standard Markdown links to Slack's unwieldy link syntax.
           slack_message="$(echo "$message" | sed -E 's/\[([^]]+)\]\(([^)]+)\)/<\2|\1>/g')"
 
+          echo "$slack_message"
+
           # This is the ChannelId of the proj postgres channel.
           body="$(jq -nc \
             --arg channel C06Q3A97USE \

.github/workflows/test-build-docker-image.yml

@@ -21,9 +21,9 @@ on:
         type: string
         default: latest
 
-  # trigger for pushes to master
+  # trigger for pushes to master and pg
   push:
-    branches: [master]
+    branches: [master, pg]
     paths:
       - "app/client/**"
       - "app/server/**"
@@ -100,7 +100,7 @@ jobs:
   ci-test:
     needs: [setup, build-docker-image]
     # Only run if the build step is successful
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
     name: ci-test
     uses: ./.github/workflows/ci-test-custom-script.yml
     secrets: inherit
@@ -113,7 +113,7 @@ jobs:
   server-unit-tests:
     name: server-unit-tests
     needs: [build-docker-image]
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
     uses: ./.github/workflows/server-build.yml
     secrets: inherit
     with:
@@ -123,7 +123,7 @@ jobs:
   client-unit-tests:
     name: client-unit-tests
     needs: [build-docker-image]
-    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' )
+    if: success() && ( github.event_name != 'push' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/pg' )
     uses: ./.github/workflows/client-unit-tests.yml
     secrets: inherit
     with:
@@ -341,6 +341,12 @@ jobs:
             scripts/generate_info_json.sh
           fi
 
+      - name: Place server artifacts-es
+        run: |
+          if [[ -f scripts/prepare_server_artifacts.sh ]]; then
+            scripts/prepare_server_artifacts.sh
+          fi
+
       - name: Set up Depot CLI
         uses: depot/setup-action@v1
 
@@ -362,7 +368,7 @@ jobs:
             APPSMITH_CLOUD_SERVICES_BASE_URL=https://release-cs.appsmith.com
             BASE=${{ vars.DOCKER_HUB_ORGANIZATION }}/base-${{ vars.EDITION }}:release
           tags: |
-            ${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:release
+            ${{ vars.DOCKER_HUB_ORGANIZATION }}/appsmith-${{ vars.EDITION }}:${{ github.ref_name }}
 
   package-master:
     needs: [ci-test, client-unit-tests, server-unit-tests]

app/client/cypress/e2e/GSheet/AllAccess_Spec.ts

@@ -15,7 +15,7 @@ const workspaceName = "gsheet apps";
 const dataSourceName = "gsheet-all";
 let appName = "gsheet-app";
 let spreadSheetName = "test-sheet";
-describe(
+describe.skip(
   "GSheet-Functional Tests With All Access",
   { tags: ["@tag.Datasource", "@tag.GSheet"] },
   function () {

app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts

@@ -21,7 +21,7 @@ const workspaceName = "gsheet apps";
 const dataSourceName = "gsheet-all";
 let appName = "gsheet-app";
 let spreadSheetName = "test-sheet";
-describe(
+describe.skip(
   "GSheet Miscellaneous Tests",
   { tags: ["@tag.Datasource", "@tag.GSheet"] },
   function () {

app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts

@@ -11,7 +11,7 @@ import {
   appSettings,
 } from "../../support/Objects/ObjectsCore";
 
-describe(
+describe.skip(
   "GSheet-Functional Tests With Read/Write Access",
   { tags: ["@tag.Datasource", "@tag.GSheet"] },
   function () {

app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts

@@ -11,7 +11,7 @@ import {
   appSettings,
 } from "../../support/Objects/ObjectsCore";
 
-describe(
+describe.skip(
   "GSheet-Functional Tests With Read Access",
   { tags: ["@tag.Datasource", "@tag.GSheet"] },
   function () {

app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts

@@ -21,7 +21,7 @@ const workspaceName = "gsheet apps";
 const dataSourceName = "gsheet-all";
 let appName = "gsheet-app";
 let spreadSheetName = "test-sheet";
-describe(
+describe.skip(
   "GSheet-widget binding",
   { tags: ["@tag.Datasource", "@tag.GSheet"] },
   function () {

app/client/cypress/e2e/Regression/ClientSide/ActionExecution/StoreValue_spec.ts

@@ -238,7 +238,7 @@ describe("storeValue Action test", { tags: ["@tag.JS"] }, () => {
     });
     agHelper.ClickButton("Test store logs");
 
-    debuggerHelper.ClickDebuggerIcon();
+    debuggerHelper.OpenDebugger();
     debuggerHelper.ClickLogsTab();
     debuggerHelper.changeLogsGroup("System logs");
     debuggerHelper.DoesConsoleLogExist("storeValue('xyz', '123', true)");