aws-sdk-core 2.1.18 → 2.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a833c3103b7fcbfef9a54799eef6ff0e5e1e9d0e
-  data.tar.gz: 59ab4f667d7d6260e87385021f44f1aa0efb9501
+  metadata.gz: 454a11cf15f51f441f688a7a76f49c8c94ff82b3
+  data.tar.gz: 1f56394ab40f5a1045e069af440f9942030133a6
 SHA512:
-  metadata.gz: 5c8c1c9e37aed29a444c7e98f9559cf6812780fe84587353b5d303877beb49010f546e109a789acdb679f04142b302451829e38cefb2c976ffd8bc87877f82aa
-  data.tar.gz: a1907c754e06a4b4caa6e5abda147ab08f61cb7b3e0a33e8d71ac8eab62ee8ffb4daab0f03f1778949d0819e87f0db78ff57ae1353b930d92e69ae94152095b9
+  metadata.gz: d3a9664f63d9a4fb883b1fbb258cf3cb1bdaa36210f766e2acc9ef5fe248fdd6801715135348b03730f659bcfb7dee69ae0f991bf1d1ee44603c0ba53e3800cb
+  data.tar.gz: a36a97ee1fe699b938ce4a726bf30a0b3d6eba4e4a4bcd0cfd555bfb4cb315a2c4dc13bc4d1b571e3d614dd2d5fe4f46653860034038e9c1749c5b2a9371535b

data/apis/ec2/2015-04-15/paginators-1.json

@@ -115,6 +115,9 @@
     "DescribeVpcs": {
       "result_key": "Vpcs"
     },
+    "DescribeVpcPeeringConnections": {
+      "result_key": "VpcPeeringConnections"
+    },
     "DescribeVpnConnections": {
       "result_key": "VpnConnections"
     },

data/apis/ec2/2015-04-15/resources-1.json

@@ -2470,6 +2470,15 @@
           }
         }
       },
+      "waiters": {
+        "Exists": {
+          "waiterName": "VpcPeeringConnectionExists",
+          "params": [
+            { "target": "VpcPeeringConnectionIds[]", "source": "identifier", "name": "Id" }
+          ],
+          "path": "VpcPeeringConnections[0]"
+        }
+      },
       "has": {
         "AccepterVpc": {
           "resource": {

data/apis/ec2/2015-04-15/waiters-2.json

@@ -499,6 +499,23 @@
           "argument": "VpnConnections[].State"
         }
       ]
+    },
+    "VpcPeeringConnectionExists": {
+      "delay": 15,
+      "operation": "DescribeVpcPeeringConnections",
+      "maxAttempts": 40,
+      "acceptors": [
+        {
+          "matcher": "status",
+          "expected": 200,
+          "state": "success"
+        },
+        {
+          "matcher": "error",
+          "expected": "InvalidVpcPeeringConnectionIDNotFound",
+          "state": "retry"
+        }
+      ]
     }
   }
 }

data/apis/storagegateway/2013-06-30/api-2.json

@@ -52,6 +52,27 @@
         }
       ]
     },
+    "AddTagsToResource":{
+      "name":"AddTagsToResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"AddTagsToResourceInput"},
+      "output":{"shape":"AddTagsToResourceOutput"},
+      "errors":[
+        {
+          "shape":"InvalidGatewayRequestException",
+          "error":{"httpStatusCode":400},
+          "exception":true
+        },
+        {
+          "shape":"InternalServerError",
+          "error":{"httpStatusCode":500},
+          "exception":true
+        }
+      ]
+    },
     "AddUploadBuffer":{
       "name":"AddUploadBuffer",
       "http":{
@@ -745,6 +766,27 @@
         }
       ]
     },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceInput"},
