aws-sdk-core 2.0.33 → 2.0.34

data/apis/EC2.api.json

@@ -6510,7 +6510,11 @@
         "r3.xlarge",
         "r3.2xlarge",
         "r3.4xlarge",
-        "r3.8xlarge"
+        "r3.8xlarge",
+        "d2.xlarge",
+        "d2.2xlarge",
+        "d2.4xlarge",
+        "d2.8xlarge"
       ]
     },
     "InstanceTypeList":{

data/apis/EC2.resources.json

@@ -838,6 +838,13 @@
         }
       },
       "waiters": {
+        "Exists": {
+          "waiterName": "InstanceExists",
+          "params": [
+            { "target": "InstanceIds[]", "source": "identifier", "name": "Id" }
+          ],
+          "path": "Reservations[0].Instances[0]"
+        },
         "Running": {
           "waiterName": "InstanceRunning",
           "params": [

data/apis/EC2.waiters.json

@@ -1,6 +1,23 @@
 {
   "version": 2,
   "waiters": {
+    "InstanceExists": {
+      "delay": 5,
+      "maxAttempts": 40,
+      "operation": "DescribeInstances",
+      "acceptors": [
+        {
+          "matcher": "status",
+          "expected": 200,
+          "state": "success"
+        },
+        {
+          "matcher": "error",
+          "expected": "InvalidInstanceIDNotFound",
+          "state": "retry"
+        }
+      ]
+    },
     "BundleTaskComplete": {
       "delay": 15,
       "operation": "DescribeBundleTasks",

data/apis/ElasticTranscoder.api.json

@@ -851,7 +851,8 @@
         "Name":{"shape":"Filename"},
         "Format":{"shape":"PlaylistFormat"},
         "OutputKeys":{"shape":"OutputKeys"},
-        "HlsContentProtection":{"shape":"HlsContentProtection"}
+        "HlsContentProtection":{"shape":"HlsContentProtection"},
+        "PlayReadyDrm":{"shape":"PlayReadyDrm"}
       }
     },
     "CreateJobPlaylists":{
@@ -1171,6 +1172,10 @@
       "min":0,
       "max":255
     },
+    "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$)"
@@ -1299,6 +1304,10 @@
       "min":1,
       "max":40
     },
+    "NonEmptyBase64EncodedString":{
+      "type":"string",
+      "pattern":"(^(?:[A-Za-z0-9\\+/]{4})*(?:[A-Za-z0-9\\+/]{2}==|[A-Za-z0-9\\+/]{3}=)?$)"
+    },
     "Notifications":{
       "type":"structure",
       "members":{
@@ -1310,6 +1319,11 @@
     },
     "NullableInteger":{"type":"integer"},
     "NullableLong":{"type":"long"},
+    "OneTo512String":{
+      "type":"string",
+      "min":1,
+      "max":512
+    },
     "Opacity":{
       "type":"string",
       "pattern":"^\\d{1,3}(\\.\\d{0,20})?$"
@@ -1372,6 +1386,21 @@
       "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":{
@@ -1379,6 +1408,7 @@
         "Format":{"shape":"PlaylistFormat"},
         "OutputKeys":{"shape":"OutputKeys"},
         "HlsContentProtection":{"shape":"HlsContentProtection"},
+        "PlayReadyDrm":{"shape":"PlayReadyDrm"},
         "Status":{"shape":"JobStatus"},
         "StatusDetail":{"shape":"Description"}
       }

data/apis/Glacier.resources.json

@@ -110,11 +110,11 @@
             ]
           }
         },
-        "InitiateArchiveRetreival": {
+        "InitiateArchiveRetrieval": {
           "request": {
             "operation": "InitiateJob",
             "params": [
-              { "target": "vaultName", "source": "identifier", "name": "Name" },
+              { "target": "vaultName", "source": "identifier", "name": "VaultName" },
               { "target": "accountId", "source": "identifier", "name": "AccountId" },
               { "target": "jobParameters.Type", "source": "string", "value": "archive-retrieval" },
               { "target": "jobParameters.ArchiveId", "source": "identifier", "name": "Id" }
@@ -125,7 +125,7 @@
             "identifiers": [
               { "target": "Id", "source": "response", "path": "jobId" },
               { "target": "AccountId", "source": "identifier", "name": "AccountId" },
-              { "target": "VaultName", "source": "identifier", "name": "Name" }
+              { "target": "VaultName", "source": "identifier", "name": "VaultName" }
             ]
           }
         }

data/apis/RDS.api.json

@@ -1,4 +1,5 @@
 {
+  "version":"2.0",
   "metadata":{
     "apiVersion":"2014-10-31",
     "endpointPrefix":"rds",
@@ -1142,6 +1143,41 @@
         }
       ]
     },
+    "DescribeAccountAttributes":{
+      "name":"DescribeAccountAttributes",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeAccountAttributesMessage"},
+      "output":{
+        "shape":"AccountAttributesMessage",
+        "resultWrapper":"DescribeAccountAttributesResult"
+      }
+    },
+    "DescribeCertificates":{
+      "name":"DescribeCertificates",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeCertificatesMessage"},
+      "output":{
+        "shape":"CertificateMessage",
+        "resultWrapper":"DescribeCertificatesResult"
+      },
+      "errors":[
+        {
+          "shape":"CertificateNotFoundFault",
+          "error":{
+            "code":"CertificateNotFound",
+            "httpStatusCode":400,
+            "senderFault":true
+          },
+          "exception":true
+        }
+      ]
+    },
     "DescribeDBEngineVersions":{
       "name":"DescribeDBEngineVersions",
       "http":{
@@ -1684,6 +1720,15 @@
             "senderFault":true
           },
           "exception":true
+        },
+        {
+          "shape":"CertificateNotFoundFault",
+          "error":{
+            "code":"CertificateNotFound",
+            "httpStatusCode":400,
+            "senderFault":true
+          },
+          "exception":true
         }
       ]
     },
@@ -2453,6 +2498,28 @@
     }
   },
   "shapes":{
+    "AccountAttributesMessage":{
+      "type":"structure",
+      "members":{
+        "AccountQuotas":{"shape":"AccountQuotaList"}
+      }
+    },
+    "AccountQuota":{
+      "type":"structure",
+      "members":{
+        "AccountQuotaName":{"shape":"String"},
+        "Used":{"shape":"Long"},
+        "Max":{"shape":"Long"}
+      },
+      "wrapper":true
+    },
+    "AccountQuotaList":{
+      "type":"list",
+      "member":{
+        "shape":"AccountQuota",
+        "locationName":"AccountQuota"
+      }
+    },
     "AddSourceIdentifierToSubscriptionMessage":{
       "type":"structure",
       "required":[
@@ -2555,6 +2622,42 @@
     },
     "Boolean":{"type":"boolean"},
     "BooleanOptional":{"type":"boolean"},
+    "Certificate":{
+      "type":"structure",
+      "members":{
+        "CertificateIdentifier":{"shape":"String"},
+        "CertificateType":{"shape":"String"},
+        "Thumbprint":{"shape":"String"},
+        "ValidFrom":{"shape":"TStamp"},
+        "ValidTill":{"shape":"TStamp"}
+      },
+      "wrapper":true
+    },
+    "CertificateList":{
+      "type":"list",
+      "member":{
+        "shape":"Certificate",
+        "locationName":"Certificate"
+      }
+    },
+    "CertificateMessage":{
+      "type":"structure",
+      "members":{
+        "Certificates":{"shape":"CertificateList"},
+        "Marker":{"shape":"String"}
+      }
+    },
+    "CertificateNotFoundFault":{
+      "type":"structure",
+      "members":{
+      },
+      "error":{
+        "code":"CertificateNotFound",
+        "httpStatusCode":400,
+        "senderFault":true
+      },
+      "exception":true
+    },
     "CharacterSet":{
       "type":"structure",
       "members":{
@@ -2814,7 +2917,8 @@
         "TdeCredentialArn":{"shape":"String"},
         "StorageEncrypted":{"shape":"Boolean"},
         "KmsKeyId":{"shape":"String"},
-        "DbiResourceId":{"shape":"String"}
+        "DbiResourceId":{"shape":"String"},
+        "CACertificateIdentifier":{"shape":"String"}
       },
       "wrapper":true
     },
@@ -3261,6 +3365,20 @@
         "OptionGroupName":{"shape":"String"}
       }
     },
