oso-cloud 1.3.0.dev.0 → 1.3.0.dev.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93c11d4552281f1cbf95ec309bbbcd5e8d1289a7f0ee2000724f8d6eb4386617
-  data.tar.gz: 62fd22884497116c5db29b06a012b2b06ad82de78b96ed4823b0dbd22862ef37
+  metadata.gz: 399088667fdeb8cf07cbaca88553b42c7af2eca560c09323425742d67eb59ccc
+  data.tar.gz: 22fdc6724778ebb443a8855451c05e7e1d21478e2a29837a6a11bcc05b791b45
 SHA512:
-  metadata.gz: 5139439b2e01ab083c0e73827ddb520a54dc0c2606d1ca20203bad6b56fc446f747a638cc603a83584da35ae65e500ecf4354fd53065c109fa044aef6ba2950f
-  data.tar.gz: eac48b47137286b49a1e27197cfb7867bbcd982b6fe6523f9e50ed9d8659934ceaea9b548f3d543510e9983872c9a9859400d417f149af8ef82f9319ea7b9f3e
+  metadata.gz: 3b6f071e3f13cb4bc665706181467c88873a868751ac0a0727ce07f2dfd02cf27375d08baf938edd288d507c877f705da1985c3a8eaa96852f9215b25f9bf2b1
+  data.tar.gz: d45dfc511dd84c2fa3a7df6f4fc1792174878de7f4a07c32e62ba863fdbddcea5f8921137ba948a8fbc5c11f0810d8570fae385f9d3c2e69078494f5d59cd273

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.2.0)
+    oso-cloud (1.3.0.dev.2)
       faraday (~> 2.5.2)
       faraday-retry (~> 2.0.0)
       faraday-typhoeus (~> 1.0.0)

data/lib/oso/api.rb

@@ -204,9 +204,8 @@ module OsoCloud
 
     # @!visibility private
     class Api
-      def initialize(url: 'https://api.osohq.com', api_key: nil, options: nil)
-        @url = url
-        @connection = Faraday.new(url: url) do |faraday|
+      def get_connection(options: nil)
+        Faraday.new(url: @url) do |faraday|
           faraday.request :json
 
           # responses are processed in reverse order; this stack implies the
@@ -255,6 +254,11 @@ module OsoCloud
              faraday.adapter :typhoeus, forbid_reuse: true, maxredirs: 1
           end
         end
+      end
+
+      def initialize(url: 'https://api.osohq.com', api_key: nil, options: nil)
+        @url = url
+        @connection = get_connection(options: options)
         @api_key = api_key
         @user_agent = "Oso Cloud (ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; rv:#{VERSION})"
         @last_offset = nil
@@ -392,15 +396,25 @@ module OsoCloud
       end
 
       def POST_BATCH(path, params, body_array, isMutation)
-        responses = []
-        @connection.in_parallel do
-          body_array.each do |body|
-          responses <<  @connection.post("api#{path}") do |req|
-            req.params = params unless params.nil?
-            req.body = OsoCloud::Helpers.to_hash(body) unless body.nil?
-            req.headers = headers
+        connection = get_connection(options: nil)
+        responses = connection.in_parallel do
+          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?
+              req.headers = headers
+            end
           end
         end
+
+        connection_failed = responses.find { |r| r.env.custom_members[:typhoeus_connection_failed] }
+        if connection_failed
+          raise Faraday::ConnectionFailed, connection_failed.env.custom_members[:typhoeus_return_message]
+        end
+
+        timed_out = responses.find { |r| r.env.custom_members[:typhoeus_timed_out] }
+        if timed_out
+          raise Faraday::TimeoutError, timed_out.env.custom_members[:typhoeus_return_message]
         end
         if isMutation
           @last_offset = responses[-1].headers[:OsoOffset]
@@ -418,7 +432,7 @@ module OsoCloud
         end
 
         if isMutation
-          @last_offset = response.headers[:OsoOffset]
+          @last_offset = @response.headers[:OsoOffset]
         end
         response.body
       rescue Faraday::Error => e

data/lib/oso/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.3.0.dev.0
+  version: 1.3.0.dev.2
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday