oso-cloud 1.3.0.dev.4 → 1.3.0.dev.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 822eaee82cfec822517e2b08f9bfb15600507ae653a81f3924e74659bef7e282
-  data.tar.gz: 77914d92cf832aa1f4d281b192da5364448af1cd4b7577eed5f12b76c513d3e0
+  metadata.gz: 14b5b319f475adefc2e05c6bf2e9cf6f22b20164d38fb9c1cb59b1b7c6c291ee
+  data.tar.gz: d9d50d1adcc35c04309b65cde6d2d802eec75ccdd62d6b2d5e05907e7bb9806f
 SHA512:
-  metadata.gz: 12e44eb71effe07a28910df9f14d96b73416dd8edb2b29ef05aeb108083ecfdb1671056b24e592c3956fd76701cbf04c61fed522f19a12b747bfa59fc70bb6a7
-  data.tar.gz: 92df3b977c7bc5fe8328fe0e21bd311fa6c34c40efb41280229b2ed739c43eecfc86dfc0d395e6ffa6a321df24b82eef4680c92f963c2ced95f059ba3763e3cb
+  metadata.gz: e8f770aaefda73dba90e6410be04dec0dc5ec1089535d7977f1aa5bd1d6310023954c6e2aae3e1d6c9e458ef2ceb5df58cf7dd16bc3c3183036da4965fcdaf02
+  data.tar.gz: 669d14ebf88e20a6f2a1bebdc609a7bda2e3eb6c20fc3d5eb7f4efa2b686ea611bc5a7ad28dcd4cd450a36226f1df5594daa09927a755d91ab97abe819363181

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.3.0.dev.3)
+    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,7 +395,7 @@ module OsoCloud
       end
 
       def POST_BATCH(path, params, body_array, isMutation)
-        connection = get_connection(options: nil)
+        connection = @parallel_connection
         responses = []
         connection.in_parallel do
           responses = body_array.map do |body|

data/lib/oso/oso.rb

@@ -270,21 +270,37 @@ module OsoCloud
       OsoCloud::Helpers.facts_to_params(result.results)
     end
 
-    def actions_batch(actor, resources, context_facts = [])
-      actor_typed_id = actor.to_api_value
-      data = resources.map do |r|
-        resource_typed_id = r.to_api_value
-        OsoCloud::Core::ActionsQuery.new(
-            actor_type: actor_typed_id.type,
-            actor_id: actor_typed_id.id,
-            resource_type: resource_typed_id.type,
-            resource_id: resource_typed_id.id,
-            context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
-          )
+    ##
+    # List authorized actions for a batch of queries
+    #
+    # Fetches a list of actions which an actor can perform on a particular resource.
+    #
+    # @param actor [OsoCloud::Value]
+    # @param queries [Array<OsoCloud::Value>] | Array<[OsoCloud::Value, Array<fact>]>
+    # @return [Array<Array<String>>]
+    # @see Oso for more information about facts
+    def actions_batch(actor, queries:)
+        actor_typed_id = actor.to_api_value
+        data = queries.map do |q|
+          context_facts = []
+          resource = nil
+          if (q.is_a?(Array))
+            resource = q[0]
+            context_facts = q[1]
+          else
+            resource = q
+          end
+          resource_typed_id = resource.to_api_value
+          OsoCloud::Core::ActionsQuery.new(
+              actor_type: actor_typed_id.type,
+              actor_id: actor_typed_id.id,
+              resource_type: resource_typed_id.type,
+              resource_id: resource_typed_id.id,
+              context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
+            )
       end
       @api.post_actions_batch(data).map { |result| result.results}
     end
   end
 
 end
-

data/lib/oso/version.rb

@@ -1,3 +1,3 @@
 module OsoCloud
-  VERSION = '1.3.0.dev.4'.freeze
+  VERSION = '1.3.0.dev.6'.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.4
+  version: 1.3.0.dev.6
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-26 00:00:00.000000000 Z
+date: 2023-10-02 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