diff --git a/packages/client/lib/client/commands.ts b/packages/client/lib/client/commands.ts index 94653e476b..84728ec76c 100644 --- a/packages/client/lib/client/commands.ts +++ b/packages/client/lib/client/commands.ts @@ -1,6 +1,7 @@ import CLUSTER_COMMANDS from '../cluster/commands'; import * as ACL_CAT from '../commands/ACL_CAT'; 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_GETUSER from '../commands/ACL_GETUSER'; import * as ACL_LIST from '../commands/ACL_LIST'; @@ -115,6 +116,8 @@ export default { aclCat: ACL_CAT, ACL_DELUSER, aclDelUser: ACL_DELUSER, + ACL_DRYRUN, + aclDryRun: ACL_DRYRUN, ACL_GENPASS, aclGenPass: ACL_GENPASS, ACL_GETUSER, diff --git a/packages/client/lib/commands/ACL_DRYRUN.spec.ts b/packages/client/lib/commands/ACL_DRYRUN.spec.ts new file mode 100644 index 0000000000..3154689c29 --- /dev/null +++ b/packages/client/lib/commands/ACL_DRYRUN.spec.ts @@ -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); +}); diff --git a/packages/client/lib/commands/ACL_DRYRUN.ts b/packages/client/lib/commands/ACL_DRYRUN.ts new file mode 100644 index 0000000000..95eed95066 --- /dev/null +++ b/packages/client/lib/commands/ACL_DRYRUN.ts @@ -0,0 +1,18 @@ +import { RedisCommandArgument, RedisCommandArguments } from '.'; + +export const IS_READ_ONLY = true; + +export function transformArguments( + username: RedisCommandArgument, + command: Array +): RedisCommandArguments { + return [ + 'ACL', + 'DRYRUN', + username, + ...command + ]; +} + +export declare function transformReply(): RedisCommandArgument; + diff --git a/packages/client/lib/commands/BLMPOP.spec.ts b/packages/client/lib/commands/BLMPOP.spec.ts index 9a4a6c96a2..15853a771b 100644 --- a/packages/client/lib/commands/BLMPOP.spec.ts +++ b/packages/client/lib/commands/BLMPOP.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './BLMPOP'; describe('BLMPOP', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/BZMPOP.spec.ts b/packages/client/lib/commands/BZMPOP.spec.ts index b35d971f0a..0e381c114f 100644 --- a/packages/client/lib/commands/BZMPOP.spec.ts +++ b/packages/client/lib/commands/BZMPOP.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './BZMPOP'; describe('BZMPOP', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/CLUSTER_LINKS.spec.ts b/packages/client/lib/commands/CLUSTER_LINKS.spec.ts index 242e9012fb..a8b1663c3a 100644 --- a/packages/client/lib/commands/CLUSTER_LINKS.spec.ts +++ b/packages/client/lib/commands/CLUSTER_LINKS.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './CLUSTER_LINKS'; describe('CLUSTER LINKS', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); it('transformArguments', () => { assert.deepEqual( diff --git a/packages/client/lib/commands/COMMAND_GETKEYSANDFLAGS.spec.ts b/packages/client/lib/commands/COMMAND_GETKEYSANDFLAGS.spec.ts index 19bc27d5f9..d568ed0e50 100644 --- a/packages/client/lib/commands/COMMAND_GETKEYSANDFLAGS.spec.ts +++ b/packages/client/lib/commands/COMMAND_GETKEYSANDFLAGS.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './COMMAND_GETKEYSANDFLAGS'; describe('COMMAND GETKEYSANDFLAGS', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); it('transformArguments', () => { assert.deepEqual( diff --git a/packages/client/lib/commands/COMMAND_LIST.spec.ts b/packages/client/lib/commands/COMMAND_LIST.spec.ts index ac4fee20c7..eef747d937 100644 --- a/packages/client/lib/commands/COMMAND_LIST.spec.ts +++ b/packages/client/lib/commands/COMMAND_LIST.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments, FilterBy } from './COMMAND_LIST'; describe('COMMAND LIST', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/EVALSHA_RO.spec.ts b/packages/client/lib/commands/EVALSHA_RO.spec.ts index 6711f24fd8..939a4a209c 100644 --- a/packages/client/lib/commands/EVALSHA_RO.spec.ts +++ b/packages/client/lib/commands/EVALSHA_RO.spec.ts @@ -3,7 +3,7 @@ import testUtils from '../test-utils'; import { transformArguments } from './EVALSHA_RO'; describe('EVALSHA_RO', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); it('transformArguments', () => { assert.deepEqual( diff --git a/packages/client/lib/commands/EVAL_RO.spec.ts b/packages/client/lib/commands/EVAL_RO.spec.ts index e39fe82dd3..f71d0b2b24 100644 --- a/packages/client/lib/commands/EVAL_RO.spec.ts +++ b/packages/client/lib/commands/EVAL_RO.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './EVAL_RO'; describe('EVAL_RO', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); it('transformArguments', () => { assert.deepEqual( diff --git a/packages/client/lib/commands/EXPIRETIME.spec.ts b/packages/client/lib/commands/EXPIRETIME.spec.ts index 3f33693d89..1d63e759a5 100644 --- a/packages/client/lib/commands/EXPIRETIME.spec.ts +++ b/packages/client/lib/commands/EXPIRETIME.spec.ts @@ -3,8 +3,8 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './EXPIRETIME'; describe('EXPIRETIME', () => { - testUtils.isVersionGreaterThanHook([7, 0]); - + testUtils.isVersionGreaterThanHook([7]); + it('transformArguments', () => { assert.deepEqual( transformArguments('key'), diff --git a/packages/client/lib/commands/FCALL.spec.ts b/packages/client/lib/commands/FCALL.spec.ts index 25fbd51399..fd29f07527 100644 --- a/packages/client/lib/commands/FCALL.spec.ts +++ b/packages/client/lib/commands/FCALL.spec.ts @@ -4,7 +4,7 @@ import { MATH_FUNCTION, loadMathFunction } from '../client/index.spec'; import { transformArguments } from './FCALL'; describe('FCALL', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); it('transformArguments', () => { assert.deepEqual( diff --git a/packages/client/lib/commands/FCALL_RO.spec.ts b/packages/client/lib/commands/FCALL_RO.spec.ts index 44332b9426..18665f92aa 100644 --- a/packages/client/lib/commands/FCALL_RO.spec.ts +++ b/packages/client/lib/commands/FCALL_RO.spec.ts @@ -4,7 +4,7 @@ import { MATH_FUNCTION, loadMathFunction } from '../client/index.spec'; import { transformArguments } from './FCALL_RO'; describe('FCALL_RO', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); it('transformArguments', () => { assert.deepEqual( diff --git a/packages/client/lib/commands/FUNCTION_DELETE.spec.ts b/packages/client/lib/commands/FUNCTION_DELETE.spec.ts index fd7dca2b07..563b9aa0a5 100644 --- a/packages/client/lib/commands/FUNCTION_DELETE.spec.ts +++ b/packages/client/lib/commands/FUNCTION_DELETE.spec.ts @@ -4,7 +4,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './FUNCTION_DELETE'; describe('FUNCTION DELETE', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); it('transformArguments', () => { assert.deepEqual( diff --git a/packages/client/lib/commands/FUNCTION_DUMP.spec.ts b/packages/client/lib/commands/FUNCTION_DUMP.spec.ts index e3befa3dc5..360ec6b745 100644 --- a/packages/client/lib/commands/FUNCTION_DUMP.spec.ts +++ b/packages/client/lib/commands/FUNCTION_DUMP.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './FUNCTION_DUMP'; describe('FUNCTION DUMP', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); it('transformArguments', () => { assert.deepEqual( diff --git a/packages/client/lib/commands/FUNCTION_FLUSH.spec.ts b/packages/client/lib/commands/FUNCTION_FLUSH.spec.ts index 8447216baa..12009d0336 100644 --- a/packages/client/lib/commands/FUNCTION_FLUSH.spec.ts +++ b/packages/client/lib/commands/FUNCTION_FLUSH.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './FUNCTION_FLUSH'; describe('FUNCTION FLUSH', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/FUNCTION_KILL.spec.ts b/packages/client/lib/commands/FUNCTION_KILL.spec.ts index cf489a8022..df4848fc82 100644 --- a/packages/client/lib/commands/FUNCTION_KILL.spec.ts +++ b/packages/client/lib/commands/FUNCTION_KILL.spec.ts @@ -3,7 +3,7 @@ import testUtils from '../test-utils'; import { transformArguments } from './FUNCTION_KILL'; describe('FUNCTION KILL', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); it('transformArguments', () => { assert.deepEqual( diff --git a/packages/client/lib/commands/FUNCTION_LIST.spec.ts b/packages/client/lib/commands/FUNCTION_LIST.spec.ts index 41de2f40f4..80723d070d 100644 --- a/packages/client/lib/commands/FUNCTION_LIST.spec.ts +++ b/packages/client/lib/commands/FUNCTION_LIST.spec.ts @@ -4,7 +4,7 @@ import { MATH_FUNCTION, loadMathFunction } from '../client/index.spec'; import { transformArguments } from './FUNCTION_LIST'; describe('FUNCTION LIST', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/FUNCTION_LIST_WITHCODE.spec.ts b/packages/client/lib/commands/FUNCTION_LIST_WITHCODE.spec.ts index 33c2ca6d91..56e6102a4b 100644 --- a/packages/client/lib/commands/FUNCTION_LIST_WITHCODE.spec.ts +++ b/packages/client/lib/commands/FUNCTION_LIST_WITHCODE.spec.ts @@ -4,7 +4,7 @@ import { MATH_FUNCTION, loadMathFunction } from '../client/index.spec'; import { transformArguments } from './FUNCTION_LIST_WITHCODE'; describe('FUNCTION LIST WITHCODE', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/FUNCTION_LOAD.spec.ts b/packages/client/lib/commands/FUNCTION_LOAD.spec.ts index 6beac45d0a..7be371c6b9 100644 --- a/packages/client/lib/commands/FUNCTION_LOAD.spec.ts +++ b/packages/client/lib/commands/FUNCTION_LOAD.spec.ts @@ -4,7 +4,7 @@ import { MATH_FUNCTION } from '../client/index.spec'; import { transformArguments } from './FUNCTION_LOAD'; describe('FUNCTION LOAD', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/FUNCTION_RESTORE.spec.ts b/packages/client/lib/commands/FUNCTION_RESTORE.spec.ts index 3ed4c2b329..a5c2e2dcc7 100644 --- a/packages/client/lib/commands/FUNCTION_RESTORE.spec.ts +++ b/packages/client/lib/commands/FUNCTION_RESTORE.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './FUNCTION_RESTORE'; describe('FUNCTION RESTORE', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/FUNCTION_STATS.spec.ts b/packages/client/lib/commands/FUNCTION_STATS.spec.ts index c9f648fa5e..a5e26b5fec 100644 --- a/packages/client/lib/commands/FUNCTION_STATS.spec.ts +++ b/packages/client/lib/commands/FUNCTION_STATS.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './FUNCTION_STATS'; describe('FUNCTION STATS', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); it('transformArguments', () => { assert.deepEqual( diff --git a/packages/client/lib/commands/LMPOP.spec.ts b/packages/client/lib/commands/LMPOP.spec.ts index a3c36f9021..5675ee9a28 100644 --- a/packages/client/lib/commands/LMPOP.spec.ts +++ b/packages/client/lib/commands/LMPOP.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './LMPOP'; describe('LMPOP', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/PEXPIRETIME.spec.ts b/packages/client/lib/commands/PEXPIRETIME.spec.ts index 8874346296..a2fd7f03f8 100644 --- a/packages/client/lib/commands/PEXPIRETIME.spec.ts +++ b/packages/client/lib/commands/PEXPIRETIME.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './PEXPIRETIME'; describe('PEXPIRETIME', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); it('transformArguments', () => { assert.deepEqual( diff --git a/packages/client/lib/commands/SINTERCARD.spec.ts b/packages/client/lib/commands/SINTERCARD.spec.ts index 24bd6cb808..a93699f6a1 100644 --- a/packages/client/lib/commands/SINTERCARD.spec.ts +++ b/packages/client/lib/commands/SINTERCARD.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './SINTERCARD'; describe('SINTERCARD', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/SORT_RO.spec.ts b/packages/client/lib/commands/SORT_RO.spec.ts index 0cc57991b7..fe3ca1240d 100644 --- a/packages/client/lib/commands/SORT_RO.spec.ts +++ b/packages/client/lib/commands/SORT_RO.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './SORT_RO'; describe('SORT_RO', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/ZINTERCARD.spec.ts b/packages/client/lib/commands/ZINTERCARD.spec.ts index a2b70616d5..492c1a9043 100644 --- a/packages/client/lib/commands/ZINTERCARD.spec.ts +++ b/packages/client/lib/commands/ZINTERCARD.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './ZINTERCARD'; describe('ZINTERCARD', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => { diff --git a/packages/client/lib/commands/ZMPOP.spec.ts b/packages/client/lib/commands/ZMPOP.spec.ts index 84f51e67b7..9a0c9676c2 100644 --- a/packages/client/lib/commands/ZMPOP.spec.ts +++ b/packages/client/lib/commands/ZMPOP.spec.ts @@ -3,7 +3,7 @@ import testUtils, { GLOBAL } from '../test-utils'; import { transformArguments } from './ZMPOP'; describe('ZMPOP', () => { - testUtils.isVersionGreaterThanHook([7, 0]); + testUtils.isVersionGreaterThanHook([7]); describe('transformArguments', () => { it('simple', () => {