Update models for release

aws · Jan 18, 2019 · 530e807 · 530e807
1 parent 217f783
commit 530e807
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 18 deletions.
diff --git a/.changes/3.86.2 b/.changes/3.86.2
@@ -0,0 +1,12 @@
+[
+    {
+        "type": "api-change",
+        "category": "EC2",
+        "description": "Adjust EC2's available instance types."
+    },
+    {
+        "type": "api-change",
+        "category": "Glue",
+        "description": "AllocatedCapacity field is being deprecated and replaced with MaxCapacity field"
+    }
+]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## next release
+
+* `Aws\EC2` - Adjust EC2's available instance types.
+* `Aws\Glue` - AllocatedCapacity field is being deprecated and replaced with MaxCapacity field
+
 ## 3.86.1 - 2019-01-17
 
 * `Aws\Lambda` - Documentation updates for AWS Lambda

diff --git a/src/data/ec2/2016-11-15/api-2.json b/src/data/ec2/2016-11-15/api-2.json
@@ -14201,9 +14201,7 @@
         "r5.xlarge",
         "r5.2xlarge",
         "r5.4xlarge",
-        "r5.8xlarge",
         "r5.12xlarge",
-        "r5.16xlarge",
         "r5.24xlarge",
         "r5.metal",
         "r5a.large",
@@ -14216,9 +14214,7 @@
         "r5d.xlarge",
         "r5d.2xlarge",
         "r5d.4xlarge",
-        "r5d.8xlarge",
         "r5d.12xlarge",
-        "r5d.16xlarge",
         "r5d.24xlarge",
         "r5d.metal",
         "x1.16xlarge",

diff --git a/src/data/ec2/2016-11-15/api-2.json.php b/src/data/ec2/2016-11-15/api-2.json.php
diff --git a/src/data/glue/2017-03-31/api-2.json b/src/data/glue/2017-03-31/api-2.json
@@ -2058,8 +2058,13 @@
         "DefaultArguments":{"shape":"GenericMap"},
         "Connections":{"shape":"ConnectionsList"},
         "MaxRetries":{"shape":"MaxRetries"},
-        "AllocatedCapacity":{"shape":"IntegerValue"},
+        "AllocatedCapacity":{
+          "shape":"IntegerValue",
+          "deprecated":true,
+          "deprecatedMessage":"This property is deprecated, use MaxCapacity instead."
+        },
         "Timeout":{"shape":"Timeout"},
+        "MaxCapacity":{"shape":"NullableDouble"},
         "NotificationProperty":{"shape":"NotificationProperty"},
         "SecurityConfiguration":{"shape":"NameString"}
       }
@@ -3214,8 +3219,13 @@
         "DefaultArguments":{"shape":"GenericMap"},
         "Connections":{"shape":"ConnectionsList"},
         "MaxRetries":{"shape":"MaxRetries"},
-        "AllocatedCapacity":{"shape":"IntegerValue"},
+        "AllocatedCapacity":{
+          "shape":"IntegerValue",
+          "deprecated":true,
+          "deprecatedMessage":"This property is deprecated, use MaxCapacity instead."
+        },
         "Timeout":{"shape":"Timeout"},
+        "MaxCapacity":{"shape":"NullableDouble"},
         "NotificationProperty":{"shape":"NotificationProperty"},
         "SecurityConfiguration":{"shape":"NameString"}
       }
@@ -3271,9 +3281,14 @@
         "Arguments":{"shape":"GenericMap"},
         "ErrorMessage":{"shape":"ErrorString"},
         "PredecessorRuns":{"shape":"PredecessorList"},
-        "AllocatedCapacity":{"shape":"IntegerValue"},
+        "AllocatedCapacity":{
+          "shape":"IntegerValue",
+          "deprecated":true,
+          "deprecatedMessage":"This property is deprecated, use MaxCapacity instead."
+        },
         "ExecutionTime":{"shape":"ExecutionTime"},
         "Timeout":{"shape":"Timeout"},
+        "MaxCapacity":{"shape":"NullableDouble"},
         "NotificationProperty":{"shape":"NotificationProperty"},
         "SecurityConfiguration":{"shape":"NameString"},
         "LogGroupName":{"shape":"GenericString"}
@@ -3306,8 +3321,13 @@
         "DefaultArguments":{"shape":"GenericMap"},
         "Connections":{"shape":"ConnectionsList"},
         "MaxRetries":{"shape":"MaxRetries"},
