aws-sdk-core 2.3.21 → 2.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74df8a47fbceb48c44e572bfe9724a2f13d20eda
-  data.tar.gz: bc06cb8919a8fb6e933b0bf58d5c21979fb138df
+  metadata.gz: 20daa05adefaf0a766d8e784f423f6df7a9bf1d6
+  data.tar.gz: 23fa85056398323571966b5a0256596686cc79db
 SHA512:
-  metadata.gz: 1cd12fdff6278486a3dabe409a5673498ec174a677c157069a83285dc4edbccd69c01d44d1c2ddb427bab2ebdd71c9b3ffb4280b42d6c8508dcd22d20532c2c8
-  data.tar.gz: 96b99fcd15a888df7842ef57a942792a1c4700b75d70faf405539c999721625e5c649a719600e0a7490eb3d8b2092cd39c2cb9e4744f684485426757ef7afa8d
+  metadata.gz: 73aed38227f751257e22b8e97bc9c4d1f0a2396d7fc2642133af74f4b62f1ce79ade538abc1a886c2801b9c578bbd3947b0150260449a544c3469eaad3aefd89
+  data.tar.gz: df9b92e6db52f1ba5b1775e86ba44b6e290a4fa4b3b67631bee8875e1fcd9c4afe5c373749ea20d92bb8d7e14a0f99c0cc3b7b7668b312f9826f28287b713fc5

data/apis/dms/2016-01-01/api-2.json

@@ -92,6 +92,19 @@
         {"shape":"ResourceQuotaExceededFault"}
       ]
     },
+    "DeleteCertificate":{
+      "name":"DeleteCertificate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteCertificateMessage"},
+      "output":{"shape":"DeleteCertificateResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundFault"},
+        {"shape":"InvalidResourceStateFault"}
+      ]
+    },
     "DeleteEndpoint":{
       "name":"DeleteEndpoint",
       "http":{
@@ -153,6 +166,18 @@
       "input":{"shape":"DescribeAccountAttributesMessage"},
       "output":{"shape":"DescribeAccountAttributesResponse"}
     },
+    "DescribeCertificates":{
+      "name":"DescribeCertificates",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeCertificatesMessage"},
+      "output":{"shape":"DescribeCertificatesResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundFault"}
+      ]
+    },
     "DescribeConnections":{
       "name":"DescribeConnections",
       "http":{
@@ -270,6 +295,19 @@
         {"shape":"InvalidResourceStateFault"}
       ]
     },
