Merge branch 'release' into dependabot/npm_and_yarn/app/client/rollup…

…-2.79.2

.coderabbit.yaml

@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
 language: "en-US"
 early_access: false
-tone_instructions: 'You must talk like teacher.'
+tone_instructions: 'You are an expert code reviewer in Java, TypeScript, JavaScript, and NodeJS. You work in an enterprise software developer team, providing concise and clear code review advice.You only elaborate or provide detailed explanations when requested.' 
 reviews:
   profile: "chill"
   request_changes_workflow: false
@@ -12,6 +12,7 @@ reviews:
   auto_review:
     enabled: true
     drafts: false
+    base_branches: ["pg", "release"]
   path_instructions:
     - path: "app/client/cypress/**/**.*"
       instructions: |
@@ -34,4 +35,4 @@ reviews:
         - Do not use duplicate filenames even with different paths.
         - Avoid using agHelper.Sleep, this.Sleep in any file in code.
 chat:
-  auto_reply: true
+  auto_reply: true

.github/workflows/ad-hoc-docker-image.yml

@@ -14,6 +14,11 @@ on:
         required: false
         type: string
         default: ad-hoc
+      pg_tag:
+        description: Postgres tag to use for image
+        required: false
+        type: string
+        default: pg
 
 jobs:
   server-build:
@@ -90,6 +95,16 @@ jobs:
             scripts/generate_info_json.sh
           fi
 
+      - name: Place server artifacts-es
+        run: |
+          run: |
+          if [[ -f scripts/prepare_server_artifacts.sh ]]; then
+            PG_TAG=${{ inputs.pg_tag }} scripts/prepare_server_artifacts.sh
+          else
+            echo "No script found to prepare server artifacts"
+            exit 1
+          fi
+
       - name: Set up Depot CLI
         uses: depot/setup-action@v1
 

.github/workflows/ci-test-custom-script.yml

@@ -148,6 +148,7 @@ jobs:
         working-directory: "."
         run: |
           sudo /etc/init.d/ssh stop ;
+          sudo systemctl disable --now ssh.socket
           mkdir -p ~/git-server/keys
           ted_tag="${{inputs.ted_tag}}"
           docker run --name test-event-driver -d -p 22:22 -p 5001:5001 -p 3306:3306 \
@@ -197,6 +198,21 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: app/client/package.json
+
+      - name: Check DB URL
+        if: steps.run_result.outputs.run_result != 'success'
+        run: |
+          db_url=$(grep -oP 'APPSMITH_DB_URL=\K[^ ]+' cicontainerlocal/stacks/configuration/docker.env || echo "")
+          if [[ -z "$db_url" ]]; then
+            echo "::error::APPSMITH_DB_URL not found in the environment file"
+          fi
+          if [[ $db_url == "postgresql"* ]]; then
+            echo "Database type: Postgres. Ensure PostgreSQL-specific configurations are in place."
+          elif [[ $db_url == "mongo"* ]]; then
+            echo "Database type: MongoDB. Verify MongoDB connection settings if issues arise."
+          else
+            echo "::warning::Unknown database type. Please verify the database configuration."
+          fi
 
       # actions/setup-node@v4 doesn’t work properly with Yarn 3
       # when the project lives in a subdirectory: https://github.com/actions/setup-node/issues/488

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

@@ -266,16 +266,18 @@ jobs:
       - name: Set Commit Message
         env:
           EVENT_COMMITS: ${{ toJson(github.event.commits[0].message) }}
+          COMMIT_INFO_AUTHOR: ${{ github.event.commits[0].author.name }}
         run: |
-          if [[ ${{ inputs.pr }} -ne 0 && ${{github.event_name}} == 'repository_dispatch' ]]; then
-            echo "COMMIT_INFO_MESSAGE=${{ env.COMMIT_INFO_MESSAGE }}" >> $GITHUB_ENV
-          elif [[ ${{ inputs.pr }} -ne 0 && ${{github.event_name}} == 'workflow_dispatch' ]]; then
+          if [[ ${{ inputs.pr }} -ne 0 && ${{ github.event_name }} == 'repository_dispatch' ]]; then
+            echo "COMMIT_INFO_MESSAGE=$COMMIT_INFO_MESSAGE" >> $GITHUB_ENV
+          elif [[ ${{ inputs.pr }} -ne 0 && ${{ github.event_name }} == 'workflow_dispatch' ]]; then
             echo "COMMIT_INFO_MESSAGE=Workflow run on PR# ${{ inputs.pr }}" >> $GITHUB_ENV
           else
