Merge branch 'release-1.10.16'

* release-1.10.16: Bumping version to 1.10.16 Update changelog to the latest version Fix IAM Create Client Method Signature Fix message generation on 5TB size limit Fix formating issues for autoscaling documentation
aws · Mar 24, 2016 · 1c0a789 · 1c0a789
2 parents d15d87b + 97af05f
commit 1c0a789
Show file tree

Hide file tree

Showing 53 changed files with 510 additions and 481 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.10.16
+=======
+
+* feature:``elasticache``: Update command to latest version
+* feature:``rds``: Update command to latest version
+* feature:``storagegateway``: Update command to latest version
+
+
 1.10.15
 =======
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.10.15'
+__version__ = '1.10.16'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/awscli/customizations/datapipeline/createdefaultroles.py b/awscli/customizations/datapipeline/createdefaultroles.py
@@ -51,8 +51,11 @@ def _run_main(self, parsed_args, parsed_globals, **kwargs):
         self._region = get_region(self._session, parsed_globals)
         self._endpoint_url = parsed_globals.endpoint_url
         self._iam_client = self._session.create_client(
-            'iam', self._region, self._endpoint_url,
-            parsed_globals.verify_ssl)
+            'iam', 
+            region_name=self._region, 
+            endpoint_url=self._endpoint_url,
+            verify=parsed_globals.verify_ssl
+        )
         remove_cli_error_event(self._iam_client)
         return self._create_default_roles(parsed_args, parsed_globals)
 

diff --git a/awscli/customizations/s3/s3handler.py b/awscli/customizations/s3/s3handler.py
@@ -184,7 +184,7 @@ def _enqueue_tasks(self, files):
             if too_large and filename.operation_name == 'upload':
                 warning_message = "File exceeds s3 upload limit of 5 TB."
                 warning = create_warning(relative_path(filename.src),
-                                         message=warning_message)
+                                         warning_message)
                 self.result_queue.put(warning)
             # Warn and skip over glacier incompatible tasks.
             elif not self.params.get('force_glacier_transfer') and \

diff --git a/awscli/examples/autoscaling/complete-lifecycle-action.rst b/awscli/examples/autoscaling/complete-lifecycle-action.rst
@@ -2,4 +2,4 @@
 
 This example notifies Auto Scaling that the specified lifecycle action is complete so that it can finish launching or terminating the instance::
 
-   aws autoscaling complete-lifecycle-action --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-auto-scaling-group --lifecycle-action-result CONTINUE --lifecycle-action-token bcd2f1b8-9a78-44d3-8a7a-4dd07d7cf635
+    aws autoscaling complete-lifecycle-action --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-auto-scaling-group --lifecycle-action-result CONTINUE --lifecycle-action-token bcd2f1b8-9a78-44d3-8a7a-4dd07d7cf635
diff --git a/awscli/examples/autoscaling/create-auto-scaling-group.rst b/awscli/examples/autoscaling/create-auto-scaling-group.rst
@@ -2,7 +2,7 @@
 
 This example creates an Auto Scaling group in a VPC::
 
-     aws autoscaling create-auto-scaling-group --auto-scaling-group-name my-auto-scaling-group --launch-configuration-name my-launch-config --min-size 1 --max-size 3 --vpc-zone-identifier subnet-41767929c
+    aws autoscaling create-auto-scaling-group --auto-scaling-group-name my-auto-scaling-group --launch-configuration-name my-launch-config --min-size 1 --max-size 3 --vpc-zone-identifier subnet-41767929c
 
 This example creates an Auto Scaling group and configures it to use an Elastic Load Balancing load balancer::
 

diff --git a/awscli/examples/autoscaling/create-launch-configuration.rst b/awscli/examples/autoscaling/create-launch-configuration.rst
@@ -2,7 +2,7 @@
 
 This example creates a launch configuration::
 
-     aws autoscaling create-launch-configuration --launch-configuration-name my-launch-config --image-id ami-c6169af6 --instance-type m1.medium
+    aws autoscaling create-launch-configuration --launch-configuration-name my-launch-config --image-id ami-c6169af6 --instance-type m1.medium
 
 This example creates a launch configuration that uses Spot Instances::
 
@@ -20,16 +20,16 @@ Add the following parameter to add an Amazon EBS volume with the device name ``/
 
 Parameter::
 
-  --block-device-mappings "[{\"DeviceName\": \"/dev/sdh\",\"Ebs\":{\"VolumeSize\":100}}]"
+    --block-device-mappings "[{\"DeviceName\": \"/dev/sdh\",\"Ebs\":{\"VolumeSize\":100}}]"
 
 Add the following parameter to add ``ephemeral1`` as an instance store volume with the device name ``/dev/sdc``.
 
 Parameter::
 