+    "ImportCertificate":{
+      "name":"ImportCertificate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ImportCertificateMessage"},
+      "output":{"shape":"ImportCertificateResponse"},
+      "errors":[
+        {"shape":"ResourceAlreadyExistsFault"},
+        {"shape":"InvalidCertificateFault"}
+      ]
+    },
     "ListTagsForResource":{
       "name":"ListTagsForResource",
       "http":{
@@ -323,6 +361,7 @@
       "input":{"shape":"ModifyReplicationSubnetGroupMessage"},
       "output":{"shape":"ModifyReplicationSubnetGroupResponse"},
       "errors":[
+        {"shape":"AccessDeniedFault"},
         {"shape":"ResourceNotFoundFault"},
         {"shape":"ResourceQuotaExceededFault"},
         {"shape":"SubnetAlreadyInUse"},
@@ -446,6 +485,27 @@
     },
     "Boolean":{"type":"boolean"},
     "BooleanOptional":{"type":"boolean"},
+    "Certificate":{
+      "type":"structure",
+      "members":{
+        "CertificateIdentifier":{"shape":"String"},
+        "CertificateCreationDate":{"shape":"TStamp"},
+        "CertificatePem":{"shape":"String"},
+        "CertificateArn":{"shape":"String"},
+        "CertificateOwner":{"shape":"String"},
+        "ValidFromDate":{"shape":"TStamp"},
+        "ValidToDate":{"shape":"TStamp"},
+        "SigningAlgorithm":{"shape":"String"},
+        "KeyLength":{"shape":"IntegerOptional"}
+      }
+    },
+    "CertificateList":{
+      "type":"list",
+      "member":{
+        "shape":"Certificate",
+        "locationName":"Certificate"
+      }
+    },
     "Connection":{
       "type":"structure",
       "members":{
@@ -486,7 +546,9 @@
         "DatabaseName":{"shape":"String"},
         "ExtraConnectionAttributes":{"shape":"String"},
         "KmsKeyId":{"shape":"String"},
-        "Tags":{"shape":"TagList"}
+        "Tags":{"shape":"TagList"},
+        "CertificateArn":{"shape":"String"},
+        "SslMode":{"shape":"DmsSslModeValue"}
       }
     },
     "CreateEndpointResponse":{
@@ -509,6 +571,7 @@
         "AvailabilityZone":{"shape":"String"},
         "ReplicationSubnetGroupIdentifier":{"shape":"String"},
         "PreferredMaintenanceWindow":{"shape":"String"},
+        "MultiAZ":{"shape":"BooleanOptional"},
         "EngineVersion":{"shape":"String"},
         "AutoMinorVersionUpgrade":{"shape":"BooleanOptional"},
         "Tags":{"shape":"TagList"},
@@ -570,6 +633,19 @@
         "ReplicationTask":{"shape":"ReplicationTask"}
       }
     },
+    "DeleteCertificateMessage":{
+      "type":"structure",
+      "required":["CertificateArn"],
+      "members":{
+        "CertificateArn":{"shape":"String"}
+      }
+    },
+    "DeleteCertificateResponse":{
+      "type":"structure",
+      "members":{
+        "Certificate":{"shape":"Certificate"}
+      }
+    },
     "DeleteEndpointMessage":{
       "type":"structure",
       "required":["EndpointArn"],
@@ -632,6 +708,21 @@
         "AccountQuotas":{"shape":"AccountQuotaList"}
       }
     },
+    "DescribeCertificatesMessage":{
+      "type":"structure",
+      "members":{
+        "Filters":{"shape":"FilterList"},
+        "MaxRecords":{"shape":"IntegerOptional"},
+        "Marker":{"shape":"String"}
+      }
+    },
+    "DescribeCertificatesResponse":{
+      "type":"structure",
+      "members":{
+        "Marker":{"shape":"String"},
+        "Certificates":{"shape":"CertificateList"}
+      }
+    },
     "DescribeConnectionsMessage":{
       "type":"structure",
       "members":{
@@ -782,6 +873,15 @@
         "Marker":{"shape":"String"}
       }
     },
+    "DmsSslModeValue":{
+      "type":"string",
+      "enum":[
+        "none",
+        "require",
+        "verify-ca",
+        "verify-full"
+      ]
+    },
     "Endpoint":{
       "type":"structure",
       "members":{
@@ -795,7 +895,9 @@
         "ExtraConnectionAttributes":{"shape":"String"},
         "Status":{"shape":"String"},
         "KmsKeyId":{"shape":"String"},
-        "EndpointArn":{"shape":"String"}
+        "EndpointArn":{"shape":"String"},
+        "CertificateArn":{"shape":"String"},
+        "SslMode":{"shape":"DmsSslModeValue"}
       }
     },
     "EndpointList":{
@@ -831,6 +933,20 @@
         "locationName":"Value"
       }
     },
