Updates SDK to v2.222.1

aws · Apr 6, 2018 · 7ada7a0 · 7ada7a0
1 parent bd142dc
commit 7ada7a0
Show file tree

Hide file tree

Showing 13 changed files with 149 additions and 69 deletions.
diff --git a/.changes/2.222.1.json b/.changes/2.222.1.json
@@ -0,0 +1,7 @@
+[
+    {
+        "type": "feature",
+        "category": "Batch",
+        "description": "Support for Timeout in SubmitJob and RegisterJobDefinition"
+    }
+]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,10 @@
 # Changelog for AWS SDK for JavaScript
-<!--LATEST=2.221.1-->
+<!--LATEST=2.222.1-->
 <!--ENTRYINSERT-->
 
+## 2.222.1
+* feature: Batch: Support for Timeout in SubmitJob and RegisterJobDefinition
+
 ## 2.221.1
 * feature: ACM: AWS Certificate Manager has added support for AWS Certificate Manager Private Certificate Authority (CA). Customers can now request private certificates with the RequestCertificate API, and also export private certificates with the ExportCertificate API.
 * feature: ACMPCA: AWS Certificate Manager (ACM) Private Certificate Authority (CA) is a managed private CA service that helps you easily and securely manage the lifecycle of your private certificates. ACM Private CA provides you a highly-available private CA service without the upfront investment and ongoing maintenance costs of operating your own private CA. ACM Private CA extends ACM's certificate management capabilities to private certificates, enabling you to manage public and private certificates centrally.

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ version.
 To use the SDK in the browser, simply add the following script tag to your
 HTML pages:
 
-    <script src="https://sdk.amazonaws.com/js/aws-sdk-2.221.1.min.js"></script>
+    <script src="https://sdk.amazonaws.com/js/aws-sdk-2.222.1.min.js"></script>
 
 You can also build a custom browser SDK with your specified set of AWS services.
 This can allow you to reduce the SDK's size, specify different API versions of

diff --git a/apis/batch-2016-08-10.min.json b/apis/batch-2016-08-10.min.json
@@ -7,6 +7,7 @@
     "protocol": "rest-json",
     "serviceAbbreviation": "AWS Batch",
     "serviceFullName": "AWS Batch",
+    "serviceId": "Batch",
     "signatureVersion": "v4",
     "uid": "batch-2016-08-10"
   },
@@ -242,6 +243,9 @@
                 },
                 "containerProperties": {
                   "shape": "Sz"
+                },
+                "timeout": {
+                  "shape": "S1a"
                 }
               }
             }
@@ -375,7 +379,7 @@
                   "type": "long"
                 },
                 "dependsOn": {
-                  "shape": "S1o"
+                  "shape": "S1p"
                 },
                 "jobDefinition": {},
                 "parameters": {
@@ -440,6 +444,9 @@
                       "type": "integer"
                     }
                   }
+                },
+                "timeout": {
+                  "shape": "S1a"
                 }
               }
             }
@@ -539,6 +546,9 @@
           },
           "retryStrategy": {
             "shape": "Sy"
+          },
+          "timeout": {
+            "shape": "S1a"
           }
         }
       },
@@ -581,7 +591,7 @@
             }
           },
           "dependsOn": {
-            "shape": "S1o"
+            "shape": "S1p"
           },
           "jobDefinition": {},
           "parameters": {
@@ -606,6 +616,9 @@
           },
           "retryStrategy": {
             "shape": "Sy"
+          },
+          "timeout": {
+            "shape": "S1a"
           }
         }
       },
@@ -884,7 +897,15 @@
         }
       }
     },