-  --block-device-mappings "[{\"DeviceName\": \"/dev/sdc\",\"VirtualName\":\"ephemeral1\"}]"
+    --block-device-mappings "[{\"DeviceName\": \"/dev/sdc\",\"VirtualName\":\"ephemeral1\"}]"
 
 Add the following parameter to omit a device included on the instance (for example, ``/dev/sdf``).
 
 Parameter::
 
-  --block-device-mappings "[{\"DeviceName\": \"/dev/sdf\",\"NoDevice\":\"\"}]"
+    --block-device-mappings "[{\"DeviceName\": \"/dev/sdf\",\"NoDevice\":\"\"}]"
diff --git a/awscli/examples/autoscaling/create-or-update-tags.rst b/awscli/examples/autoscaling/create-or-update-tags.rst
@@ -2,4 +2,4 @@
 
 This example adds two tags to the specified Auto Scaling group::
 
-	aws autoscaling create-or-update-tags --tags ResourceId=my-auto-scaling-group,ResourceType=auto-scaling-group,Key=Role,Value=WebServer,PropagateAtLaunch=true ResourceId=my-auto-scaling-group,ResourceType=auto-scaling-group,Key=Dept,Value=Research,PropagateAtLaunch=true
+    aws autoscaling create-or-update-tags --tags ResourceId=my-auto-scaling-group,ResourceType=auto-scaling-group,Key=Role,Value=WebServer,PropagateAtLaunch=true ResourceId=my-auto-scaling-group,ResourceType=auto-scaling-group,Key=Dept,Value=Research,PropagateAtLaunch=true
diff --git a/awscli/examples/autoscaling/delete-launch-configuration.rst b/awscli/examples/autoscaling/delete-launch-configuration.rst
@@ -2,7 +2,7 @@
 
 This example deletes the specified launch configuration::
 
-	aws autoscaling delete-launch-configuration --launch-configuration-name my-launch-config
+    aws autoscaling delete-launch-configuration --launch-configuration-name my-launch-config
 
 For more information, see `Shut Down Auto Scaling Processes`_ in the *Auto Scaling Developer Guide*.
 

diff --git a/awscli/examples/autoscaling/delete-lifecycle-hook.rst b/awscli/examples/autoscaling/delete-lifecycle-hook.rst
@@ -2,4 +2,4 @@
 
 This example deletes the specified lifecycle hook::
 
-   aws autoscaling delete-lifecycle-hook --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-auto-scaling-group
+    aws autoscaling delete-lifecycle-hook --lifecycle-hook-name my-lifecycle-hook --auto-scaling-group-name my-auto-scaling-group
diff --git a/awscli/examples/autoscaling/delete-notification-configuration.rst b/awscli/examples/autoscaling/delete-notification-configuration.rst
@@ -2,9 +2,8 @@
 
 This example deletes the specified notification from the specified Auto Scaling group::
 
-	aws autoscaling delete-notification-configuration --auto-scaling-group-name my-auto-scaling-group --topic-arn arn:aws:sns:us-west-2:123456789012:my-sns-topic
+    aws autoscaling delete-notification-configuration --auto-scaling-group-name my-auto-scaling-group --topic-arn arn:aws:sns:us-west-2:123456789012:my-sns-topic
 
 For more information, see `Delete the Notification Configuration`_ in the *Auto Scaling Developer Guide*.
 
 .. _`Delete the Notification Configuration`: http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/ASGettingNotifications.html#delete-settingupnotifications
-
diff --git a/awscli/examples/autoscaling/delete-policy.rst b/awscli/examples/autoscaling/delete-policy.rst
@@ -2,4 +2,4 @@
 
 This example deletes the specified Auto Scaling policy::
 
-	aws autoscaling delete-policy --auto-scaling-group-name my-auto-scaling-group --policy-name ScaleIn
+    aws autoscaling delete-policy --auto-scaling-group-name my-auto-scaling-group --policy-name ScaleIn
diff --git a/awscli/examples/autoscaling/delete-scheduled-action.rst b/awscli/examples/autoscaling/delete-scheduled-action.rst
@@ -2,4 +2,4 @@
 
 This example deletes the specified scheduled action from the specified Auto Scaling group::
 
-	aws autoscaling delete-scheduled-action --auto-scaling-group-name my-auto-scaling-group --scheduled-action-name my-scheduled-action
+    aws autoscaling delete-scheduled-action --auto-scaling-group-name my-auto-scaling-group --scheduled-action-name my-scheduled-action
diff --git a/awscli/examples/autoscaling/delete-tags.rst b/awscli/examples/autoscaling/delete-tags.rst
@@ -2,7 +2,7 @@
 
 This example deletes the specified tag from the specified Auto Scaling group::
 
