Skip to content

E2e/bugfix/ri 3778 docker #1390

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
Nov 14, 2022
Merged

E2e/bugfix/ri 3778 docker #1390

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
ef0bf92
fix api tests
Nov 10, 2022
c5e906d
fix port data type sending in API endpoint
Nov 10, 2022
6ead300
Merge branch 'feature/RI-3238/prepare_for_docker' into e2e/bugfix/RI-…
Nov 10, 2022
1f14b6f
create Sentinel endpoint
Nov 10, 2022
68d357e
change getClusterNodesApi endpoint
Nov 10, 2022
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
31 changes: 17 additions & 14 deletions tests/e2e/helpers/api/api-database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ const endpoint = common.getEndpoint();
* @param databaseParameters The database parameters
*/
export async function addNewStandaloneDatabaseApi(databaseParameters: AddNewDatabaseParameters): Promise<void> {
const response = await request(endpoint).post('/instance')
const response = await request(endpoint).post('/databases')
.send({
'name': databaseParameters.databaseName,
'host': databaseParameters.host,
'port': databaseParameters.port,
'port': Number(databaseParameters.port),
'username': databaseParameters.databaseUsername,
'password': databaseParameters.databasePassword
})
Expand Down Expand Up @@ -44,8 +44,11 @@ export async function addNewStandaloneDatabasesApi(databasesParameters: AddNewDa
* @param databaseParameters The database parameters
*/
export async function addNewOSSClusterDatabaseApi(databaseParameters: OSSClusterParameters): Promise<void> {
const response = await request(endpoint).post('/instance')
.send({ 'name': databaseParameters.ossClusterDatabaseName, 'host': databaseParameters.ossClusterHost, 'port': databaseParameters.ossClusterPort })
const response = await request(endpoint).post('/databases')
.send({
'name': databaseParameters.ossClusterDatabaseName,
'host': databaseParameters.ossClusterHost,
'port': Number(databaseParameters.ossClusterPort) })
.set('Accept', 'application/json');

await t.expect(await response.status).eql(201, 'The creation of new oss cluster database request failed')
Expand All @@ -62,23 +65,23 @@ export async function discoverSentinelDatabaseApi(databaseParameters: SentinelPa
if (primaryGroupsNumber) {
masters = databaseParameters.masters.slice(0, primaryGroupsNumber);
}
const response = await request(endpoint).post('/instance/sentinel-masters')
const response = await request(endpoint).post('/redis-sentinel/databases')
.send({
'host': databaseParameters.sentinelHost,
'port': databaseParameters.sentinelPort,
'port': Number(databaseParameters.sentinelPort),
'password': databaseParameters.sentinelPassword,
'masters': masters
})
.set('Accept', 'application/json');

await t.expect(response.status).eql(201, 'The autodiscover of Sentinel database request failed');
await t.expect(response.status).eql(201, 'Autodiscovery of Sentinel database request failed');
}

/**
* Get all databases through api
*/
export async function getAllDatabases(): Promise<string[]> {
const response = await request(endpoint).get('/instance')
const response = await request(endpoint).get('/databases')
.set('Accept', 'application/json').expect(200);
return await response.body;
}
Expand Down Expand Up @@ -130,7 +133,7 @@ export async function deleteAllDatabasesApi(): Promise<void> {
databaseIds.push(dbData.id);
}
if (databaseIds.length > 0) {
await request(endpoint).delete('/instance')
await request(endpoint).delete('/databases')
.send({ 'ids': databaseIds })
.set('Accept', 'application/json')
.expect(200);
Expand All @@ -144,7 +147,7 @@ export async function deleteAllDatabasesApi(): Promise<void> {
*/
export async function deleteStandaloneDatabaseApi(databaseParameters: AddNewDatabaseParameters): Promise<void> {
const databaseId = await getDatabaseByName(databaseParameters.databaseName);
await request(endpoint).delete('/instance')
await request(endpoint).delete('/databases')
.send({ 'ids': [`${databaseId}`] })
.set('Accept', 'application/json')
.expect(200);
Expand All @@ -156,7 +159,7 @@ export async function deleteStandaloneDatabaseApi(databaseParameters: AddNewData
*/
export async function deleteOSSClusterDatabaseApi(databaseParameters: OSSClusterParameters): Promise<void> {
const databaseId = await getDatabaseByName(databaseParameters.ossClusterDatabaseName);
const response = await request(endpoint).delete('/instance')
const response = await request(endpoint).delete('/databases')
.send({ 'ids': [`${databaseId}`] }).set('Accept', 'application/json');

await t.expect(response.status).eql(200, 'Delete OSS cluster database request failed');
Expand All @@ -169,7 +172,7 @@ export async function deleteOSSClusterDatabaseApi(databaseParameters: OSSCluster
export async function deleteAllSentinelDatabasesApi(databaseParameters: SentinelParameters): Promise<void> {
for (let i = 0; i < databaseParameters.name.length; i++) {
const databaseId = await getDatabaseByName(databaseParameters.name[i]);
const response = await request(endpoint).delete('/instance')
const response = await request(endpoint).delete('/databases')
.send({ 'ids': [`${databaseId}`] }).set('Accept', 'application/json');
await t.expect(response.status).eql(200, 'Delete Sentinel database request failed');
}
Expand All @@ -180,7 +183,7 @@ export async function deleteAllSentinelDatabasesApi(databaseParameters: Sentinel
*/
export async function deleteAllDatabasesByConnectionTypeApi(connectionType: string): Promise<void> {
const databaseIds = await getDatabaseByConnectionType(connectionType);
const response = await request(endpoint).delete('/instance')
const response = await request(endpoint).delete('/databases')
.send({ 'ids': [`${databaseIds}`] }).set('Accept', 'application/json');
await t.expect(response.status).eql(200, 'Delete Sentinel database request failed');
}
Expand All @@ -204,7 +207,7 @@ export async function deleteStandaloneDatabasesApi(databasesParameters: AddNewDa
export async function getClusterNodesApi(databaseParameters: OSSClusterParameters): Promise<string[]> {
const databaseId = await getDatabaseByName(databaseParameters.ossClusterDatabaseName);
const response = await request(endpoint)
.get(`/instance/${databaseId}/cluster-details`)
.get(`/databases/${databaseId}/cluster-details`)
.set('Accept', 'application/json')
.expect(200);
const nodes = await response.body.nodes;
Expand Down
16 changes: 8 additions & 8 deletions tests/e2e/helpers/api/api-keys.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const endpoint = common.getEndpoint();
*/
export async function addHashKeyApi(keyParameters: HashKeyParameters, databaseParameters: AddNewDatabaseParameters): Promise<void> {
const databaseId = await getDatabaseByName(databaseParameters.databaseName);
const response = await request(endpoint).post(`/instance/${databaseId}/hash?encoding=buffer`)
const response = await request(endpoint).post(`/databases/${databaseId}/hash?encoding=buffer`)
.send({
'keyName': keyParameters.keyName,
'fields': keyParameters.fields
Expand All @@ -38,7 +38,7 @@ export async function addHashKeyApi(keyParameters: HashKeyParameters, databasePa
*/
export async function addStreamKeyApi(keyParameters: StreamKeyParameters, databaseParameters: AddNewDatabaseParameters): Promise<void> {
const databaseId = await getDatabaseByName(databaseParameters.databaseName);
const response = await request(endpoint).post(`/instance/${databaseId}/streams?encoding=buffer`)
const response = await request(endpoint).post(`/databases/${databaseId}/streams?encoding=buffer`)
.send({
'keyName': keyParameters.keyName,
'entries': keyParameters.entries
Expand All @@ -55,7 +55,7 @@ export async function addStreamKeyApi(keyParameters: StreamKeyParameters, databa
*/
export async function addSetKeyApi(keyParameters: SetKeyParameters, databaseParameters: AddNewDatabaseParameters): Promise<void> {
const databaseId = await getDatabaseByName(databaseParameters.databaseName);
const response = await request(endpoint).post(`/instance/${databaseId}/set?encoding=buffer`)
const response = await request(endpoint).post(`/databases/${databaseId}/set?encoding=buffer`)
.send({
'keyName': keyParameters.keyName,
'members': keyParameters.members
Expand All @@ -72,7 +72,7 @@ export async function addSetKeyApi(keyParameters: SetKeyParameters, databasePara
*/
export async function addSortedSetKeyApi(keyParameters: SortedSetKeyParameters, databaseParameters: AddNewDatabaseParameters): Promise<void> {
const databaseId = await getDatabaseByName(databaseParameters.databaseName);
const response = await request(endpoint).post(`/instance/${databaseId}/zSet?encoding=buffer`)
const response = await request(endpoint).post(`/databases/${databaseId}/zSet?encoding=buffer`)
.send({
'keyName': keyParameters.keyName,
'members': keyParameters.members
Expand All @@ -89,7 +89,7 @@ export async function addSortedSetKeyApi(keyParameters: SortedSetKeyParameters,
*/
export async function addListKeyApi(keyParameters: ListKeyParameters, databaseParameters: AddNewDatabaseParameters): Promise<void> {
const databaseId = await getDatabaseByName(databaseParameters.databaseName);
const response = await request(endpoint).post(`/instance/${databaseId}/list?encoding=buffer`)
const response = await request(endpoint).post(`/databases/${databaseId}/list?encoding=buffer`)
.send({
'keyName': keyParameters.keyName,
'element': keyParameters.element
Expand All @@ -106,7 +106,7 @@ export async function addListKeyApi(keyParameters: ListKeyParameters, databasePa
*/
export async function searchKeyByNameApi(keyName: string, databaseParameters: AddNewDatabaseParameters): Promise<string[]> {
const databaseId = await getDatabaseByName(databaseParameters.databaseName);
const response = await request(endpoint).get(`/instance/${databaseId}/keys?cursor=0&count=5000&match=${keyName}`)
const response = await request(endpoint).get(`/databases/${databaseId}/keys?cursor=0&count=5000&match=${keyName}`)
.set('Accept', 'application/json').expect(200);

return await response.body[0].keys;
Expand All @@ -121,7 +121,7 @@ export async function deleteKeyByNameApi(keyName: string, databaseParameters: Ad
const databaseId = await getDatabaseByName(databaseParameters.databaseName);
const isKeyExist = await searchKeyByNameApi(keyName, databaseParameters);
if (isKeyExist.length > 0) {
const response = await request(endpoint).delete(`/instance/${databaseId}/keys`)
const response = await request(endpoint).delete(`/databases/${databaseId}/keys`)
.send({ 'keyNames': [keyName] })
.set('Accept', 'application/json');

Expand All @@ -136,7 +136,7 @@ export async function deleteKeyByNameApi(keyName: string, databaseParameters: Ad
*/
export async function deleteKeysApi(keyNames: string[], databaseParameters: AddNewDatabaseParameters): Promise<void> {
const databaseId = await getDatabaseByName(databaseParameters.databaseName);
const response = await request(endpoint).delete(`/instance/${databaseId}/keys`)
const response = await request(endpoint).delete(`/databases/${databaseId}/keys`)
.send({ 'keyNames': keyNames })
.set('Accept', 'application/json');

Expand Down