-    "S1o": {
+    "S1a": {
+      "type": "structure",
+      "members": {
+        "attemptDurationSeconds": {
+          "type": "integer"
+        }
+      }
+    },
+    "S1p": {
       "type": "list",
       "member": {
         "type": "structure",

diff --git a/apis/batch-2016-08-10.normal.json b/apis/batch-2016-08-10.normal.json
@@ -7,6 +7,7 @@
     "protocol":"rest-json",
     "serviceAbbreviation":"AWS Batch",
     "serviceFullName":"AWS Batch",
+    "serviceId":"Batch",
     "signatureVersion":"v4",
     "uid":"batch-2016-08-10"
   },
@@ -326,11 +327,11 @@
         },
         "startedAt":{
           "shape":"Long",
-          "documentation":"<p>The Unix time stamp for when the attempt was started (when the attempt transitioned from the <code>STARTING</code> state to the <code>RUNNING</code> state).</p>"
+          "documentation":"<p>The Unix time stamp (in seconds and milliseconds) for when the attempt was started (when the attempt transitioned from the <code>STARTING</code> state to the <code>RUNNING</code> state).</p>"
         },
         "stoppedAt":{
           "shape":"Long",
-          "documentation":"<p>The Unix time stamp for when the attempt was stopped (when the attempt transitioned from the <code>RUNNING</code> state to a terminal state, such as <code>SUCCEEDED</code> or <code>FAILED</code>).</p>"
+          "documentation":"<p>The Unix time stamp (in seconds and milliseconds) for when the attempt was stopped (when the attempt transitioned from the <code>RUNNING</code> state to a terminal state, such as <code>SUCCEEDED</code> or <code>FAILED</code>).</p>"
         },
         "statusReason":{
           "shape":"String",
@@ -679,7 +680,7 @@
         },
         "memory":{
           "shape":"Integer",
-          "documentation":"<p>The hard limit (in MiB) of memory to present to the container. If your container attempts to exceed the memory specified here, the container is killed. This parameter maps to <code>Memory</code> in the <a href=\"https://docs.docker.com/engine/reference/api/docker_remote_api_v1.23/#create-a-container\">Create a container</a> section of the <a href=\"https://docs.docker.com/engine/reference/api/docker_remote_api_v1.23/\">Docker Remote API</a> and the <code>--memory</code> option to <a href=\"https://docs.docker.com/engine/reference/run/\">docker run</a>. You must specify at least 4 MiB of memory for a job.</p>"
+          "documentation":"<p>The hard limit (in MiB) of memory to present to the container. If your container attempts to exceed the memory specified here, the container is killed. This parameter maps to <code>Memory</code> in the <a href=\"https://docs.docker.com/engine/reference/api/docker_remote_api_v1.23/#create-a-container\">Create a container</a> section of the <a href=\"https://docs.docker.com/engine/reference/api/docker_remote_api_v1.23/\">Docker Remote API</a> and the <code>--memory</code> option to <a href=\"https://docs.docker.com/engine/reference/run/\">docker run</a>. You must specify at least 4 MiB of memory for a job.</p> <note> <p>If you are trying to maximize your resource utilization by providing your jobs as much memory as possible for a particular instance type, see <a href=\"http://docs.aws.amazon.com/batch/latest/userguide/memory-management.html\">Memory Management</a> in the <i>AWS Batch User Guide</i>.</p> </note>"
         },
         "command":{
           "shape":"StringList",
@@ -1055,6 +1056,10 @@
         "containerProperties":{
           "shape":"ContainerProperties",
           "documentation":"<p>An object with various properties specific to container-based jobs. </p>"
+        },
+        "timeout":{
+          "shape":"JobTimeout",
+          "documentation":"<p>The timeout configuration for jobs that are submitted with this job definition. You can specify a timeout duration after which AWS Batch terminates your jobs if they have not finished.</p>"
         }
       },
       "documentation":"<p>An object representing an AWS Batch job definition.</p>"
@@ -1122,19 +1127,19 @@
         },
         "createdAt":{
           "shape":"Long",
-          "documentation":"<p>The Unix time stamp for when the job was created. For non-array jobs and parent array jobs, this is when the job entered the <code>SUBMITTED</code> state (at the time <a>SubmitJob</a> was called). For array child jobs, this is when the child job was spawned by its parent and entered the <code>PENDING</code> state.</p>"
+          "documentation":"<p>The Unix time stamp (in seconds and milliseconds) for when the job was created. For non-array jobs and parent array jobs, this is when the job entered the <code>SUBMITTED</code> state (at the time <a>SubmitJob</a> was called). For array child jobs, this is when the child job was spawned by its parent and entered the <code>PENDING</code> state.</p>"
         },
         "retryStrategy":{
           "shape":"RetryStrategy",
           "documentation":"<p>The retry strategy to use for this job if an attempt fails.</p>"
         },
         "startedAt":{
           "shape":"Long",
-          "documentation":"<p>The Unix time stamp for when the job was started (when the job transitioned from the <code>STARTING</code> state to the <code>RUNNING</code> state).</p>"
+          "documentation":"<p>The Unix time stamp (in seconds and milliseconds) for when the job was started (when the job transitioned from the <code>STARTING</code> state to the <code>RUNNING</code> state).</p>"
         },
         "stoppedAt":{
           "shape":"Long",
-          "documentation":"<p>The Unix time stamp for when the job was stopped (when the job transitioned from the <code>RUNNING</code> state to a terminal state, such as <code>SUCCEEDED</code> or <code>FAILED</code>).</p>"
+          "documentation":"<p>The Unix time stamp (in seconds and milliseconds) for when the job was stopped (when the job transitioned from the <code>RUNNING</code> state to a terminal state, such as <code>SUCCEEDED</code> or <code>FAILED</code>).</p>"
         },
         "dependsOn":{
           "shape":"JobDependencyList",
@@ -1155,6 +1160,10 @@
         "arrayProperties":{
           "shape":"ArrayPropertiesDetail",
           "documentation":"<p>The array properties of the job, if it is an array job.</p>"
+        },
+        "timeout":{
+          "shape":"JobTimeout",
+          "documentation":"<p>The timeout configuration for the job. </p>"
         }
       },
       "documentation":"<p>An object representing an AWS Batch job.</p>"