-	aws autoscaling delete-tags --tags ResourceId=my-auto-scaling-group,ResourceType=auto-scaling-group,Key=Dept,Value=Research
+    aws autoscaling delete-tags --tags ResourceId=my-auto-scaling-group,ResourceType=auto-scaling-group,Key=Dept,Value=Research
 
 For more information, see `Tagging Auto Scaling Groups and Instances`_ in the *Auto Scaling Developer Guide*.
 

diff --git a/awscli/examples/autoscaling/describe-account-limits.rst b/awscli/examples/autoscaling/describe-account-limits.rst
@@ -2,16 +2,16 @@
 
 This example describes the Auto Scaling limits for your AWS account::
 
-	aws autoscaling describe-account-limits
+    aws autoscaling describe-account-limits
 
 The following is example output::
 
-	{
-	  "NumberOfLaunchConfigurations": 5,
-		"MaxNumberOfLaunchConfigurations": 100,
-		"NumberOfAutoScalingGroups": 3,
-		"MaxNumberOfAutoScalingGroups": 20
-	}
+    {
+        "NumberOfLaunchConfigurations": 5,
+        "MaxNumberOfLaunchConfigurations": 100,
+        "NumberOfAutoScalingGroups": 3,
+        "MaxNumberOfAutoScalingGroups": 20
+    }
 
 For more information, see `Auto Scaling Limits`_ in the *Auto Scaling Developer Guide*.
 

diff --git a/awscli/examples/autoscaling/describe-adjustment-types.rst b/awscli/examples/autoscaling/describe-adjustment-types.rst
@@ -2,23 +2,23 @@
 
 This example describes the available adjustment types::
 
-	aws autoscaling describe-adjustment-types
+    aws autoscaling describe-adjustment-types
 
 The following is example output::
 
-  {
-    "AdjustmentTypes": [
-      {
-        "AdjustmentType": "ChangeInCapacity"
-      }
-      {
-        "AdjustmentType": "ExactCapcity"
-      }
-      {
-        "AdjustmentType": "PercentChangeInCapacity"
-      }
-    ]
-  }
+    {
+        "AdjustmentTypes": [
+            {
+                "AdjustmentType": "ChangeInCapacity"
+            }
+            {
+                "AdjustmentType": "ExactCapcity"
+            }
+            {
+                "AdjustmentType": "PercentChangeInCapacity"
+            }
+        ]
+    }
 
 For more information, see `Scaling Adjustment Types`_ in the *Auto Scaling Developer Guide*.
 

diff --git a/awscli/examples/autoscaling/describe-auto-scaling-groups.rst b/awscli/examples/autoscaling/describe-auto-scaling-groups.rst
@@ -8,39 +8,39 @@ The following is example output::
 
     {
         "AutoScalingGroups": [
-           {
-              "AutoScalingGroupARN": "arn:aws:autoscaling:us-west-2:123456789012:autoScalingGroup:930d940e-891e-4781-a11a-7b0acd480f03:autoScalingGroupName/my-auto-scaling-group",
-              "HealthCheckGracePeriod": 300,
-              "SuspendedProcesses": [],
-              "DesiredCapacity": 1,
-              "Tags": [],
-              "EnabledMetrics": [],
-              "LoadBalancerNames": [],
-              "AutoScalingGroupName": "my-auto-scaling-group",
-              "DefaultCooldown": 300,
-              "MinSize": 0,
-              "Instances": [
-                  {
-                      "InstanceId": "i-4ba0837f",
-                      "AvailabilityZone": "us-west-2c",
-                      "HealthStatus": "Healthy",
-                      "LifecycleState": "InService",
-                      "LaunchConfigurationName": "my-launch-config"
-                   }
-               ],
-               "MaxSize": 1,
-               "VPCZoneIdentifier": null,
-               "TerminationPolicies": [
-                     "Default"
-               ],
-               "LaunchConfigurationName": "my-launch-config",
-               "CreatedTime": "2013-08-19T20:53:25.584Z",
-               "AvailabilityZones": [
-                   "us-west-2c"
-               ],
-               "HealthCheckType": "EC2",
-               "NewInstancesProtectedFromScaleIn": false
-           }
+            {
+                "AutoScalingGroupARN": "arn:aws:autoscaling:us-west-2:123456789012:autoScalingGroup:930d940e-891e-4781-a11a-7b0acd480f03:autoScalingGroupName/my-auto-scaling-group",
+                "HealthCheckGracePeriod": 300,
+                "SuspendedProcesses": [],
+                "DesiredCapacity": 1,
+                "Tags": [],
+                "EnabledMetrics": [],
+                "LoadBalancerNames": [],
+                "AutoScalingGroupName": "my-auto-scaling-group",
+                "DefaultCooldown": 300,
+                "MinSize": 0,
+                "Instances": [
+                    {
+                        "InstanceId": "i-4ba0837f",
+                        "AvailabilityZone": "us-west-2c",
+                        "HealthStatus": "Healthy",
+                        "LifecycleState": "InService",
+                        "LaunchConfigurationName": "my-launch-config"
+                    }
+                ],
+                "MaxSize": 1,
+                "VPCZoneIdentifier": null,
+                "TerminationPolicies": [
+                    "Default"
+                ],
+                "LaunchConfigurationName": "my-launch-config",
+                "CreatedTime": "2013-08-19T20:53:25.584Z",
+                "AvailabilityZones": [
+                    "us-west-2c"
+                ],
+                "HealthCheckType": "EC2",
+                "NewInstancesProtectedFromScaleIn": false
+            }
         ]
     }
 

