Disallow snapshot names with uppercase chars

fixes elastic#562

CONTRIBUTORS

@@ -70,3 +70,5 @@ Contributors:
 * (pbamba)
 * Pavel Strashkin (xaka)
 * Wadim Kruse (wkruse)
+* Richard Megginson (richm)
+* Thibaut Ackermann (thib-ack)

curator/cli/snapshot.py

@@ -42,4 +42,13 @@ def snapshot(
         logger.error('Missing required parameter --repository')
         msgout('Missing required parameter --repository', error=True, quiet=ctx.parent.params['quiet'])
         sys.exit(1)
+    # Check if `name` contains upper-case characters, which are forbidden #562
+    if True in map(str.isupper,name):
+        msgout(
+            'Snapshot name: "{0}" contains upper-case characters, which are not allowed.'.format(name),
+            error=True,
+            quiet=ctx.parent.params['quiet']
+        )
+        logger.error('Snapshot name: "{0}" contains upper-case characters, which are not allowed.'.format(name))
+        sys.exit(1)
 snapshot.add_command(indices)

docs/Changelog.rst

@@ -13,6 +13,11 @@ Changelog
 
 **Bug fixes**
 
+  * Prevent users from creating snapshots with upper-case letters, which is not
+    permitted by Elasticsearch. #562 (untergeek)
+  * Remove `print()` command from ``setup.py`` as it causes issues with command-
+    line retrieval of ``--url``, etc. #568 (thib-ack)
+
 
 
 3.4.1 (10 February 2016)

test/integration/test_cli_commands.py

@@ -728,6 +728,22 @@ def test_snapshot_no_repository_param(self):
                     ],
                     obj={"filters":[]})
         self.assertEqual(1, result.exit_code)
+    def test_snapshot_name_with_uppercase_chars(self):
+        test = clicktest.CliRunner()
+        result = test.invoke(
+                    curator.cli,
+                    [
+                        '--logfile', os.devnull,
+                        '--host', host,
+                        '--port', str(port),
+                        'snapshot',
+                        '--repository', self.args['repository'],
+                        '--name', 'BadSnapName',
+                        'indices',
+                        '--all-indices',
+                    ],
+                    obj={"filters":[]})
+        self.assertEqual(1, result.exit_code)
     def test_cli_snapshot_indices(self):
         self.create_indices(5)
         self.create_repository()