@@ -1270,6 +1279,16 @@
       "type":"list",
       "member":{"shape":"JobSummary"}
     },
+    "JobTimeout":{
+      "type":"structure",
+      "members":{
+        "attemptDurationSeconds":{
+          "shape":"Integer",
+          "documentation":"<p>The time duration in seconds (measured from the job attempt's <code>startedAt</code> timestamp) after which AWS Batch terminates your jobs if they have not finished.</p>"
+        }
+      },
+      "documentation":"<p>An object representing a job timeout configuration.</p>"
+    },
     "KeyValuePair":{
       "type":"structure",
       "members":{
@@ -1376,7 +1395,11 @@
         },
         "retryStrategy":{
           "shape":"RetryStrategy",
-          "documentation":"<p>The retry strategy to use for failed jobs that are submitted with this job definition. Any retry strategy that is specified during a <a>SubmitJob</a> operation overrides the retry strategy defined here.</p>"
+          "documentation":"<p>The retry strategy to use for failed jobs that are submitted with this job definition. Any retry strategy that is specified during a <a>SubmitJob</a> operation overrides the retry strategy defined here. If a job is terminated due to a timeout, it is not retried. </p>"
+        },
+        "timeout":{
+          "shape":"JobTimeout",
+          "documentation":"<p>The timeout configuration for jobs that are submitted with this job definition, after which AWS Batch terminates your jobs if they have not finished. If a job is terminated due to a timeout, it is not retried. The minimum value for the timeout is 60 seconds. Any timeout configuration that is specified during a <a>SubmitJob</a> operation overrides the timeout configuration defined here. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonECS/latest/developerguide/job_timeouts.html\">Job Timeouts</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         }
       }
     },
@@ -1466,6 +1489,10 @@
         "retryStrategy":{
           "shape":"RetryStrategy",
           "documentation":"<p>The retry strategy to use for failed jobs from this <a>SubmitJob</a> operation. When a retry strategy is specified here, it overrides the retry strategy defined in the job definition.</p>"
+        },
+        "timeout":{
+          "shape":"JobTimeout",
+          "documentation":"<p>The timeout configuration for this <a>SubmitJob</a> operation. You can specify a timeout duration after which AWS Batch terminates your jobs if they have not finished. If a job is terminated due to a timeout, it is not retried. The minimum value for the timeout is 60 seconds. This configuration overrides any timeout configuration specified in the job definition. For array jobs, child jobs have the same timeout configuration as the parent job. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonECS/latest/developerguide/job_timeouts.html\">Job Timeouts</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p>"
         }
       }
     },

diff --git a/clients/batch.d.ts b/clients/batch.d.ts
@@ -201,11 +201,11 @@ declare namespace Batch {
      */
     container?: AttemptContainerDetail;
     /**
-     * The Unix time stamp for when the attempt was started (when the attempt transitioned from the STARTING state to the RUNNING state).
+     * The Unix time stamp (in seconds and milliseconds) for when the attempt was started (when the attempt transitioned from the STARTING state to the RUNNING state).
      */
     startedAt?: Long;
     /**
-     * The Unix time stamp for when the attempt was stopped (when the attempt transitioned from the RUNNING state to a terminal state, such as SUCCEEDED or FAILED).
+     * The Unix time stamp (in seconds and milliseconds) for when the attempt was stopped (when the attempt transitioned from the RUNNING state to a terminal state, such as SUCCEEDED or FAILED).
      */
     stoppedAt?: Long;
     /**
@@ -447,7 +447,7 @@ declare namespace Batch {
      */
     vcpus: Integer;
     /**
-     * The hard limit (in MiB) of memory to present to the container. If your container attempts to exceed the memory specified here, the container is killed. This parameter maps to Memory in the Create a container section of the Docker Remote API and the --memory option to docker run. You must specify at least 4 MiB of memory for a job.
+     * The hard limit (in MiB) of memory to present to the container. If your container attempts to exceed the memory specified here, the container is killed. This parameter maps to Memory in the Create a container section of the Docker Remote API and the --memory option to docker run. You must specify at least 4 MiB of memory for a job.  If you are trying to maximize your resource utilization by providing your jobs as much memory as possible for a particular instance type, see Memory Management in the AWS Batch User Guide. 
      */
     memory: Integer;
     /**
@@ -716,6 +716,10 @@ declare namespace Batch {
      * An object with various properties specific to container-based jobs. 
      */
     containerProperties?: ContainerProperties;
+    /**
+     * The timeout configuration for jobs that are submitted with this job definition. You can specify a timeout duration after which AWS Batch terminates your jobs if they have not finished.
+     */
+    timeout?: JobTimeout;
   }
   export type JobDefinitionList = JobDefinition[];
   export type JobDefinitionType = "container"|string;
