Merge branch 'master' into 4.x

elastic · Apr 25, 2016 · 39d3790 · 39d3790
2 parents cca0e52 + 4135643
commit 39d3790
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/curator/_version.py b/curator/_version.py
@@ -1 +1 @@
-__version__ = '4.0.0a6'
+__version__ = '4.0.0a7'
diff --git a/curator/utils.py b/curator/utils.py
@@ -520,15 +520,17 @@ def get_client(**kwargs):
                     'Missing one or more of "aws_key", "aws_secret_key", '
                     'or "region".'
                 )
-        # Override these kwargs
-        kwargs['use_ssl'] = True
-        kwargs['verify_certs'] = True
-        kwargs['connection_class'] = elasticsearch.RequestsHttpConnection
-        kwargs['http_auth'] = (
-            AWS4Auth(
-                kwargs['aws_key'], kwargs['aws_secret_key'],
-                kwargs['region'], 'es')
-        )
+            # Override these kwargs
+            kwargs['use_ssl'] = True
+            kwargs['verify_certs'] = True
+            kwargs['connection_class'] = elasticsearch.RequestsHttpConnection
+            kwargs['http_auth'] = (
+                AWS4Auth(
+                    kwargs['aws_key'], kwargs['aws_secret_key'],
+                    kwargs['region'], 'es')
+            )
+        else:
+            logger.debug('"requests_aws4auth" module present, but not used.')
     except ImportError:
         logger.debug('Not using "requests_aws4auth" python module to connect.')
 

diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,6 +3,13 @@
 Changelog
 =========
 
+4.0.0a7 (25 Apr 2016)
+---------------------
+
+**Bug Fixes**
+
+  * Fix AWS4Auth error.
+
 4.0.0a6 (25 Apr 2016)
 ---------------------