-            if [[ '${{env.EVENT_COMMITS}}' == 'null' ]]; then
-              echo "COMMIT_INFO_MESSAGE=${{ github.event_name }} by ${{ env.COMMIT_INFO_AUTHOR }}" >> $GITHUB_ENV
+            if [[ "$EVENT_COMMITS" == "null" ]]; then
+              echo "COMMIT_INFO_MESSAGE=${{ github.event_name }} by $COMMIT_INFO_AUTHOR" >> $GITHUB_ENV
             else
-              echo "COMMIT_INFO_MESSAGE=$(echo \"${{ env.EVENT_COMMITS }}\" | awk -F '\\\\n' '{print $1}' | sed 's/^\"//')" >> $GITHUB_ENV
+              COMMIT_FIRST_LINE=$(echo "$EVENT_COMMITS" | awk -F '\\\\n' '{print $1}' | sed 's/^\"//')
+              echo "COMMIT_INFO_MESSAGE=$COMMIT_FIRST_LINE" >> $GITHUB_ENV
             fi
           fi
 

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

@@ -256,16 +256,18 @@ jobs:
       - name: Set Commit Message
         env:
           EVENT_COMMITS: ${{ toJson(github.event.commits[0].message) }}
+          COMMIT_INFO_AUTHOR: ${{ github.event.commits[0].author.name }}
         run: |
-          if [[ ${{ inputs.pr }} -ne 0 && ${{github.event_name}} == 'repository_dispatch' ]]; then
-            echo "COMMIT_INFO_MESSAGE=${{ env.COMMIT_INFO_MESSAGE }}" >> $GITHUB_ENV
-          elif [[ ${{ inputs.pr }} -ne 0 && ${{github.event_name}} == 'workflow_dispatch' ]]; then
+          if [[ ${{ inputs.pr }} -ne 0 && ${{ github.event_name }} == 'repository_dispatch' ]]; then
+            echo "COMMIT_INFO_MESSAGE=$COMMIT_INFO_MESSAGE" >> $GITHUB_ENV
+          elif [[ ${{ inputs.pr }} -ne 0 && ${{ github.event_name }} == 'workflow_dispatch' ]]; then
             echo "COMMIT_INFO_MESSAGE=Workflow run on PR# ${{ inputs.pr }}" >> $GITHUB_ENV
           else
-            if [[ '${{env.EVENT_COMMITS}}' == 'null' ]]; then
-              echo "COMMIT_INFO_MESSAGE=${{ github.event_name }} by ${{ env.COMMIT_INFO_AUTHOR }}" >> $GITHUB_ENV
+            if [[ "$EVENT_COMMITS" == "null" ]]; then
+              echo "COMMIT_INFO_MESSAGE=${{ github.event_name }} by $COMMIT_INFO_AUTHOR" >> $GITHUB_ENV
             else
-              echo "COMMIT_INFO_MESSAGE=$(echo \"${{ env.EVENT_COMMITS }}\" | awk -F '\\\\n' '{print $1}' | sed 's/^\"//')" >> $GITHUB_ENV
+              COMMIT_FIRST_LINE=$(echo "$EVENT_COMMITS" | awk -F '\\\\n' '{print $1}' | sed 's/^\"//')
+              echo "COMMIT_INFO_MESSAGE=$COMMIT_FIRST_LINE" >> $GITHUB_ENV
             fi
           fi
 

.github/workflows/server-build.yml

@@ -23,6 +23,27 @@ on:
         type: string
         default: "false"
 
+  workflow_dispatch:
+    inputs:
+      pr:
+        description: "PR number for the workflow"
+        required: false
+        type: number
+      skip-tests:
+        description: "Skip tests flag"
+        required: false
+        type: string
+        default: "false"
+      branch:
+        description: "Branch for the build"
+        required: false
+        type: string
+      is-pg-build:
+        description: "Flag for PG build"
+        required: false
+        type: string
+        default: "false"
+
 # Change the working directory for all the jobs in this workflow
 defaults:
   run:
@@ -72,6 +93,9 @@ jobs:
 
       - name: Figure out the PR number
         run: echo ${{ inputs.pr }}
+
+      - name: Default database URL
+        run: echo "Is this a PG build? ${{ inputs.is-pg-build }}"
 
       - name: Print the Github event
         run: echo ${{ github.event_name }}
@@ -175,39 +199,104 @@ jobs:
           APPSMITH_ENVFILE_PATH: /tmp/dummy.env
           APPSMITH_VERBOSE_LOGGING_ENABLED: false
         run: |
