Merge pull request #830 from danielgtaylor/shorthand-list-fix

Fix single item shorthand list parsing bug. Fixes #830.

CHANGELOG.rst

@@ -5,6 +5,10 @@ CHANGELOG
 Next Release (TBD)
 ==================
 
+* bugfix:Shorthand JSON: Fix bug where shorthand lists with
+  a single item (e.g. ``--arg Param=[item]``) were not parsed
+  correctly.
+  (`issue 830 <https://github.com/aws/aws-cli/pull/830>`__)
 * bugfix:``aws cloudsearchdomain``: Fix bug where
   ``--endpoint-url`` is required even for ``help`` subcommands
   (`issue 828 <https://github.com/aws/aws-cli/pull/828>`__)

awscli/utils.py

@@ -45,7 +45,11 @@ def _split_with_quotes(value):
         if list_start >= 0 and value.find(']') != -1 and \
            (quote_char is None or part.find(quote_char) > list_start):
             # This is a list, eat all the items until the end
-            new_chunk = _eat_items(value, iter_parts, part, ']')
+            if ']' in part:
+                # Short circuit for only one item
+                new_chunk = part
+            else:
+                new_chunk = _eat_items(value, iter_parts, part, ']')
             list_items = _split_with_quotes(new_chunk[list_start + 2:-1])
             new_chunk = new_chunk[:list_start + 1] + ','.join(list_items)
             new_parts.append(new_chunk)

tests/unit/test_argprocess.py

@@ -220,12 +220,18 @@ def test_list_structure_list_scalar_3(self):
             {"Name": "foo",
              "Args": ["a", "k1=v1", "b"]},
             {"Name": "bar",
-             "Args": ["baz"]}
+             "Args": ["baz"]},
+            {"Name": "single_kv",
+             "Args": ["key=value"]},
+            {"Name": "single_v",
+             "Args": ["value"]}
         ]
 
         simplified = self.simplify(p, [
             "Name=foo,Args=[a,k1=v1,b]",
-            "Name=bar,Args=baz"
+            "Name=bar,Args=baz",
+            "Name=single_kv,Args=[key=value]",
+            "Name=single_v,Args=[value]"
         ])
 
         self.assertEqual(simplified, expected)