1
0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00

fix #1904 - ACL DRYRUN (#2102)

* fix #1904 - ACL DRYRUN

* clean code

* fix test
This commit is contained in:
Leibale Eidelman
2022-04-26 09:04:21 -04:00
committed by GitHub
parent 1e51680205
commit b586ccb9d7
28 changed files with 68 additions and 26 deletions

View File

@@ -1,6 +1,7 @@
import CLUSTER_COMMANDS from '../cluster/commands'; import CLUSTER_COMMANDS from '../cluster/commands';
import * as ACL_CAT from '../commands/ACL_CAT'; import * as ACL_CAT from '../commands/ACL_CAT';
import * as ACL_DELUSER from '../commands/ACL_DELUSER'; import * as ACL_DELUSER from '../commands/ACL_DELUSER';
import * as ACL_DRYRUN from '../commands/ACL_DRYRUN';
import * as ACL_GENPASS from '../commands/ACL_GENPASS'; import * as ACL_GENPASS from '../commands/ACL_GENPASS';
import * as ACL_GETUSER from '../commands/ACL_GETUSER'; import * as ACL_GETUSER from '../commands/ACL_GETUSER';
import * as ACL_LIST from '../commands/ACL_LIST'; import * as ACL_LIST from '../commands/ACL_LIST';
@@ -115,6 +116,8 @@ export default {
aclCat: ACL_CAT, aclCat: ACL_CAT,
ACL_DELUSER, ACL_DELUSER,
aclDelUser: ACL_DELUSER, aclDelUser: ACL_DELUSER,
ACL_DRYRUN,
aclDryRun: ACL_DRYRUN,
ACL_GENPASS, ACL_GENPASS,
aclGenPass: ACL_GENPASS, aclGenPass: ACL_GENPASS,
ACL_GETUSER, ACL_GETUSER,

View File

@@ -0,0 +1,21 @@
import { strict as assert } from 'assert';
import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './ACL_DRYRUN';
describe('ACL DRYRUN', () => {
testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => {
assert.deepEqual(
transformArguments('default', ['GET', 'key']),
['ACL', 'DRYRUN', 'default', 'GET', 'key']
);
});
testUtils.testWithClient('client.aclDryRun', async client => {
assert.equal(
await client.aclDryRun('default', ['GET', 'key']),
'OK'
);
}, GLOBAL.SERVERS.OPEN);
});

View File

