aws-sdk-core 2.0.0.rc4 → 2.0.0.rc5

data/apis/source/ec2-2013-10-15.paginators.json

@@ -0,0 +1,126 @@
+{
+  "pagination": {
+    "DescribeAccountAttributes": {
+      "result_key": "AccountAttributes"
+    },
+    "DescribeAddresses": {
+      "result_key": "Addresses"
+    },
+    "DescribeAvailabilityZones": {
+      "result_key": "AvailabilityZones"
+    },
+    "DescribeBundleTasks": {
+      "result_key": "BundleTasks"
+    },
+    "DescribeConversionTasks": {
+      "result_key": "ConversionTasks"
+    },
+    "DescribeCustomerGateways": {
+      "result_key": "CustomerGateways"
+    },
+    "DescribeDhcpOptions": {
+      "result_key": "DhcpOptions"
+    },
+    "DescribeExportTasks": {
+      "result_key": "ExportTasks"
+    },
+    "DescribeImages": {
+      "result_key": "Images"
+    },
+    "DescribeInstanceStatus": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "InstanceStatuses"
+    },
+    "DescribeInstances": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Reservations"
+    },
+    "DescribeInternetGateways": {
+      "result_key": "InternetGateways"
+    },
+    "DescribeKeyPairs": {
+      "result_key": "KeyPairs"
+    },
+    "DescribeLicenses": {
+      "result_key": "Licenses"
+    },
+    "DescribeNetworkAcls": {
+      "result_key": "NetworkAcls"
+    },
+    "DescribeNetworkInterfaces": {
+      "result_key": "NetworkInterfaces"
+    },
+    "DescribePlacementGroups": {
+      "result_key": "PlacementGroups"
+    },
+    "DescribeRegions": {
+      "result_key": "Regions"
+    },
+    "DescribeReservedInstances": {
+      "result_key": "ReservedInstances"
+    },
+    "DescribeReservedInstancesListings": {
+      "result_key": "ReservedInstancesListings"
+    },
+    "DescribeReservedInstancesModifications": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "result_key": "ReservedInstancesModifications"
+    },
+    "DescribeReservedInstancesOfferings": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "ReservedInstancesOfferings"
+    },
+    "DescribeRouteTables": {
+      "result_key": "RouteTables"
+    },
+    "DescribeSecurityGroups": {
+      "result_key": "SecurityGroups"
+    },
+    "DescribeSnapshots": {
+      "result_key": "Snapshots"
+    },
+    "DescribeSpotInstanceRequests": {
+      "result_key": "SpotInstanceRequests"
+    },
+    "DescribeSpotPriceHistory": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "SpotPriceHistory"
+    },
+    "DescribeSubnets": {
+      "result_key": "Subnets"
+    },
+    "DescribeTags": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "Tags"
+    },
+    "DescribeVolumeStatus": {
+      "input_token": "NextToken",
+      "output_token": "NextToken",
+      "limit_key": "MaxResults",
+      "result_key": "VolumeStatuses"
+    },
+    "DescribeVolumes": {
+      "result_key": "Volumes"
+    },
+    "DescribeVpcs": {
+      "result_key": "Vpcs"
+    },
+    "DescribeVpnConnections": {
+      "result_key": "VpnConnections"
+    },
+    "DescribeVpnGateways": {
+      "result_key": "VpnGateways"
+    }
+  }
+}

data/apis/source/ec2-2013-10-15.waiters.json

