Skip to content

Commit 8247ef9

Browse files
authored
Merge pull request #3873 from RedisInsight/release/2.58.0
Release/2.58.0 to latest
2 parents 35ce664 + 1d91854 commit 8247ef9

File tree

173 files changed

+4128
-765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+4128
-765
lines changed

.circleci/build/release-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
HELP="Args:
5-
-v - Semver (2.56.0)
5+
-v - Semver (2.58.0)
66
-d - Build image repository (Ex: -d redisinsight)
77
-r - Target repository (Ex: -r redis/redisinsight)
88
"

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
"@testing-library/user-event": "^14.4.3",
9797
"@types/classnames": "^2.2.11",
9898
"@types/d3": "^7.4.0",
99-
"@types/date-fns": "^2.6.0",
10099
"@types/detect-port": "^1.3.0",
101100
"@types/electron-store": "^3.2.0",
102101
"@types/express": "^4.17.3",
@@ -130,7 +129,7 @@
130129
"@vitejs/plugin-react": "^4.2.1",
131130
"@vitejs/plugin-react-swc": "^3.6.0",
132131
"assert": "^2.1.0",
133-
"concurrently": "^5.3.0",
132+
"concurrently": "^9.0.1",
134133
"construct-style-sheets-polyfill": "^3.1.0",
135134
"copyfiles": "^2.4.1",
136135
"core-js": "^3.6.5",

redisinsight/api/config/default.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export default {
8080
migrateOldFolders: process.env.RI_MIGRATE_OLD_FOLDERS ? process.env.RI_MIGRATE_OLD_FOLDERS === 'true' : true,
8181
autoBootstrap: process.env.RI_AUTO_BOOTSTRAP ? process.env.RI_AUTO_BOOTSTRAP === 'true' : true,
8282
buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
83-
appVersion: process.env.RI_APP_VERSION || '2.56.0',
83+
appVersion: process.env.RI_APP_VERSION || '2.58.0',
8484
requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
8585
excludeRoutes: [],
8686
excludeAuthRoutes: [],

redisinsight/api/config/features-config.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": 2.5403,
2+
"version": 2.56,
33
"features": {
44
"redisDataIntegration": {
55
"flag": true,
@@ -63,11 +63,11 @@
6363
"redisStackPreview": [
6464
{
6565
"provider": "AWS",
66-
"regions": ["us-east-2", "ap-southeast-1", "sa-east-1"]
66+
"regions": []
6767
},
6868
{
6969
"provider": "GCP",
70-
"regions": ["asia-northeast1", "europe-west1", "us-central1"]
70+
"regions": []
7171
}
7272
]
7373
}

redisinsight/api/config/production.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export default {
4040
},
4141
ai: {
4242
convAiApiUrl: process.env.RI_AI_CONVAI_API_URL || 'https://redis.io/convai/api',
43-
querySocketUrl: process.env.RI_AI_QUERY_SOCKET_URL || 'https://app.redislabs.com',
43+
querySocketUrl: process.env.RI_AI_QUERY_SOCKET_URL || 'https://cloud.redis.io',
4444
querySocketPath: process.env.RI_AI_QUERY_SOCKET_PATH || '/api/v1/cloud-copilot-service/socket.io/',
4545
},
4646
};

redisinsight/api/config/swagger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
55
info: {
66
title: 'Redis Insight Backend API',
77
description: 'Redis Insight Backend API',
8-
version: '2.56.0',
8+
version: '2.58.0',
99
},
1010
tags: [],
1111
};

redisinsight/api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "redisinsight-api",
3-
"version": "2.56.0",
3+
"version": "2.58.0",
44
"description": "Redis Insight API",
55
"private": true,
66
"author": {

redisinsight/api/src/__mocks__/rdi.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ import { ApiRdiClient } from 'src/modules/rdi/client/api.rdi.client';
88
import { RdiEntity } from 'src/modules/rdi/entities/rdi.entity';
99
import { EncryptionStrategy } from 'src/modules/encryption/models';
1010
import { RdiDryRunJobDto } from 'src/modules/rdi/dto';
11+
import { sign } from 'jsonwebtoken';
1112

1213
export const mockRdiId = 'rdiId';
1314
export const mockRdiPasswordEncrypted = 'password_ENCRYPTED';
1415

1516
export const mockRdiPasswordPlain = 'some pass';
1617

18+
export const mockedRdiAccessToken = sign({ exp: Math.trunc(Date.now() / 1000) + 3600 }, 'test');
19+
1720
export class MockRdiClient extends ApiRdiClient {
1821
constructor(metadata: RdiClientMetadata, client: any = jest.fn()) {
1922
super(metadata, client);
@@ -31,6 +34,12 @@ export class MockRdiClient extends ApiRdiClient {
3134

3235
public deploy = jest.fn();
3336

37+
public startPipeline = jest.fn();
38+
39+
public stopPipeline = jest.fn();
40+
41+
public resetPipeline = jest.fn();
42+
3443
public deployJob = jest.fn();
3544

3645
public dryRunJob = jest.fn();

redisinsight/api/src/constants/agreements-spec.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"disabled": false,
1010
"category": "privacy",
1111
"since": "1.0.1",
12-
"title": "Analytics",
13-
"label": "Enable Analytics",
14-
"description": "Select to help us make Redis Insight better. We aggregate anonymized user experience data and use it to fix bugs and improve experience for all users."
12+
"title": "Usage Data",
13+
"label": "Usage Data",
14+
"description": "Select the usage data option to help us improve Redis Insight. We use such usage data to understand how Redis Insight features are used, prioritize new features, and enhance the user experience."
1515
},
1616
"notifications": {
1717
"defaultValue": false,

redisinsight/api/src/constants/custom-error-codes.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,7 @@ export enum CustomErrorCodes {
6262
RdiValidationError = 11_404,
6363
RdiNotFound = 11_405,
6464
RdiForbidden = 11_406,
65+
RdiResetPipelineFailure = 11_407,
66+
RdiStartPipelineFailure = 11_408,
67+
RdiStopPipelineFailure = 11_409,
6568
}

0 commit comments

Comments
 (0)