Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix regression when parsing number types in shorthand #693

Merged
merged 1 commit into from

2 participants

@jamesls
Owner

We can't call strip() until we know that the object is a string.
This is a regression introduced in the last CLI release.

@jamesls jamesls Fix regression when parsing number types in shorthand
We can't call strip() until we know that the object is a string.
This is a regression introduced in the last CLI release.
ef9ea88
@jamesls jamesls merged commit ef9ea88 into aws:develop

1 check passed

Details default The Travis CI build passed
@jamesls jamesls deleted the jamesls:shorthand-str-bug branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 6, 2014
  1. @jamesls

    Fix regression when parsing number types in shorthand

    jamesls authored
    We can't call strip() until we know that the object is a string.
    This is a regression introduced in the last CLI release.
This page is out of date. Refresh to see the latest.
View
4 awscli/argprocess.py
@@ -162,8 +162,8 @@ def get_parse_method_for_param(self, param, value=None):
if isinstance(value, list):
check_val = value[0]
else:
- check_val = value.strip()
- if isinstance(check_val, six.string_types) and check_val.startswith(
+ check_val = value
+ if isinstance(check_val, six.string_types) and check_val.strip().startswith(
('[', '{')):
LOG.debug("Param %s looks like JSON, not considered for "
"param shorthand.", param.py_name)
View
27 tests/unit/rds/test_describe_db_log_files.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+# Copyright 2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+from tests.unit import BaseAWSCommandParamsTest
+
+
+class TestDescribeDBLogFiles(BaseAWSCommandParamsTest):
+ maxDiff = None
+ prefix = 'rds describe-db-log-files '
+
+ def test_add_option(self):
+ args = ('--file-last-written 10 '
+ '--db-instance-identifier foo')
+ cmdline = self.prefix + args
+ result = {'DBInstanceIdentifier': 'foo',
+ 'FileLastWritten': '10'}
+ self.assert_params_for_cmd(cmdline, result)
Something went wrong with that request. Please try again.