+      "output":{"shape":"ListTagsForResourceOutput"},
+      "errors":[
+        {
+          "shape":"InvalidGatewayRequestException",
+          "error":{"httpStatusCode":400},
+          "exception":true
+        },
+        {
+          "shape":"InternalServerError",
+          "error":{"httpStatusCode":500},
+          "exception":true
+        }
+      ]
+    },
     "ListVolumeInitiators":{
       "name":"ListVolumeInitiators",
       "http":{
@@ -808,6 +850,27 @@
         }
       ]
     },
+    "RemoveTagsFromResource":{
+      "name":"RemoveTagsFromResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RemoveTagsFromResourceInput"},
+      "output":{"shape":"RemoveTagsFromResourceOutput"},
+      "errors":[
+        {
+          "shape":"InvalidGatewayRequestException",
+          "error":{"httpStatusCode":400},
+          "exception":true
+        },
+        {
+          "shape":"InternalServerError",
+          "error":{"httpStatusCode":500},
+          "exception":true
+        }
+      ]
+    },
     "ResetCache":{
       "name":"ResetCache",
       "http":{
@@ -1108,6 +1171,23 @@
         "GatewayARN":{"shape":"GatewayARN"}
       }
     },
+    "AddTagsToResourceInput":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "Tags"
+      ],
+      "members":{
+        "ResourceARN":{"shape":"ResourceARN"},
+        "Tags":{"shape":"Tags"}
+      }
+    },
+    "AddTagsToResourceOutput":{
+      "type":"structure",
+      "members":{
+        "ResourceARN":{"shape":"ResourceARN"}
+      }
+    },
     "AddUploadBufferInput":{
       "type":"structure",
       "required":[
@@ -1521,6 +1601,7 @@
       "members":{
         "GatewayARN":{"shape":"GatewayARN"},
         "GatewayId":{"shape":"GatewayId"},
+        "GatewayName":{"shape":"string"},
         "GatewayTimezone":{"shape":"GatewayTimezone"},
         "GatewayState":{"shape":"GatewayState"},
         "GatewayNetworkInterfaces":{"shape":"GatewayNetworkInterfaces"},
@@ -1819,7 +1900,8 @@
       "members":{
         "GatewayARN":{"shape":"GatewayARN"},
         "GatewayType":{"shape":"GatewayType"},
-        "GatewayOperationalState":{"shape":"GatewayOperationalState"}
+        "GatewayOperationalState":{"shape":"GatewayOperationalState"},
+        "GatewayName":{"shape":"string"}
       }
     },
     "GatewayName":{
@@ -1927,6 +2009,22 @@
         "Disks":{"shape":"Disks"}
       }
     },
+    "ListTagsForResourceInput":{
+      "type":"structure",
+      "members":{
+        "ResourceARN":{"shape":"ResourceARN"},
+        "Marker":{"shape":"Marker"},
+        "Limit":{"shape":"PositiveIntObject"}
+      }
+    },
+    "ListTagsForResourceOutput":{
+      "type":"structure",
+      "members":{
+        "ResourceARN":{"shape":"ResourceARN"},
+        "Marker":{"shape":"Marker"},
+        "Tags":{"shape":"Tags"}
+      }
+    },
     "ListVolumeInitiatorsInput":{
       "type":"structure",
       "required":["VolumeARN"],
@@ -2022,6 +2120,19 @@
       "min":1,
       "max":25
     },
+    "RemoveTagsFromResourceInput":{
+      "type":"structure",
+      "members":{
+        "ResourceARN":{"shape":"ResourceARN"},
+        "TagKeys":{"shape":"TagKeys"}
+      }
+    },
+    "RemoveTagsFromResourceOutput":{
+      "type":"structure",
+      "members":{
+        "ResourceARN":{"shape":"ResourceARN"}
+      }
+    },
     "ResetCacheInput":{
       "type":"structure",
       "required":["GatewayARN"],
@@ -2035,6 +2146,11 @@
         "GatewayARN":{"shape":"GatewayARN"}
       }
     },
