oso-cloud 1.8.0 → 1.9.1.pre.vendored.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa3ca5a542cd09609eab342416030091943a7e777e6fdccd8b6caf1b1b6a5a99
-  data.tar.gz: 34c40e85594b08ef91ead85505c1488d42fc1291bcf1f3583dacce49abb47446
+  metadata.gz: 2e6e451a7a4bf36fa1e34670ffd71de8c8d0777b80257eff2a33988721886021
+  data.tar.gz: a563939cb00850f94d9cdb97ae47e53d9416f4266a88dc7a6af88b7f2e77bf26
 SHA512:
-  metadata.gz: e950c324bbb312688fe5b2e119d761fb5e7189ac087386ef232d632b1179d7ad2db0a3f7c63ea468088fd3a4d1b4953d4837f8462b6582bb3f09f4c0ed93eb9e
-  data.tar.gz: 24bed9cfb7b77c0fa77867166188e55e2811e63c5ed0fedb111d013338b8a8fdd59c0edf084169ad58d11c1988f4fb53a0e14d882aa8d827a195afc12f1129e7
+  metadata.gz: c24aaa5d60c172fc85a545f97180db79a828923e5ed89fdf0de85b7a505f466ac3a4c3d31b7d46795c4c10b58578e0afe9690174ab6429a7d1c99d11f634df28
+  data.tar.gz: 46356c35150c44a61868034a7a4cbae0f495e310557e2a2d309db50bc68ff0048386eb992557bf313c72d3dbd438618d66f5e3c8385df6ea964a8e7a4d3c9a6c

data/.gitignore

@@ -1,2 +1 @@
 .bundle
-vendor

data/Gemfile

@@ -4,3 +4,8 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 12.0"
+gem "faraday", "2.5.2", :path => "vendor/gems/faraday-2.5.2"
+gem "faraday-retry", "2.0.0", :path => "vendor/gems/faraday-retry-2.0.0"
+gem "faraday-net_http_persistent", "2.3.0", :path => "vendor/gems/faraday-net_http_persistent-2.3.0"
+gem "faraday-net_http", "3.0.2", :path => "vendor/gems/faraday-net_http-3.0.2"
+gem "net-http-persistent", "4.0.5", :path => "vendor/gems/net-http-persistent-4.0.5"

data/Gemfile.lock

@@ -1,11 +1,36 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.8.0)
+    oso-cloud (1.9.1.pre.vendored.0)
       faraday (~> 2.5.2)
       faraday-net_http_persistent (~> 2.0)
       faraday-retry (~> 2.0.0)
 
+PATH
+  remote: vendor/gems/faraday-2.5.2
+  specs:
+    faraday (2.5.2)
+
+PATH
+  remote: vendor/gems/faraday-net_http-3.0.2
+  specs:
+    faraday-net_http (3.0.2)
+
+PATH
+  remote: vendor/gems/faraday-net_http_persistent-2.3.0
+  specs:
+    faraday-net_http_persistent (2.3.0)
+
+PATH
+  remote: vendor/gems/faraday-retry-2.0.0
+  specs:
+    faraday-retry (2.0.0)
+
+PATH
+  remote: vendor/gems/net-http-persistent-4.0.5
+  specs:
+    net-http-persistent (4.0.5)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -31,21 +56,10 @@ GEM
     connection_pool (2.4.1)
     drb (2.2.0)
       ruby2_keywords
-    faraday (2.5.2)
-      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)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     minitest (5.18.0)
     mutex_m (0.2.0)
-    net-http-persistent (4.0.2)
-      connection_pool (~> 2.2)
     pg (1.5.4)
     rake (12.3.3)
     ruby2_keywords (0.0.5)
@@ -58,7 +72,12 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 7.0)
+  faraday (= 2.5.2)!
+  faraday-net_http (= 3.0.2)!
+  faraday-net_http_persistent (= 2.3.0)!
+  faraday-retry (= 2.0.0)!
   minitest (~> 5.15)
+  net-http-persistent (= 4.0.5)!
   oso-cloud!
   pg (~> 1.0)
   rake (~> 12.0)

data/README.md

