Merge branch 'master' into 4.x

curator/_version.py

@@ -1 +1 @@
-__version__ = '4.0.0a3'
+__version__ = '4.0.0a4'

curator/cli.py

@@ -4,7 +4,7 @@
 import click
 import copy
 from .settings import ACTION_DEFAULTS, CONFIG_FILE, CLIENT_DEFAULTS, \
-    LOGGING_DEFAULTS
+    LOGGING_DEFAULTS, OPTION_DEFAULTS
 from .exceptions import *
 from .utils import *
 from .indexlist import IndexList
@@ -176,7 +176,9 @@ def cli(config, dry_run, action_file):
         else:
             raise MissingArgument('No value for "action" provided')
         logger.info('Action #{0}: {1}'.format(idx, action))
-
+        if not 'options' in actions[idx] or \
+                type(actions[idx]['options']) is not type(dict()):
+            actions[idx]['options'] = OPTION_DEFAULTS
         # Assign and remove these keys from the options as the action will
         # raise an exception if they are passed as kwargs
         action_disabled = actions[idx]['options'].pop('disable_action', False)

curator/settings.py

@@ -29,6 +29,11 @@
     'logformat': 'default',
 }
 
+OPTION_DEFAULTS = {
+    'continue_if_exception': False,
+    'disable_action': False,
+}
+
 REGEX_MAP = {
     'timestring': r'^.*{0}.*$',
     'regex': r'{0}',

docs/Changelog.rst

@@ -3,10 +3,18 @@
 Changelog
 =========
 
+4.0.0a4 (21 Apr 2016)
+---------------------
+
+**Bug Fixes**
+
+  * Require `pyyaml` 3.10 or better.
+  * In the case that no `options` are in an action, apply the defaults.
+
 4.0.0a3 (21 Apr 2016)
 ---------------------
 
-It's time for Curator 4.0 alpha 1!
+It's time for Curator 4.0 alpha!
 
 **Breaking Changes**
 

requirements.txt

@@ -1,3 +1,4 @@
 urllib3>=1.8.3
 elasticsearch>=2.3.0,<5.1.0
 click>=3.3
+pyyaml>=3.10

setup.py

@@ -24,6 +24,7 @@ def get_version():
 def get_install_requires():
     res = ['elasticsearch>=2.3.0,<5.1.0' ]
     res.append('click>=3.3')
+    res.append('pyyaml>=3.10')
     return res
 
 try:

test/integration/test_cli.py

@@ -173,3 +173,20 @@ def test_continue_if_exception_False(self):
                     )
         self.assertEquals(10, len(curator.get_indices(self.client)))
         self.assertEqual(1, result.exit_code)
+    def test_no_options_in_action(self):
+        self.create_indices(10)
+        self.write_config(
+            self.args['configfile'], testvars.client_config.format(host, port))
+        self.write_config(self.args['actionfile'],
+            testvars.no_options_proto.format('delete_indices'))
+        test = clicktest.CliRunner()
+        result = test.invoke(
+                    curator.cli,
+                    [
+                        '--config', self.args['configfile'],
+                        '--dry-run',
+                        self.args['actionfile']
+
+                    ],
+                    )
+        self.assertEqual(0, result.exit_code)

test/integration/testvars.py

@@ -151,6 +151,16 @@
 '        kind: prefix\n'
 '        value: my\n')
 
+no_options_proto = ('---\n'
+'actions:\n'
+'  1:\n'
+'    description: "Act on indices as filtered"\n'
+'    action: {0}\n'
+'    filters:\n'
+'      - filtertype: pattern\n'
+'        kind: prefix\n'
+'        value: my\n')
+
 actionless_proto = ('---\n'
 'actions:\n'
 '  1:\n'