Merge branch 'release-1.7.16' into develop

* release-1.7.16:
  Bumping version to 1.7.16
  Update integ test with latest model changes
  Update changelog with latest features
  Update changelog with latest fixes
  Rename test to match operation
  Add unit test for cloudfront command

CHANGELOG.rst

@@ -2,9 +2,19 @@
 CHANGELOG
 =========
 
-Next Release (TBD)
-==================
+1.7.16
+======
 
+* feature:``aws ec2 wait image-available``:  Add support for polling
+  until an EC2 image is available
+  (`issue 1105 <https://github.com/aws/aws-cli/issues/1105>`__)
+* feature:``aws ec2 wait``: Add support for additional EC2 waiters
+  including ``instance-status-ok``, ``password-data-available``,
+  ``spot-instance-request-fulfilled``, and ``system-status-ok``
+* feature:``aws s3api``: Add support for Amazon S3 cross region
+  replication
+* feature:``aws s3api``:  Add support for Amazon S3 requester pays
+  (`issue 797 <https://github.com/aws/aws-cli/issues/797>`__)
 * bugfix:Tab Completion: Fix issue where tab completion could not
   handle an ``LC_CTYPE`` of ``UTF-8``
   (`issue 1233 <https://github.com/aws/aws-cli/pull/1233>`__)
@@ -13,7 +23,11 @@ Next Release (TBD)
   (`botocore issue 495 <https://github.com/boto/botocore/pull/495>`__)
 * bugfix:``aws cloudfront``: Fix issue when calling cloudfront
   commands
-  (`botocore issue 497 <https://github.com/boto/botocore/pull/497>`__)
+  (`issue 1234 <https://github.com/aws/aws-cli/issues/1234>`__)
+* bugfix:``aws ec2 copy-snapshot``: Fix issue with the
+  ``aws ec2 copy-snapshot`` command not correctly generating the
+  presigned url argument
+  (`botocore issue 498 <https://github.com/boto/botocore/pull/498>`__)
 
 
 1.7.15

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.7.15'
+__version__ = '1.7.16'
 
 #
 # Get our data path to be added to botocore's search path

awscli/testutils.py

@@ -361,6 +361,18 @@ def run_cmd(self, cmd, expected_rc=0):
         return stdout, stderr, rc
 
 
+class BaseAWSPreviewCommandParamsTest(BaseAWSCommandParamsTest):
+    def setUp(self):
+        self.preview_patch = mock.patch(
+            'awscli.customizations.preview.mark_as_preview')
+        self.preview_patch.start()
+        super(BaseAWSPreviewCommandParamsTest, self).setUp()
+
+    def tearDown(self):
+        self.preview_patch.stop()
+        super(BaseAWSPreviewCommandParamsTest, self).tearDown()
+
+
 class FileCreator(object):
     def __init__(self):
         self.rootdir = tempfile.mkdtemp()

doc/source/conf.py

@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.7.'
 # The full version, including alpha/beta/rc tags.
-release = '1.7.15'
+release = '1.7.16'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -6,7 +6,7 @@
 import awscli
 
 
-requires = ['botocore>=0.96.0,<0.97.0',
+requires = ['botocore>=0.97.0,<0.98.0',
             'bcdoc>=0.13.0,<0.14.0',
             'colorama>=0.2.5,<=0.3.3',
             'docutils>=0.10',

tests/integration/customizations/test_generatecliskeleton.py

@@ -62,7 +62,8 @@ def test_generate_cli_skeleton_s3api(self):
         self.assertEqual(p.rc, 0)
         self.assertEqual(
             json.loads(p.stdout),
-            {'Bucket': '','Key': '', 'MFA': '', 'VersionId': ''}
+            {'Bucket': '','Key': '', 'MFA': '', 'VersionId': '',
+             'RequestPayer': ''}
         )
 
     def test_generate_cli_skeleton_sqs(self):

tests/unit/cloudfront/__init__.py

@@ -0,0 +1,12 @@
+# Copyright 2015 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.

tests/unit/cloudfront/test_get_distribution_config.py

@@ -0,0 +1,25 @@
+# Copyright 2015 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 awscli.testutils import BaseAWSPreviewCommandParamsTest as \
+    BaseAWSCommandParamsTest
+
+
+class TestGetDistributionConfig(BaseAWSCommandParamsTest):
+
+    prefix = 'cloudfront get-distribution-config'
+
+    def test_get_distribution_config(self):
+        cmdline = self.prefix
+        cmdline += ' --id foo'
+        result = {'Id': 'foo'}
+        self.assert_params_for_cmd(cmdline, result)