-          if [[ "${{ inputs.is-pg-build }}" == "true" ]]; then
-            export APPSMITH_DB_URL="postgresql://postgres:password@localhost:5432/postgres"
-          else
-            export APPSMITH_DB_URL="mongodb://localhost:27017/mobtools"
-          fi
-          args=()
-          if [[ "${{ steps.run_result.outputs.run_result }}" == "failedtest" ]]; then
-            failed_tests="${{ steps.failed_tests.outputs.tests }}"
-            args+=("-DfailIfNoTests=false" "-Dsurefire.failIfNoSpecifiedTests=false" "-Dtest=${failed_tests}")
-          fi
-          if ! mvn test "${args[@]}"; then
-            echo "Generating failed test list:"
-            failed_tests_file="$PWD/failed-server-tests.txt"
+            if [[ "${{ inputs.is-pg-build }}" == "true" ]]; then
+                export APPSMITH_DB_URL="postgresql://postgres:password@localhost:5432/postgres"
+            else
+                export APPSMITH_DB_URL="mongodb://localhost:27017/mobtools"
+            fi
+
+            args=()
+            if [[ "${{ steps.run_result.outputs.run_result }}" == "failedtest" ]]; then
+                failed_tests="${{ steps.failed_tests.outputs.tests }}"
+                args+=("-DfailIfNoTests=false" "-Dsurefire.failIfNoSpecifiedTests=false" "-Dtest=${failed_tests}")
+            fi
+
+            # Run tests and capture logs
+            mvn test "${args[@]}" | tee mvn_test.log
+            
+            # Check for "BUILD FAILURE" in the mvn_test.log
+            if grep -q "BUILD FAILURE" mvn_test.log; then
+                test_result="failed"
+            else
+                test_result="passed"
+            fi
+
+            echo "test_result variable value: ${test_result}"
+
+            # Prepare output file for failed tests and ensure a fresh file is created
+            OUTPUT_FILE="failed-server-tests.txt"
+            rm -f "$OUTPUT_FILE"
+            touch "$OUTPUT_FILE"
+
+            failed_modules=()
+            skipped_modules=()
+
+            # Process mvn_test.log for FAILURE and SKIPPED statuses
+            while IFS= read -r line; do
+                if [[ $line == *"FAILURE"* ]]; then
+                    module_name=$(echo "$line" | awk '{print $2}')
+                    failed_modules+=("$module_name")
+                elif [[ $line == *"SKIPPED"* ]]; then
+                    module_name=$(echo "$line" | awk '{print $2}')
+                    skipped_modules+=("$module_name")
+                fi
+            done < mvn_test.log
+
+            echo "Failed Modules: ${failed_modules[*]}"
+            echo "Skipped Modules: ${skipped_modules[*]}"
+
+            # Handle older approach for reading failed tests from XML files
+            failed_tests_from_xml="$PWD/failed-tests-from-xml.txt"
             gawk -F\" '/<testcase / {cur_test = $4 "#" $2} /<(failure|error) / {print cur_test}' $(find . -type f -name 'TEST-*.xml') \
               | sort -u \