@@ -0,0 +1,146 @@
+{
+  "waiters": {
+    "__default__": {
+      "interval": 15,
+      "max_attempts": 40,
+      "acceptor_type": "output"
+    },
+    "__InstanceState": {
+      "operation": "DescribeInstances",
+      "acceptor_path": "Reservations[].Instances[].State.Name"
+    },
+    "InstanceRunning": {
+      "extends": "__InstanceState",
+      "success_value": "running",
+      "failure_value": [
+        "shutting-down",
+        "terminated",
+        "stopping"
+      ]
+    },
+    "InstanceStopped": {
+      "extends": "__InstanceState",
+      "success_value": "stopped",
+      "failure_value": [
+        "pending",
+        "terminated"
+      ]
+    },
+    "InstanceTerminated": {
+      "extends": "__InstanceState",
+      "success_value": "terminated",
+      "failure_value": [
+        "pending",
+        "stopping"
+      ]
+    },
+    "__ExportTaskState": {
+      "operation": "DescribeExportTasks",
+      "acceptor_path": "ExportTasks[].State"
+    },
+    "ExportTaskCompleted": {
+      "extends": "__ExportTaskState",
+      "success_value": "completed"
+    },
+    "ExportTaskCancelled": {
+      "extends": "__ExportTaskState",
+      "success_value": "cancelled"
+    },
+    "SnapshotCompleted": {
+      "operation": "DescribeSnapshots",
+      "success_path": "Snapshots[].State",
+      "success_value": "completed"
+    },
+    "SubnetAvailable": {
+      "operation": "DescribeSubnets",
+      "success_path": "Subnets[].State",
+      "success_value": "available"
+    },
+    "__VolumeStatus": {
+      "operation": "DescribeVolumes",
+      "acceptor_path": "VolumeStatuses[].VolumeStatus.Status"
+    },
+    "VolumeAvailable": {
+      "extends": "__VolumeStatus",
+      "success_value": "available",
+      "failure_value": [
+        "deleted"
+      ]
+    },
+    "VolumeInUse": {
+      "extends": "__VolumeStatus",
+      "success_value": "in-use",
+      "failure_value": [
+        "deleted"
+      ]
+    },
+    "VolumeDeleted": {
+      "extends": "__VolumeStatus",
+      "success_value": "deleted"
+    },
+    "VpcAvailable": {
+      "operation": "DescribeVpcs",
+      "success_path": "Vpcs[].State",
+      "success_value": "available"
+    },
+    "__VpnConnectionState": {
+      "operation": "DescribeVpnConnections",
+      "acceptor_path": "VpnConnections[].State"
+    },
+    "VpnConnectionAvailable": {
+      "extends": "__VpnConnectionState",
+      "success_value": "available",
+      "failure_value": [
+        "deleting",
+        "deleted"
+      ]
+    },
+    "VpnConnectionDeleted": {
+      "extends": "__VpnConnectionState",
+      "success_value": "deleted",
+      "failure_value": [
+        "pending"
+      ]
+    },
+    "BundleTaskComplete": {
+      "operation": "DescribeBundleTasks",
+      "acceptor_path": "BundleTasks[].State",
+      "success_value": "complete",
+      "failure_value": [
+        "failed"
+      ]
+    },
+    "__ConversionTaskState": {
+      "operation": "DescribeConversionTasks",
+      "acceptor_path": "ConversionTasks[].State"
+    },
+    "ConversionTaskCompleted": {
+      "extends": "__ConversionTaskState",
+      "success_value": "completed",
+      "failure_value": [
+        "cancelled",
+        "cancelling"
+      ]
+    },
+    "ConversionTaskCancelled": {
+      "extends": "__ConversionTaskState",
+      "success_value": "cancelled"
+    },
+    "__CustomerGatewayState": {
+      "operation": "DescribeCustomerGateways",
+      "acceptor_path": "CustomerGateways[].State"
+    },
+    "CustomerGatewayAvailable": {
+      "extends": "__CustomerGatewayState",
+      "success_value": "available",
+      "failure_value": [
+        "deleted",
+        "deleting"
+      ]
+    },
+    "ConversionTaskDeleted": {
+      "extends": "__CustomerGatewayState",
+      "success_value": "deleted"
+    }
+  }
+}

data/apis/source/elasticache-2013-06-15.json

@@ -2,7 +2,7 @@
   "api_version": "2013-06-15",
   "type": "query",
   "result_wrapped": true,
-  "signature_version": "v2",
+  "signature_version": "v4",
   "service_full_name": "Amazon ElastiCache",
   "endpoint_prefix": "elasticache",
   "xmlnamespace": "http://elasticache.amazonaws.com/doc/2013-06-15/",
