Merge branch 'release' into fix-22680

Author: prsidhu

.github/pull_request_template.md

@@ -1,52 +1,56 @@
 > Pull Request Template
 >
 > Use this template to quickly create a well written pull request. Delete all quotes before creating the pull request.
-
+>
 ## Description
-
+> Add a TL;DR when description is extra long (helps content team)
+>
 > Please include a summary of the changes and which issue has been fixed. Please also include relevant motivation
 > and context. List any dependencies that are required for this change
+>
 > Links to Notion, Figma or any other documents that might be relevant to the PR
-
-> Add a TL;DR when description is extra long (helps content team)
-
-Fixes # (issue)
+>
+>
+#### PR fixes following issue(s)
+Fixes # (issue number)
 > if no issue exists, please create an issue and ask the maintainers about this first
-
-
-Media
+>
+>
+#### Media
 > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video
-
-
-## Type of change
-
+>
+>
+#### Type of change
 > Please delete options that are not relevant.
-
 - Bug fix (non-breaking change which fixes an issue)
 - New feature (non-breaking change which adds functionality)
 - Breaking change (fix or feature that would cause existing functionality to not work as expected)
 - Chore (housekeeping or task changes that don't impact user perception)
 - This change requires a documentation update
-
-
-## How Has This Been Tested?
-> Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce.
-> Please also list any relevant details for your test configuration.
-> Delete anything that is not important
-
-- Manual
-- Jest
-- Cypress
-
-### Test Plan
+>
+>
+>
+## Testing
+>
+#### How Has This Been Tested?
+> Please describe the tests that you ran to verify your changes. Also list any relevant details for your test configuration.
+> Delete anything that is not relevant
+- [ ] Manual
+- [ ] Jest
+- [ ] Cypress
+>
+>
+#### Test Plan
 > Add Testsmith test cases links that relate to this PR
-
-### Issues raised during DP testing
+>
+>
+#### Issues raised during DP testing
 > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR)
-
-
+>
+>
+>
 ## Checklist:
-### Dev activity
+#### Dev activity
 - [ ] My code follows the style guidelines of this project
 - [ ] I have performed a self-review of my own code
 - [ ] I have commented my code, particularly in hard-to-understand areas
@@ -57,9 +61,12 @@ Media
 - [ ] PR is being merged under a feature flag
 
 
