async-aws 0.3.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4b4634f5e07b319d4e20f927f524e59fea4236693fc38a57d914cba8e616fc8
-  data.tar.gz: 57868e373bbe1137a4f5a0fd38f6727f72eb895ce1a732910e3d5debec1e18b0
+  metadata.gz: 101257bc534ed74edf2e3dce144db4f7689dcf2b626d693177605438cbe5853b
+  data.tar.gz: 2346df96c07eac2723f486ef9c624dca7fa9970603f2bbc562a81e11251772da
 SHA512:
-  metadata.gz: 9acbd7be0847428db25bdc766c184d2c10eb9bd5c6facb72b266389bdcc7d276bf07e99da04cfd959d6522ce1aecf247707061d3b8b1b8f537aacd38b093f01e
-  data.tar.gz: 72f1485b45e5d2b8cd8be02f5ad96dc7161fd8b94e0e4989a95fcd8786e7fc63dd460533ebb1cc88dc2923ca52320dac6ae5030c643b28cb845b3aababecd5dd
+  metadata.gz: bae8bf53175273340c63d4fbf3470d04d07606ac0fa8788d829841cd9047a393266ac3cb6196276bb88aaaf5c632ba73fdd73c27658353f36b45dc62ce4b9ee2
+  data.tar.gz: 7b45cb4941d72f0506b1f179b17535192422eff2c2ce21dec0a86051c8aea2af1112dfb2860e67e72a21bd0ef66c0a11ab2cee4e2da5ba3ad6f08019b6ee60b0

data/Gemfile.lock

@@ -1,71 +1,71 @@
 PATH
   remote: .
   specs:
-    async-aws (0.3.0)
-      async-http (~> 0.48)
+    async-aws (1.0.1)
+      async-http (~> 0.51)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    async (1.23.0)
+    async (1.24.2)
       console (~> 1.0)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-http (0.50.0)
+    async-http (0.51.2)
       async (~> 1.23)
-      async-io (~> 1.27.0)
+      async-io (~> 1.28)
       async-pool (~> 0.2)
-      protocol-http (~> 0.13.0)
-      protocol-http1 (~> 0.10.0)
-      protocol-http2 (~> 0.10.0)
-    async-io (1.27.1)
+      protocol-http (~> 0.18.0)
+      protocol-http1 (~> 0.12.0)
+      protocol-http2 (~> 0.13.0)
+    async-io (1.28.0)
       async (~> 1.14)
     async-pool (0.2.0)
       async (~> 1.8)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.223.0)