@@ -161,20 +161,17 @@
           "NumCacheNodes": {
             "shape_name": "IntegerOptional",
             "type": "integer",
-            "documentation": "\n        <p>The initial number of cache nodes that the cache cluster will have.</p>\n        <p>For a Memcached cluster, valid values are between 1 and 20. If you need to exceed this\n            limit, please fill out the ElastiCache Limit Increase Request form at <a href=\"http://aws.amazon.com/contact-us/elasticache-node-limit-request/\"></a> .</p>\n        <p>For Redis, only single-node cache clusters are supported at this time, so the value for\n            this parameter must be 1.</p>\n    ",
-            "required": true
+            "documentation": "\n        <p>The initial number of cache nodes that the cache cluster will have.</p>\n        <p>For a Memcached cluster, valid values are between 1 and 20. If you need to exceed this\n            limit, please fill out the ElastiCache Limit Increase Request form at <a href=\"http://aws.amazon.com/contact-us/elasticache-node-limit-request/\"></a> .</p>\n        <p>For Redis, only single-node cache clusters are supported at this time, so the value for\n            this parameter must be 1.</p>\n    "
           },
           "CacheNodeType": {
             "shape_name": "String",
             "type": "string",
-            "documentation": "\n        <p>The compute and memory capacity of the nodes in the cache cluster.</p> \n<p>Valid values for Memcached:</p>\n    <p>\n        <code>cache.t1.micro</code> |  \n        <code>cache.m1.small</code> | \n        <code>cache.m1.medium</code> |\n        <code>cache.m1.large</code> | \n        <code>cache.m1.xlarge</code> | \n        <code>cache.m3.xlarge</code> | \n        <code>cache.m3.2xlarge</code> | \n        <code>cache.m2.xlarge</code> | \n        <code>cache.m2.2xlarge</code> |\n        <code>cache.m2.4xlarge</code> | \n        <code>cache.c1.xlarge</code>\n    </p>\n    <p>Valid values for Redis:</p>\n    <p>\n       <code>cache.t1.micro</code> | \n       <code>cache.m1.small</code> | \n       <code>cache.m1.medium</code> |\n       <code>cache.m1.large</code> | \n       <code>cache.m1.xlarge</code> |  \n       <code>cache.m2.xlarge</code> | \n       <code>cache.m2.2xlarge</code> | \n       <code>cache.m2.4xlarge</code> | \n       <code>cache.c1.xlarge</code>\n    </p>\n<p>For a complete listing of cache node types and specifications, see <a href=\"http://aws.amazon.com/elasticache/\"/>.</p>\n ",
-            "required": true
+            "documentation": "\n        <p>The compute and memory capacity of the nodes in the cache cluster.</p> \n<p>Valid values for Memcached:</p>\n    <p>\n        <code>cache.t1.micro</code> |  \n        <code>cache.m1.small</code> | \n        <code>cache.m1.medium</code> |\n        <code>cache.m1.large</code> | \n        <code>cache.m1.xlarge</code> | \n        <code>cache.m3.xlarge</code> | \n        <code>cache.m3.2xlarge</code> | \n        <code>cache.m2.xlarge</code> | \n        <code>cache.m2.2xlarge</code> |\n        <code>cache.m2.4xlarge</code> | \n        <code>cache.c1.xlarge</code>\n    </p>\n    <p>Valid values for Redis:</p>\n    <p>\n       <code>cache.t1.micro</code> | \n       <code>cache.m1.small</code> | \n       <code>cache.m1.medium</code> |\n       <code>cache.m1.large</code> | \n       <code>cache.m1.xlarge</code> |  \n       <code>cache.m2.xlarge</code> | \n       <code>cache.m2.2xlarge</code> | \n       <code>cache.m2.4xlarge</code> | \n       <code>cache.c1.xlarge</code>\n    </p>\n<p>For a complete listing of cache node types and specifications, see <a href=\"http://aws.amazon.com/elasticache/\"/>.</p>\n "
           },
           "Engine": {
             "shape_name": "String",
             "type": "string",
-            "documentation": "\n        <p>The name of the cache engine to be used for this cache cluster.</p>\n        <p>Valid values for this parameter are:</p>\n            <p><code>memcached</code> | <code>redis</code></p>\n    ",
-            "required": true
+            "documentation": "\n        <p>The name of the cache engine to be used for this cache cluster.</p>\n        <p>Valid values for this parameter are:</p>\n            <p><code>memcached</code> | <code>redis</code></p>\n    "
           },
           "EngineVersion": {
             "shape_name": "String",
@@ -1681,6 +1678,11 @@
             "type": "string",
             "documentation": "\n        <p>The identifier for the replication group to be deleted. This parameter is not case\n            sensitive.</p>\n    ",
             "required": true
+          },
+          "RetainPrimaryCluster": {
+            "shape_name": "BooleanOptional",
+            "type": "boolean",
+            "documentation": "\n        <p>If set to <i>true</i>, all of the read replicas will be deleted, but the primary \n        cache cluster will be retained.</p>\n    "
           }
         },
         "documentation": "\n        <p>Represents the input of a <i>DeleteReplicationGroup</i> operation.</p>\n    "
