aws-sdk-core 2.0.30 → 2.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e5565de9fac343a1538ad3024b3eb832421a10d
-  data.tar.gz: f87ebae71daab5281f05bc9c15f3258a48c14195
+  metadata.gz: 2527f5d46e4a0136c5c0f3bfe9559b007bef4305
+  data.tar.gz: 8abce5aaf9b9848e3bbe2eaf49be9be10b4fb526
 SHA512:
-  metadata.gz: 39345041cb751c51f6c1237ae2221be82f758de23e5b5c6c2292caa843f0d306a2cbbf35f48564f521002896751f00cfdc6502229fffe607890069864d4a8b5c
-  data.tar.gz: 54b5a6ec5786fc9202eb1b46c145fffdd5cc81913d6e66ef77f464ba9a2daf7dcbaf99613bf5aa55712bb5d7a21fe6a7a1e71d2f54e24462518d78e6004c31d1
+  metadata.gz: 1aa1557d3265161f88854ea6d540758e1c7051f07d50555fd2c1c8caf3d75bd2d426ae2e70c0b1c45768e681bf291643d014531352dfbd1ce30ec8cc99e02f2f
+  data.tar.gz: 195b56cc858a097688b8a81158c1304e45c44151281a693d994b1be21ec374dd450036c984ebd3faffba6b7297ed2b6cbcf6a050e5d9e627b7716a8da6f9f064

data/apis/EC2.resources.json

@@ -65,7 +65,7 @@
         "resource": {
           "type": "PlacementGroup",
           "identifiers": [
-            { "target": "Id", "source": "requestParameter", "path": "GroupName" }
+            { "target": "Name", "source": "requestParameter", "path": "GroupName" }
           ]
         }
       },
@@ -1298,6 +1298,14 @@
               { "target": "Value", "source": "requestParameter", "path": "Tags[].Value" }
             ]
           }
+        },
+        "Delete": {
+          "request": {
+            "operation": "DeleteRouteTable",
+            "params": [
+              { "target": "RouteTableId", "source": "identifier", "name": "Id" }
+            ]
+          }
         }
       },
       "has": {

data/apis/ElasticTranscoder.api.json

@@ -705,7 +705,7 @@
     },
     "AudioCodec":{
       "type":"string",
-      "pattern":"(^AAC$)|(^vorbis$)|(^mp3$)"
+      "pattern":"(^AAC$)|(^vorbis$)|(^mp3$)|(^mp2$)"
     },
     "AudioCodecOptions":{
       "type":"structure",
@@ -1114,7 +1114,8 @@
         "AlbumArt":{"shape":"JobAlbumArt"},
         "Composition":{"shape":"Composition"},
         "Captions":{"shape":"Captions"},
-        "Encryption":{"shape":"Encryption"}
+        "Encryption":{"shape":"Encryption"},
+        "AppliedColorSpaceConversion":{"shape":"String"}
       }
     },
     "JobOutputs":{
@@ -1391,7 +1392,7 @@
     },
     "PresetContainer":{
       "type":"string",
-      "pattern":"(^mp4$)|(^ts$)|(^webm$)|(^mp3$)|(^ogg$)|(^fmp4$)"
+      "pattern":"(^mp4$)|(^ts$)|(^webm$)|(^mp3$)|(^ogg$)|(^fmp4$)|(^mpg$)|(^flv$)|(^gif$)"
     },
     "PresetType":{
       "type":"string",
@@ -1676,7 +1677,7 @@
     },
     "VideoCodec":{
       "type":"string",
-      "pattern":"(^H\\.264$)|(^vp8$)"
+      "pattern":"(^H\\.264$)|(^vp8$)|(^mpeg2$)|(^gif$)"
     },
     "VideoParameters":{
       "type":"structure",

data/apis/S3.api.json

@@ -1,4 +1,5 @@
 {
+  "version":"2.0",
   "metadata":{
     "apiVersion":"2006-03-01",
     "checksumFormat":"md5",
@@ -17,6 +18,7 @@
         "requestUri":"/{Bucket}/{Key+}"
       },
       "input":{"shape":"AbortMultipartUploadRequest"},
+      "output":{"shape":"AbortMultipartUploadOutput"},
       "errors":[
         {
           "shape":"NoSuchUpload",
@@ -503,6 +505,7 @@
         "requestUri":"/{Bucket}/{Key+}?acl"
       },
       "input":{"shape":"PutObjectAclRequest"},
+      "output":{"shape":"PutObjectAclOutput"},
       "errors":[
         {
           "shape":"NoSuchKey",
@@ -518,6 +521,7 @@
         "requestUri":"/{Bucket}/{Key+}?restore"
       },
       "input":{"shape":"RestoreObjectRequest"},
+      "output":{"shape":"RestoreObjectOutput"},
       "errors":[
         {
           "shape":"ObjectAlreadyInActiveTierError",
@@ -549,6 +553,16 @@
     }
   },
   "shapes":{
+    "AbortMultipartUploadOutput":{
+      "type":"structure",
+      "members":{
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
+        }
+      }
+    },
     "AbortMultipartUploadRequest":{
       "type":"structure",
       "required":[
@@ -571,6 +585,11 @@
           "shape":"MultipartUploadId",
           "location":"querystring",
           "locationName":"uploadId"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       }
     },
@@ -764,6 +783,11 @@
           "shape":"SSEKMSKeyId",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
+        },
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
         }
       }
     },