-              | tee "$failed_tests_file"
-            echo "Saved to $failed_tests_file"
-            if [[ -s $failed_tests_file ]]; then
-              content="$(
-                echo "## Failed server tests"
-                echo
-                sed 's/^/- /' "$failed_tests_file"
-              )"
-              echo "$content" >> "$GITHUB_STEP_SUMMARY"
-              # Add a comment to the PR with the list of failed tests.
-              curl --silent --show-error \
-                --header "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-                --data "$(jq -n --arg body "$content" '$ARGS.named')" \
-                "https://api.github.com/repos/$GITHUB_REPOSITORY/issues/${{ inputs.pr }}/comments" \
-                > /dev/null
+              | tee "$failed_tests_from_xml"
+
+            # Filter out failed modules and add only relevant tests to the final failed list
+            for module in "${failed_modules[@]}"; do
+                grep -v "$module" "$failed_tests_from_xml" > temp_file && mv temp_file "$failed_tests_from_xml"
+            done
+
+            # Include all skipped module test files in the final list
+            for module in "${skipped_modules[@]}"; do
+                module_directories=$(find . -path "*/${module}*/src/test/java/*" -type f -name "*Test.java" -exec dirname {} \; | sort -u)
+                for module_directory in $module_directories; do
+                    test_classes=$(find "$module_directory" -type f -name "*Test.java" | sed 's|.*/src/test/java/||; s|\.java$||; s|/|.|g')
+                    for class_name in $test_classes; do
+                        if [[ ${#class_name} -le 240 ]] && ! grep -Fxq "$class_name#" "$OUTPUT_FILE"; then
+                            echo "${class_name}#" >> "$OUTPUT_FILE"
+                        fi
+                    done
+                done
+            done
+
+            # Combine the XML file test cases and skipped module test files into the final output file
+            cat "$failed_tests_from_xml" >> "$OUTPUT_FILE"
+            
+            # Print the final output
+            cat "$OUTPUT_FILE"
+
+            if [[ -s $OUTPUT_FILE ]]; then
+                content="$(
+                    echo "## Failed server tests"
+                    echo
+                    sed 's/^/- /' "$OUTPUT_FILE"
+                )"
+                echo "$content" >> "$GITHUB_STEP_SUMMARY"
+                
+                # Post a comment to the PR
+                curl --silent --show-error \
+                    --header "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+                    --data "$(jq -n --arg body "$content" '$ARGS.named')" \
+                    "https://api.github.com/repos/$GITHUB_REPOSITORY/issues/${{ inputs.pr }}/comments" \
+                    > /dev/null
             fi
-            exit 1
-          fi
+
+            # Fail the script if tests did not pass
+            if [[ "$test_result" == "failed" ]]; then
+                echo "Tests failed, exiting with status 1."
+                exit 1
+            fi
+
 
       # Set status = failedtest
       - name: Set fail if there are test failures

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

@@ -50,7 +50,36 @@ jobs:
       - name: Push changes
         if: env.MERGE_CONFLICT == 'false'
         run: |
-          git push origin pg
+          set -e
+          git push https://${{ secrets.PAT_GITHUB }}@github.com/${{ github.repository }} HEAD:pg || echo "PUSH_FAILURE=true" >> $GITHUB_ENV
+
+      - name: Capture push failure message
+        if: env.PUSH_FAILURE == 'true'
+        run: |
+          # Capture the last git error message
+          push_error_message=$(git push https://${{ secrets.PAT_GITHUB }}@github.com/${{ github.repository }} HEAD:pg 2>&1 | tail -n 1)
+          echo "PUSH_ERROR_MESSAGE=$push_error_message" >> $GITHUB_ENV
+
+      - name: Notify on push failure
+        if: env.PUSH_FAILURE == 'true'
+        env:
+          SLACK_MESSAGE: "Push to pg branch failed: ${{ env.PUSH_ERROR_MESSAGE }}"
+        run: |
+          # Format the Slack message
+          slack_message="${{ env.SLACK_MESSAGE }}"
+
+          # Set the Slack message body with channel ID and text
+          body="$(jq -nc \
+            --arg channel C07JMLWEXDJ \
+            --arg text "$slack_message" \
+            '$ARGS.named'
+          )"
+
+          # Send the message to Slack
+          curl -v https://slack.com/api/chat.postMessage \
+            --header "Authorization: Bearer ${{ secrets.SLACK_APPSMITH_ALERTS_TOKEN }}" \
+            --header "Content-Type: application/json; charset=utf-8" \
+            --data-raw "$body"
 
       - name: Notify on merge conflicts
         if: env.MERGE_CONFLICT == 'true'
@@ -59,9 +88,9 @@ jobs:
           CONFLICTING_COMMIT: ${{ env.CONFLICTING_COMMIT }}
         run: |
           # Prepare the message for Slack
-          message="Merge conflict detected while merging release into pg branch. Conflicted commits:\n"
+          message="Merge conflict detected while merging release into pg branch. Conflicted commits:"
           commit_url="$REPOSITORY_URL/commit/$CONFLICTING_COMMIT"
-          message+="$commit_url\n"
+          message+="$commit_url"
 
           # Send the message to Slack
           # This unwieldy horror of a sed command, converts standard Markdown links to Slack's unwieldy link syntax.

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

@@ -499,3 +499,32 @@ jobs:
             --header 'Authorization: Bearer ${{ secrets.SLACK_APPSMITH_ALERTS_TOKEN }}' \
             --header 'Content-Type: application/json; charset=utf-8' \
             --data-raw "$body"
+
+
+  notify-slack-for-pg:
+    needs: ci-test-result
+    runs-on: ubuntu-latest
+
+    if: ( failure() && github.ref == 'refs/heads/pg' )
+
+    steps:
+      - name: Notify failure on workflow run and on Slack
+        run: |
+          set -o errexit
+          set -o nounset
+          set -o xtrace
+
+          run_url='${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}'
+          slack_message="🚨 TBP workflow failed in <$run_url|${{ vars.EDITION }} attempt ${{ github.run_attempt }} (run ${{ github.run_id }})>."
+
+          # This is the ChannelId of the proj-postgres-sync channel.
+          body="$(jq -nc \
+            --arg channel C07JMLWEXDJ \
+            --arg text "$slack_message" \
+            '$ARGS.named'
+          )"
+          curl -v https://slack.com/api/chat.postMessage \
+            --fail-with-body \
+            --header 'Authorization: Bearer ${{ secrets.SLACK_APPSMITH_ALERTS_TOKEN }}' \
+            --header 'Content-Type: application/json; charset=utf-8' \
+            --data-raw "$body"