+    "DescribeAccountAttributesMessage":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DescribeCertificatesMessage":{
+      "type":"structure",
+      "members":{
+        "CertificateIdentifier":{"shape":"String"},
+        "Filters":{"shape":"FilterList"},
+        "MaxRecords":{"shape":"IntegerOptional"},
+        "Marker":{"shape":"String"}
+      }
+    },
     "DescribeDBEngineVersionsMessage":{
       "type":"structure",
       "members":{
@@ -3870,7 +3988,8 @@
         "NewDBInstanceIdentifier":{"shape":"String"},
         "StorageType":{"shape":"String"},
         "TdeCredentialArn":{"shape":"String"},
-        "TdeCredentialPassword":{"shape":"String"}
+        "TdeCredentialPassword":{"shape":"String"},
+        "CACertificateIdentifier":{"shape":"String"}
       }
     },
     "ModifyDBParameterGroupMessage":{
@@ -4176,7 +4295,8 @@
         "AutoAppliedAfterDate":{"shape":"TStamp"},
         "ForcedApplyDate":{"shape":"TStamp"},
         "OptInStatus":{"shape":"String"},
-        "CurrentApplyDate":{"shape":"TStamp"}
+        "CurrentApplyDate":{"shape":"TStamp"},
+        "Description":{"shape":"String"}
       }
     },
     "PendingMaintenanceActionDetails":{
@@ -4212,7 +4332,8 @@
         "EngineVersion":{"shape":"String"},
         "Iops":{"shape":"IntegerOptional"},
         "DBInstanceIdentifier":{"shape":"String"},
-        "StorageType":{"shape":"String"}
+        "StorageType":{"shape":"String"},
+        "CACertificateIdentifier":{"shape":"String"}
       }
     },
     "PointInTimeRestoreNotEnabledFault":{

data/apis/S3.api.json

@@ -7,6 +7,7 @@
     "globalEndpoint":"s3.amazonaws.com",
     "serviceAbbreviation":"Amazon S3",
     "serviceFullName":"Amazon Simple Storage Service",
+    "signatureVersion":"s3",
     "timestampFormat":"rfc822",
     "protocol":"rest-xml"
   },