@@ -1867,7 +1869,7 @@
           "documentation": "\n        <p>Two or more incompatible parameters were specified.</p>\n    "
         }
       ],
-      "documentation": "\n        <p>The <i>DeleteReplicationGroup</i> operation deletes an existing replication group.\n            <i>DeleteReplicationGroup</i> deletes the primary cache cluster and all of the read replicas in the replication\n            group. When you receive a successful response\n            from this operation, Amazon ElastiCache immediately begins deleting the entire replication group; you\n            cannot cancel or revert this operation.</p>\n    "
+      "documentation": "\n        <p>The <i>DeleteReplicationGroup</i> operation deletes an existing replication group.  \n        By default, this operation deletes the entire replication group, including the primary \n        cache cluster and all of the read replicas. You can optionally delete only the read \n        replicas, while retaining the primary cache cluster.</p>\n        <p>When you receive a successful response from this operation, Amazon ElastiCache immediately \n        begins deleting the selected resources; you cannot cancel or revert this operation.</p>\n    "
     },
     "DescribeCacheClusters": {
       "name": "DescribeCacheClusters",

data/apis/source/elasticache-2013-06-15.paginators.json

@@ -38,9 +38,9 @@
     },
     "DescribeEngineDefaultParameters": {
       "input_token": "Marker",
-      "output_token": "Marker",
+      "output_token": "EngineDefaults.Marker",
       "limit_key": "MaxRecords",
-      "result_key": "Parameters"
+      "result_key": "EngineDefaults.Parameters"
     },
     "DescribeEvents": {
       "input_token": "Marker",
@@ -59,6 +59,12 @@
       "output_token": "Marker",
       "limit_key": "MaxRecords",
       "result_key": "ReservedCacheNodesOfferings"
+    },
+    "DescribeReplicationGroups": {
+      "input_token": "Marker",
+      "output_token": "Marker",
+      "limit_key": "MaxRecords",
+      "result_key": "ReplicationGroups"
     }
   }
 }

data/apis/source/elasticbeanstalk-2010-12-01.json

@@ -7,7 +7,7 @@
   "service_abbreviation": "Elastic Beanstalk",
   "endpoint_prefix": "elasticbeanstalk",
   "xmlnamespace": "http://elasticbeanstalk.amazonaws.com/docs/2010-12-01/",
-  "documentation": "\n      <fullname>AWS Elastic Beanstalk</fullname>\n\n      <p>\n         This is the AWS Elastic Beanstalk API Reference. This guide provides detailed information \n         about AWS Elastic Beanstalk actions, data types, parameters, and errors.\n      </p>\n\n      <p>AWS Elastic Beanstalk\n         is a tool that makes it easy for you to create,\n         deploy, and manage scalable, fault-tolerant applications running on\n         Amazon Web Services cloud resources.\n      </p>\n\n      <p>\n         For more information about this product, go to the <a href=\"http://aws.amazon.com/elasticbeanstalk/\">AWS Elastic Beanstalk</a> details page.  \n         The location of the lastest AWS Elastic Beanstalk WSDL is \n         <a href=\"http://elasticbeanstalk.s3.amazonaws.com/doc/2010-12-01/AWSElasticBeanstalk.wsdl\">http://elasticbeanstalk.s3.amazonaws.com/doc/2010-12-01/AWSElasticBeanstalk.wsdl</a>.\n      </p>\n       <p><b>Endpoints</b></p>\n       <p>For a list of region-specific endpoints that AWS Elastic Beanstalk supports, go to <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html#elasticbeanstalk_region\">Regions and Endpoints</a> in the \n<i>Amazon Web Services Glossary</i>.</p>\n   ",
+  "documentation": "\n      <fullname>AWS Elastic Beanstalk</fullname>\n\n      <p>\n         This is the AWS Elastic Beanstalk API Reference. This guide provides detailed information \n         about AWS Elastic Beanstalk actions, data types, parameters, and errors.\n      </p>\n\n      <p>AWS Elastic Beanstalk\n         is a tool that makes it easy for you to create,\n         deploy, and manage scalable, fault-tolerant applications running on\n         Amazon Web Services cloud resources.\n      </p>\n\n      <p>\n         For more information about this product, go to the <a href=\"http://aws.amazon.com/elasticbeanstalk/\">AWS Elastic Beanstalk</a> details page.  \n         The location of the latest AWS Elastic Beanstalk WSDL is \n         <a href=\"http://elasticbeanstalk.s3.amazonaws.com/doc/2010-12-01/AWSElasticBeanstalk.wsdl\">http://elasticbeanstalk.s3.amazonaws.com/doc/2010-12-01/AWSElasticBeanstalk.wsdl</a>.\n      </p>\n       <p><b>Endpoints</b></p>\n       <p>For a list of region-specific endpoints that AWS Elastic Beanstalk supports, go to <a href=\"http://docs.aws.amazon.com/general/latest/gr/rande.html#elasticbeanstalk_region\">Regions and Endpoints</a> in the \n<i>Amazon Web Services Glossary</i>.</p>\n   ",
   "operations": {
     "CheckDNSAvailability": {
       "name": "CheckDNSAvailability",
@@ -143,7 +143,7 @@
           "documentation": "\n    <p>The caller has exceeded the limit on the number of applications associated with their account.</p>\n  "
         }
       ],