+    "ImportCertificateMessage":{
+      "type":"structure",
+      "required":["CertificateIdentifier"],
+      "members":{
+        "CertificateIdentifier":{"shape":"String"},
+        "CertificatePem":{"shape":"String"}
+      }
+    },
+    "ImportCertificateResponse":{
+      "type":"structure",
+      "members":{
+        "Certificate":{"shape":"Certificate"}
+      }
+    },
     "InsufficientResourceCapacityFault":{
       "type":"structure",
       "members":{
@@ -840,6 +956,13 @@
     },
     "Integer":{"type":"integer"},
     "IntegerOptional":{"type":"integer"},
+    "InvalidCertificateFault":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"ExceptionMessage"}
+      },
+      "exception":true
+    },
     "InvalidResourceStateFault":{
       "type":"structure",
       "members":{
@@ -900,7 +1023,9 @@
         "ServerName":{"shape":"String"},
         "Port":{"shape":"IntegerOptional"},
         "DatabaseName":{"shape":"String"},
-        "ExtraConnectionAttributes":{"shape":"String"}
+        "ExtraConnectionAttributes":{"shape":"String"},
+        "CertificateArn":{"shape":"String"},
+        "SslMode":{"shape":"DmsSslModeValue"}
       }
     },
     "ModifyEndpointResponse":{
@@ -919,6 +1044,7 @@
         "ReplicationInstanceClass":{"shape":"String"},
         "VpcSecurityGroupIds":{"shape":"VpcSecurityGroupIdList"},
         "PreferredMaintenanceWindow":{"shape":"String"},
+        "MultiAZ":{"shape":"BooleanOptional"},
         "EngineVersion":{"shape":"String"},
         "AllowMajorVersionUpgrade":{"shape":"Boolean"},
         "AutoMinorVersionUpgrade":{"shape":"BooleanOptional"},
@@ -1039,12 +1165,21 @@
         "ReplicationSubnetGroup":{"shape":"ReplicationSubnetGroup"},
         "PreferredMaintenanceWindow":{"shape":"String"},
         "PendingModifiedValues":{"shape":"ReplicationPendingModifiedValues"},
+        "MultiAZ":{"shape":"Boolean"},
         "EngineVersion":{"shape":"String"},
         "AutoMinorVersionUpgrade":{"shape":"Boolean"},
         "KmsKeyId":{"shape":"String"},
         "ReplicationInstanceArn":{"shape":"String"},
-        "ReplicationInstancePublicIpAddress":{"shape":"String"},
-        "ReplicationInstancePrivateIpAddress":{"shape":"String"},
+        "ReplicationInstancePublicIpAddress":{
+          "shape":"String",
+          "deprecated":true
+        },
+        "ReplicationInstancePrivateIpAddress":{
+          "shape":"String",
+          "deprecated":true
+        },
+        "ReplicationInstancePublicIpAddresses":{"shape":"ReplicationInstancePublicIpAddressList"},
+        "ReplicationInstancePrivateIpAddresses":{"shape":"ReplicationInstancePrivateIpAddressList"},
         "PubliclyAccessible":{"shape":"Boolean"}
       }
     },
@@ -1055,11 +1190,20 @@
         "locationName":"ReplicationInstance"
       }
     },
+    "ReplicationInstancePrivateIpAddressList":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
+    "ReplicationInstancePublicIpAddressList":{
+      "type":"list",
+      "member":{"shape":"String"}
+    },
     "ReplicationPendingModifiedValues":{
       "type":"structure",
       "members":{
         "ReplicationInstanceClass":{"shape":"String"},
         "AllocatedStorage":{"shape":"IntegerOptional"},
+        "MultiAZ":{"shape":"BooleanOptional"},
         "EngineVersion":{"shape":"String"}
       }
     },

data/apis/ecs/2014-11-13/api-2.json

@@ -1039,6 +1039,7 @@
       ],
       "members":{
         "family":{"shape":"String"},
+        "taskRoleArn":{"shape":"String"},
         "containerDefinitions":{"shape":"ContainerDefinitions"},
         "volumes":{"shape":"VolumeList"}
       }
@@ -1246,6 +1247,7 @@
         "taskDefinitionArn":{"shape":"String"},
         "containerDefinitions":{"shape":"ContainerDefinitions"},
         "family":{"shape":"String"},
+        "taskRoleArn":{"shape":"String"},
         "revision":{"shape":"Integer"},
         "volumes":{"shape":"VolumeList"},
         "status":{"shape":"TaskDefinitionStatus"},
@@ -1270,7 +1272,8 @@
     "TaskOverride":{
       "type":"structure",
       "members":{
-        "containerOverrides":{"shape":"ContainerOverrides"}
+        "containerOverrides":{"shape":"ContainerOverrides"},
+        "taskRoleArn":{"shape":"String"}
       }
     },
     "Tasks":{

data/apis/rds/2014-10-31/api-2.json

@@ -71,6 +71,23 @@
         {"shape":"AuthorizationQuotaExceededFault"}
       ]
     },