-        "AllocatedCapacity":{"shape":"IntegerValue"},
+        "AllocatedCapacity":{
+          "shape":"IntegerValue",
+          "deprecated":true,
+          "deprecatedMessage":"This property is deprecated, use MaxCapacity instead."
+        },
         "Timeout":{"shape":"Timeout"},
+        "MaxCapacity":{"shape":"NullableDouble"},
         "NotificationProperty":{"shape":"NotificationProperty"},
         "SecurityConfiguration":{"shape":"NameString"}
       }
@@ -3472,6 +3492,10 @@
       "box":true,
       "min":1
     },
+    "NullableDouble":{
+      "type":"double",
+      "box":true
+    },
     "OperationTimeoutException":{
       "type":"structure",
       "members":{
@@ -3844,8 +3868,13 @@
         "JobName":{"shape":"NameString"},
         "JobRunId":{"shape":"IdString"},
         "Arguments":{"shape":"GenericMap"},
-        "AllocatedCapacity":{"shape":"IntegerValue"},
+        "AllocatedCapacity":{
+          "shape":"IntegerValue",
+          "deprecated":true,
+          "deprecatedMessage":"This property is deprecated, use MaxCapacity instead."
+        },
         "Timeout":{"shape":"Timeout"},
+        "MaxCapacity":{"shape":"NullableDouble"},
         "NotificationProperty":{"shape":"NotificationProperty"},
         "SecurityConfiguration":{"shape":"NameString"}
       }

diff --git a/src/data/glue/2017-03-31/api-2.json.php b/src/data/glue/2017-03-31/api-2.json.php
diff --git a/src/data/glue/2017-03-31/docs-2.json b/src/data/glue/2017-03-31/docs-2.json
@@ -1193,7 +1193,7 @@
         "GetSecurityConfigurationsResponse$NextToken": "<p>A continuation token, if there are more security configurations to return.</p>",
         "GetTriggersRequest$NextToken": "<p>A continuation token, if this is a continuation call.</p>",
         "GetTriggersResponse$NextToken": "<p>A continuation token, if not all the requested triggers have yet been returned.</p>",
-        "JobCommand$Name": "<p>The name of the job command: this must be <code>glueetl</code>.</p>",
+        "JobCommand$Name": "<p>The name of the job command: this must be <code>glueetl</code>, for an Apache Spark ETL job, or <code>pythonshell</code>, for a Python shell job.</p>",
         "JobRun$LogGroupName": "<p>The name of the log group for secure logging, that can be server-side encrypted in CloudWatch using KMS. This name can be <code>/aws-glue/jobs/</code>, in which case the default encryption is <code>NONE</code>. If you add a role name and SecurityConfiguration name (in other words, <code>/aws-glue/jobs-yourRoleName-yourSecurityConfigurationName/</code>), then that security configuration will be used to encrypt the log group.</p>",
         "PublicKeysList$member": null,
         "StringList$member": null,
@@ -1622,16 +1622,16 @@
         "CreateDevEndpointRequest$NumberOfNodes": "<p>The number of AWS Glue Data Processing Units (DPUs) to allocate to this DevEndpoint.</p>",
         "CreateDevEndpointResponse$ZeppelinRemoteSparkInterpreterPort": "<p>The Apache Zeppelin port for the remote Apache Spark interpreter.</p>",
         "CreateDevEndpointResponse$NumberOfNodes": "<p>The number of AWS Glue Data Processing Units (DPUs) allocated to this DevEndpoint.</p>",
-        "CreateJobRequest$AllocatedCapacity": "<p>The number of AWS Glue data processing units (DPUs) to allocate to this Job. From 2 to 100 DPUs can be allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>.</p>",
+        "CreateJobRequest$AllocatedCapacity": "<p>This parameter is deprecated. Use <code>MaxCapacity</code> instead.</p> <p>The number of AWS Glue data processing units (DPUs) to allocate to this Job. From 2 to 100 DPUs can be allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>.</p>",
         "DevEndpoint$ZeppelinRemoteSparkInterpreterPort": "<p>The Apache Zeppelin port for the remote Apache Spark interpreter.</p>",
         "DevEndpoint$NumberOfNodes": "<p>The number of AWS Glue Data Processing Units (DPUs) allocated to this DevEndpoint.</p>",
-        "Job$AllocatedCapacity": "<p>The number of AWS Glue data processing units (DPUs) allocated to runs of this job. From 2 to 100 DPUs can be allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>.</p>",
+        "Job$AllocatedCapacity": "<p>This field is deprecated, use <code>MaxCapacity</code> instead.</p> <p>The number of AWS Glue data processing units (DPUs) allocated to runs of this job. From 2 to 100 DPUs can be allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>.</p> <p/>",
         "JobBookmarkEntry$Version": "<p>Version of the job.</p>",
         "JobBookmarkEntry$Run": "<p>The run ID number.</p>",
         "JobBookmarkEntry$Attempt": "<p>The attempt ID number.</p>",
-        "JobRun$AllocatedCapacity": "<p>The number of AWS Glue data processing units (DPUs) allocated to this JobRun. From 2 to 100 DPUs can be allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>.</p>",
-        "JobUpdate$AllocatedCapacity": "<p>The number of AWS Glue data processing units (DPUs) to allocate to this Job. From 2 to 100 DPUs can be allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>.</p>",
-        "StartJobRunRequest$AllocatedCapacity": "<p>The number of AWS Glue data processing units (DPUs) to allocate to this JobRun. From 2 to 100 DPUs can be allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>.</p>"
+        "JobRun$AllocatedCapacity": "<p>This field is deprecated, use <code>MaxCapacity</code> instead.</p> <p>The number of AWS Glue data processing units (DPUs) allocated to this JobRun. From 2 to 100 DPUs can be allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>.</p>",
+        "JobUpdate$AllocatedCapacity": "<p>This field is deprecated. Use <code>MaxCapacity</code> instead.</p> <p>The number of AWS Glue data processing units (DPUs) to allocate to this Job. From 2 to 100 DPUs can be allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>.</p>",
+        "StartJobRunRequest$AllocatedCapacity": "<p>This field is deprecated, use <code>MaxCapacity</code> instead.</p> <p>The number of AWS Glue data processing units (DPUs) to allocate to this JobRun. From 2 to 100 DPUs can be allocated; the default is 10. A DPU is a relative measure of processing power that consists of 4 vCPUs of compute capacity and 16 GB of memory. For more information, see the <a href=\"https://aws.amazon.com/glue/pricing/\">AWS Glue pricing page</a>.</p>"
       }
     },
     "InternalServiceException": {
@@ -2107,6 +2107,16 @@
         "NotificationProperty$NotifyDelayAfter": "<p>After a job run starts, the number of minutes to wait before sending a job run delay notification.</p>"
       }
     },