-      "documentation": "\n      <p>\n         Creates an application that has one configuration\n         template named\n         <code>default</code>\n         and no application versions.\n      </p>\n      <note>\n         The\n         <code>default</code>\n         configuration template is for a 32-bit version of the\n         Amazon Linux\n         operating system running the Tomcat 6 application container.\n      </note>\n      <examples>\n         <queryrequest>https://elasticbeanstalk.us-east-1.amazon.com/?ApplicationName=SampleApp\n&Description=Sample%20Description\n&Operation=CreateApplication\n&AuthParams         </queryrequest>\n\n         <queryresponse><CreateApplicationResponse xmlns=\"https://elasticbeanstalk.amazonaws.com/docs/2010-12-01/\">\n  <CreateApplicationResult>\n    <Application>\n      <Versions/>\n      <Description>Sample Description</Description>\n      <ApplicationName>SampleApp</ApplicationName>\n      <DateCreated>2010-11-16T23:09:20.256Z</DateCreated>\n      <DateUpdated>2010-11-16T23:09:20.256Z</DateUpdated>\n      <ConfigurationTemplates>\n        <member>Default</member>\n      </ConfigurationTemplates>\n    </Application>\n  </CreateApplicationResult>\n  <ResponseMetadata>\n    <RequestId>8b00e053-f1d6-11df-8a78-9f77047e0d0c</RequestId>\n  </ResponseMetadata>\n</CreateApplicationResponse>      </queryresponse>\n      </examples>\n   "
+      "documentation": "\n      <p>\n         Creates an application that has one configuration\n         template named\n         <code>default</code>\n         and no application versions.\n      </p>\n      <?oxy_delete author=\"brussard\" timestamp=\"20131024T142047-0700\" content=\"&lt;note&gt;\n         The\n         &lt;code&gt;default&lt;/code&gt;\n         configuration template is for a 32-bit version of the\n         Amazon Linux\n         operating system running the Tomcat 6 application container.\n      &lt;/note&gt;\">\n      <examples>\n         <queryrequest>https://elasticbeanstalk.us-east-1.amazon.com/?ApplicationName=SampleApp\n&Description=Sample%20Description\n&Operation=CreateApplication\n&AuthParams         </queryrequest>\n\n         <queryresponse><CreateApplicationResponse xmlns=\"https://elasticbeanstalk.amazonaws.com/docs/2010-12-01/\">\n  <CreateApplicationResult>\n    <Application>\n      <Versions/>\n      <Description>Sample Description</Description>\n      <ApplicationName>SampleApp</ApplicationName>\n      <DateCreated>2010-11-16T23:09:20.256Z</DateCreated>\n      <DateUpdated>2010-11-16T23:09:20.256Z</DateUpdated>\n      <ConfigurationTemplates>\n        <member>Default</member>\n      </ConfigurationTemplates>\n    </Application>\n  </CreateApplicationResult>\n  <ResponseMetadata>\n    <RequestId>8b00e053-f1d6-11df-8a78-9f77047e0d0c</RequestId>\n  </ResponseMetadata>\n</CreateApplicationResponse>      </queryresponse>\n      </examples>\n   "
     },
     "CreateApplicationVersion": {
       "name": "CreateApplicationVersion",
@@ -504,13 +504,6 @@
             "documentation": "\n      <p>\n         The name of the application that contains the version to be deployed.\n      </p>\n      <p>\n         If no application is found with this name, <code>CreateEnvironment</code>\n         returns an\n         <code>InvalidParameterValue</code>\n         error.\n      </p>\n   ",
             "required": true
           },