-### QA activity:
-- [ ] Test plan has been approved by relevant developers
-- [ ] Test plan has been peer reviewed by QA
-- [ ] Cypress test cases have been added and approved by either SDET or manual QA
-- [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA
-- [ ] Added Test Plan Approved label after reveiwing all Cypress test
+#### QA activity:
+- [ ] [Speedbreak features](https://github.com/appsmithorg/TestSmith/wiki/Test-plan-implementation#speedbreaker-features-to-consider-for-every-change) have been covered
+- [ ] Test plan covers all impacted features and [areas of interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans/_edit#areas-of-interest)
+- [ ] Test plan has been peer reviewed by project stakeholders and other QA members
+- [ ] Manually tested functionality on DP
+- [ ] We had an implementation alignment call with stakeholders post QA Round 2
+- [ ] Cypress test cases have been added and approved by SDET/manual QA
+- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
+- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed

.github/workflows/CypressAddKnownfailedtests.yml

@@ -3,7 +3,7 @@ name: Cypress Add Known failed tests
 on:
   issues:
     types: [opened, closed, reopened]
-   
+
 jobs:
   IssueOpened:
     if: (github.event.action == 'opened' || github.event.action == 'reopened') && contains( github.event.issue.labels.*.name, 'CI impacted')
@@ -19,14 +19,16 @@ jobs:
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
           XATATOKEN: ${{ secrets.XATA_TOKEN }}
+          ISSUE_TITLE: ${{ github.event.issue.title }}
+          ISSUE_BODY: ${{ github.event.issue.body }}
         run: |
-          echo "Issue title: ${{ github.event.issue.title }}"
-          echo "Issue body: ${{ github.event.issue.body }}"
+          echo "Issue title: $ISSUE_TITLE"
+          echo "Issue body: $ISSUE_BODY"
           #echo "$GITHUB_CONTEXT"
           chmod a+x app/client/cypress/xataadd.sh
-          echo "${{ github.event.issue.title }}"|awk '{print $2}'
-          echo "${{ github.event.issue.title }}"|awk '{print $2}'|xargs app/client/cypress/xataadd.sh
-          
+          echo "$ISSUE_TITLE"|awk '{print $2}'
+          echo "$ISSUE_TITLE"|awk '{print $2}'|xargs app/client/cypress/xataadd.sh
+
   IssueClosed:
     if: github.event.action == 'closed' && contains( github.event.issue.labels.*.name, 'CI impacted')
     runs-on: ubuntu-latest
@@ -41,12 +43,11 @@ jobs:
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
           XATATOKEN: ${{ secrets.XATA_TOKEN }}
+          ISSUE_TITLE: ${{ github.event.issue.title }}
+          ISSUE_BODY: ${{ github.event.issue.body }}
         run: |
-          echo "Issue title: ${{ github.event.issue.title }}"
-          echo "Issue body: ${{ github.event.issue.body }}"
+          echo "Issue title: $ISSUE_TITLE"
+          echo "Issue body: $ISSUE_BODY"
           #echo "$GITHUB_CONTEXT"
           chmod a+x app/client/cypress/xatadel.sh
-          echo "${{ github.event.issue.title }}"|awk '{print $2}'|xargs app/client/cypress/xatadel.sh
-          
-          
-          
+          echo "$ISSUE_TITLE"|awk '{print $2}'|xargs app/client/cypress/xatadel.sh

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

@@ -0,0 +1,37 @@
+name: Build client server without running tests
+
+on:
+  # This workflow can be triggered manually from the GitHub Actions page
+  workflow_dispatch:
+
+jobs:
+  server-build:
+    name: server-build
+    uses: ./.github/workflows/server-build.yml
+    secrets: inherit
+    with:
+      pr: 0
+      skip-tests: "true"
+
+  client-build:
+    name: client-build
+    uses: ./.github/workflows/client-build.yml
+    secrets: inherit
+    with:
+      pr: 0
+      skip-tests: "true"
+
+  rts-build:
+    name: rts-build
+    uses: ./.github/workflows/rts-build.yml
+    secrets: inherit
+    with:
+      pr: 0
+
+  ci-test-limited:
+    needs: [ client-build, server-build, rts-build ]
+    name: ci-test-limited
+    uses: ./.github/workflows/ci-test-limited.yml
+    secrets: inherit
+    with:
+      pr: 0

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

@@ -21,7 +21,7 @@ jobs:
     defaults:
       run:
         shell: bash
-   
+
     steps:
       # Check out merge commit
       - name: Fork based /ok-to-test checkout
@@ -30,28 +30,26 @@ jobs:
         with:
           fetch-depth: 0
           ref: "refs/pull/${{ inputs.pr }}/merge"
-          
+
       # Checkout the code in the current branch in case the workflow is called because of a branch push event
       - name: Checkout the head commit of the branch
         if: inputs.pr == 0
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          
-      # Setup Java
-      - name: Set up JDK 17
-        if: steps.run_result.outputs.run_result != 'success'
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
 
       - name: Download the client build artifact
         if: steps.run_result.outputs.run_result != 'success'
         uses: actions/download-artifact@v3
         with:
           name: client-build
-          path: app/client/build
+          path: app/client
+
+      - name: Unpack the client build artifact
+        if: steps.run_result.outputs.run_result != 'success'
+        run: |
+          mkdir -p app/client/build
+          tar -xvf app/client/build.tar -C app/client/build
 
       - name: Download the server build artifact
         if: steps.run_result.outputs.run_result != 'success'
@@ -80,13 +78,13 @@ jobs:
         working-directory: "."
         run: |
           docker build -t cicontainer .
-      
+
       # Saving the docker image to tar file
       - name: Save Docker image to tar file
         run: |
           docker save cicontainer -o cicontainer.tar
           gzip cicontainer.tar
-      
+
       # Uploading the artifact to use it in other subsequent runners
       - name: Upload Docker image to artifacts
         uses: actions/upload-artifact@v3
@@ -96,4 +94,3 @@ jobs:
 
       - name: Save the status of the run
         run: echo "run_result=success" >> $GITHUB_OUTPUT > ~/run_result
-        

.github/workflows/ci-sanity.yml

@@ -149,7 +149,7 @@ jobs:
             -e APPSMITH_CLOUD_SERVICES_BASE_URL=http://host.docker.internal:5001 \
             --add-host=host.docker.internal:host-gateway --add-host=api.segment.io:host-gateway --add-host=t.appsmith.com:host-gateway \
             cicontainer
-            
+
       - name: Setup MSSQL & Arango docker containers
         working-directory : app/client/cypress
         run : |
@@ -216,6 +216,8 @@ jobs:
           CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL }}
+          CYPRESS_EXCLUDE_TAGS: "airgap"
+          CYPRESS_AIRGAPPED: false
           APPSMITH_DISABLE_TELEMETRY: true
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           POSTGRES_PASSWORD: postgres
@@ -270,6 +272,8 @@ jobs:
           CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL }}
+          CYPRESS_EXCLUDE_TAGS: "airgap"
+          CYPRESS_AIRGAPPED: false
           APPSMITH_DISABLE_TELEMETRY: true
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
@@ -328,6 +332,8 @@ jobs:
           CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL }}
+          CYPRESS_EXCLUDE_TAGS: "airgap"
+          CYPRESS_AIRGAPPED: false
           APPSMITH_DISABLE_TELEMETRY: true
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}

.github/workflows/ci-smoke.yml

@@ -149,7 +149,7 @@ jobs:
             -e APPSMITH_CLOUD_SERVICES_BASE_URL=http://host.docker.internal:5001 \
             --add-host=host.docker.internal:host-gateway --add-host=api.segment.io:host-gateway --add-host=t.appsmith.com:host-gateway \
             cicontainer
-            
+
       - name: Setup MSSQL & Arango docker containers
         working-directory : app/client/cypress
         run : |
@@ -216,6 +216,8 @@ jobs:
           CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL }}
+          CYPRESS_EXCLUDE_TAGS: "airgap"
+          CYPRESS_AIRGAPPED: false
           APPSMITH_DISABLE_TELEMETRY: true
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           POSTGRES_PASSWORD: postgres
@@ -270,6 +272,8 @@ jobs:
           CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL }}
+          CYPRESS_EXCLUDE_TAGS: "airgap"
+          CYPRESS_AIRGAPPED: false
           APPSMITH_DISABLE_TELEMETRY: true
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
@@ -328,6 +332,8 @@ jobs:
           CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_TOKEN_URL }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_USER_INFO }}
           CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_OIDC_JWKS_URL }}
+          CYPRESS_EXCLUDE_TAGS: "airgap"
+          CYPRESS_AIRGAPPED: false
           APPSMITH_DISABLE_TELEMETRY: true
           APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }}
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}