aws-sdk-core 2.0.0 → 2.11.632

data/apis/elasticmapreduce/2009-03-31/examples-1.json

@@ -0,0 +1,5 @@
+{
+  "version": "1.0",
+  "examples": {
+  }
+}

data/apis/{EMR.paginators.json → elasticmapreduce/2009-03-31/paginators-1.json}

@@ -13,6 +13,11 @@
       "output_token": "Marker",
       "result_key": "Clusters"
     },
+    "ListInstanceFleets": {
+      "input_token": "Marker",
+      "output_token": "Marker",
+      "result_key": "InstanceFleets"
+    },
     "ListInstanceGroups": {
       "input_token": "Marker",
       "output_token": "Marker",
@@ -23,10 +28,20 @@
       "output_token": "Marker",
       "result_key": "Instances"
     },
+    "ListNotebookExecutions": {
+      "input_token": "Marker",
+      "output_token": "Marker",
+      "result_key": "NotebookExecutions"
+    },
+    "ListSecurityConfigurations": {
+      "input_token": "Marker",
+      "output_token": "Marker",
+      "result_key": "SecurityConfigurations"
+    },
     "ListSteps": {
       "input_token": "Marker",
       "output_token": "Marker",
       "result_key": "Steps"
     }
   }
-}
+}

data/apis/elasticmapreduce/2009-03-31/smoke.json

@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "defaultRegion": "us-west-2",
+    "testCases": [
+        {
+            "operationName": "ListClusters",
+            "input": {},
+            "errorExpectedFromService": false
+        },
+        {
+            "operationName": "DescribeCluster",
+            "input": {
+                "ClusterId": "fake_cluster"
+            },
+            "errorExpectedFromService": true
+        }
+    ]
+}

data/apis/elasticmapreduce/2009-03-31/waiters-2.json

@@ -0,0 +1,86 @@
+{
+  "version": 2,
+  "waiters": {
+    "ClusterRunning": {
+      "delay": 30,
+      "operation": "DescribeCluster",
+      "maxAttempts": 60,
+      "acceptors": [
+        {
+          "state": "success",
+          "matcher": "path",
+          "argument": "Cluster.Status.State",
+          "expected": "RUNNING"
+        },
+        {
+          "state": "success",
+          "matcher": "path",
+          "argument": "Cluster.Status.State",
+          "expected": "WAITING"
+        },
+        {
+          "state": "failure",
+          "matcher": "path",
+          "argument": "Cluster.Status.State",
+          "expected": "TERMINATING"
+        },
+        {
+          "state": "failure",
+          "matcher": "path",
+          "argument": "Cluster.Status.State",
+          "expected": "TERMINATED"
+        },
+        {
+          "state": "failure",
+          "matcher": "path",
+          "argument": "Cluster.Status.State",
+          "expected": "TERMINATED_WITH_ERRORS"
+        }
+      ]
+    },
+    "StepComplete": {
+      "delay": 30,
+      "operation": "DescribeStep",
+      "maxAttempts": 60,
+      "acceptors": [
+        {
+          "state": "success",
+          "matcher": "path",
+          "argument": "Step.Status.State",
+          "expected": "COMPLETED"
+        },
+        {
+          "state": "failure",
+          "matcher": "path",
+          "argument": "Step.Status.State",
+          "expected": "FAILED"
+        },
+        {
+          "state": "failure",
+          "matcher": "path",
+          "argument": "Step.Status.State",
+          "expected": "CANCELLED"
+        }
+      ]
+    },
+    "ClusterTerminated": {
+      "delay": 30,
+      "operation": "DescribeCluster",
+      "maxAttempts": 60,
+      "acceptors": [
+        {
+          "state": "success",
+          "matcher": "path",
+          "argument": "Cluster.Status.State",
+          "expected": "TERMINATED"
+        },
+        {
+          "state": "failure",
+          "matcher": "path",
+          "argument": "Cluster.Status.State",
+          "expected": "TERMINATED_WITH_ERRORS"
+        }
+      ]
+    }
+  }
+}

data/apis/{ElasticTranscoder.api.json → elastictranscoder/2012-09-25/api-2.json}