-          "VersionLabel": {
-            "shape_name": "VersionLabel",
-            "type": "string",
-            "min_length": 1,
-            "max_length": 100,
-            "documentation": "\n      <p>The name of the application version to deploy.</p>\n      <p>\n         If the specified application has no associated application versions, AWS Elastic Beanstalk\n         <code>UpdateEnvironment</code> returns an\n         <code>InvalidParameterValue</code>\n         error.\n      </p>\n      <p>\n         Default: If not specified, AWS Elastic Beanstalk\n         attempts to launch the most recently created\n         application version.\n      </p>\n   "
-          },
           "EnvironmentName": {
             "shape_name": "EnvironmentName",
             "type": "string",
@@ -519,6 +512,48 @@
             "documentation": "\n      <p>\n         A unique name for the deployment environment. Used in\n         the application\n         URL.\n         </p>\n      <p>Constraint: Must be from 4 to 23 characters\n         in length. The name can\n         contain only letters, numbers, and hyphens. It cannot start\n         or end with\n         a hyphen. This name must be unique in your account.\n         If the specified\n         name already exists, AWS Elastic Beanstalk\n         returns an\n         <code>InvalidParameterValue</code>\n         error.\n      </p>\n      <p>Default: If the CNAME parameter is not specified, the environment name\n         becomes part of the CNAME, and therefore\n         part of the visible URL for your application.</p>\n\n\n   ",
             "required": true
           },
+          "Description": {
+            "shape_name": "Description",
+            "type": "string",
+            "max_length": 200,
+            "documentation": "\n      <p>Describes this environment.</p>\n   "
+          },
+          "CNAMEPrefix": {
+            "shape_name": "DNSCnamePrefix",
+            "type": "string",
+            "min_length": 4,
+            "max_length": 63,
+            "documentation": "\n      <p>\n         If specified, the environment attempts to use this value as the prefix for the\n         CNAME.\n         If not specified, the CNAME is generated automatically by appending a random alphanumeric string to the environment name.\n\t\t</p>\n   "
+          },
+          "Tier": {
+            "shape_name": "EnvironmentTier",
+            "type": "structure",
+            "members": {
+              "Name": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The name of this environment tier.</p>\n   "
+              },
+              "Type": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The type of this environment tier.</p>\n   "
+              },
+              "Version": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The version of this environment tier.</p>\n   "
+              }
+            },
+            "documentation": "\n      <p>\n         This specifies the tier to use for creating this environment.\n      </p>\n   "
+          },
+          "VersionLabel": {
+            "shape_name": "VersionLabel",
+            "type": "string",
+            "min_length": 1,
+            "max_length": 100,
+            "documentation": "\n      <p>The name of the application version to deploy.</p>\n      <p>\n         If the specified application has no associated application versions, AWS Elastic Beanstalk\n         <code>UpdateEnvironment</code> returns an\n         <code>InvalidParameterValue</code>\n         error.\n      </p>\n      <p>\n         Default: If not specified, AWS Elastic Beanstalk\n         attempts to launch the <?oxy_delete author=\"brussard\" timestamp=\"20131030T145730-0700\" content=\"most recently created\n         application version\"><?oxy_insert_start author=\"brussard\" timestamp=\"20131030T145730-0700\">sample application in the container<?oxy_insert_end>.\n      </p>\n   "
+          },
           "TemplateName": {
             "shape_name": "ConfigurationTemplateName",
             "type": "string",
@@ -532,19 +567,6 @@
             "max_length": 100,
             "documentation": "\n      <p>\n         This is an alternative to specifying a configuration name.\n         If specified, AWS Elastic Beanstalk\n         sets the configuration values to the default values\n         associated with the specified solution stack.\n      </p>\n      <p>\n         Condition: You must specify either this or a\n         <code>TemplateName</code>,\n         but not both.\n         If you specify both, AWS Elastic Beanstalk\n         returns an\n         <code>InvalidParameterCombination</code>\n         error. If you do not specify either, AWS Elastic Beanstalk\n         returns a\n         <code>MissingRequiredParameter</code>\n         error.\n      </p>\n   "
           },
