oso-cloud 1.3.0.dev.3 → 1.3.0.dev.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75c0b57a46025c665c2098566134bbdc8e9e5a577706b6efc318b35a7a60ca57
-  data.tar.gz: c6482fd3885bb7736c95ec2cf744b6f9b8111da1f9daf62c9ff56fd5636d475e
+  metadata.gz: 51dc4187ef8812ede5669c392262eceb0cf09ed962831f0263c0eb931703ba21
+  data.tar.gz: 37f0a58b35e23da57458685ad36a9171e20c933fa90a80685226ef0d3a9b9cf6
 SHA512:
-  metadata.gz: a0f41beb06adcdc1fdefeaefedb705d45b128c4a40533ba8356922e7903acddd566a481ac1a15910eb9aaeddc904b7091ef13e0023618cdca343c74b74ab7214
-  data.tar.gz: 027de9f7060481d03b7da46a837525d39391e130fb247dc140e7b0f7cf8db43e017da000ce6a02c4cb19032783e5888d5d36e92b90e1a618fe5324ffb955dab9
+  metadata.gz: 732ec34bb79ad29287de13c6e6d696e374b21478dd4943059d0b7e4adb41ff96d31908b339e69f346bc7ee64704bdaeca1973ffdb49ae088dd73991615da43b8
+  data.tar.gz: a397403259a48af1d934cefe3563c0a5816810b00a213e30f99aabaa41affacfa95e276c234da9201f36474ddca0305d83969816ca2ea5021eb862e2b717b579

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.3.0.dev.2)
+    oso-cloud (1.3.0.dev.5)
       faraday (~> 2.5.2)
+      faraday-net_http_persistent (~> 2.0)
       faraday-retry (~> 2.0.0)
       faraday-typhoeus (~> 1.0.0)
 
@@ -12,6 +13,7 @@ GEM
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     coderay (1.1.3)
+    connection_pool (2.4.1)
     debug_inspector (1.1.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
@@ -19,15 +21,20 @@ GEM
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
+    faraday-net_http_persistent (2.1.0)
+      faraday (~> 2.5)
+      net-http-persistent (~> 4.0)
     faraday-retry (2.0.0)
       faraday (~> 2.0)
     faraday-typhoeus (1.0.0)
       faraday (~> 2.0)
       typhoeus (~> 1.4)
-    ffi (1.15.5)
+    ffi (1.16.2)
     interception (0.5)
     method_source (1.0.0)
     minitest (5.18.0)
+    net-http-persistent (4.0.2)
+      connection_pool (~> 2.2)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)

data/lib/oso/api.rb

@@ -3,6 +3,7 @@ require 'uri'
 require 'faraday'
 require 'faraday/retry'
 require 'faraday/typhoeus'
+require 'faraday/net_http_persistent'
 
 require 'oso/helpers'
 require 'oso/version'
@@ -230,7 +231,7 @@ module OsoCloud
                 /api/actions
                 /api/query
               ].include? env.url.path
-            }
+            },
           }
 
           if options && options[:test_adapter]
@@ -245,13 +246,10 @@ module OsoCloud
                 options[:test_adapter][:func].call
               end
             end
+          elsif options && options[:parallel_adapter]
+            faraday.adapter :typhoeus, forbid_reuse: false, maxredirs: 1, connecttimeout: 30
           else
-            # faraday.adapter :net_http
-            # faraday.adapter :net_http_persistent, pool_size: 5 do |http|
-            #   # yields Net::HTTP::Persistent
-            #   http.idle_timeout = 1000
-            # end
-             faraday.adapter :typhoeus, forbid_reuse: true, maxredirs: 1
+            faraday.adapter :net_http_persistent, pool_size: 10, idle_timeout: 30
           end
         end
       end
@@ -259,6 +257,7 @@ module OsoCloud
       def initialize(url: 'https://api.osohq.com', api_key: nil, options: nil)
         @url = url
         @connection = get_connection(options: options)
+        @parallel_connection = get_connection(options: { parallel_adapter: true })
         @api_key = api_key
         @user_agent = "Oso Cloud (ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; rv:#{VERSION})"
         @last_offset = nil
@@ -396,9 +395,10 @@ module OsoCloud
       end
 
       def POST_BATCH(path, params, body_array, isMutation)
-        connection = get_connection(options: nil)
-        responses = connection.in_parallel do
-          body_array.map do |body|
+        connection = @parallel_connection
+        responses = []
+        connection.in_parallel do
+          responses = body_array.map do |body|
             connection.post("api#{path}") do |req|
               req.params = params unless params.nil?
               req.body = OsoCloud::Helpers.to_hash(body) unless body.nil?

data/lib/oso/version.rb

@@ -1,3 +1,3 @@
 module OsoCloud
-  VERSION = '1.3.0.dev.3'.freeze
+  VERSION = '1.3.0.dev.5'.freeze
 end

data/oso-cloud.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday', '~> 2.5.2'
   spec.add_dependency 'faraday-retry', '~> 2.0.0'
-  # spec.add_dependency 'faraday-net_http_persistent', '~> 2.0'
+  spec.add_dependency 'faraday-net_http_persistent', '~> 2.0'
   spec.add_dependency 'faraday-typhoeus', '~> 1.0.0'
   #
   spec.add_development_dependency 'minitest', '~> 5.15'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.3.0.dev.3
+  version: 1.3.0.dev.5
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-26 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: faraday-net_http_persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: faraday-typhoeus
   requirement: !ruby/object:Gem::Requirement