Handle file:// values containing leading/trailing spaces

awscli/argprocess.py

@@ -139,7 +139,7 @@ def get_parse_method_for_param(self, param, value=None):
         if isinstance(value, list):
             check_val = value[0]
         else:
-            check_val = value
+            check_val = value.strip()
         if isinstance(check_val, str) and check_val.startswith(('[', '{')):
             LOG.debug("Param %s looks like JSON, not considered for "
                       "param shorthand.", param.py_name)

tests/unit/elb/test_register_instances_with_load_balancer.py

@@ -64,6 +64,14 @@ def test_two_instance_from_file(self):
         cmdline += ' --instances file://%s' % data_path
         self.assert_params_for_cmd(cmdline, TWO_INSTANCE_EXPECTED)
 
+    def test_json_file_with_spaces(self):
+        data_path = os.path.join(os.path.dirname(__file__),
+                                 'test_with_spaces.json')
+        cmdline = self.prefix
+        cmdline += ' --load-balancer-name my-lb'
+        cmdline += ' --instances file://%s' % data_path
+        self.assert_params_for_cmd(cmdline, TWO_INSTANCE_EXPECTED)
+
     def test_two_instance_shorthand(self):
         cmdline = self.prefix
         cmdline += ' --load-balancer-name my-lb'

tests/unit/elb/test_with_spaces.json

@@ -0,0 +1,2 @@
+  [{"InstanceId": "i-12345678"},
+ {"InstanceId": "i-87654321"}]