-          "CNAMEPrefix": {
-            "shape_name": "DNSCnamePrefix",
-            "type": "string",
-            "min_length": 4,
-            "max_length": 63,
-            "documentation": "\n      <p>\n         If specified, the environment attempts to use this value as the prefix for the\n         CNAME.\n         If not specified, the CNAME is generated automatically by appending a random alphanumeric string to the environment name.\n\t\t</p>\n   "
-          },
-          "Description": {
-            "shape_name": "Description",
-            "type": "string",
-            "max_length": 200,
-            "documentation": "\n      <p>Describes this environment.</p>\n   "
-          },
           "OptionSettings": {
             "shape_name": "ConfigurationOptionSettingsList",
             "type": "list",
@@ -649,7 +671,7 @@
           "EndpointURL": {
             "shape_name": "EndpointURL",
             "type": "string",
-            "documentation": "\n      <p>The URL to the LoadBalancer for this environment.</p>\n   "
+            "documentation": "\n      <p>For load-balanced, autoscaling environments, the URL to the LoadBalancer. For single-instance environments, the IP address of the instance.</p>\n   "
           },
           "CNAME": {
             "shape_name": "DNSCname",
@@ -736,6 +758,28 @@
               }
             },
             "documentation": "\n      <p>The description of the AWS resources used by this environment.</p>\n   "
+          },
+          "Tier": {
+            "shape_name": "EnvironmentTier",
+            "type": "structure",
+            "members": {
+              "Name": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The name of this environment tier.</p>\n   "
+              },
+              "Type": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The type of this environment tier.</p>\n   "
+              },
+              "Version": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The version of this environment tier.</p>\n   "
+              }
+            },
+            "documentation": "\n      <p>Describes the current tier of this environment.</p>\n   "
           }
         },
         "documentation": "\n      <p>Describes the properties of an environment.</p>\n\n\n   "
@@ -1576,6 +1620,28 @@
                   "documentation": "\n      <p>Describes a trigger.</p>\n   "
                 },
                 "documentation": "\n      <p>\n         The\n         <code>AutoScaling</code>\n         triggers in use by this environment.\n      </p>\n   "
+              },
+              "Queues": {
+                "shape_name": "QueueList",
+                "type": "list",
+                "members": {
+                  "shape_name": "Queue",
+                  "type": "structure",
+                  "members": {
+                    "Name": {
+                      "shape_name": "String",
+                      "type": "string",
+                      "documentation": "\n      <p>The name of the queue.</p>\n   "
+                    },
+                    "URL": {
+                      "shape_name": "String",
+                      "type": "string",
+                      "documentation": "\n      <p>The URL of the queue.</p>\n   "
+                    }
+                  },
+                  "documentation": "\n      <p>Describes a queue.</p>\n   "
+                },
+                "documentation": "\n      <p>\n         The queues used by this environment.\n      </p>\n   "
               }
             },
             "documentation": "\n      <p>\n         A list of\n         <a>EnvironmentResourceDescription</a>.\n      </p>\n   "
@@ -1708,7 +1774,7 @@
                 "EndpointURL": {
                   "shape_name": "EndpointURL",
                   "type": "string",
-                  "documentation": "\n      <p>The URL to the LoadBalancer for this environment.</p>\n   "
+                  "documentation": "\n      <p>For load-balanced, autoscaling environments, the URL to the LoadBalancer. For single-instance environments, the IP address of the instance.</p>\n   "
                 },
                 "CNAME": {
                   "shape_name": "DNSCname",
@@ -1795,6 +1861,28 @@
                     }
                   },
                   "documentation": "\n      <p>The description of the AWS resources used by this environment.</p>\n   "
+                },
+                "Tier": {
+                  "shape_name": "EnvironmentTier",
+                  "type": "structure",
+                  "members": {
+                    "Name": {
+                      "shape_name": "String",
+                      "type": "string",
+                      "documentation": "\n      <p>The name of this environment tier.</p>\n   "
+                    },
+                    "Type": {
+                      "shape_name": "String",
+                      "type": "string",
+                      "documentation": "\n      <p>The type of this environment tier.</p>\n   "
+                    },
+                    "Version": {
+                      "shape_name": "String",
+                      "type": "string",
+                      "documentation": "\n      <p>The version of this environment tier.</p>\n   "
+                    }
+                  },
+                  "documentation": "\n      <p>Describes the current tier of this environment.</p>\n   "
                 }
               },
               "documentation": "\n      <p>Describes the properties of an environment.</p>\n\n\n   "