diff --git a/awscli/examples/autoscaling/describe-auto-scaling-instances.rst b/awscli/examples/autoscaling/describe-auto-scaling-instances.rst
@@ -6,36 +6,36 @@ This example describes the specified instance::
 
 The following is example output::
 
-  {
-    "AutoScalingInstances": [
-        {
-            "InstanceId": "i-4ba0837f",
-            "HealthStatus": "HEALTHY",
-            "AvailabilityZone": "us-west-2c",
-            "AutoScalingGroupName": "my-auto-scaling-group",
-            "LifecycleState": "InService"
-        }
-    ]
-  }
+    {
+        "AutoScalingInstances": [
+            {
+                "InstanceId": "i-4ba0837f",
+                "HealthStatus": "HEALTHY",
+                "AvailabilityZone": "us-west-2c",
+                "AutoScalingGroupName": "my-auto-scaling-group",
+                "LifecycleState": "InService"
+            }
+        ]
+    }
 
 This example uses the ``max-items`` parameter to specify how many instances to return with this call::
 
-	aws autoscaling describe-auto-scaling-instances --max-items 1
+    aws autoscaling describe-auto-scaling-instances --max-items 1
 
 The following is example output::
 
-  {
-    "NextToken": "None___1",
-    "AutoScalingInstances": [
-        {
-            "InstanceId": "i-4ba0837f",
-            "HealthStatus": "HEALTHY",
-            "AvailabilityZone": "us-west-2c",
-            "AutoScalingGroupName": "my-auto-scaling-group",
-            "LifecycleState": "InService"
-        }
-    ]
-  }
+    {
+        "NextToken": "None___1",
+        "AutoScalingInstances": [
+            {
+                "InstanceId": "i-4ba0837f",
+                "HealthStatus": "HEALTHY",
+                "AvailabilityZone": "us-west-2c",
+                "AutoScalingGroupName": "my-auto-scaling-group",
+                "LifecycleState": "InService"
+            }
+        ]
+    }
 
 If the output includes a ``NextToken`` field, there are more instances. To get the additional instances, use the value of this field with the ``starting-token`` parameter in a subsequent call as follows::
 

diff --git a/awscli/examples/autoscaling/describe-auto-scaling-notification-types.rst b/awscli/examples/autoscaling/describe-auto-scaling-notification-types.rst
@@ -2,19 +2,19 @@
 
 This example describes the available notification types::
 
-	aws autoscaling describe-auto-scaling-notification-types
+    aws autoscaling describe-auto-scaling-notification-types
 
 The following is example output::
 
-	{
-		"AutoScalingNotificationTypes": [
-			"autoscaling:EC2_INSTANCE_LAUNCH",
-			"autoscaling:EC2_INSTANCE_LAUNCH_ERROR",
-			"autoscaling:EC2_INSTANCE_TERMINATE",
-			"autoscaling:EC2_INSTANCE_TERMINATE_ERROR",
-			"autoscaling:TEST_NOTIFICATION"
-		]
-	}
+    {
+        "AutoScalingNotificationTypes": [
+            "autoscaling:EC2_INSTANCE_LAUNCH",
+            "autoscaling:EC2_INSTANCE_LAUNCH_ERROR",
+            "autoscaling:EC2_INSTANCE_TERMINATE",
+            "autoscaling:EC2_INSTANCE_TERMINATE_ERROR",
+            "autoscaling:TEST_NOTIFICATION"
+        ]
+    }
 
 For more information, see `Configure Your Auto Scaling Group to Send Notifications`_ in the *Auto Scaling Developer Guide*.