oso-cloud 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460a79201e11b1f8e81db2eedea8bfd1c6651301336e1d31652a54a1ed537344
-  data.tar.gz: bd3692528348f8e9e45a36c09a3df41cef74fc47258db81471b456e0f1297f32
+  metadata.gz: 339079e696596a482f6f1fe6bc875d9f88dc5415b0eaca4b4e7a04304280cc7a
+  data.tar.gz: '099c6b0532405a7fc0cf5933b09ea03991fe43f3e2da6b726d5e33e932706b55'
 SHA512:
-  metadata.gz: 360042f1cb0f076651160473ae092215f36773832c70aa042e26a58a2ebbd9aacf034ec7e0227136075fbe1bc000148c627629a6ddee3ca0ba91cc422b1f2818
-  data.tar.gz: 79eeab9786a8358d12c3010648ab03f3fff454e69ae217e15122fbc5ebd5e2f4619111da3727e2bb60af14bd3f11e66989c8c74594243852ab131de0e8d1396d
+  metadata.gz: 441e11c7fdb4b201cf22d84195d7f0cc5454a64186c0078086ae085138a31a8ee10f667f5723b94b467aa74ee89780e1ccd853c435d044f84616b46f78a44527
+  data.tar.gz: 56c4cb7d88820805bbd9238624f8220253c48aa19fdffe71298af26ff9369e3bf5692d49be70f439a582e4f76ff9d4b7458f45a303fa32c02296c5c2324f9f08

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.0.0)
+    oso-cloud (1.0.1)
       faraday (~> 2.5.2)
       faraday-retry (~> 2.0.0)
 
@@ -11,7 +11,7 @@ GEM
     faraday (2.5.2)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
+    faraday-net_http (3.0.2)
     faraday-retry (2.0.0)
       faraday (~> 2.0)
     minitest (5.15.0)

data/lib/oso/api.rb

@@ -18,11 +18,9 @@ module OsoCloud
     end
 
     # @!visibility private
-    class ApiError
-      attr_reader :message
-
+    class ApiError < StandardError
       def initialize(message:)
-        @message = message
+        super(message)
       end
     end
 
@@ -229,20 +227,51 @@ module OsoCloud
 
     # @!visibility private
     class Api
-      def initialize(url: 'https://cloud.osohq.com', api_key: nil)
+      def initialize(url: 'https://cloud.osohq.com', api_key: nil, options: nil)
         @url = url
         @connection = Faraday.new(url: url) do |faraday|
+          faraday.request :json
+
+          # responses are processed in reverse order; this stack implies the
+          # retries are attempted before an error is raised, and the json
+          # parser is only applied if there are no errors
+          faraday.response :json, preserve_raw: true
+          faraday.response :raise_error
           faraday.request :retry, {
-            max: 15,
-            interval: 0.05,
-            interval_randomness: 0.5,
+            max: (options && options[:max_retries]) || 10,
+            interval: 0.01,
+            interval_randomness: 0.005,
+            max_interval: 1,
             backoff_factor: 2,
             retry_statuses: [429, 500, 502, 503, 504],
+            # ensure authorize and related check functions are retried because
+            # they are POST requests, which are not retried automatically
+            retry_if: ->(env, _exc) {
+              %w[
+                /api/authorize
+                /api/authorize_resources
+                /api/list
+                /api/actions
+                /api/query
+              ].include? env.url.path
+            },
           }
 
-          faraday.request :json
-          faraday.response :json, preserve_raw: true
-          faraday.adapter :net_http
+          if (options && options[:test_adapter])
+            faraday.adapter :test do |stub|
+              stub.post(options[:test_adapter][:path]) do |env|
+                options[:test_adapter][:func].call
+              end
+              stub.get(options[:test_adapter][:path]) do |env|
+                options[:test_adapter][:func].call
+              end
+              stub.delete(options[:test_adapter][:path]) do |env|
+                options[:test_adapter][:func].call
+              end
+            end
+          else
+            faraday.adapter :net_http
+          end
         end
         @api_key = api_key
       end
@@ -390,6 +419,8 @@ module OsoCloud
       def GET(path, params, body)
         response = @connection.get("api#{path}", params, headers )
         handle_faraday_response response
+      rescue Faraday::Error => error
+        handle_faraday_error error
       end
 
       def POST(path, params, body)
@@ -397,6 +428,8 @@ module OsoCloud
           req.params = params
         end
         handle_faraday_response response
+      rescue Faraday::Error => error
+        handle_faraday_error error
       end
 
       def DELETE(path, params, body)
@@ -404,12 +437,21 @@ module OsoCloud
           req.body = body
         end
         handle_faraday_response response
+      rescue Faraday::Error => error
+        handle_faraday_error error
       end
 
       def handle_faraday_response(response)
         # TODO:(@patrickod) refactor duplicative JSON parsing
         JSON.parse(response.env[:raw_body], symbolize_names: true)
       end
+
+      def handle_faraday_error(error)
+        err = JSON.parse(error.response[:body], symbolize_names: true)
+        raise ApiError.new(**err)
+      rescue JSON::ParserError => e
+        raise ApiError.new(message: e.message)
+      end
     end
 
   end

data/lib/oso/version.rb

@@ -1,3 +1,3 @@
 module OsoCloud
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday