Merge branch 'main' into e2e/feature/RI-5072-docker-encryption

Author: vlad-dargel

.circleci/config.yml

@@ -462,6 +462,8 @@ jobs:
                 command: |
                   cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/web/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
                   TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \
+                  RI_SERVER_TLS_CERT="$RI_SERVER_TLS_CERT" \
+                  RI_SERVER_TLS_KEY="$RI_SERVER_TLS_KEY" \
                   docker-compose \
                   -f tests/e2e/rte.docker-compose.yml \
                   -f tests/e2e/docker.web.docker-compose.yml \
@@ -476,6 +478,8 @@ jobs:
                 command: |
                   cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/web/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
                   TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \
+                  RI_SERVER_TLS_CERT="$RI_SERVER_TLS_CERT" \
+                  RI_SERVER_TLS_KEY="$RI_SERVER_TLS_KEY" \
                   docker-compose \
                   -f tests/e2e/rte.docker-compose.yml \
                   -f tests/e2e/local.web.docker-compose.yml \
@@ -618,11 +622,11 @@ jobs:
             export RI_CLOUD_CAPI_URL=$RI_CLOUD_CAPI_URL_STAGE
 
             if [ << parameters.env >> == 'stage' ]; then
-              UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage --linux << parameters.target >>
+              RI_UPGRADES_LINK=$RI_UPGRADES_LINK_STAGE RI_SEGMENT_WRITE_KEY=$RI_SEGMENT_WRITE_KEY_STAGE yarn package:stage --linux << parameters.target >>
               exit 0;
             fi
 
-            UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage --linux << parameters.target >>
+            RI_UPGRADES_LINK='' RI_SEGMENT_WRITE_KEY='' yarn package:stage --linux << parameters.target >>
       - when:
           condition:
             equal: [ true, << parameters.redisstack >> ]
@@ -710,12 +714,12 @@ jobs:
             export RI_CLOUD_IDP_GH_ID=$RI_CLOUD_IDP_GH_ID_STAGE
             export RI_CLOUD_API_URL=$RI_CLOUD_API_URL_STAGE
             export RI_CLOUD_CAPI_URL=$RI_CLOUD_CAPI_URL_STAGE
-            export UPGRADES_LINK=''
-            export SEGMENT_WRITE_KEY=''
+            export RI_UPGRADES_LINK=''
+            export RI_SEGMENT_WRITE_KEY=''
 
             if [ << parameters.env >> == 'stage' ]; then
-              export UPGRADES_LINK=$UPGRADES_LINK_STAGE
-              export SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE
+              export RI_UPGRADES_LINK=$RI_UPGRADES_LINK_STAGE
+              export RI_SEGMENT_WRITE_KEY=$RI_SEGMENT_WRITE_KEY_STAGE
             fi
 
             # handle manual builds
@@ -792,9 +796,9 @@ jobs:
             export RI_CLOUD_CAPI_URL=$RI_CLOUD_CAPI_URL_STAGE
 
             if [ << parameters.env >> == 'stage' ]; then
-              UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage --win << parameters.target >>
+              RI_UPGRADES_LINK=$RI_UPGRADES_LINK_STAGE RI_SEGMENT_WRITE_KEY=$RI_SEGMENT_WRITE_KEY_STAGE yarn package:stage --win << parameters.target >>
             else
-              UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage --win << parameters.target >>
+              RI_UPGRADES_LINK='' RI_SEGMENT_WRITE_KEY='' yarn package:stage --win << parameters.target >>
             fi
 
             rm -rf release/win-unpacked
@@ -860,20 +864,18 @@ jobs:
       - run:
           name: Build Docker image (API + UI)
           command: |
-            TELEMETRY=$SEGMENT_WRITE_KEY_DEV
+            TELEMETRY=$RI_SEGMENT_WRITE_KEY_DEV
 
             if [ << parameters.env >> == 'production' ]; then
-              TELEMETRY=$SEGMENT_WRITE_KEY
+              TELEMETRY=$RI_SEGMENT_WRITE_KEY
             fi
 
             if [ << parameters.env >> == 'staging' ]; then
-              TELEMETRY=$SEGMENT_WRITE_KEY_STAGE
+              TELEMETRY=$RI_SEGMENT_WRITE_KEY_STAGE
             fi
 
             docker build --build-arg NODE_ENV=<< parameters.env >> \
-            --build-arg RI_SERVER_TLS_CERT="$RI_SERVER_TLS_CERT" \
-            --build-arg RI_SERVER_TLS_KEY="$RI_SERVER_TLS_KEY" \
-            --build-arg SEGMENT_WRITE_KEY="$TELEMETRY" \
+            --build-arg RI_SEGMENT_WRITE_KEY="$TELEMETRY" \
             -t riv2:latest .
 
             mkdir -p docker-release
@@ -1154,6 +1156,9 @@ workflows:
             - Setup sign certificates (stage)
       - linux:
           name: Build app - Linux (stage)
+          env: stage
+          redisstack: false
+          target: AppImage
           requires:
             - Setup build (stage)
       - docker:

.circleci/e2e/test.app-image.sh

@@ -17,5 +17,5 @@ docker-compose -f tests/e2e/rte.docker-compose.yml up --force-recreate -d -V
 # run tests
 COMMON_URL=$(tail -n 1 apppath)/resources/app.asar/dist/renderer/index.html \
 ELECTRON_PATH=$(tail -n 1 apppath)/redisinsight \
-SOCKETS_CORS=true \
+RI_SOCKETS_CORS=true \
 yarn --cwd tests/e2e dotenv -e .desktop.env yarn --cwd tests/e2e test:desktop:ci

.circleci/e2e/test.exe.cmd

@@ -6,7 +6,7 @@ set OSS_STANDALONE_HOST=%E2E_CLOUD_DATABASE_HOST%
 set OSS_STANDALONE_PORT=%E2E_CLOUD_DATABASE_PORT%
 set OSS_STANDALONE_USERNAME=%E2E_CLOUD_DATABASE_USERNAME%
 set OSS_STANDALONE_PASSWORD=%E2E_CLOUD_DATABASE_PASSWORD%
-set SOCKETS_CORS=true
+set RI_SOCKETS_CORS=true
 
 call yarn --cwd tests/e2e install
 

.circleci/redisstack/app-image.repack.sh

@@ -4,7 +4,7 @@ set -e
 ARCH=${ARCH:-x86_64}
 WORKING_DIRECTORY=$(pwd)
 SOURCE_APP=${SOURCE_APP:-"RedisInsight-linux-$ARCH.AppImage"}
-APP_FOLDER_NAME="RedisInsight-linux"
+RI_APP_FOLDER_NAME="RedisInsight-linux"
 TAR_NAME="RedisInsight-app-linux.$ARCH.tar.gz"
 TMP_FOLDER="/tmp/RedisInsight-app-$ARCH"
 
@@ -17,9 +17,9 @@ cp "./release/$SOURCE_APP" "$TMP_FOLDER"
 cd "$TMP_FOLDER" || exit 1
 
 ./"$SOURCE_APP" --appimage-extract
-mv squashfs-root "$APP_FOLDER_NAME"
+mv squashfs-root "$RI_APP_FOLDER_NAME"
 
-tar -czvf "$TAR_NAME" "$APP_FOLDER_NAME"
+tar -czvf "$TAR_NAME" "$RI_APP_FOLDER_NAME"
 
 cp "$TAR_NAME" "$WORKING_DIRECTORY/release/redisstack/"
 cd "$WORKING_DIRECTORY" || exit 1

.circleci/redisstack/dmg.repack.sh

@@ -4,8 +4,8 @@ set -e
 ARCH=${ARCH:-x64}
 WORKING_DIRECTORY=$(pwd)
 TAR_NAME="RedisInsight-app-darwin.$ARCH.tar.gz"
-APP_FOLDER_NAME="RedisInsight.app"
-TMP_FOLDER="/tmp/$APP_FOLDER_NAME"
+RI_APP_FOLDER_NAME="RedisInsight.app"
+TMP_FOLDER="/tmp/$RI_APP_FOLDER_NAME"
 
 rm -rf "$TMP_FOLDER"
 
@@ -15,7 +15,7 @@ mkdir -p "$TMP_FOLDER"
 hdiutil attach "./release/RedisInsight-mac-$ARCH.dmg"
 cp -a /Volumes/RedisInsight*/RedisInsight.app "/tmp"
 cd "/tmp" || exit 1
-tar -czvf "$TAR_NAME" "$APP_FOLDER_NAME"
+tar -czvf "$TAR_NAME" "$RI_APP_FOLDER_NAME"
 cp "$TAR_NAME" "$WORKING_DIRECTORY/release/redisstack/"
 cd "$WORKING_DIRECTORY" || exit 1
 hdiutil unmount /Volumes/RedisInsight*/

Dockerfile

@@ -43,20 +43,12 @@ FROM node:18.18-alpine
 
 # runtime args and environment variables
 ARG NODE_ENV=production
-ARG RI_APP_HOST
-ARG RI_APP_PORT=5000
-ARG RI_SERVER_TLS_CERT
-ARG RI_SERVER_TLS_KEY
-ARG SEGMENT_WRITE_KEY
-ENV RI_APP_HOST=${RI_APP_HOST}
-ENV RI_APP_PORT=${RI_APP_PORT}
-ENV RI_SERVER_TLS_CERT=${RI_SERVER_TLS_CERT}
-ENV RI_SERVER_TLS_KEY=${RI_SERVER_TLS_KEY}
-ENV SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
+ARG RI_SEGMENT_WRITE_KEY
+ENV RI_SEGMENT_WRITE_KEY=${RI_SEGMENT_WRITE_KEY}
 ENV NODE_ENV=${NODE_ENV}
-ENV SERVER_STATIC_CONTENT=true
-ENV BUILD_TYPE='DOCKER_ON_PREMISE'
-ENV APP_FOLDER_ABSOLUTE_PATH='/data'
+ENV RI_SERVE_STATICS=true
+ENV RI_BUILD_TYPE='DOCKER_ON_PREMISE'
+ENV RI_APP_FOLDER_ABSOLUTE_PATH='/data'
 
 # this resolves CVE-2023-5363
 # TODO: remove this line once we update to base image that doesn't have this vulnerability

README.md

@@ -7,7 +7,7 @@
 [![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/QUkjSsk)
 
 
-RedisInsight is a visual tool that provides capabilities to design, develop and optimize your Redis application. 
+RedisInsight is a visual tool that provides capabilities to design, develop, and optimize your Redis application.
 Query, analyse and interact with your Redis data. [Download it here](https://redis.com/redis-enterprise/redis-insight/#insight-form)!
 
 ![RedisInsight Browser screenshot](/.github/redisinsight_browser.png)
@@ -23,26 +23,26 @@ RedisInsight is an intuitive and efficient GUI for Redis, allowing you to intera
 * Browse, filter, visualise your key-value Redis data structures and see key values in different formats (including JSON, Hex, ASCII, etc.)
 * CRUD support for Lists, Hashes, Strings, Sets, Sorted Sets, and Streams
 * CRUD support for [RedisJSON](https://oss.redis.com/redisjson/)
+* Interactive tutorials to learn easily, among other things, how to leverage the native JSON data structure supporting structured querying and full-text search, including vector similarity search for your AI use cases
+* Contextualised recommendations to optimize performance and memory usage. The list of recommendations gets updated as you interact with your database
 * Profiler - analyze every command sent to Redis in real-time
 * SlowLog - analyze slow operations in Redis instances based on the [Slowlog](https://github.com/RedisInsight/RedisInsight/releases#:~:text=results%20of%20the-,Slowlog,-command%20to%20analyze) command
 * Pub/Sub - support for [Redis pub/sub](https://redis.io/docs/manual/pubsub/), enabling subscription to channels and posting messages to channels
 * Bulk actions - Delete the keys in bulk based on the filters set in Browser or Tree view
-* Introducing Workbench - advanced command line interface with intelligent command auto-complete, complex data visualizations and support for the raw mode
+* Workbench - advanced command line interface with intelligent command auto-complete, complex data visualizations and support for the raw mode
 * Command auto-complete support for [RediSearch](https://oss.redis.com/redisearch/), [RedisJSON](https://oss.redis.com/redisjson/), [RedisGraph](https://oss.redis.com/redisgraph/), [RedisTimeSeries](https://oss.redis.com/redistimeseries/), [RedisAI](https://oss.redis.com/redisai/)
-* Visualizations of your [RediSearch](https://oss.redis.com/redisearch/) index, queries, and aggregations
-* Ability to build your own data visualization plugins
-* Built-in click-through guides for Redis capabilities
-* Officially supported for Redis OSS, [Redis Cloud](https://redis.com/try-free/). Works with Microsoft Azure Cache for Redis (official support upcoming).
-* Available for macOS (including M1), Windows and Linux 
+* Visualizations of your [RediSearch](https://oss.redis.com/redisearch/) index, queries, and aggregations. Ability to build [your own data visualization plugins](https://github.com/RedisInsight/Packages)
+* Officially supported for Redis OSS, [Redis Cloud](https://redis.com/try-free/). Works with Microsoft Azure Cache for Redis (official support upcoming)
 
 Check out the [release notes](https://docs.redis.com/latest/ri/release-notes/). 
 
 ## Get started with RedisInsight
 
-This repository includes the code for the GA version of RedisInsight 2.0. Check out the [blogpost](https://redis.com/blog/introducing-redisinsight-2/) announcing it. 
+This repository includes the code for RedisInsight. Check out the [blogpost](https://redis.com/blog/introducing-redisinsight-2/) announcing it. 
 
 ### Installable 
 Available to download for free from [here](https://redis.com/redis-enterprise/redis-insight/#insight-form).
+Supports Windows, macOS (including M1), and Linux.
 
 ### Build 
 Alternatively you can also build from source. See our wiki for instructions.

api.Dockerfile

@@ -26,7 +26,7 @@ RUN dbus-uuidgen > /var/lib/dbus/machine-id
 
 ARG NODE_ENV=production
 ENV NODE_ENV=${NODE_ENV}
-ENV BUILD_TYPE='DOCKER_ON_PREMISE'
+ENV RI_BUILD_TYPE='DOCKER_ON_PREMISE'
 
 WORKDIR /usr/src/app
 

configs/webpack.config.main.prod.ts

@@ -55,18 +55,18 @@ export default merge(baseConfig, {
       NODE_ENV: 'production',
       DEBUG_PROD: false,
       START_MINIMIZED: false,
-      APP_ENV: 'electron',
+      RI_APP_TYPE: 'electron',
       RI_SERVER_TLS_CERT: process.env.RI_SERVER_TLS_CERT || '',
       RI_SERVER_TLS_KEY: process.env.RI_SERVER_TLS_KEY || '',
-      APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
-      UPGRADES_LINK: process.env.UPGRADES_LINK || '',
+      RI_SERVE_STATICS: false,
+      RI_APP_FOLDER_NAME: process.env.RI_APP_FOLDER_NAME || '',
+      RI_UPGRADES_LINK: process.env.RI_UPGRADES_LINK || '',
       RI_APP_HOST: '127.0.0.1',
-      BUILD_TYPE: 'ELECTRON',
-      APP_VERSION: version,
-      AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
-      SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
-      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
-        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
+      RI_BUILD_TYPE: 'ELECTRON',
+      RI_APP_VERSION: version,
+      RI_SEGMENT_WRITE_KEY: 'RI_SEGMENT_WRITE_KEY' in process.env ? process.env.RI_SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
+      RI_CONNECTIONS_TIMEOUT_DEFAULT: 'RI_CONNECTIONS_TIMEOUT_DEFAULT' in process.env
+        ? process.env.RI_CONNECTIONS_TIMEOUT_DEFAULT
         : toString(30 * 1000), // 30 sec
       // cloud auth
       RI_CLOUD_IDP_AUTHORIZE_URL: 'RI_CLOUD_IDP_AUTHORIZE_URL' in process.env ? process.env.RI_CLOUD_IDP_AUTHORIZE_URL: '',

configs/webpack.config.main.stage.ts

@@ -1,10 +1,8 @@
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
-import { toString } from 'lodash';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import mainProdConfig from './webpack.config.main.prod';
 import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
-import { version } from '../redisinsight/package.json';
 
 DeleteSourceMaps();
 
@@ -18,21 +16,6 @@ export default merge(mainProdConfig, {
 
     new webpack.EnvironmentPlugin({
       NODE_ENV: 'staging',
-      DEBUG_PROD: false,
-      START_MINIMIZED: false,
-      APP_ENV: 'electron',
-      RI_SERVER_TLS_CERT: process.env.RI_SERVER_TLS_CERT || '',
-      RI_SERVER_TLS_KEY: process.env.RI_SERVER_TLS_KEY || '',
-      APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
-      UPGRADES_LINK: process.env.UPGRADES_LINK || '',
-      RI_APP_HOST: '127.0.0.1',
-      BUILD_TYPE: 'ELECTRON',
-      APP_VERSION: version,
-      AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
-      SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
-      CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
-        ? process.env.CONNECTIONS_TIMEOUT_DEFAULT
-        : toString(30 * 1000), // 30 sec
     }),
   ],
 });