@@ -2322,7 +2410,7 @@
           "EndpointURL": {
             "shape_name": "EndpointURL",
             "type": "string",
-            "documentation": "\n      <p>The URL to the LoadBalancer for this environment.</p>\n   "
+            "documentation": "\n      <p>For load-balanced, autoscaling environments, the URL to the LoadBalancer. For single-instance environments, the IP address of the instance.</p>\n   "
           },
           "CNAME": {
             "shape_name": "DNSCname",
@@ -2409,6 +2497,28 @@
               }
             },
             "documentation": "\n      <p>The description of the AWS resources used by this environment.</p>\n   "
+          },
+          "Tier": {
+            "shape_name": "EnvironmentTier",
+            "type": "structure",
+            "members": {
+              "Name": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The name of this environment tier.</p>\n   "
+              },
+              "Type": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The type of this environment tier.</p>\n   "
+              },
+              "Version": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The version of this environment tier.</p>\n   "
+              }
+            },
+            "documentation": "\n      <p>Describes the current tier of this environment.</p>\n   "
           }
         },
         "documentation": "\n      <p>Describes the properties of an environment.</p>\n\n\n   "
@@ -2808,6 +2918,34 @@
             "max_length": 23,
             "documentation": "\n      <p>The\n         name of the environment to update. If no environment with this name\n         exists, \n      AWS Elastic Beanstalk\n         returns an\n         <code>InvalidParameterValue</code>\n         error.\n      </p>\n      <p>\n         Condition: You must specify either this or an EnvironmentId, or both.  \n         If you do not specify either, AWS Elastic Beanstalk returns <code>MissingRequiredParameter</code> error.\n\t\t</p>\n\n   "
           },
+          "Description": {
+            "shape_name": "Description",
+            "type": "string",
+            "max_length": 200,
+            "documentation": "\n      <p>\n         If this parameter is specified, AWS Elastic Beanstalk\n         updates the description\n         of this environment.\n      </p>\n   "
+          },
+          "Tier": {
+            "shape_name": "EnvironmentTier",
+            "type": "structure",
+            "members": {
+              "Name": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The name of this environment tier.</p>\n   "
+              },
+              "Type": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The type of this environment tier.</p>\n   "
+              },
+              "Version": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The version of this environment tier.</p>\n   "
+              }
+            },
+            "documentation": "\n      <p>\n         This specifies the tier to use to update the environment.\n      </p>\n      <p>\n         Condition: You can only update the tier version for an environment. If you change the name of the type, \n         AWS Elastic Beanstalk returns <code>InvalidParameterValue</code> error.\n      </p>\n   "
+          },
           "VersionLabel": {
             "shape_name": "VersionLabel",
             "type": "string",
@@ -2822,12 +2960,6 @@
             "max_length": 100,
             "documentation": "\n      <p>\n         If this parameter is specified, AWS Elastic Beanstalk\n         deploys this\n         configuration template to the environment. If no such\n         configuration\n         template is found, AWS Elastic Beanstalk\n         returns an\n         <code>InvalidParameterValue</code>\n         error.\n      </p>\n   "
           },
-          "Description": {
-            "shape_name": "Description",
-            "type": "string",
-            "max_length": 200,
-            "documentation": "\n      <p>\n         If this parameter is specified, AWS Elastic Beanstalk\n         updates the description\n         of this environment.\n      </p>\n   "
-          },
           "OptionSettings": {
             "shape_name": "ConfigurationOptionSettingsList",
             "type": "list",
@@ -2932,7 +3064,7 @@
           "EndpointURL": {
             "shape_name": "EndpointURL",
             "type": "string",
-            "documentation": "\n      <p>The URL to the LoadBalancer for this environment.</p>\n   "
+            "documentation": "\n      <p>For load-balanced, autoscaling environments, the URL to the LoadBalancer. For single-instance environments, the IP address of the instance.</p>\n   "
           },
           "CNAME": {
             "shape_name": "DNSCname",
@@ -3019,6 +3151,28 @@
               }
             },
             "documentation": "\n      <p>The description of the AWS resources used by this environment.</p>\n   "
+          },
+          "Tier": {
+            "shape_name": "EnvironmentTier",
+            "type": "structure",
+            "members": {
+              "Name": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The name of this environment tier.</p>\n   "
+              },
+              "Type": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The type of this environment tier.</p>\n   "
+              },
+              "Version": {
+                "shape_name": "String",
+                "type": "string",
+                "documentation": "\n      <p>The version of this environment tier.</p>\n   "
+              }
+            },
+            "documentation": "\n      <p>Describes the current tier of this environment.</p>\n   "
           }
         },
         "documentation": "\n      <p>Describes the properties of an environment.</p>\n\n\n   "