@@ -1,10 +1,13 @@
 {
+  "version":"2.0",
   "metadata":{
     "apiVersion":"2012-09-25",
     "endpointPrefix":"elastictranscoder",
+    "protocol":"rest-json",
     "serviceFullName":"Amazon Elastic Transcoder",
+    "serviceId":"Elastic Transcoder",
     "signatureVersion":"v4",
-    "protocol":"rest-json"
+    "uid":"elastictranscoder-2012-09-25"
   },
   "operations":{
     "CancelJob":{
@@ -17,36 +20,12 @@
       "input":{"shape":"CancelJobRequest"},
       "output":{"shape":"CancelJobResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"ResourceInUseException",
-          "error":{"httpStatusCode":409},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "CreateJob":{
@@ -59,36 +38,12 @@
       "input":{"shape":"CreateJobRequest"},
       "output":{"shape":"CreateJobResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{"httpStatusCode":429},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "CreatePipeline":{
@@ -101,36 +56,12 @@
       "input":{"shape":"CreatePipelineRequest"},
       "output":{"shape":"CreatePipelineResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{"httpStatusCode":429},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "CreatePreset":{
@@ -143,31 +74,11 @@
       "input":{"shape":"CreatePresetRequest"},
       "output":{"shape":"CreatePresetResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"LimitExceededException",
-          "error":{"httpStatusCode":429},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "DeletePipeline":{
@@ -180,36 +91,12 @@
       "input":{"shape":"DeletePipelineRequest"},
       "output":{"shape":"DeletePipelineResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"ResourceInUseException",
-          "error":{"httpStatusCode":409},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "DeletePreset":{
@@ -222,31 +109,11 @@
       "input":{"shape":"DeletePresetRequest"},
       "output":{"shape":"DeletePresetResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "ListJobsByPipeline":{
@@ -258,31 +125,11 @@
       "input":{"shape":"ListJobsByPipelineRequest"},
       "output":{"shape":"ListJobsByPipelineResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "ListJobsByStatus":{
@@ -294,31 +141,11 @@
       "input":{"shape":"ListJobsByStatusRequest"},
       "output":{"shape":"ListJobsByStatusResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "ListPipelines":{
@@ -330,26 +157,10 @@
       "input":{"shape":"ListPipelinesRequest"},
       "output":{"shape":"ListPipelinesResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "ListPresets":{
@@ -361,26 +172,10 @@
       "input":{"shape":"ListPresetsRequest"},
       "output":{"shape":"ListPresetsResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "ReadJob":{
@@ -392,31 +187,11 @@
       "input":{"shape":"ReadJobRequest"},
       "output":{"shape":"ReadJobResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "ReadPipeline":{
@@ -428,31 +203,11 @@
       "input":{"shape":"ReadPipelineRequest"},
       "output":{"shape":"ReadPipelineResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "ReadPreset":{
@@ -464,31 +219,11 @@
       "input":{"shape":"ReadPresetRequest"},
       "output":{"shape":"ReadPresetResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "TestRole":{
@@ -501,32 +236,13 @@
       "input":{"shape":"TestRoleRequest"},
       "output":{"shape":"TestRoleResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
-      ]
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "deprecated":true
     },
     "UpdatePipeline":{
       "name":"UpdatePipeline",
@@ -538,36 +254,12 @@
       "input":{"shape":"UpdatePipelineRequest"},
       "output":{"shape":"UpdatePipelineResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"ResourceInUseException",
-          "error":{"httpStatusCode":409},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "UpdatePipelineNotifications":{
@@ -579,36 +271,12 @@
       "input":{"shape":"UpdatePipelineNotificationsRequest"},
       "output":{"shape":"UpdatePipelineNotificationsResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"ResourceInUseException",
-          "error":{"httpStatusCode":409},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     },
     "UpdatePipelineStatus":{
@@ -620,36 +288,12 @@
       "input":{"shape":"UpdatePipelineStatusRequest"},
       "output":{"shape":"UpdatePipelineStatusResponse"},
       "errors":[
-        {
-          "shape":"ValidationException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"IncompatibleVersionException",
-          "error":{"httpStatusCode":400},
-          "exception":true
-        },
-        {
-          "shape":"ResourceNotFoundException",
-          "error":{"httpStatusCode":404},
-          "exception":true
-        },
-        {
-          "shape":"ResourceInUseException",
-          "error":{"httpStatusCode":409},
-          "exception":true
-        },
-        {
-          "shape":"AccessDeniedException",
-          "error":{"httpStatusCode":403},
-          "exception":true
-        },
-        {
-          "shape":"InternalServiceException",
-          "exception":true,
-          "fault":true
-        }
+        {"shape":"ValidationException"},
+        {"shape":"IncompatibleVersionException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServiceException"}
       ]
     }
   },
@@ -678,7 +322,8 @@
         "MaxHeight":{"shape":"DigitsOrAuto"},
         "SizingPolicy":{"shape":"SizingPolicy"},
         "PaddingPolicy":{"shape":"PaddingPolicy"},
-        "AlbumArtFormat":{"shape":"JpgOrPng"}
+        "AlbumArtFormat":{"shape":"JpgOrPng"},
+        "Encryption":{"shape":"Encryption"}
       }
     },
     "Artworks":{
@@ -693,6 +338,14 @@
       "type":"string",
       "pattern":"(^auto$)|(^1:1$)|(^4:3$)|(^3:2$)|(^16:9$)"
     },
+    "AudioBitDepth":{
+      "type":"string",
+      "pattern":"(^8$)|(^16$)|(^24$)|(^32$)"
+    },
+    "AudioBitOrder":{
+      "type":"string",
+      "pattern":"(^LittleEndian$)"
+    },
     "AudioBitRate":{
       "type":"string",
       "pattern":"^\\d{1,3}$"
@@ -703,18 +356,25 @@
     },
     "AudioCodec":{
       "type":"string",
-      "pattern":"(^AAC$)|(^vorbis$)|(^mp3$)"
+      "pattern":"(^AAC$)|(^vorbis$)|(^mp3$)|(^mp2$)|(^pcm$)|(^flac$)"
     },
     "AudioCodecOptions":{
       "type":"structure",
       "members":{
-        "Profile":{"shape":"AudioCodecProfile"}
+        "Profile":{"shape":"AudioCodecProfile"},
+        "BitDepth":{"shape":"AudioBitDepth"},
+        "BitOrder":{"shape":"AudioBitOrder"},
+        "Signed":{"shape":"AudioSigned"}
       }
     },
     "AudioCodecProfile":{
       "type":"string",
       "pattern":"(^auto$)|(^AAC-LC$)|(^HE-AAC$)|(^HE-AACv2$)"
     },
+    "AudioPackingMode":{
+      "type":"string",
+      "pattern":"(^SingleTrack$)|(^OneChannelPerTrack$)|(^OneChannelPerTrackWithMosTo8Tracks$)"
+    },
     "AudioParameters":{
       "type":"structure",
       "members":{
@@ -722,12 +382,21 @@
         "SampleRate":{"shape":"AudioSampleRate"},
         "BitRate":{"shape":"AudioBitRate"},
         "Channels":{"shape":"AudioChannels"},
+        "AudioPackingMode":{"shape":"AudioPackingMode"},
         "CodecOptions":{"shape":"AudioCodecOptions"}
       }
     },
     "AudioSampleRate":{
       "type":"string",
-      "pattern":"(^auto$)|(^22050$)|(^32000$)|(^44100$)|(^48000$)|(^96000$)"
+      "pattern":"(^auto$)|(^22050$)|(^32000$)|(^44100$)|(^48000$)|(^96000$)|(^192000$)"
+    },
+    "AudioSigned":{
+      "type":"string",
+      "pattern":"(^Unsigned$)|(^Signed$)"
+    },
+    "Base64EncodedString":{
+      "type":"string",
+      "pattern":"^$|(^(?:[A-Za-z0-9\\+/]{4})*(?:[A-Za-z0-9\\+/]{2}==|[A-Za-z0-9\\+/]{3}=)?$)"
     },
     "BucketName":{
       "type":"string",
@@ -753,12 +422,13 @@
       "type":"structure",
       "members":{
         "Format":{"shape":"CaptionFormatFormat"},
-        "Pattern":{"shape":"CaptionFormatPattern"}
+        "Pattern":{"shape":"CaptionFormatPattern"},
+        "Encryption":{"shape":"Encryption"}
       }
     },
     "CaptionFormatFormat":{
       "type":"string",
-      "pattern":"(^mov-text$)|(^cea-608$)|(^cea-708$)|(^srt$)|(^scc$)|(^webvtt$)|(^dfxp$)"
+      "pattern":"(^mov-text$)|(^srt$)|(^scc$)|(^webvtt$)|(^dfxp$)|(^cea-708$)"
     },
     "CaptionFormatPattern":{
       "type":"string",
@@ -776,10 +446,11 @@
     "CaptionSource":{
       "type":"structure",
       "members":{
-        "Key":{"shape":"Key"},
+        "Key":{"shape":"LongKey"},
         "Language":{"shape":"Key"},
         "TimeOffset":{"shape":"TimeOffset"},
-        "Label":{"shape":"Name"}
+        "Label":{"shape":"Name"},
+        "Encryption":{"shape":"Encryption"}
       }
     },
     "CaptionSources":{
@@ -790,8 +461,14 @@
     "Captions":{
       "type":"structure",
       "members":{
-        "MergePolicy":{"shape":"CaptionMergePolicy"},
-        "CaptionSources":{"shape":"CaptionSources"},
+        "MergePolicy":{
+          "shape":"CaptionMergePolicy",
+          "deprecated":true
+        },
+        "CaptionSources":{
+          "shape":"CaptionSources",
+          "deprecated":true
+        },
         "CaptionFormats":{"shape":"CaptionFormats"}
       }
     },
@@ -799,12 +476,13 @@
       "type":"structure",
       "members":{
         "TimeSpan":{"shape":"TimeSpan"}
-      }
+      },
+      "deprecated":true
     },
     "CodecOption":{
       "type":"string",
-      "min":1,
-      "max":255
+      "max":255,
+      "min":1
     },
     "CodecOptions":{
       "type":"map",
@@ -814,20 +492,26 @@
     },
     "Composition":{
       "type":"list",
-      "member":{"shape":"Clip"}
+      "member":{"shape":"Clip"},
+      "deprecated":true
     },
     "CreateJobOutput":{
       "type":"structure",
       "members":{
         "Key":{"shape":"Key"},
         "ThumbnailPattern":{"shape":"ThumbnailPattern"},
+        "ThumbnailEncryption":{"shape":"Encryption"},
         "Rotate":{"shape":"Rotate"},
         "PresetId":{"shape":"Id"},
-        "SegmentDuration":{"shape":"Float"},
+        "SegmentDuration":{"shape":"FloatString"},
         "Watermarks":{"shape":"JobWatermarks"},
         "AlbumArt":{"shape":"JobAlbumArt"},
-        "Composition":{"shape":"Composition"},
-        "Captions":{"shape":"Captions"}
+        "Composition":{
+          "shape":"Composition",
+          "deprecated":true
+        },
+        "Captions":{"shape":"Captions"},
+        "Encryption":{"shape":"Encryption"}
       }
     },
     "CreateJobOutputs":{
@@ -840,7 +524,9 @@
       "members":{
         "Name":{"shape":"Filename"},
         "Format":{"shape":"PlaylistFormat"},
-        "OutputKeys":{"shape":"OutputKeys"}
+        "OutputKeys":{"shape":"OutputKeys"},
+        "HlsContentProtection":{"shape":"HlsContentProtection"},
+        "PlayReadyDrm":{"shape":"PlayReadyDrm"}
       }
     },
     "CreateJobPlaylists":{
@@ -850,17 +536,16 @@
     },
     "CreateJobRequest":{
       "type":"structure",
-      "required":[
-        "PipelineId",
-        "Input"
-      ],
+      "required":["PipelineId"],
       "members":{
         "PipelineId":{"shape":"Id"},
         "Input":{"shape":"JobInput"},
+        "Inputs":{"shape":"JobInputs"},
         "Output":{"shape":"CreateJobOutput"},
         "Outputs":{"shape":"CreateJobOutputs"},
         "OutputKeyPrefix":{"shape":"Key"},
-        "Playlists":{"shape":"CreateJobPlaylists"}
+        "Playlists":{"shape":"CreateJobPlaylists"},
+        "UserMetadata":{"shape":"UserMetadata"}
       }
     },
     "CreateJobResponse":{
@@ -881,6 +566,7 @@
         "InputBucket":{"shape":"BucketName"},
         "OutputBucket":{"shape":"BucketName"},
         "Role":{"shape":"Role"},
+        "AwsKmsKeyArn":{"shape":"KeyArn"},
         "Notifications":{"shape":"Notifications"},
         "ContentConfig":{"shape":"PipelineOutputConfig"},
         "ThumbnailConfig":{"shape":"PipelineOutputConfig"}
@@ -889,7 +575,8 @@
     "CreatePipelineResponse":{
       "type":"structure",
       "members":{
-        "Pipeline":{"shape":"Pipeline"}
+        "Pipeline":{"shape":"Pipeline"},
+        "Warnings":{"shape":"Warnings"}
       }
     },
     "CreatePresetRequest":{
@@ -948,8 +635,18 @@
     },
     "Description":{
       "type":"string",
-      "min":0,
-      "max":255
+      "max":255,
+      "min":0
+    },
+    "DetectedProperties":{
+      "type":"structure",
+      "members":{
+        "Width":{"shape":"NullableInteger"},
+        "Height":{"shape":"NullableInteger"},
+        "FrameRate":{"shape":"FloatString"},
+        "FileSize":{"shape":"NullableLong"},
+        "DurationMillis":{"shape":"NullableLong"}
+      }
     },
     "Digits":{
       "type":"string",
@@ -959,20 +656,33 @@
       "type":"string",
       "pattern":"(^auto$)|(^\\d{2,4}$)"
     },
+    "Encryption":{
+      "type":"structure",
+      "members":{
+        "Mode":{"shape":"EncryptionMode"},
+        "Key":{"shape":"Base64EncodedString"},
+        "KeyMd5":{"shape":"Base64EncodedString"},
+        "InitializationVector":{"shape":"ZeroTo255String"}
+      }
+    },
+    "EncryptionMode":{
+      "type":"string",
+      "pattern":"(^s3$)|(^s3-aws-kms$)|(^aes-cbc-pkcs7$)|(^aes-ctr$)|(^aes-gcm$)"
+    },
     "ExceptionMessages":{
       "type":"list",
       "member":{"shape":"String"}
     },
     "Filename":{
       "type":"string",
-      "min":1,
-      "max":255
+      "max":255,
+      "min":1
     },
     "FixedGOP":{
       "type":"string",
       "pattern":"(^true$)|(^false$)"
     },
-    "Float":{
+    "FloatString":{
       "type":"string",
       "pattern":"^\\d{1,5}(\\.\\d{0,5})?$"
     },
@@ -982,13 +692,28 @@
     },
     "Grantee":{
       "type":"string",
-      "min":1,
-      "max":255
+      "max":255,
+      "min":1
     },
     "GranteeType":{
       "type":"string",
       "pattern":"(^Canonical$)|(^Email$)|(^Group$)"
     },
+    "HlsContentProtection":{
+      "type":"structure",
+      "members":{
+        "Method":{"shape":"HlsContentProtectionMethod"},
+        "Key":{"shape":"Base64EncodedString"},
+        "KeyMd5":{"shape":"Base64EncodedString"},
+        "InitializationVector":{"shape":"ZeroTo255String"},
+        "LicenseAcquisitionUrl":{"shape":"ZeroTo512String"},
+        "KeyStoragePolicy":{"shape":"KeyStoragePolicy"}
+      }
+    },
+    "HlsContentProtectionMethod":{
+      "type":"string",
+      "pattern":"(^aes-128$)"
+    },
     "HorizontalAlign":{
       "type":"string",
       "pattern":"(^Left$)|(^Right$)|(^Center$)"
@@ -1004,6 +729,13 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "InputCaptions":{
+      "type":"structure",
+      "members":{
+        "MergePolicy":{"shape":"CaptionMergePolicy"},
+        "CaptionSources":{"shape":"CaptionSources"}
+      }
+    },
     "Interlaced":{
       "type":"string",
       "pattern":"(^auto$)|(^true$)|(^false$)"
@@ -1022,11 +754,14 @@
         "Arn":{"shape":"String"},
         "PipelineId":{"shape":"Id"},
         "Input":{"shape":"JobInput"},
+        "Inputs":{"shape":"JobInputs"},
         "Output":{"shape":"JobOutput"},
         "Outputs":{"shape":"JobOutputs"},
         "OutputKeyPrefix":{"shape":"Key"},
         "Playlists":{"shape":"Playlists"},
-        "Status":{"shape":"JobStatus"}
+        "Status":{"shape":"JobStatus"},
+        "UserMetadata":{"shape":"UserMetadata"},
+        "Timing":{"shape":"Timing"}
       }
     },
     "JobAlbumArt":{
@@ -1043,32 +778,50 @@
     "JobInput":{
       "type":"structure",
       "members":{
-        "Key":{"shape":"Key"},
+        "Key":{"shape":"LongKey"},
         "FrameRate":{"shape":"FrameRate"},
         "Resolution":{"shape":"Resolution"},
         "AspectRatio":{"shape":"AspectRatio"},
         "Interlaced":{"shape":"Interlaced"},
-        "Container":{"shape":"JobContainer"}
+        "Container":{"shape":"JobContainer"},
+        "Encryption":{"shape":"Encryption"},
+        "TimeSpan":{"shape":"TimeSpan"},
+        "InputCaptions":{"shape":"InputCaptions"},
+        "DetectedProperties":{"shape":"DetectedProperties"}
       }
     },
+    "JobInputs":{
+      "type":"list",
+      "member":{"shape":"JobInput"},
+      "max":200
+    },
     "JobOutput":{
       "type":"structure",
       "members":{
         "Id":{"shape":"String"},
         "Key":{"shape":"Key"},
         "ThumbnailPattern":{"shape":"ThumbnailPattern"},
+        "ThumbnailEncryption":{"shape":"Encryption"},
         "Rotate":{"shape":"Rotate"},
         "PresetId":{"shape":"Id"},
-        "SegmentDuration":{"shape":"Float"},
+        "SegmentDuration":{"shape":"FloatString"},
         "Status":{"shape":"JobStatus"},
         "StatusDetail":{"shape":"Description"},
         "Duration":{"shape":"NullableLong"},
         "Width":{"shape":"NullableInteger"},
         "Height":{"shape":"NullableInteger"},
+        "FrameRate":{"shape":"FloatString"},
+        "FileSize":{"shape":"NullableLong"},
+        "DurationMillis":{"shape":"NullableLong"},
         "Watermarks":{"shape":"JobWatermarks"},
         "AlbumArt":{"shape":"JobAlbumArt"},
-        "Composition":{"shape":"Composition"},
-        "Captions":{"shape":"Captions"}
+        "Composition":{
+          "shape":"Composition",
+          "deprecated":true
+        },
+        "Captions":{"shape":"Captions"},
+        "Encryption":{"shape":"Encryption"},
+        "AppliedColorSpaceConversion":{"shape":"String"}
       }
     },
     "JobOutputs":{
@@ -1083,7 +836,8 @@
       "type":"structure",
       "members":{
         "PresetWatermarkId":{"shape":"PresetWatermarkId"},
-        "InputKey":{"shape":"WatermarkKey"}
+        "InputKey":{"shape":"WatermarkKey"},
+        "Encryption":{"shape":"Encryption"}
       }
     },
     "JobWatermarks":{
@@ -1100,8 +854,21 @@
     },
     "Key":{
       "type":"string",
-      "min":1,
-      "max":255
+      "max":255,
+      "min":1
+    },
+    "KeyArn":{
+      "type":"string",
+      "max":255,
+      "min":0
+    },
+    "KeyIdGuid":{
+      "type":"string",
+      "pattern":"(^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$)|(^[0-9A-Fa-f]{32}$)"
+    },
+    "KeyStoragePolicy":{
+      "type":"string",
+      "pattern":"(^NoStore$)|(^WithVariantPlaylists$)"
     },
     "KeyframesMaxDist":{
       "type":"string",
@@ -1214,6 +981,11 @@
         "NextPageToken":{"shape":"Id"}
       }
     },
+    "LongKey":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
     "MaxFrameRate":{
       "type":"string",
       "pattern":"(^10$)|(^15$)|(^23.97$)|(^24$)|(^25$)|(^29.97$)|(^30$)|(^50$)|(^60$)"
@@ -1224,8 +996,12 @@
     },
     "Name":{
       "type":"string",
-      "min":1,
-      "max":40
+      "max":40,
+      "min":1
+    },
+    "NonEmptyBase64EncodedString":{
+      "type":"string",
+      "pattern":"(^(?:[A-Za-z0-9\\+/]{4})*(?:[A-Za-z0-9\\+/]{2}==|[A-Za-z0-9\\+/]{3}=)?$)"
     },
     "Notifications":{
       "type":"structure",
@@ -1238,6 +1014,11 @@
     },
     "NullableInteger":{"type":"integer"},
     "NullableLong":{"type":"long"},
+    "OneTo512String":{
+      "type":"string",
+      "max":512,
+      "min":1
+    },
     "Opacity":{
       "type":"string",
       "pattern":"^\\d{1,3}(\\.\\d{0,20})?$"
@@ -1274,6 +1055,7 @@
         "InputBucket":{"shape":"BucketName"},
         "OutputBucket":{"shape":"BucketName"},
         "Role":{"shape":"Role"},
+        "AwsKmsKeyArn":{"shape":"KeyArn"},
         "Notifications":{"shape":"Notifications"},
         "ContentConfig":{"shape":"PipelineOutputConfig"},
         "ThumbnailConfig":{"shape":"PipelineOutputConfig"}
@@ -1299,19 +1081,36 @@
       "type":"string",
       "pattern":"(^\\d{1,3}(\\.\\d{0,5})?%$)|(^\\d{1,4}?px$)"
     },
+    "PlayReadyDrm":{
+      "type":"structure",
+      "members":{
+        "Format":{"shape":"PlayReadyDrmFormatString"},
+        "Key":{"shape":"NonEmptyBase64EncodedString"},
+        "KeyMd5":{"shape":"NonEmptyBase64EncodedString"},
+        "KeyId":{"shape":"KeyIdGuid"},
+        "InitializationVector":{"shape":"ZeroTo255String"},
+        "LicenseAcquisitionUrl":{"shape":"OneTo512String"}
+      }
+    },
+    "PlayReadyDrmFormatString":{
+      "type":"string",
+      "pattern":"(^microsoft$)|(^discretix-3.0$)"
+    },
     "Playlist":{
       "type":"structure",
       "members":{
         "Name":{"shape":"Filename"},
         "Format":{"shape":"PlaylistFormat"},
         "OutputKeys":{"shape":"OutputKeys"},
+        "HlsContentProtection":{"shape":"HlsContentProtection"},
+        "PlayReadyDrm":{"shape":"PlayReadyDrm"},
         "Status":{"shape":"JobStatus"},
         "StatusDetail":{"shape":"Description"}
       }
     },
     "PlaylistFormat":{
       "type":"string",
-      "pattern":"(^HLSv3$)"
+      "pattern":"(^HLSv3$)|(^HLSv4$)|(^Smooth$)|(^MPEG-DASH$)"
     },
     "Playlists":{
       "type":"list",
@@ -1333,7 +1132,7 @@
     },
     "PresetContainer":{
       "type":"string",
-      "pattern":"(^mp4$)|(^ts$)|(^webm$)|(^mp3$)|(^ogg$)"
+      "pattern":"(^mp4$)|(^ts$)|(^webm$)|(^mp3$)|(^flac$)|(^oga$)|(^ogg$)|(^fmp4$)|(^mpg$)|(^flv$)|(^gif$)|(^mxf$)|(^wav$)|(^mp2$)"
     },
     "PresetType":{
       "type":"string",
@@ -1356,8 +1155,8 @@
     },
     "PresetWatermarkId":{
       "type":"string",
-      "min":1,
-      "max":40
+      "max":40,
+      "min":1
     },
     "PresetWatermarks":{
       "type":"list",
@@ -1398,7 +1197,8 @@
     "ReadPipelineResponse":{
       "type":"structure",
       "members":{
-        "Pipeline":{"shape":"Pipeline"}
+        "Pipeline":{"shape":"Pipeline"},
+        "Warnings":{"shape":"Warnings"}
       }
     },
     "ReadPresetRequest":{
@@ -1483,14 +1283,16 @@
         "InputBucket":{"shape":"BucketName"},
         "OutputBucket":{"shape":"BucketName"},
         "Topics":{"shape":"SnsTopics"}
-      }
+      },
+      "deprecated":true
     },
     "TestRoleResponse":{
       "type":"structure",
       "members":{
         "Success":{"shape":"Success"},
         "Messages":{"shape":"ExceptionMessages"}
-      }
+      },
+      "deprecated":true
     },
     "ThumbnailPattern":{
       "type":"string",
@@ -1528,6 +1330,14 @@
         "Duration":{"shape":"Time"}
       }
     },
+    "Timing":{
+      "type":"structure",
+      "members":{
+        "SubmitTimeMillis":{"shape":"NullableLong"},
+        "StartTimeMillis":{"shape":"NullableLong"},
+        "FinishTimeMillis":{"shape":"NullableLong"}
+      }
+    },
     "UpdatePipelineNotificationsRequest":{
       "type":"structure",
       "required":[
@@ -1561,6 +1371,7 @@
         "Name":{"shape":"Name"},
         "InputBucket":{"shape":"BucketName"},
         "Role":{"shape":"Role"},
+        "AwsKmsKeyArn":{"shape":"KeyArn"},
         "Notifications":{"shape":"Notifications"},
         "ContentConfig":{"shape":"PipelineOutputConfig"},
         "ThumbnailConfig":{"shape":"PipelineOutputConfig"}
@@ -1568,9 +1379,9 @@
     },
     "UpdatePipelineResponse":{
       "type":"structure",
-      "required":["Pipeline"],
       "members":{
-        "Pipeline":{"shape":"Pipeline"}
+        "Pipeline":{"shape":"Pipeline"},
+        "Warnings":{"shape":"Warnings"}
       }
     },
     "UpdatePipelineStatusRequest":{
@@ -1594,6 +1405,11 @@
         "Pipeline":{"shape":"Pipeline"}
       }
     },
+    "UserMetadata":{
+      "type":"map",
+      "key":{"shape":"String"},
+      "value":{"shape":"String"}
+    },
     "ValidationException":{
       "type":"structure",
       "members":{
@@ -1611,7 +1427,7 @@
     },
     "VideoCodec":{
       "type":"string",
-      "pattern":"(^H\\.264$)|(^vp8$)"
+      "pattern":"(^H\\.264$)|(^vp8$)|(^vp9$)|(^mpeg2$)|(^gif$)"
     },
     "VideoParameters":{
       "type":"structure",
@@ -1633,15 +1449,36 @@
         "Watermarks":{"shape":"PresetWatermarks"}
       }
     },
+    "Warning":{
+      "type":"structure",
+      "members":{
+        "Code":{"shape":"String"},
+        "Message":{"shape":"String"}
+      }
+    },
+    "Warnings":{
+      "type":"list",
+      "member":{"shape":"Warning"}
+    },
     "WatermarkKey":{
       "type":"string",
+      "max":1024,
       "min":1,
-      "max":255,
-      "pattern":"(^.{1,}.jpg$)|(^.{1,}.jpeg$)|(^.{1,}.png$)"
+      "pattern":"(^.{1,1020}.jpg$)|(^.{1,1019}.jpeg$)|(^.{1,1020}.png$)"
     },
     "WatermarkSizingPolicy":{
       "type":"string",
       "pattern":"(^Fit$)|(^Stretch$)|(^ShrinkToFit$)"
+    },
+    "ZeroTo255String":{
+      "type":"string",
+      "max":255,
+      "min":0
+    },
+    "ZeroTo512String":{
+      "type":"string",
+      "max":512,
+      "min":0
     }
   }
 }