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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea1469d68034a213af21a5a0300d2b1b1c7df2d00a3a2518f0a5e48fc0b5756b
-  data.tar.gz: 9491bc2e2bc622296b16a473c0996fdb89a67eb2242f046637ccba173a9e9fb4
+  metadata.gz: 399088667fdeb8cf07cbaca88553b42c7af2eca560c09323425742d67eb59ccc
+  data.tar.gz: 22fdc6724778ebb443a8855451c05e7e1d21478e2a29837a6a11bcc05b791b45
 SHA512:
-  metadata.gz: 4baf074d8e2a237287699be969ad02959f5ba1c626cc582c0542931c198cc3c7728b5aa2ec5fa1d323a1368a027d7734fea5c07490247df81f16153c4192cdc4
-  data.tar.gz: '083f190963c58855ac7c5514a07f4547edb2d4b01cb01ac1ef2e11594375401d1b5481a23811134ac484242b8a257a1897e57c36da59241da4a2e95e6fc4d694'
+  metadata.gz: 3b6f071e3f13cb4bc665706181467c88873a868751ac0a0727ce07f2dfd02cf27375d08baf938edd288d507c877f705da1985c3a8eaa96852f9215b25f9bf2b1
+  data.tar.gz: d45dfc511dd84c2fa3a7df6f4fc1792174878de7f4a07c32e62ba863fdbddcea5f8921137ba948a8fbc5c11f0810d8570fae385f9d3c2e69078494f5d59cd273

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.3.0.dev.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,9 +396,10 @@ module OsoCloud
       end
 
       def POST_BATCH(path, params, body_array, isMutation)
-        @connection.in_parallel do
-          @responses = body_array.map do |body|
-            @connection.post("api#{path}") do |req|
+        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
@@ -402,19 +407,19 @@ module OsoCloud
           end
         end
 
-        connection_failed = @responses.find { |r| r.env.custom_members[:typhoeus_connection_failed] }
+        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] }
+        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]
+          @last_offset = responses[-1].headers[:OsoOffset]
         end
-        @responses
+        responses
       rescue Faraday::Error => e
         handle_faraday_error e
       end
@@ -427,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.1'.freeze
+  VERSION = '1.3.0.dev.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.3.0.dev.1
+  version: 1.3.0.dev.2
 platform: ruby
 authors:
 - Oso Security, Inc.