+    "ResourceARN":{
+      "type":"string",
+      "min":50,
+      "max":500
+    },
     "RetrieveTapeArchiveInput":{
       "type":"structure",
       "required":[
@@ -2130,6 +2246,35 @@
       "type":"list",
       "member":{"shape":"StorediSCSIVolume"}
     },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{"shape":"TagKey"},
+        "Value":{"shape":"TagValue"}
+      }
+    },
+    "TagKey":{
+      "type":"string",
+      "min":1,
+      "max":128,
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-%@]*)$"
+    },
+    "TagKeys":{
+      "type":"list",
+      "member":{"shape":"TagKey"}
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256
+    },
+    "Tags":{
+      "type":"list",
+      "member":{"shape":"Tag"}
+    },
     "Tape":{
       "type":"structure",
       "members":{
@@ -2263,7 +2408,8 @@
     "UpdateGatewayInformationOutput":{
       "type":"structure",
       "members":{
-        "GatewayARN":{"shape":"GatewayARN"}
+        "GatewayARN":{"shape":"GatewayARN"},
+        "GatewayName":{"shape":"string"}
       }
     },
     "UpdateGatewaySoftwareNowInput":{

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

@@ -1,3 +1,4 @@
+require 'json'
 require 'time'
 require 'net/http'
 
@@ -15,7 +16,7 @@ module Aws
     # is not present, no responding or some other non-recoverable
     # error.
     # @api private
-    FAILURES = [
+    NETWORK_ERRORS = [
       Errno::EHOSTUNREACH,
       Errno::ECONNREFUSED,
       Errno::EHOSTDOWN,
@@ -65,31 +66,33 @@ module Aws
     end
 
     def refresh
-      c = Json.load(get_credentials)
-      @credentials = Credentials.new(
-        c['AccessKeyId'],
-        c['SecretAccessKey'],
-        c['Token']
-      )
-      @expiration = c['Expiration'] ? Time.parse(c['Expiration']) : nil
+      # Retry loading credentials up to 3 times is the instance metadata
+      # service is responding but is returning invalid JSON documents
+      # in response to the GET profile credentials call.
+      retry_errors([JSON::ParserError], max_retries: 3) do
+        c = JSON.parse(get_credentials.to_s)
+        @credentials = Credentials.new(
+          c['AccessKeyId'],
+          c['SecretAccessKey'],
+          c['Token']
+        )
+        @expiration = c['Expiration'] ? Time.parse(c['Expiration']) : nil
+      end
     end
 
     def get_credentials
-      failed_attempts = 0
+      # Retry loading credentials a configurable number of times if
+      # the instance metadata service is not responding.
       begin
-        open_connection do |conn|
-          path = '/latest/meta-data/iam/security-credentials/'
-          profile_name = http_get(conn, path).lines.first.strip
-          http_get(conn, path + profile_name)
-        end
-      rescue *FAILURES
-        if failed_attempts < @retries
-          @backoff.call(failed_attempts)
-          failed_attempts += 1
-          retry
-        else
-          '{}'
+        retry_errors(NETWORK_ERRORS, max_retries: @retries) do
+          open_connection do |conn|
+            path = '/latest/meta-data/iam/security-credentials/'
+            profile_name = http_get(conn, path).lines.first.strip
+            http_get(conn, path + profile_name)
+          end
         end
+      rescue
+        '{}'
       end
     end
 
@@ -111,5 +114,21 @@ module Aws
       end
     end
 
+    def retry_errors(error_classes, options = {}, &block)
+      max_retries = options[:max_retries]
+      retries = 0
+      begin
+        yield
+      rescue *error_classes => error
+        if retries < max_retries
+          @backoff.call(retries)
+          retries += 1
+          retry
+        else
+          raise
+        end
+      end
+    end
+
   end
 end

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

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.1.18'
+  VERSION = '2.1.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.1.18
+  version: 2.1.19
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath