Skip to content

Bugfix/ri 7145 fix pre setup dbs #4581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 27, 2025
Merged

Bugfix/ri 7145 fix pre setup dbs #4581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6257a35
RI-7141 add db number to env
ArtemHoruzhenko May 27, 2025
3100e73
RI-7145 fix db id undefined state
ArtemHoruzhenko May 27, 2025
9abe1fc
RI-7145 fix /db/info ITests
ArtemHoruzhenko May 27, 2025
820edf7
RI-7145 fix /db/info ITests for cluster
ArtemHoruzhenko May 27, 2025
1690af0
RI-7145 fix /db/info ITests for cluster
ArtemHoruzhenko May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion redisinsight/api/src/__mocks__/database-discovery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const mockDefaultDatabaseFields = {
modules: [],
caCert: null,
clientCert: null,
db: null,
db: 0,
nameFromProvider: null,
password: null,
provider: null,
Expand All @@ -24,6 +24,7 @@ export const mockDatabaseToImportFromEnvsInput = {
host: 'localhost',
port: 6379,
name: 'local database',
db: 0,
} as Partial<Database>;

export const mockDatabaseToImportFromEnvsPrepared = {
Expand All @@ -45,6 +46,7 @@ export const mockDatabaseToImportWithCertsFromEnvsInput = {
key: 'User key',
},
verifyServerCert: true,
db: 0,
} as Partial<Database>;

export const mockDatabaseToImportWithCertsFromEnvsPrepared = {
Expand Down
4 changes: 3 additions & 1 deletion redisinsight/api/src/modules/database-discovery/utils/pre-setup.discovery.util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { v4 as uuidv4 } from 'uuid';
import { pathExists, readFile } from 'fs-extra';
import { Database } from 'src/modules/database/models/database';
import {
Expand Down Expand Up @@ -34,7 +35,7 @@ export const populateDefaultValues = (
database: Partial<Database>,
): Database => {
const {
id,
id = uuidv4(),
host,
port = 6379,
name = `${host}:${port}`,
Expand Down Expand Up @@ -126,6 +127,7 @@ export const prepareDatabaseFromEnvs = async (
id: id || '0',
host: process.env[hostEnv],
port: parseInt(process.env[`RI_REDIS_PORT${id}`], 10) || 6379,
db: parseInt(process.env[`RI_REDIS_DB${id}`], 10) || 0,
name: process.env[`RI_REDIS_ALIAS${id}`],
username: process.env[`RI_REDIS_USERNAME${id}`],
password: process.env[`RI_REDIS_PASSWORD${id}`],
Expand Down
16 changes: 16 additions & 0 deletions redisinsight/api/test/api/database/GET-databases-id-info.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,24 @@ const responseSchema = Joi.object()
hitRatio: Joi.number().required(),
cashedScripts: Joi.number(),
server: Joi.object().required(),
stats: Joi.object().keys({
instantaneous_ops_per_sec: Joi.string(),
instantaneous_input_kbps: Joi.string(),
instantaneous_output_kbps: Joi.string(),
uptime_in_days: Joi.string(),
maxmemory_policy: Joi.string(),
numberOfKeysRange: Joi.string(),
}),
}),
),
stats: Joi.object().keys({
instantaneous_ops_per_sec: Joi.string(),
instantaneous_input_kbps: Joi.string(),
instantaneous_output_kbps: Joi.string(),
uptime_in_days: Joi.string(),
maxmemory_policy: Joi.string(),
numberOfKeysRange: Joi.string(),
}),
})
.required()
.strict();
Expand Down
Loading