fix: Merge conflicts resolved.

.github/workflows/helm-release.yml

@@ -0,0 +1,74 @@
+name: Helm Charts Publish
+
+# Package & publish new version for Helm chart to S3 bucket.
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "deploy/helm/**"
+
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: deploy/helm
+        shell: bash
+
+    steps:
+      - name: Checkout the code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.6.3
+
+      - name: Get the chart version
+        id: chart-version
+        run: |
+          set -o xtrace
+          cat "${{ github.workspace }}/deploy/helm/Chart.yaml"
+          chart_version="$(awk '$1 == "version:" {print $2}' "${{ github.workspace }}/deploy/helm/Chart.yaml")"
+          echo "::set-output name=version::$chart_version"
+      # Scan the S3 bucket with the Helm version retrieved from Chart.yaml
+      # If an archive with this version already exists in the bucket, fail immediately.
+      - name: Check chart version is not already published
+        env:
+          AWS_ACCESS_KEY_ID: "${{ secrets.HELM_AWS_ACCESS_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.HELM_AWS_SECRET_ACCESS_KEY }}"
+          AWS_EC2_METADATA_DISABLED: true
+        run: |
+          set -o xtrace
+          chart_version="${{ steps.chart-version.outputs.version }}"
+          if [[ -z $chart_version ]]; then
+            echo "Empty chart version from Chart.yaml. Exiting." >&2
+            exit 1
+          fi
+          archive="appsmith-$chart_version.tgz"
+          if [[ "$archive" == "$(aws s3api list-objects --bucket '${{ secrets.HELM_S3_BUCKET }}' --prefix "$archive" --query 'Contents[0].Key' --output text)" ]]; then
+            echo "$archive is already present in the Helm bucket. Please change the version number in 'Chart.yaml' file." >&2
+            exit 1
+          fi
+      - name: Publish Helm
+        env:
+          AWS_ACCESS_KEY_ID: "${{ secrets.HELM_AWS_ACCESS_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.HELM_AWS_SECRET_ACCESS_KEY }}"
+          # Not really sure why this is needed, but without it, we see the error:
+          #   <botocore.awsrequest.AWSRequest object at 0x7fde607adac0>
+          #   Error: Process completed with exit code 255.
+          AWS_EC2_METADATA_DISABLED: true
+        run: |
+          echo "Publishing new Helm chart version"
+          helm package .
+          aws s3 cp s3://${{ secrets.HELM_S3_BUCKET }}/index.yaml .
+          helm repo index . --url https://${{ secrets.HELM_S3_BUCKET }} --merge index.yaml
+          aws s3 cp appsmith-${{ steps.chart-version.outputs.version }}.tgz s3://${{ secrets.HELM_S3_BUCKET }}
+          aws s3 cp index.yaml s3://${{ secrets.HELM_S3_BUCKET }}

.github/workflows/integration-tests-command.yml

@@ -676,7 +676,7 @@ jobs:
           parallel: true
           config-file: cypress_fat.json
           group: "Electrons on Github Action"
-          spec: ${{ env.failed_spec_env }}
+          spec: "cypress/integration/Smoke_TestSuite_Fat/**/*"
           working-directory: app/client
           # tag will be either "push" or "pull_request"
           tag: ${{ github.event_name }}

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

@@ -660,7 +660,7 @@ jobs:
           parallel: true
           config-file: cypress_fat.json
           group: "Electrons on Github Action"
-          spec: ${{ env.failed_spec_env }}
+          spec: "cypress/integration/Smoke_TestSuite_Fat/**/*"
           working-directory: app/client
           # tag will be either "push" or "pull_request"
           tag: ${{ github.event_name }}

.gitignore

@@ -19,4 +19,5 @@ deploy/ansible/appsmith_playbook/inventory
 
 # performance tests
 app/client/perf/traces/*
-.history
+.history
+stacks

Dockerfile

@@ -83,7 +83,7 @@ COPY ./deploy/docker/templates/supervisord/ templates/supervisord/
 COPY ./deploy/docker/templates/cron.d /etc/cron.d/
 RUN chmod 0644 /etc/cron.d/*
 
-RUN chmod +x entrypoint.sh renew-certificate.sh
+RUN chmod +x entrypoint.sh renew-certificate.sh healthcheck.sh
 
 # Disable setuid/setgid bits for the files inside container.
 RUN find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -print -exec chmod -s '{}' + \) || true
@@ -94,4 +94,5 @@ ENV PATH /opt/appsmith/utils/node_modules/.bin:$PATH
 EXPOSE 80
 EXPOSE 443
 ENTRYPOINT [ "/opt/appsmith/entrypoint.sh" ]
+HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/opt/appsmith/healthcheck.sh"
 CMD ["/usr/bin/supervisord", "-n"]

app/client/Dockerfile

@@ -16,4 +16,5 @@ COPY ./docker/templates/nginx-app-https.conf.template /nginx-app-https.conf.temp
 
 # This is the script that is used to start Nginx when the Docker container starts
 COPY ./docker/start-nginx.sh /start-nginx.sh
+HEALTHCHECK --interval=15s --timeout=15s --start-period=15s --retries=3 CMD curl -f http://localhost:80/ || exit 1
 CMD ["/start-nginx.sh"]

app/client/cypress.env.json

@@ -2,4 +2,4 @@
   "MySQL":1,
   "Mongo":1,
   "Edition": 0
- }
+ }