@@ -794,6 +818,11 @@
           "shape":"MultipartUploadId",
           "location":"querystring",
           "locationName":"uploadId"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       },
       "payload":"MultipartUpload"
@@ -865,6 +894,11 @@
           "shape":"SSEKMSKeyId",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
+        },
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
         }
       },
       "payload":"CopyObjectResult"
@@ -1026,6 +1060,11 @@
           "shape":"CopySourceSSECustomerKeyMD5",
           "location":"header",
           "locationName":"x-amz-copy-source-server-side-encryption-customer-key-MD5"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       }
     },
@@ -1150,6 +1189,11 @@
           "shape":"SSEKMSKeyId",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
+        },
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
         }
       }
     },
@@ -1264,6 +1308,11 @@
           "shape":"SSEKMSKeyId",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       }
     },
@@ -1379,6 +1428,11 @@
           "shape":"ObjectVersionId",
           "location":"header",
           "locationName":"x-amz-version-id"
+        },
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
         }
       }
     },
@@ -1408,6 +1462,11 @@
           "shape":"ObjectVersionId",
           "location":"querystring",
           "locationName":"versionId"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       }
     },
@@ -1415,6 +1474,11 @@
       "type":"structure",
       "members":{
         "Deleted":{"shape":"DeletedObjects"},
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
+        },
         "Errors":{
           "shape":"Errors",
           "locationName":"Error"
@@ -1442,6 +1506,11 @@
           "shape":"MFA",
           "location":"header",
           "locationName":"x-amz-mfa"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       },
       "payload":"Delete"
@@ -1504,7 +1573,7 @@
       "member":{"shape":"Event"},
       "flattened":true
     },
-    "Expiration":{"type":"timestamp"},
+    "Expiration":{"type":"string"},
     "ExpirationStatus":{
       "type":"string",
       "enum":[
@@ -1734,6 +1803,11 @@
         "Grants":{
           "shape":"Grants",
           "locationName":"AccessControlList"
+        },
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
         }
       }
     },
@@ -1758,6 +1832,11 @@
           "shape":"ObjectVersionId",
           "location":"querystring",
           "locationName":"versionId"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       }
     },
@@ -1872,6 +1951,11 @@
           "shape":"SSEKMSKeyId",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
+        },
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
         }
       },
       "payload":"Body"
@@ -1967,6 +2051,11 @@
           "shape":"SSECustomerKeyMD5",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       }
     },
@@ -1976,6 +2065,11 @@
         "Body":{
           "shape":"Body",
           "streaming":true
+        },
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
         }
       },
       "payload":"Body"
@@ -1996,6 +2090,11 @@
           "shape":"ObjectKey",
           "location":"uri",
           "locationName":"Key"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       }
     },
@@ -2155,6 +2254,11 @@
           "shape":"SSEKMSKeyId",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
+        },
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
         }
       }
     },
@@ -2219,6 +2323,11 @@
           "shape":"SSECustomerKeyMD5",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       }
     },
@@ -2467,7 +2576,12 @@
         },
         "Initiator":{"shape":"Initiator"},
         "Owner":{"shape":"Owner"},
-        "StorageClass":{"shape":"StorageClass"}
+        "StorageClass":{"shape":"StorageClass"},
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
+        }
       }
     },
     "ListPartsRequest":{
@@ -2502,6 +2616,11 @@
           "shape":"MultipartUploadId",
           "location":"querystring",
           "locationName":"uploadId"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       }
     },
@@ -3017,6 +3136,16 @@
       },
       "payload":"WebsiteConfiguration"
     },