@@ -0,0 +1,18 @@
import { RedisCommandArgument, RedisCommandArguments } from '.';
export const IS_READ_ONLY = true;
export function transformArguments(
username: RedisCommandArgument,
command: Array<RedisCommandArgument>
): RedisCommandArguments {
return [
'ACL',
'DRYRUN',
username,
...command
];
}
export declare function transformReply(): RedisCommandArgument;

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './BLMPOP'; import { transformArguments } from './BLMPOP';
describe('BLMPOP', () => { describe('BLMPOP', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './BZMPOP'; import { transformArguments } from './BZMPOP';
describe('BZMPOP', () => { describe('BZMPOP', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './CLUSTER_LINKS'; import { transformArguments } from './CLUSTER_LINKS';
describe('CLUSTER LINKS', () => { describe('CLUSTER LINKS', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './COMMAND_GETKEYSANDFLAGS'; import { transformArguments } from './COMMAND_GETKEYSANDFLAGS';
describe('COMMAND GETKEYSANDFLAGS', () => { describe('COMMAND GETKEYSANDFLAGS', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments, FilterBy } from './COMMAND_LIST'; import { transformArguments, FilterBy } from './COMMAND_LIST';
describe('COMMAND LIST', () => { describe('COMMAND LIST', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -3,7 +3,7 @@ import testUtils from '../test-utils';
import { transformArguments } from './EVALSHA_RO'; import { transformArguments } from './EVALSHA_RO';
describe('EVALSHA_RO', () => { describe('EVALSHA_RO', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './EVAL_RO'; import { transformArguments } from './EVAL_RO';
describe('EVAL_RO', () => { describe('EVAL_RO', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(

View File

@@ -3,8 +3,8 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './EXPIRETIME'; import { transformArguments } from './EXPIRETIME';
describe('EXPIRETIME', () => { describe('EXPIRETIME', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(
transformArguments('key'), transformArguments('key'),

View File

@@ -4,7 +4,7 @@ import { MATH_FUNCTION, loadMathFunction } from '../client/index.spec';
import { transformArguments } from './FCALL'; import { transformArguments } from './FCALL';
describe('FCALL', () => { describe('FCALL', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(

View File

@@ -4,7 +4,7 @@ import { MATH_FUNCTION, loadMathFunction } from '../client/index.spec';
import { transformArguments } from './FCALL_RO'; import { transformArguments } from './FCALL_RO';
describe('FCALL_RO', () => { describe('FCALL_RO', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(

View File

@@ -4,7 +4,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './FUNCTION_DELETE'; import { transformArguments } from './FUNCTION_DELETE';
describe('FUNCTION DELETE', () => { describe('FUNCTION DELETE', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './FUNCTION_DUMP'; import { transformArguments } from './FUNCTION_DUMP';
describe('FUNCTION DUMP', () => { describe('FUNCTION DUMP', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './FUNCTION_FLUSH'; import { transformArguments } from './FUNCTION_FLUSH';
describe('FUNCTION FLUSH', () => { describe('FUNCTION FLUSH', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -3,7 +3,7 @@ import testUtils from '../test-utils';
import { transformArguments } from './FUNCTION_KILL'; import { transformArguments } from './FUNCTION_KILL';
describe('FUNCTION KILL', () => { describe('FUNCTION KILL', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(

View File

@@ -4,7 +4,7 @@ import { MATH_FUNCTION, loadMathFunction } from '../client/index.spec';
import { transformArguments } from './FUNCTION_LIST'; import { transformArguments } from './FUNCTION_LIST';
describe('FUNCTION LIST', () => { describe('FUNCTION LIST', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -4,7 +4,7 @@ import { MATH_FUNCTION, loadMathFunction } from '../client/index.spec';
import { transformArguments } from './FUNCTION_LIST_WITHCODE'; import { transformArguments } from './FUNCTION_LIST_WITHCODE';
describe('FUNCTION LIST WITHCODE', () => { describe('FUNCTION LIST WITHCODE', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -4,7 +4,7 @@ import { MATH_FUNCTION } from '../client/index.spec';
import { transformArguments } from './FUNCTION_LOAD'; import { transformArguments } from './FUNCTION_LOAD';
describe('FUNCTION LOAD', () => { describe('FUNCTION LOAD', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './FUNCTION_RESTORE'; import { transformArguments } from './FUNCTION_RESTORE';
describe('FUNCTION RESTORE', () => { describe('FUNCTION RESTORE', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './FUNCTION_STATS'; import { transformArguments } from './FUNCTION_STATS';
describe('FUNCTION STATS', () => { describe('FUNCTION STATS', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './LMPOP'; import { transformArguments } from './LMPOP';
describe('LMPOP', () => { describe('LMPOP', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './PEXPIRETIME'; import { transformArguments } from './PEXPIRETIME';
describe('PEXPIRETIME', () => { describe('PEXPIRETIME', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
it('transformArguments', () => { it('transformArguments', () => {
assert.deepEqual( assert.deepEqual(

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './SINTERCARD'; import { transformArguments } from './SINTERCARD';
describe('SINTERCARD', () => { describe('SINTERCARD', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './SORT_RO'; import { transformArguments } from './SORT_RO';
describe('SORT_RO', () => { describe('SORT_RO', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './ZINTERCARD'; import { transformArguments } from './ZINTERCARD';
describe('ZINTERCARD', () => { describe('ZINTERCARD', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {

View File

@@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils';
import { transformArguments } from './ZMPOP'; import { transformArguments } from './ZMPOP';
describe('ZMPOP', () => { describe('ZMPOP', () => {
testUtils.isVersionGreaterThanHook([7, 0]); testUtils.isVersionGreaterThanHook([7]);
describe('transformArguments', () => { describe('transformArguments', () => {
it('simple', () => { it('simple', () => {