+    "NullableDouble": {
+      "base": null,
+      "refs": {
+        "CreateJobRequest$MaxCapacity": "<p>AWS Glue supports running jobs on a <code>JobCommand.Name</code>=\"pythonshell\" with allocated processing as low as 0.0625 DPU, which can be specified using <code>MaxCapacity</code>. Glue ETL jobs running in any other way cannot have fractional DPU allocations.</p>",
+        "Job$MaxCapacity": "<p>AWS Glue supports running jobs on a <code>JobCommand.Name</code>=\"pythonshell\" with allocated processing as low as 0.0625 DPU, which can be specified using <code>MaxCapacity</code>. Glue ETL jobs running in any other way cannot have fractional DPU allocations.</p>",
+        "JobRun$MaxCapacity": "<p>AWS Glue supports running jobs on a <code>JobCommand.Name</code>=\"pythonshell\" with allocated processing as low as 0.0625 DPU, which can be specified using <code>MaxCapacity</code>. Glue ETL jobs running in any other way cannot have fractional DPU allocations.</p>",
+        "JobUpdate$MaxCapacity": "<p>AWS Glue supports running jobs on a <code>JobCommand.Name</code>=\"pythonshell\" with allocated processing as low as 0.0625 DPU, which can be specified using <code>MaxCapacity</code>. Glue ETL jobs running in any other way cannot have fractional DPU allocations.</p>",
+        "StartJobRunRequest$MaxCapacity": "<p>AWS Glue supports running jobs on a <code>JobCommand.Name</code>=\"pythonshell\" with allocated processing as low as 0.0625 DPU, which can be specified using <code>MaxCapacity</code>. Glue ETL jobs running in any other way cannot have fractional DPU allocations.</p>"
+      }
+    },
     "OperationTimeoutException": {
       "base": "<p>The operation timed out.</p>",
       "refs": {

diff --git a/src/data/glue/2017-03-31/docs-2.json.php b/src/data/glue/2017-03-31/docs-2.json.php