data/apis/S3.waiters.json

@@ -11,6 +11,11 @@
           "matcher": "status",
           "state": "success"
         },
+        {
+          "expected": 403,
+          "matcher": "status",
+          "state": "success"
+        },
         {
           "expected": 404,
           "matcher": "status",

data/apis/SNS.resources.json

@@ -69,7 +69,6 @@
         "resource": {
           "type": "Subscription",
           "identifiers": [
-            { "target": "TopicArn", "source": "response", "path": "Subscriptions[].TopicArn" },
             { "target": "Arn", "source": "response", "path": "Subscriptions[].SubscriptionArn" }
           ]
         }
@@ -111,7 +110,6 @@
           "resource": {
             "type": "PlatformEndpoint",
             "identifiers": [
-              { "target": "PlatformApplicationArn", "source": "identifier", "name": "Arn" },
               { "target": "Arn", "source": "response", "path": "EndpointArn" }
             ]
           }

data/lib/aws-sdk-core/api/service_customizations.rb

@@ -114,6 +114,8 @@ module Aws
         add_plugin 'Aws::Plugins::S3UrlEncodedKeys'
         add_plugin 'Aws::Plugins::S3RequestSigner'
 
+        api.definition['metadata'].delete('signatureVersion')
+
         # required for the GetBucketLocation fix to work, disabled normal
         # parsing of the output
         client_class.api.operation(:get_bucket_location).

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

@@ -19,9 +19,7 @@ module Aws
     def providers
       [
         [:static_credentials, {}],
-        [:env_credentials, { prefix: 'AWS' }],
-        [:env_credentials, { prefix: 'AMAZON' }],
-        [:env_credentials, { key:'AWS_ACCESS_KEY', secret:'AWS_SECRET_KEY' }],
+        [:env_credentials, {}],
         [:shared_credentials, {}],
         [:instance_profile_credentials, {
           retries: 0,
@@ -40,16 +38,19 @@ module Aws
     end
 
     def env_credentials(options)
-      env_keys = []
-      if prefix = options[:prefix]
-        env_keys << "#{prefix}_ACCESS_KEY_ID"
-        env_keys << "#{prefix}_SECRET_ACCESS_KEY"
-        env_keys << "#{prefix}_SESSION_TOKEN"
-      else
-        env_keys << options[:key]
-        env_keys << options[:secret]
+      key =    %w(AWS_ACCESS_KEY_ID     AMAZON_ACCESS_KEY_ID     AWS_ACCESS_KEY)
+      secret = %w(AWS_SECRET_ACCESS_KEY AMAZON_SECRET_ACCESS_KEY AWS_SECRET_KEY)
+      token =  %w(AWS_SESSION_TOKEN     AMAZON_SESSION_TOKEN)
+      Credentials.new(envar(key), envar(secret), envar(token))
+    end
+
+    def envar(keys)
+      keys.each do |key|
+        if ENV.key?(key)
+          return ENV[key]
+        end
       end
-      Credentials.new(*ENV.values_at(*env_keys))
+      nil
     end
 
     def shared_credentials(options = {})

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

@@ -13,17 +13,32 @@ module Aws
 
       private
 
-      def extract_error(context)
-        json = MultiJson.load(context.http_response.body_contents)
-        error_code = json['code'] || json['__type']
-        error_code ||= context.http_response.headers['x-amzn-errortype']
-        error_code = error_code.split('#').last
-        if error_code == 'RequestEntityTooLarge'
-          error_message = 'Request body must be less than 1 MB'
+      def extract_error(body, context)
+        json = MultiJson.load(body)
+        code = error_code(json, context)
+        message = error_message(code, json)
+        [code, message]
+      rescue MultiJson::ParseError
+        [http_status_error_code(context), '']
+      end
+
+      def error_code(json, context)
+        code = json['code']
+        code ||= json['__type']
+        code ||= context.http_response.headers['x-amzn-errortype']
+        if code
+          code.split('#').last
+        else
+          http_status_error_code(context)
+        end
+      end
+
+      def error_message(code, json)
+        if code == 'RequestEntityTooLarge'
+          'Request body must be less than 1 MB'
         else
-          error_message = json['message'] || json['Message']
+          json['message'] || json['Message'] || ''
         end
-        [error_code, error_message]
       end
 
     end