-    aws-sdk-core (3.68.1)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1.0)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.296.0)
+    aws-sdk-core (3.94.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-dynamodb (1.36.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-dynamodb (1.45.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.24.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-kms (1.30.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.50.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-s3 (1.61.2)
+      aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
+    aws-sigv4 (1.1.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
-    console (1.5.0)
+    console (1.8.2)
     diff-lcs (1.3)
     jmespath (1.4.0)
     nio4r (2.5.2)
-    protocol-hpack (1.4.1)
-    protocol-http (0.13.0)
-    protocol-http1 (0.10.0)
-      protocol-http (~> 0.13)
-    protocol-http2 (0.10.4)
+    protocol-hpack (1.4.2)
+    protocol-http (0.18.0)
+    protocol-http1 (0.12.0)
+      protocol-http (~> 0.18)
+    protocol-http2 (0.13.3)
       protocol-hpack (~> 1.4)
-      protocol-http (~> 0.2)
-    rake (10.5.0)
+      protocol-http (~> 0.18)
+    rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     timers (4.3.0)
 
 PLATFORMS
@@ -77,7 +77,7 @@ DEPENDENCIES
   aws-sdk-dynamodb
   aws-sdk-s3
   bundler (~> 2.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH

data/README.md

@@ -20,6 +20,13 @@ Or install it yourself as:
 
     $ gem install async-aws
 
+## Configuration
+```ruby
+Async::Aws.configure(
+  connection_limit: 4 # Max number of connections per endpoint (passed to Async::HTTP::Client)
+)
+```
+
 ## Usage
 
 ### Method 1

data/async-aws.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'async-http', '~> 0.48'
+  spec.add_dependency 'async-http', '~> 0.51'
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "aws-sdk-s3"
   spec.add_development_dependency "aws-sdk-dynamodb"

data/lib/async/aws.rb

@@ -1,6 +1,4 @@
 require 'async/http'
-require 'async/http/internet'
-require 'async/aws/http_client'
 require 'async/aws/http_handler'
 require 'async/aws/http_plugin'
 
@@ -8,24 +6,24 @@ module Async
   module Aws
     module_function
 
-    def keep_alive_timeout=(arg)
-      @keep_alive_timeout = arg.to_i
+    def config
+      @config ||= {}
     end
 
-    def keep_alive_timeout
-      @keep_alive_timeout || 2
+    def configure(**kwargs)
+      config.merge!(kwargs.slice(:connection_limit))
     end
 
-    def connection_pool_size=(arg)
-      @connection_pool_size = arg.to_i
+    def set(key, value)
+      __send__("#{key}=".to_sym, value)
     end
 
-    def connection_pool_size
-      @connection_pool_size || 1
+    def connection_limit=(arg)
+      config[:connection_limit] = arg.to_i
     end
 
-    def configure(&block)
-      instance_exec(&block)
+    def connection_limit
+      config.fetch(:connection_limit, 1)
     end
   end
 end

data/lib/async/aws/http_handler.rb

@@ -5,47 +5,38 @@ module Async
         @clients ||= {}
       end
 
-      def self.with_configuration(**kwargs)
-        Class.new(self).tap do |klass|
-          klass.connection_pool_size = kwargs.fetch(
-            :connection_pool_size, Async::Aws.connection_pool_size
-          )
-          klass.keep_alive_timeout = kwargs.fetch(
-            :keep_alive_timeout, Async::Aws.keep_alive_timeout
-          )
-        end
-      end
-
-      def self.connection_pool_size
-        @connection_pool_size ||= Async::Aws.connection_pool_size
-      end
-
-      def self.connection_pool_size=(value)
-        @connection_pool_size = value.to_i
+      def self.endpoints
+        @endpoints ||= {}
       end
 
-      def self.keep_alive_timeout
-        @keep_alive_timeout ||= Async::Aws.keep_alive_timeout
+      def self.endpoint_for(url)
+        endpoints[url.to_s] ||= Async::HTTP::Endpoint.parse(url.to_s)
       end
 
-      def self.keep_alive_timeout=(value)
-        @keep_alive_timeout = value.to_i
+      def self.client_for(endpoint)
+        clients[endpoint.hostname] ||= ::Async::HTTP::Client.new(
+          endpoint,
+          retries: 0,
+          connection_limit: Async::Aws.connection_limit
+        )
       end
 
       def call(context)
         req = context.http_request
         resp = context.http_response
-        endpoint = Async::HTTP::Endpoint.parse(req.endpoint.to_s)
+        endpoint = self.class.endpoint_for(req.endpoint)
 
         begin
-          client = client_for(endpoint)
-          headers_arr = req.headers.reject do |k, v|
-            k == 'host' || k == 'content-length'
-          end
+          client = self.class.client_for(endpoint)
+          headers = ::Protocol::HTTP::Headers.new(
+            req.headers.reject do |k, v|
+              k == 'host' || k == 'content-length'
+            end
+          )
           buffered_body = Async::HTTP::Body::Buffered.wrap(req.body)
           request = ::Protocol::HTTP::Request.new(
             client.scheme, endpoint.authority, req.http_method, endpoint.path,
-            nil, headers_arr, buffered_body
+            nil, headers, buffered_body
           )
           response = client.call(request)
           body = response.read
@@ -59,14 +50,6 @@ module Async
 
         Seahorse::Client::Response.new(context: context)
       end
-
-      def client_for(endpoint)
-        self.class.clients[endpoint.hostname] ||= ::Async::Aws::HttpClient.new(
-          endpoint,
-          pool_size: self.class.connection_pool_size,
-          keep_alive_timeout: self.class.keep_alive_timeout
-        )
-      end
     end
   end
 end

data/lib/async/aws/version.rb

@@ -1,5 +1,5 @@
 module Async
   module Aws
-    VERSION = '0.3.0'
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-aws
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Julien D.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0.51'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0.51'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,6 @@ files:
 - lib/async-aws.rb
 - lib/async/aws.rb
 - lib/async/aws/all.rb
-- lib/async/aws/http_client.rb
 - lib/async/aws/http_handler.rb
 - lib/async/aws/http_plugin.rb
 - lib/async/aws/version.rb

data/lib/async/aws/http_client.rb

@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-
-require 'async/io/endpoint'
-require 'async/io/stream'
-require 'protocol/http/body/streamable'
-require 'protocol/http/methods'
-
-module Async
-  module Aws
-    class HttpClient < ::Protocol::HTTP::Methods
-      attr_accessor :keep_alive_timeout
-      attr_reader   :scheme
-
-      ConnectionSpec = Struct.new(:connection, :used_at)
-
-      # Provides a robust interface to a server.
-      # * If there are no connections, it will create one.
-      # * If there are already connections, it will reuse it.
-      # * If a request fails, it will retry it up to N times if it was idempotent.
-      # The client object will never become unusable. It internally manages persistent connections (or non-persistent connections if that's required).
-      # @param endpoint [Endpoint] the endpoint to connnect to.
-      # @param protocol [Protocol::HTTP1 | Protocol::HTTP2 | Protocol::HTTPS] the protocol to use.
-      # @param scheme [String] The default scheme to set to requests.
-      # @param authority [String] The default authority to set to requests.
-      def initialize(endpoint, pool_size: 2, keep_alive_timeout: 5)
-        @endpoint = endpoint
-        @protocol = endpoint.protocol
-        @scheme = endpoint.scheme
-        @authority = endpoint.authority
-        @keep_alive_timeout = keep_alive_timeout
-        @clock_gettime_constant = \
-          if defined?(Process::CLOCK_MONOTONIC)
-            Process::CLOCK_MONOTONIC
-          else
-            Process::CLOCK_REALTIME
-          end
-        @pool = make_pool(pool_size)
-      end
-
-      def close
-        until @pool.empty?
-          connection_spec = @pool.dequeue
-          connection_spec.connection.close
-        end
-      end
-
-      def call(request)
-        request.scheme ||= self.scheme
-        request.authority ||= self.authority
-
-        attempt = 0
-
-        # We may retry the request if it is possible to do so. https://tools.ietf.org/html/draft-nottingham-httpbis-retry-01 is a good guide for how retrying requests should work.
-        begin
-          attempt += 1
-
-          # As we cache pool, it's possible these pool go bad (e.g. closed by remote host). In this case, we need to try again. It's up to the caller to impose a timeout on this. If this is the last attempt, we force a new connection.
-          connection_spec = @pool.dequeue
-          if connection_spec.used_at + keep_alive_timeout <= current_time
-            connection_spec.connection.close
-            connection_spec = create_connection_spec
-          end
-
-          # send request
-          response = request.call(connection_spec.connection)
-
-          # The connection won't be released until the body is completely read/released.
-          ::Protocol::HTTP::Body::Streamable.wrap(response) do
-            connection_spec.used_at = current_time
-            @pool << connection_spec
-          end
-
-          return response
-        rescue => e
-          @pool << connection_spec if connection_spec
-          raise e
-        end
-      end
-
-      private
-
-      def current_time
-        Process.clock_gettime(@clock_gettime_constant)
-      end
-
-      def create_connection_spec
-        ConnectionSpec.new(
-          @protocol.client(@endpoint.connect),
-          current_time
-        )
-      end
-
-      def make_pool(size)
-        Async::Queue.new.tap do |queue|
-          size.times do
-            queue << create_connection_spec
-          end
-        end
-      end
-    end
-  end
-end