Merge branch 'release-1.10.28'

AWS · James Saryerwinnie · commit 5e6bff578bc8 · 2016-05-12T20:29:09.000Z
* release-1.10.28:
  Bumping version to 1.10.28
  Update changelog based on model updates
  Add doc analytics
  Move EC2 customizations into a single directory
diff --git a/.changes/1.10.28.json b/.changes/1.10.28.json
@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``ec2``", 
+    "description": "Update ec2 command to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``ssm``", 
+    "description": "Update ssm command to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``discovery``", 
+    "description": "Update discovery command to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``cloudformation``", 
+    "description": "Update cloudformation command to latest version", 
+    "type": "feature"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.10.28
+=======
+
+* feature:``ec2``: Update ec2 command to latest version
+* feature:``ssm``: Update ssm command to latest version
+* feature:``discovery``: Update discovery command to latest version
+* feature:``cloudformation``: Update cloudformation command to latest version
+
+
 1.10.27
 =======
 
diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.10.27'
+__version__ = '1.10.28'
 
 #
 # Get our data path to be added to botocore's search path
diff --git a/awscli/customizations/ec2/__init__.py b/awscli/customizations/ec2/__init__.py
@@ -0,0 +1,12 @@
+# Copyright 2016 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.
diff --git a/awscli/customizations/ec2/addcount.py b/awscli/customizations/ec2/addcount.py
diff --git a/awscli/customizations/ec2/bundleinstance.py b/awscli/customizations/ec2/bundleinstance.py
diff --git a/awscli/customizations/ec2/decryptpassword.py b/awscli/customizations/ec2/decryptpassword.py
@@ -36,9 +36,9 @@ def ec2_add_priv_launch_key(argument_table, operation_model, session,
     operation has been created.  It's job is to add the
     ``priv-launch-key`` parameter.
     """
-    argument_table['priv-launch-key'] = LaunchKeyArgument(session,
-                                                          operation_model,
-                                                          'priv-launch-key')
+    argument_table['priv-launch-key'] = LaunchKeyArgument(
+        session, operation_model, 'priv-launch-key')
+
 
 class LaunchKeyArgument(BaseCLIArgument):
 
diff --git a/awscli/customizations/ec2/protocolarg.py b/awscli/customizations/ec2/protocolarg.py
@@ -16,6 +16,7 @@
 parameter of the operation accepts only integer protocol numbers.
 """
 
+
 def _fix_args(params, **kwargs):
     key_name = 'Protocol'
     if key_name in params:
diff --git a/awscli/customizations/ec2/runinstances.py b/awscli/customizations/ec2/runinstances.py
diff --git a/awscli/customizations/ec2/secgroupsimplify.py b/awscli/customizations/ec2/secgroupsimplify.py
diff --git a/awscli/handlers.py b/awscli/handlers.py
@@ -18,59 +18,59 @@
 """
 from awscli.argprocess import ParamShorthand
 from awscli.argprocess import uri_param
-from awscli.errorhandler import ErrorHandler
-from awscli.customizations.streamingoutputarg import add_streaming_output_arg
+from awscli.customizations import datapipeline
 from awscli.customizations.addexamples import add_examples
-from awscli.customizations.removals import register_removals
-from awscli.customizations.ec2addcount import register_count_events
-from awscli.customizations.paginate import register_pagination
-from awscli.customizations.ec2decryptpassword import ec2_add_priv_launch_key
-from awscli.customizations.ec2secgroupsimplify import register_secgroup
-from awscli.customizations.preview import register_preview_commands
-from awscli.customizations.ec2bundleinstance import register_bundleinstance
-from awscli.customizations.s3.s3 import s3_plugin_initialize
-from awscli.customizations.ec2runinstances import register_runinstances
-from awscli.customizations.rds import register_rds_modify_split
-from awscli.customizations.putmetricdata import register_put_metric_data
-from awscli.customizations.sessendemail import register_ses_send_email
-from awscli.customizations.cloudfront import register as register_cloudfront
-from awscli.customizations.iamvirtmfa import IAMVMFAWrapper
 from awscli.customizations.argrename import register_arg_renames
-from awscli.customizations.configure.configure import register_configure_cmd
-from awscli.customizations.cloudtrail import initialize as cloudtrail_init
-from awscli.customizations.ecr import register_ecr_commands
-from awscli.customizations.toplevelbool import register_bool_params
-from awscli.customizations.ec2protocolarg import register_protocol_args
-from awscli.customizations import datapipeline
-from awscli.customizations.globalargs import register_parse_global_args
+from awscli.customizations.assumerole import register_assume_role_provider
+from awscli.customizations.awslambda import register_lambda_create_function
+from awscli.customizations.cliinputjson import register_cli_input_json
+from awscli.customizations.cloudfront import register as register_cloudfront
 from awscli.customizations.cloudsearch import initialize as cloudsearch_init
-from awscli.customizations.emr.emr import emr_initialize
 from awscli.customizations.cloudsearchdomain import register_cloudsearchdomain
-from awscli.customizations.s3endpoint import register_s3_endpoint
-from awscli.customizations.s3errormsg import register_s3_error_msg
-from awscli.customizations.cliinputjson import register_cli_input_json
-from awscli.customizations.generatecliskeleton import \
-    register_generate_cli_skeleton
-from awscli.customizations.assumerole import register_assume_role_provider
-from awscli.customizations.waiters import register_add_waiters
+from awscli.customizations.cloudtrail import initialize as cloudtrail_init
+from awscli.customizations.codecommit import initialize as codecommit_init
 from awscli.customizations.codedeploy.codedeploy import initialize as \
     codedeploy_init
-from awscli.customizations.configservice.subscribe import register_subscribe
 from awscli.customizations.configservice.getstatus import register_get_status
-from awscli.customizations.configservice.rename_cmd import \
-    register_rename_config
 from awscli.customizations.configservice.putconfigurationrecorder import \
     register_modify_put_configuration_recorder
-from awscli.customizations.scalarparse import register_scalar_parser
-from awscli.customizations.opsworks import initialize as opsworks_init
-from awscli.customizations.awslambda import register_lambda_create_function
-from awscli.customizations.kms import register_fix_kms_create_grant_docs
-from awscli.customizations.route53 import register_create_hosted_zone_doc_fix
-from awscli.customizations.codecommit import initialize as codecommit_init
-from awscli.customizations.iot_data import register_custom_endpoint_note
+from awscli.customizations.configservice.rename_cmd import \
+    register_rename_config
+from awscli.customizations.configservice.subscribe import register_subscribe
+from awscli.customizations.configure.configure import register_configure_cmd
+from awscli.customizations.ec2.addcount import register_count_events
+from awscli.customizations.ec2.bundleinstance import register_bundleinstance
+from awscli.customizations.ec2.decryptpassword import ec2_add_priv_launch_key
+from awscli.customizations.ec2.protocolarg import register_protocol_args
+from awscli.customizations.ec2.runinstances import register_runinstances
+from awscli.customizations.ec2.secgroupsimplify import register_secgroup
+from awscli.customizations.ecr import register_ecr_commands
+from awscli.customizations.emr.emr import emr_initialize
+from awscli.customizations.gamelift import register_gamelift_commands
+from awscli.customizations.generatecliskeleton import \
+    register_generate_cli_skeleton
+from awscli.customizations.globalargs import register_parse_global_args
+from awscli.customizations.iamvirtmfa import IAMVMFAWrapper
 from awscli.customizations.iot import register_create_keys_and_cert_arguments
 from awscli.customizations.iot import register_create_keys_from_csr_arguments
-from awscli.customizations.gamelift import register_gamelift_commands
+from awscli.customizations.iot_data import register_custom_endpoint_note
+from awscli.customizations.kms import register_fix_kms_create_grant_docs
+from awscli.customizations.opsworks import initialize as opsworks_init
+from awscli.customizations.paginate import register_pagination
+from awscli.customizations.preview import register_preview_commands
+from awscli.customizations.putmetricdata import register_put_metric_data
+from awscli.customizations.rds import register_rds_modify_split
+from awscli.customizations.removals import register_removals
+from awscli.customizations.route53 import register_create_hosted_zone_doc_fix
+from awscli.customizations.s3.s3 import s3_plugin_initialize
+from awscli.customizations.s3endpoint import register_s3_endpoint
+from awscli.customizations.s3errormsg import register_s3_error_msg
+from awscli.customizations.scalarparse import register_scalar_parser
+from awscli.customizations.sessendemail import register_ses_send_email
+from awscli.customizations.streamingoutputarg import add_streaming_output_arg
+from awscli.customizations.toplevelbool import register_bool_params
+from awscli.customizations.waiters import register_add_waiters
+from awscli.errorhandler import ErrorHandler
 
 
 def awscli_initialize(event_handlers):
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.10.'
 # The full version, including alpha/beta/rc tags.
-release = '1.10.27'
+release = '1.10.28'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/source/guzzle_sphinx_theme/guzzle_sphinx_theme/layout.html b/doc/source/guzzle_sphinx_theme/guzzle_sphinx_theme/layout.html
@@ -102,6 +102,15 @@
 
     </div>
   {%- endif %}
+  <script type="text/javascript" src="https://media.amazonwebservices.com/js/sitecatalyst/s_code.min.js"></script>
+  <script type="text/javascript">
+  s.prop66 = 'AWS CLI';
+  s.eVar66 = 'D=c66';
+  s.prop65 = 'API Reference';
+  s.eVar65 = 'D=c65';
+  var s_code = s.t();
+  if (s_code) document.write(s_code);
+  </script>
 {%- endblock %}
 
 {%- block footer %}
diff --git a/setup.cfg b/setup.cfg
@@ -4,7 +4,7 @@ universal = 1
 
 [metadata]
 requires-dist =
-        botocore==1.4.18
+        botocore==1.4.19
         colorama>=0.2.5,<=0.3.3
         docutils>=0.10
         rsa>=3.1.2,<=3.3.0
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 import awscli
 
 
-requires = ['botocore==1.4.18',
+requires = ['botocore==1.4.19',
             'colorama>=0.2.5,<=0.3.3',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.3.0',
diff --git a/tests/functional/ec2/test_bundle_instance.py b/tests/functional/ec2/test_bundle_instance.py
@@ -11,15 +11,16 @@
 # 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 BaseAWSCommandParamsTest
-import awscli.customizations.ec2bundleinstance
-
-import datetime
 import base64
+import datetime
 
-from awscli.compat import six
-from six.moves import cStringIO
 import mock
+from six.moves import cStringIO
+
+import awscli.customizations.ec2.bundleinstance
+from awscli.compat import six
+from awscli.testutils import BaseAWSCommandParamsTest
+
 
 class TestBundleInstance(BaseAWSCommandParamsTest):
 
@@ -39,7 +40,7 @@ def setUp(self):
         # don't what the policy or its signature to change each time
         # we run the test.
         self.datetime_patcher = mock.patch.object(
-            awscli.customizations.ec2bundleinstance.datetime, 'datetime',
+            awscli.customizations.ec2.bundleinstance.datetime, 'datetime',
             mock.Mock(wraps=datetime.datetime)
         )
         mocked_datetime = self.datetime_patcher.start()

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"""`
`18`	`18`	`import os`
`19`	`19`
`20`		`-__version__ = '1.10.27'`
	`20`	`+__version__ = '1.10.28'`
`21`	`21`
`22`	`22`	`#`
`23`	`23`	`# Get our data path to be added to botocore's search path`