Merge pull request #200 from RedisLabsModules/enable_edit_protected_configs

Author: alonre24

RLTest/__main__.py

@@ -282,6 +282,10 @@ def do_normal_conn(self, line):
     '--enable-debug-command', action='store_const', const=True, default=False,
     help='On Redis 7, debug command need to be enabled in order to be used.')
 
+parser.add_argument(
+    '--enable-protected-configs', action='store_const', const=True, default=False,
+    help='On Redis 7, this option needs to be enabled in order to change protected configuration in runtime.')
+
 parser.add_argument('--check-exitcode', help='Check redis process exit code',
                     default=False, action='store_true')
 
@@ -449,6 +453,7 @@ def __init__(self):
         Defaults.oss_password = self.args.oss_password
         Defaults.cluster_node_timeout = self.args.cluster_node_timeout
         Defaults.enable_debug_command = self.args.enable_debug_command
+        Defaults.enable_protected_configs = self.args.enable_protected_configs
         if Defaults.use_unix and Defaults.use_slaves:
             raise Exception('Cannot use unix sockets with slaves')
 

RLTest/env.py

@@ -146,6 +146,7 @@ class Defaults:
     curr_test_name = None
     port=6379
     enable_debug_command=False
+    enable_protected_configs=False
     terminate_retries=None
     terminate_retry_secs=None
     protocol=2
@@ -179,7 +180,7 @@ def getKwargs(self):
 class Env:
     RTestInstance = None
     EnvCompareParams = ['module', 'moduleArgs', 'env', 'useSlaves', 'shardsCount', 'useAof',
-                        'useRdbPreamble', 'forceTcp', 'enableDebugCommand', 'protocol']
+                        'useRdbPreamble', 'forceTcp', 'enableDebugCommand', 'enableProtectedConfigs', 'protocol']
 
     def compareEnvs(self, env):
         if env is None:
@@ -194,7 +195,8 @@ def __init__(self, testName=None, testDescription=None, module=None,
                  useAof=None, useRdbPreamble=None, forceTcp=False, useTLS=False, tlsCertFile=None, tlsKeyFile=None,
                  tlsCaCertFile=None, tlsPassphrase=None, logDir=None, redisBinaryPath=None, dmcBinaryPath=None,
                  redisEnterpriseBinaryPath=None, noDefaultModuleArgs=False, clusterNodeTimeout = None,
-                 freshEnv=False, enableDebugCommand=None, protocol=None, terminateRetries=None, terminateRetrySecs=None):
+                 freshEnv=False, enableDebugCommand=None, enableProtectedConfigs=None, protocol=None,
+                 terminateRetries=None, terminateRetrySecs=None):
 
         self.testName = testName if testName else Defaults.curr_test_name
         if self.testName is None:
@@ -232,6 +234,8 @@ def __init__(self, testName=None, testDescription=None, module=None,
         self.clusterNodeTimeout = clusterNodeTimeout if clusterNodeTimeout else Defaults.cluster_node_timeout
         self.port = Defaults.port
         self.enableDebugCommand = enableDebugCommand if enableDebugCommand else Defaults.enable_debug_command
+        self.enableProtectedConfigs = enableProtectedConfigs if enableProtectedConfigs\
+            else Defaults.enable_protected_configs
         self.terminateRetries = terminateRetries
         self.terminateRetrySecs = terminateRetrySecs
 
@@ -348,6 +352,7 @@ def getEnvKwargs(self):
             'tlsPassphrase': self.tlsPassphrase,
             'port': self.port,
             'enableDebugCommand': self.enableDebugCommand,
+            'enableProtectedConfigs': self.enableProtectedConfigs,
             'protocol': self.protocol,
             'terminateRetries': self.terminateRetries,
             'terminateRetrySecs': self.terminateRetrySecs,

RLTest/redis_std.py

@@ -22,7 +22,7 @@ def __init__(self, redisBinaryPath, port=6379, modulePath=None, moduleArgs=None,
                  dbDirPath=None, useSlaves=False, serverId=1, password=None, libPath=None, clusterEnabled=False, decodeResponses=False,
                  useAof=False, useRdbPreamble=True, debugger=None, sanitizer=None, noCatch=False, noLog=False, unix=False, verbose=False, useTLS=False,
                  tlsCertFile=None, tlsKeyFile=None, tlsCaCertFile=None, clusterNodeTimeout=None, tlsPassphrase=None, enableDebugCommand=False, protocol=2,
-                 terminateRetries=None, terminateRetrySecs=None, loglevel=None):
+                 terminateRetries=None, terminateRetrySecs=None, enableProtectedConfigs=False, loglevel=None):
         self.uuid = uuid.uuid4().hex
         self.redisBinaryPath = os.path.expanduser(redisBinaryPath) if redisBinaryPath.startswith(
             '~/') else redisBinaryPath
@@ -63,6 +63,7 @@ def __init__(self, redisBinaryPath, port=6379, modulePath=None, moduleArgs=None,
         self.clusterNodeTimeout = clusterNodeTimeout
         self.tlsPassphrase = tlsPassphrase
         self.enableDebugCommand = enableDebugCommand
+        self.enableProtectedConfigs = enableProtectedConfigs
         self.protocol = protocol
         self.terminateRetries = terminateRetries
         self.terminateRetrySecs = terminateRetrySecs
@@ -236,9 +237,11 @@ def createCmdArgs(self, role):
 
             cmdArgs += ['--tls-replication', 'yes']
 
-        if self.enableDebugCommand:
-            if self._getRedisVersion() > 70000:
+        if self._getRedisVersion() > 70000:
+            if self.enableDebugCommand:
                 cmdArgs += ['--enable-debug-command', 'yes']
+            if self.enableProtectedConfigs:
+                cmdArgs += ['--enable-protected-configs', 'yes']
 
         return cmdArgs
 

config.txt

@@ -1,3 +1,5 @@
 #-vv
 --clear-logs
+--enable-debug-command
+--enable-protected-configs
 #--debug