@@ -756,19 +760,19 @@ declare namespace Batch {
      */
     statusReason?: String;
     /**
-     * The Unix time stamp for when the job was created. For non-array jobs and parent array jobs, this is when the job entered the SUBMITTED state (at the time SubmitJob was called). For array child jobs, this is when the child job was spawned by its parent and entered the PENDING state.
+     * The Unix time stamp (in seconds and milliseconds) for when the job was created. For non-array jobs and parent array jobs, this is when the job entered the SUBMITTED state (at the time SubmitJob was called). For array child jobs, this is when the child job was spawned by its parent and entered the PENDING state.
      */
     createdAt?: Long;
     /**
      * The retry strategy to use for this job if an attempt fails.
      */
     retryStrategy?: RetryStrategy;
     /**
-     * The Unix time stamp for when the job was started (when the job transitioned from the STARTING state to the RUNNING state).
+     * The Unix time stamp (in seconds and milliseconds) for when the job was started (when the job transitioned from the STARTING state to the RUNNING state).
      */
     startedAt: Long;
     /**
-     * The Unix time stamp for when the job was stopped (when the job transitioned from the RUNNING state to a terminal state, such as SUCCEEDED or FAILED).
+     * The Unix time stamp (in seconds and milliseconds) for when the job was stopped (when the job transitioned from the RUNNING state to a terminal state, such as SUCCEEDED or FAILED).
      */
     stoppedAt?: Long;
     /**
@@ -791,6 +795,10 @@ declare namespace Batch {
      * The array properties of the job, if it is an array job.
      */
     arrayProperties?: ArrayPropertiesDetail;
+    /**
+     * The timeout configuration for the job. 
+     */
+    timeout?: JobTimeout;
   }
   export type JobDetailList = JobDetail[];
   export interface JobQueueDetail {
@@ -864,6 +872,12 @@ declare namespace Batch {
     arrayProperties?: ArrayPropertiesSummary;
   }
   export type JobSummaryList = JobSummary[];
+  export interface JobTimeout {
+    /**
+     * The time duration in seconds (measured from the job attempt's startedAt timestamp) after which AWS Batch terminates your jobs if they have not finished.
+     */
+    attemptDurationSeconds?: Integer;
+  }
   export interface KeyValuePair {
     /**
      * The name of the key-value pair. For environment variables, this is the name of the environment variable.
@@ -941,9 +955,13 @@ declare namespace Batch {
      */
     containerProperties?: ContainerProperties;
     /**
-     * The retry strategy to use for failed jobs that are submitted with this job definition. Any retry strategy that is specified during a SubmitJob operation overrides the retry strategy defined here.
+     * The retry strategy to use for failed jobs that are submitted with this job definition. Any retry strategy that is specified during a SubmitJob operation overrides the retry strategy defined here. If a job is terminated due to a timeout, it is not retried. 
      */
     retryStrategy?: RetryStrategy;
+    /**
+     * The timeout configuration for jobs that are submitted with this job definition, after which AWS Batch terminates your jobs if they have not finished. If a job is terminated due to a timeout, it is not retried. The minimum value for the timeout is 60 seconds. Any timeout configuration that is specified during a SubmitJob operation overrides the timeout configuration defined here. For more information, see Job Timeouts in the Amazon Elastic Container Service Developer Guide.
+     */
+    timeout?: JobTimeout;
   }
   export interface RegisterJobDefinitionResponse {
     /**
@@ -1000,6 +1018,10 @@ declare namespace Batch {
      * The retry strategy to use for failed jobs from this SubmitJob operation. When a retry strategy is specified here, it overrides the retry strategy defined in the job definition.
      */
     retryStrategy?: RetryStrategy;
+    /**
+     * The timeout configuration for this SubmitJob operation. You can specify a timeout duration after which AWS Batch terminates your jobs if they have not finished. If a job is terminated due to a timeout, it is not retried. The minimum value for the timeout is 60 seconds. This configuration overrides any timeout configuration specified in the job definition. For array jobs, child jobs have the same timeout configuration as the parent job. For more information, see Job Timeouts in the Amazon Elastic Container Service Developer Guide.
+     */
+    timeout?: JobTimeout;
   }
   export interface SubmitJobResponse {
     /**