+    "CopyDBClusterParameterGroup":{
+      "name":"CopyDBClusterParameterGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CopyDBClusterParameterGroupMessage"},
+      "output":{
+        "shape":"CopyDBClusterParameterGroupResult",
+        "resultWrapper":"CopyDBClusterParameterGroupResult"
+      },
+      "errors":[
+        {"shape":"DBParameterGroupNotFoundFault"},
+        {"shape":"DBParameterGroupQuotaExceededFault"},
+        {"shape":"DBParameterGroupAlreadyExistsFault"}
+      ]
+    },
     "CopyDBClusterSnapshot":{
       "name":"CopyDBClusterSnapshot",
       "http":{
@@ -930,7 +947,8 @@
       },
       "errors":[
         {"shape":"DBClusterNotFoundFault"},
-        {"shape":"InvalidDBClusterStateFault"}
+        {"shape":"InvalidDBClusterStateFault"},
+        {"shape":"InvalidDBInstanceStateFault"}
       ]
     },
     "ListTagsForResource":{
@@ -1594,6 +1612,26 @@
         "CharacterSetDescription":{"shape":"String"}
       }
     },
+    "CopyDBClusterParameterGroupMessage":{
+      "type":"structure",
+      "required":[
+        "SourceDBClusterParameterGroupIdentifier",
+        "TargetDBClusterParameterGroupIdentifier",
+        "TargetDBClusterParameterGroupDescription"
+      ],
+      "members":{
+        "SourceDBClusterParameterGroupIdentifier":{"shape":"String"},
+        "TargetDBClusterParameterGroupIdentifier":{"shape":"String"},
+        "TargetDBClusterParameterGroupDescription":{"shape":"String"},
+        "Tags":{"shape":"TagList"}
+      }
+    },
+    "CopyDBClusterParameterGroupResult":{
+      "type":"structure",
+      "members":{
+        "DBClusterParameterGroup":{"shape":"DBClusterParameterGroup"}
+      }
+    },
     "CopyDBClusterSnapshotMessage":{
       "type":"structure",
       "required":[
@@ -1676,9 +1714,7 @@
       "type":"structure",
       "required":[
         "DBClusterIdentifier",
-        "Engine",
-        "MasterUsername",
-        "MasterUserPassword"
+        "Engine"
       ],
       "members":{
         "AvailabilityZones":{"shape":"AvailabilityZones"},
@@ -3302,7 +3338,8 @@
     "FailoverDBClusterMessage":{
       "type":"structure",
       "members":{
-        "DBClusterIdentifier":{"shape":"String"}
+        "DBClusterIdentifier":{"shape":"String"},
+        "TargetDBInstanceIdentifier":{"shape":"String"}
       }
     },
     "FailoverDBClusterResult":{

data/lib/aws-sdk-core.rb

@@ -110,6 +110,7 @@ module Aws
   autoload :Credentials, 'aws-sdk-core/credentials'
   autoload :Deprecations, 'aws-sdk-core/deprecations'
   autoload :EagerLoader, 'aws-sdk-core/eager_loader'
+  autoload :ECSCredentials, 'aws-sdk-core/ecs_credentials'
   autoload :EmptyStructure, 'aws-sdk-core/empty_structure'
   autoload :EndpointProvider, 'aws-sdk-core/endpoint_provider'
   autoload :Errors, 'aws-sdk-core/errors'

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

@@ -68,7 +68,11 @@ module Aws
     end
 
     def instance_profile_credentials(options)
-      InstanceProfileCredentials.new(options)
+      if ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
+        ECSCredentials.new(options)
+      else
+        InstanceProfileCredentials.new(options)
+      end
     end
 
   end

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

@@ -0,0 +1,141 @@
+require 'json'
+require 'time'
+require 'net/http'
+
+module Aws
+  class ECSCredentials
+
+    include CredentialProvider
+    include RefreshingCredentials
+
+    # @api private
+    class Non200Response < RuntimeError; end
+
+    # These are the errors we trap when attempting to talk to the
+    # instance metadata service.  Any of these imply the service
+    # is not present, no responding or some other non-recoverable
+    # error.
+    # @api private
+    NETWORK_ERRORS = [
+      Errno::EHOSTUNREACH,
+      Errno::ECONNREFUSED,
+      Errno::EHOSTDOWN,
+      Errno::ENETUNREACH,
+      SocketError,
+      Timeout::Error,
+      Non200Response,
+    ]
+
+    # @param [Hash] options
+    # @option options [Integer] :retries (5) Number of times to retry
+    #   when retrieving credentials.
+    # @option options [String] :ip_address ('169.254.170.2')
+    # @option options [Integer] :port (80)
+    # @option options [String] :credential_path By default, the value of the
+    #   AWS_CONTAINER_CREDENTIALS_RELATIVE_URI environment variable.
+    # @option options [Float] :http_open_timeout (5)
+    # @option options [Float] :http_read_timeout (5)
+    # @option options [Numeric, Proc] :delay By default, failures are retried
+    #   with exponential back-off, i.e. `sleep(1.2 ** num_failures)`. You can
+    #   pass a number of seconds to sleep between failed attempts, or
+    #   a Proc that accepts the number of failures.
+    # @option options [IO] :http_debug_output (nil) HTTP wire
+    #   traces are sent to this object.  You can specify something
+    #   like $stdout.
+    def initialize options = {}
+      @retries = options[:retries] || 5
+      @ip_address = options[:ip_address] || '169.254.170.2'
+      @port = options[:port] || 80
+      @credential_path = options[:credential_path]
+      @credential_path ||= ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI']
+      unless @credential_path
+        raise ArgumentError.new(
+          "Cannot instantiate an ECS Credential Provider without a credential path."
+        )
+      end
+      @http_open_timeout = options[:http_open_timeout] || 5
+      @http_read_timeout = options[:http_read_timeout] || 5
+      @http_debug_output = options[:http_debug_output]
+      @backoff = backoff(options[:backoff])
+      super
+    end
+
+    # @return [Integer] The number of times to retry failed atttempts to
+    #   fetch credentials from the instance metadata service. Defaults to 0.
+    attr_reader :retries
+
+    private
+
+    def backoff(backoff)
+      case backoff
+      when Proc then backoff
+      when Numeric then lambda { |_| sleep(backoff) }
+      else lambda { |num_failures| Kernel.sleep(1.2 ** num_failures) }
+      end
+    end
+
+    def refresh
+      # 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, StandardError], 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
+      # Retry loading credentials a configurable number of times if
+      # the instance metadata service is not responding.
+      begin
+        retry_errors(NETWORK_ERRORS, max_retries: @retries) do
+          open_connection do |conn|
+            http_get(conn, @credential_path)
+          end
+        end
+      rescue
+        '{}'
+      end
+    end
+
+    def open_connection
+      http = Net::HTTP.new(@ip_address, @port, nil)
+      http.open_timeout = @http_open_timeout
+      http.read_timeout = @http_read_timeout
+      http.set_debug_output(@http_debug_output) if @http_debug_output
+      http.start
+      yield(http).tap { http.finish }
+    end
+
+    def http_get(connection, path)
+      response = connection.request(Net::HTTP::Get.new(path))
+      if response.code.to_i == 200
+        response.body
+      else
+        raise Non200Response
+      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.3.21'
+  VERSION = '2.3.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.3.21
+  version: 2.3.22
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -301,6 +301,7 @@ files:
 - lib/aws-sdk-core/ec2.rb
 - lib/aws-sdk-core/ecr.rb
 - lib/aws-sdk-core/ecs.rb
+- lib/aws-sdk-core/ecs_credentials.rb
 - lib/aws-sdk-core/efs.rb
 - lib/aws-sdk-core/elasticache.rb
 - lib/aws-sdk-core/elasticbeanstalk.rb