+    "PutObjectAclOutput":{
+      "type":"structure",
+      "members":{
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
+        }
+      }
+    },
     "PutObjectAclRequest":{
       "type":"structure",
       "required":[
@@ -3073,6 +3202,11 @@
           "shape":"ObjectKey",
           "location":"uri",
           "locationName":"Key"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       },
       "payload":"AccessControlPolicy"
@@ -3114,6 +3248,11 @@
           "shape":"SSEKMSKeyId",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
+        },
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
         }
       }
     },
@@ -3242,6 +3381,11 @@
           "shape":"SSEKMSKeyId",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       },
       "payload":"Body"
@@ -3284,6 +3428,14 @@
     },
     "ReplaceKeyPrefixWith":{"type":"string"},
     "ReplaceKeyWith":{"type":"string"},
+    "RequestCharged":{
+      "type":"string",
+      "enum":["requester"]
+    },
+    "RequestPayer":{
+      "type":"string",
+      "enum":["requester"]
+    },
     "RequestPaymentConfiguration":{
       "type":"structure",
       "required":["Payer"],
@@ -3298,6 +3450,16 @@
     "ResponseContentType":{"type":"string"},
     "ResponseExpires":{"type":"timestamp"},
     "Restore":{"type":"string"},
+    "RestoreObjectOutput":{
+      "type":"structure",
+      "members":{
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
+        }
+      }
+    },
     "RestoreObjectRequest":{
       "type":"structure",
       "required":[
@@ -3324,6 +3486,11 @@
           "shape":"RestoreRequest",
           "xmlNamespace":{"uri":"http://s3.amazonaws.com/doc/2006-03-01/"},
           "locationName":"RestoreRequest"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       },
       "payload":"RestoreRequest"
@@ -3501,6 +3668,11 @@
           "shape":"SSEKMSKeyId",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
+        },
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
         }
       },
       "payload":"CopyPartResult"
@@ -3594,6 +3766,11 @@
           "shape":"CopySourceSSECustomerKeyMD5",
           "location":"header",
           "locationName":"x-amz-copy-source-server-side-encryption-customer-key-MD5"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       }
     },
@@ -3624,6 +3801,11 @@
           "shape":"SSEKMSKeyId",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-aws-kms-key-id"
+        },
+        "RequestCharged":{
+          "shape":"RequestCharged",
+          "location":"header",
+          "locationName":"x-amz-request-charged"
         }
       }
     },
@@ -3684,6 +3866,11 @@
           "shape":"SSECustomerKeyMD5",
           "location":"header",
           "locationName":"x-amz-server-side-encryption-customer-key-MD5"
+        },
+        "RequestPayer":{
+          "shape":"RequestPayer",
+          "location":"header",
+          "locationName":"x-amz-request-payer"
         }
       },
       "payload":"Body"

data/lib/aws-sdk-core/json/error_handler.rb

@@ -1,6 +1,6 @@
 module Aws
   module Json
-    class ErrorHandler < Seahorse::Client::Handler
+    class ErrorHandler < Xml::ErrorHandler
 
       # @param [Seahorse::Client::RequestContext] context
       # @return [Seahorse::Client::Response]
@@ -13,13 +13,6 @@ module Aws
 
       private
 
-      def error(context)
-        error_code, error_message = extract_error(context)
-        svc = context.client.class.name.split('::')[1]
-        errors_module = Aws.const_get(svc).const_get(:Errors)
-        errors_module.error_class(error_code).new(context, error_message)
-      end
-
       def extract_error(context)
         json = MultiJson.load(context.http_response.body_contents)
         error_code = json['code'] || json['__type']

data/lib/aws-sdk-core/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.0.30'
+  VERSION = '2.0.31'
 end

data/lib/aws-sdk-core/xml/error_handler.rb

@@ -38,6 +38,7 @@ module Aws
           403 => 'Forbidden',
           404 => 'NotFound',
           412 => 'PreconditionFailed',
+          413 => 'RequestEntityTooLarge',
         }[status_code] || "Http#{status_code}Error"
       end
 

data/lib/aws-sdk-core/xml/parser.rb

@@ -34,6 +34,8 @@ module Aws
             target[member_name] = parse_shape(member_shape, values[value_key])
           elsif member_shape.is_a?(Seahorse::Model::Shapes::List)
             target[member_name] = DefaultList.new
+          elsif member_shape.is_a?(Seahorse::Model::Shapes::Map)
+            target[member_name] = {}
           end
         end
         target

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.0.30
+  version: 2.0.31
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json