@@ -32,7 +32,7 @@ architecture, check out the
 - To get up and running with Oso Cloud, try the
   [Quickstart guide](https://www.osohq.com/docs/get-started/quickstart).
 - For method-level documentation, see the
-  [Ruby Client API documentation](https://www.osohq.com/docs/reference/client-apis/ruby).
+  [Ruby Client API documentation](https://www.osohq.com/docs/app-integration/client-apis/ruby).
 - Full documentation is available at
   [osohq.com/docs](https://www.osohq.com/docs).
 - To learn about authorization best practices (not specific to Oso), read the

data/lib/oso/api.rb

@@ -511,6 +511,9 @@ module OsoCloud
             req.params = params unless params.nil?
             req.headers = headers
           end
+
+          create_api_error(response, "Unexpected status #{response.status}") if response.status >= 300 || response.status < 200
+
           response.body
         rescue Faraday::BadRequestError, Faraday::ServerError, Faraday::ConnectionFailed, Faraday::TimeoutError,
                Faraday::SSLError => e
@@ -520,6 +523,9 @@ module OsoCloud
             req.params = params unless params.nil?
             req.headers = headers
           end
+
+          create_api_error(response, "Unexpected status #{response.status}") if response.status >= 300 || response.status < 200
+
           response.body
         end
       rescue Faraday::Error => e
@@ -542,6 +548,8 @@ module OsoCloud
             req.headers = headers
           end
 
+          create_api_error(response, "Unexpected status #{response.status}") if response.status >= 300 || response.status < 200
+
           @last_offset = response.headers[:OsoOffset] if isMutation
           response.body
         # only attempt fallback on 5xx, and connection failure conditions
@@ -554,6 +562,7 @@ module OsoCloud
             req.body = OsoCloud::Helpers.to_hash(body) unless body.nil?
             req.headers = headers
           end
+          create_api_error(response, "Unexpected status #{response.status}") if response.status >= 300 || response.status < 200
           response.body
         end
       rescue Faraday::Error => e
@@ -573,6 +582,9 @@ module OsoCloud
           req.headers = headers
           req.body = OsoCloud::Helpers.to_hash(body) unless body.nil?
         end
+
+        create_api_error(response, "Unexpected status #{response.status}") if response.status >= 300 || response.status < 200
+
         response.body
       rescue Faraday::Error => e
         handle_faraday_error e
@@ -580,14 +592,18 @@ module OsoCloud
 
       def handle_faraday_error(error)
         resp = error.response
+        create_api_error(resp, error.message)
+      end
+
+      def create_api_error(resp, message)
         formatted_request_id = if resp.nil? || resp[:headers].nil? || resp[:headers]['X-Request-ID'].nil?
                                  ''
                                else
                                  ' (Request ID: ' + resp[:headers]['X-Request-ID'] + ')'
                                end
 
-        err = if resp.nil? || resp[:body].nil? || resp[:body][:message].nil?
-                error.message
+        err = if resp.nil? || resp[:body].nil? || !resp[:body].is_a?(Hash) || resp[:body][:message].nil?
+                message
               else
                 resp[:body][:message]
               end

data/lib/oso/oso.rb

@@ -8,7 +8,7 @@ require 'oso/helpers'
 
 ##
 # For more detailed documentation, see
-# https://www.osohq.com/docs/reference/client-apis/ruby
+# https://www.osohq.com/docs/app-integration/client-apis/ruby
 module OsoCloud
   # Represents an object in your application, with a type and id.
   # Both "type" and "id" should be strings.
@@ -41,8 +41,9 @@ module OsoCloud
     # @param actor [OsoCloud::Value]
     # @param action [String]
     # @param resource [OsoCloud::Value]
+    # @param context_facts [Array<fact>]
     # @return [String]
-    def authorize_local(actor, action, resource)
+    def authorize_local(actor, action, resource, context_facts = [])
       actor_typed_id = actor.to_api_value
       resource_typed_id = resource.to_api_value
       result = @api.post_authorize_query(
@@ -52,7 +53,7 @@ module OsoCloud
           action: action,
           resource_type: resource_typed_id.type,
           resource_id: resource_typed_id.id,
-          context_facts: []
+          context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
         )
       )
       result.sql
@@ -67,8 +68,9 @@ module OsoCloud
     # @param action [String]
     # @param resource_type [String]
     # @param column [String]
+    # @param context_facts [Array<fact>]
     # @return [String]
-    def list_local(actor, action, resource_type, column)
+    def list_local(actor, action, resource_type, column, context_facts = [])
       actor_typed_id = actor.to_api_value
       result = @api.post_list_query(
         query: OsoCloud::Core::ListQuery.new(
@@ -76,7 +78,7 @@ module OsoCloud
           actor_id: actor_typed_id.id,
           action: action,
           resource_type: resource_type,
-          context_facts: []
+          context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
         ),
         column: column
       )
@@ -90,8 +92,9 @@ module OsoCloud
     #
     # @param actor [OsoCloud::Value]
     # @param resource [OsoCloud::Value]
+    # @param context_facts [Array<fact>]
     # @return [String]
-    def actions_local(actor, resource)
+    def actions_local(actor, resource, context_facts = [])
       actor_typed_id = actor.to_api_value
       resource_typed_id = resource.to_api_value
       result = @api.post_actions_query(
@@ -100,7 +103,7 @@ module OsoCloud
           actor_id: actor_typed_id.id,
           resource_type: resource_typed_id.type,
           resource_id: resource_typed_id.id,
-          context_facts: []
+          context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
         )
       )
       result.sql

data/lib/oso/version.rb

@@ -1,3 +1,3 @@
 module OsoCloud
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.9.1.pre.vendored.0'.freeze
 end