Merge branch 'main' into e2e/feature/RI-6291_dependabot-updates

Author: vlad-dargel

.circleci/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.60.0)
+-v - Semver (2.62.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

.eslintrc.js

@@ -2,6 +2,7 @@ module.exports = {
   root: true,
   env: {
     node: true,
+    browser: true,
   },
   extends: ['airbnb-typescript'],
   plugins: ['@typescript-eslint'],

.github/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.60.0)
+-v - Semver (2.62.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

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

@@ -7,8 +7,8 @@ on:
         default: 'staging'
         type: string
 
-      only_docker:
-        description: Build only docker
+      for_e2e_tests:
+        description: Build for e2e docker tests
         default: false
         type: boolean
 
@@ -45,7 +45,16 @@ jobs:
       run: ./.github/build/build.sh
 
       # todo: matrix
+    - name: Build web archives for e2e tests
+      if: inputs.for_e2e_tests
+      run: |
+        unset npm_config_keytar_binary_host_mirror
+        unset npm_config_node_sqlite3_binary_host_mirror
+        # Docker sources
+        PLATFORM=linux ARCH=x64 LIBC=musl .github/build/build_modules.sh
+
     - name: Build web archives
+      if: ${{ !inputs.for_e2e_tests }}
       run: |
         unset npm_config_keytar_binary_host_mirror
         unset npm_config_node_sqlite3_binary_host_mirror
@@ -60,10 +69,8 @@ jobs:
         PLATFORM=darwin ARCH=arm64 .github/build/build_modules.sh
         # VSC Windows
         PLATFORM=win32 ARCH=x64 .github/build/build_modules.sh
-    - name: Build Docker (x64, arm64)
-      env:
-        ENV: ${{ vars.ENV }}
-        RI_SEGMENT_WRITE_KEY: ${{ secrets.RI_SEGMENT_WRITE_KEY }}
+
+    - name: Build Docker (x64)
       run: |
         # Build alpine x64 image
         docker buildx build \
@@ -75,6 +82,12 @@ jobs:
         -t redisinsight:amd64 \
         .
 
+        mkdir -p release/docker
+        docker image save -o release/docker/docker-linux-alpine.amd64.tar redisinsight:amd64
+
+    - name: Build Docker (arm64)
+      if: ${{ !inputs.for_e2e_tests }}
+      run: |
         # Build alpine arm64 image
         docker buildx build \
         -f .github/build/build.Dockerfile \
@@ -86,7 +99,6 @@ jobs:
         .
 
         mkdir -p release/docker
-        docker image save -o release/docker/docker-linux-alpine.amd64.tar redisinsight:amd64
         docker image save -o release/docker/docker-linux-alpine.arm64.tar redisinsight:arm64
 
     - uses: actions/upload-artifact@v4
@@ -100,6 +112,7 @@ jobs:
           ./release/web-mini
 
     env:
+      ENV: ${{ vars.ENV }}
       RI_AI_CONVAI_TOKEN: ${{ secrets.RI_AI_CONVAI_TOKEN }}
       RI_AI_QUERY_PASS: ${{ secrets.RI_AI_QUERY_PASS }}
       RI_AI_QUERY_USER: ${{ secrets.RI_AI_QUERY_USER }}

.github/workflows/pipeline-build-macos.yml

@@ -73,6 +73,7 @@ jobs:
 
         yarn package:stage && yarn package:mas
         rm -rf release/mac
+
         mv release/mas-universal/Redis-Insight-mac-universal-mas.pkg release/Redis-Insight-mac-universal-mas.pkg
 
     # handle manual builds

.github/workflows/publish-stores.yml

@@ -0,0 +1,70 @@
+name: Publish to stores
+
+on:
+  workflow_call:
+
+env:
+  AWS_BUCKET_NAME: ${{ secrets.AWS_BUCKET_NAME }}
+  AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
+  AWS_DISTRIBUTION_ID: ${{ secrets.AWS_DISTRIBUTION_ID }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    name: Publish to Dockerhub
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Download Docker images
+      run: |
+        mkdir release
+        aws s3 cp s3://${AWS_BUCKET_NAME}/public/latest/docker ./release/docker --recursive
+
+    - name: Publish docker
+      env:
+        DOCKER_USER: ${{ secrets.DOCKER_USER }}
+        DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
+        DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
+        DOCKER_V1_USER: ${{ secrets.DOCKER_V1_USER }}
+        DOCKER_V1_REPO: ${{ secrets.DOCKER_V1_REPO }}
+      run: |
+        appVersion=$(jq -r '.version' redisinsight/package.json)
+
+        docker login -u $DOCKER_USER -p $DOCKER_PASS
+
+        ./.github/build/release-docker.sh \
+        -d redisinsight \
+        -r $DOCKER_REPO \
+        -v $appVersion
+
+        docker login -u $DOCKER_V1_USER -p $DOCKER_V1_PASS
+
+        ./.github/build/release-docker.sh \
+        -d redisinsight \
+        -r $DOCKER_V1_REPO \
+        -v $appVersion
+
+  snapcraft:
+    runs-on: ubuntu-latest
+    name: Publish to Snapcraft
+    env:
+      SNAPCRAFT_FILE_NAME: 'Redis-Insight-linux-amd64.snap'
+      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_STORE_CREDENTIALS }}
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Download Snapcraft package
+      id: snap
+      run: |
+        mkdir release
+        aws s3 cp s3://${AWS_BUCKET_NAME}/public/latest/${SNAPCRAFT_FILE_NAME} ./release
+        echo "snap-path=$(readlink -e ./release/${SNAPCRAFT_FILE_NAME})" >> "$GITHUB_OUTPUT"
+
+    - uses: snapcore/action-publish@v1
+      name: Publish Snapcraft
+      with:
+        snap: ${{ steps.snap.outputs.snap-path }}
+        release: stable
+

.github/workflows/release-docker.yml

@@ -50,9 +50,9 @@ jobs:
     needs: virustotal-prod
     secrets: inherit
 
-  docker-prod:
-    name: Release docker images
-    uses: ./.github/workflows/release-docker.yml
+  publish-stores:
+    name: Publish to stores
+    uses: ./.github/workflows/publish-stores.yml
     needs: aws-upload-prod
     secrets: inherit
 

.github/workflows/release-prod.yml

@@ -33,14 +33,6 @@ jobs:
   e2e-docker-tests:
     runs-on: ubuntu-latest
     name: E2E Docker tests
-    # environment:
-      # name: production
-    container:
-      image: docker:latest
-      options: --privileged
-      volumes:
-        - /usr/src/app/results:/usr/src/app/results
-        - /usr/src/app/report:/usr/src/app/report
     strategy:
       fail-fast: false
       matrix:
@@ -50,9 +42,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Setup repository
-      run: git config --global --add safe.directory /__w/RedisInsight/RedisInsight
-
     # SSH Debug
     - name: Enable SSH
       uses: mxschmitt/action-tmate@v3
@@ -74,6 +63,7 @@ jobs:
       working-directory: ./tests/e2e
       run: |
         testFiles=$(find tests/web -type f -name '*.e2e.ts' | sort | awk "NR % 4 == ${{ matrix.parallel }}")
+
         echo $testFiles
 
         # Multi-Line value
@@ -117,23 +107,8 @@ jobs:
         list-suites: 'failed'
         fail-on-error: 'false'
 
-    - name: Add link to report in the workflow summary
-      if: always()
-      run: |
-        DATE=$(date +'%Y-%m-%d')
-        link="${{ vars.DEFAULT_TEST_REPORTS_URL }}/${DATE}/${{ github.run_id }}/${{ env.REPORT_NAME }}-${{ matrix.parallel }}/index.html"
-
-        echo "- [${link}](${link})" >> $GITHUB_STEP_SUMMARY
-
-  # Deploy report to AWS test bucket
-  deploy-report:
-    name: Deploy report
-    needs: 'e2e-docker-tests'
-    if: always()
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
     - name: Deploy report
+      if: always()
       uses: ./.github/actions/deploy-test-reports
       with:
         group: 'report'
@@ -143,3 +118,12 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
+    - name: Add link to report in the workflow summary
+      if: always()
+      run: |
+        DATE=$(date +'%Y-%m-%d')
+        link="${{ vars.DEFAULT_TEST_REPORTS_URL }}/${DATE}/${{ github.run_id }}/${{ env.REPORT_NAME }}-${{ matrix.parallel }}/index.html"
+
+        echo "- [${link}](${link})" >> $GITHUB_STEP_SUMMARY
+
+

.github/workflows/tests-e2e-docker.yml

@@ -48,6 +48,7 @@ env:
     }
   ITESTS_NAMES_SHORT: |
     {
+      "mods-preview": "OSS Standalone and all preview modules",
       "oss-st-5-pass": "OSS Standalone v5 with admin pass required",
       "oss-st-6-tls-auth": "OSS Standalone v6 with TLS auth required",
       "oss-clu-tls": "OSS Cluster with TLS enabled",