Add flag to automatically accept default configuration values

Closes elastic#172
hub-cap · Oct 26, 2016 · 1e66495 · 1e66495
1 parent 0b28c00
commit 1e66495
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/esrally/config.py b/esrally/config.py
@@ -186,14 +186,19 @@ def __init__(self, i=input, sec_i=getpass.getpass, o=console.println):
         self.i = i
         self.sec_i = sec_i
         self.o = o
+        self.assume_defaults = False
 
-    def create_config(self, config_file, advanced_config=False):
+    def create_config(self, config_file, advanced_config=False, assume_defaults=False):
         """
         Either creates a new configuration file or overwrites an existing one. Will ask the user for input on configurable properties
         and writes them to the configuration file in ~/.rally/rally.ini.
 
+        :param config_file:
         :param advanced_config: Whether to ask for properties that are not necessary for everyday use (on a dev machine). Default: False.
+        :param assume_defaults: If True, assume the user accepted all values for which defaults are provided. Mainly intended for automatic
+        configuration in CI run. Default: False.
         """
+        self.assume_defaults = assume_defaults
         if advanced_config:
             self.o("Running advanced configuration. You can get additional help at:")
             self.o("")
@@ -386,12 +391,16 @@ def _ask_env_name(self):
                                   check_pattern=ConfigFactory.ENV_NAME_PATTERN)
 
     def _ask_property(self, prompt, mandatory=True, check_path_exists=False, check_pattern=None, sensitive=False, default_value=None):
+        print("ASSUME DEFAULTS: %s" % (str(self.assume_defaults)))
         if default_value is not None:
             final_prompt = "%s [default: '%s']: " % (prompt, default_value)
         else:
             final_prompt = "%s: " % prompt
         while True:
-            if sensitive:
+            if self.assume_defaults and default_value is not None:
+                self.o(final_prompt)
+                value = None
+            elif sensitive:
                 value = self.sec_i(final_prompt)
             else:
                 value = self.i(final_prompt)

diff --git a/esrally/rally.py b/esrally/rally.py
@@ -246,6 +246,11 @@ def positive_number(v):
             help="show additional configuration options (default: false)",
             default=False,
             action="store_true")
+        p.add_argument(
+            "--assume-defaults",
+            help="Automatically accept all options with default values (default: false)",
+            default=False,
+            action="store_true")
 
     for p in [parser, race_parser]:
         p.add_argument(
@@ -396,7 +401,7 @@ def derive_sub_command(args, cfg):
 
 def ensure_configuration_present(cfg, args, sub_command):
     if sub_command == "configure":
-        config.ConfigFactory().create_config(cfg.config_file, advanced_config=args.advanced_config)
+        config.ConfigFactory().create_config(cfg.config_file, advanced_config=args.advanced_config, assume_defaults=args.assume_defaults)
         exit(0)
     else:
         if cfg.config_present():