oso-cloud 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0afcafa1d502f02d19ed93b21ad4606eaf59056114c496c5a9d8b72f55994c05
-  data.tar.gz: e9bc9ad6450429c9d2c5a1574e4451316e1f043b666da2cfbdc3ae69e1e449cf
+  metadata.gz: 3991004d30f9fb3930a74494eb15f9658d469bf198440888ef4247b04e0e90fe
+  data.tar.gz: 19a847a4fa5ef0940606838879aa99cb5e1cb9f0b0b591fac9d30ee1b03adf90
 SHA512:
-  metadata.gz: 8e837b4bd3d8c16aa1859c93453756a35c844c5371ab9cad18d2afb88748dfc413993be213da260f73bff9d9b83ef28a734e2cfd994e706220c92c4d2ce62df4
-  data.tar.gz: 179d6e9639dd2cf447c4c71c6f888b5474f633ad1f323f15b46a8729e8acb86419e2e5b4f628628a4c8655d874881ee6e938d379dbd794f68ea6a18b593c580d
+  metadata.gz: a69a9097271580148040e9790d49b297d2ca4c90fb5c032d088f51b619e0e995b5348312e46e3748fc2d2d95a4c16cf9a98bba017d5e09292b64a65202b47b25
+  data.tar.gz: 3dfcf182d1283311f79c5ad806ff53e8e8a40c2f36b12cc54b459cfa3d23c215b92e5b59d24b9553df8e2c3a2b874a70e67f87e7ab2f9a647e492188dc4960fc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.1.0)
+    oso-cloud (1.2.0)
       faraday (~> 2.5.2)
       faraday-retry (~> 2.0.0)
 
@@ -14,7 +14,7 @@ GEM
     faraday-net_http (3.0.2)
     faraday-retry (2.0.0)
       faraday (~> 2.0)
-    minitest (5.15.0)
+    minitest (5.18.0)
     rake (12.3.3)
     ruby2_keywords (0.0.5)
 

data/lib/oso/api.rb

@@ -4,6 +4,7 @@ require 'faraday'
 require 'faraday/retry'
 
 require 'oso/helpers'
+require 'oso/version'
 
 module OsoCloud
   # @!visibility private
@@ -202,7 +203,7 @@ module OsoCloud
 
     # @!visibility private
     class Api
-      def initialize(url: 'https://cloud.osohq.com', api_key: nil, options: nil)
+      def initialize(url: 'https://api.osohq.com', api_key: nil, options: nil)
         @url = url
         @connection = Faraday.new(url: url) do |faraday|
           faraday.request :json
@@ -210,7 +211,7 @@ module OsoCloud
           # 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 :json, parser_options: { symbolize_names: true }
           faraday.response :raise_error
           faraday.request :retry, {
             max: (options && options[:max_retries]) || 10,
@@ -249,117 +250,91 @@ module OsoCloud
           end
         end
         @api_key = api_key
+        @user_agent = "Oso Cloud (ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; rv:#{VERSION})"
+        @last_offset = nil
       end
 
       def get_policy
-        params = {}
-        data = nil
         url = '/policy'
-        result = GET(url, params, data)
+        result = GET(url, nil)
         GetPolicyResult.new(**result)
       end
 
       def post_policy(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/policy'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, true)
         ApiResult.new(**result)
       end
 
       def post_facts(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/facts'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, true)
         Fact.new(**result)
       end
 
       def delete_facts(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/facts'
-        result = DELETE(url, params, data)
+        result = DELETE(url, data)
         ApiResult.new(**result)
       end
 
       def post_bulk_load(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/bulk_load'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, true)
         ApiResult.new(**result)
       end
 
       def post_bulk_delete(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/bulk_delete'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, true)
         ApiResult.new(**result)
       end
 
       def post_bulk(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/bulk'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, true)
         ApiResult.new(**result)
       end
 
       def post_authorize(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/authorize'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, false)
         AuthorizeResult.new(**result)
       end
 
       def post_authorize_resources(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/authorize_resources'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, false)
         AuthorizeResourcesResult.new(**result)
       end
 
       def post_list(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/list'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, false)
         ListResult.new(**result)
       end
 
       def post_actions(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/actions'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, false)
         ActionsResult.new(**result)
       end
 
       def post_query(data)
-        params = {}
-        data = OsoCloud::Helpers.to_hash(data)
         url = '/query'
-        result = POST(url, params, data)
+        result = POST(url, nil, data, false)
         QueryResult.new(**result)
       end
 
       def get_stats
-        params = {}
-        data = nil
         url = '/stats'
-        result = GET(url, params, data)
+        result = GET(url, {})
         StatsResult.new(**result)
       end
 
       def clear_data
-        params = {}
-        data = nil
         url = '/clear_data'
-        result = POST(url, params, data)
+        result = POST(url, nil, nil, true)
         ApiResult.new(**result)
       end
 
@@ -376,57 +351,67 @@ module OsoCloud
             params["args.#{i}.id"] = arg_query.id
           end
         end
-        data = nil
         url = '/facts'
-        result = GET(url, params, data)
+        result = GET(url, params)
         result.map { |v| Fact.new(**v) }
       end
 
       def headers
-        {
+        default_headers = {
           'Authorization' => format('Bearer %s', @api_key),
-          'User-Agent' => 'Oso Cloud (ruby)',
+          'User-Agent' => @user_agent,
           Accept: 'application/json',
           'Content-Type': 'application/json',
-          'X-OsoApiVersion': '0'
+          'X-OsoApiVersion': '0',
         }
+        # set OsoOffset is last_offset is not nil
+        default_headers[:OsoOffset] = @last_offset unless @last_offset.nil?
+        default_headers
       end
 
-      def GET(path, params, _body)
-        response = @connection.get("api#{path}", params, headers)
-        handle_faraday_response response
+      def GET(path, params)
+        response = @connection.get("api#{path}")  do |req|
+          req.params = params unless params.nil?
+          req.headers = headers
+        end
+        response.body
       rescue Faraday::Error => e
         handle_faraday_error e
       end
 
-      def POST(path, params, body)
-        response = @connection.post("api#{path}", body, headers) do |req|
-          req.params = params
+      def POST(path, params, body, isMutation)
+        response = @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
-        handle_faraday_response response
+
+        if isMutation
+          @last_offset = response.headers[:OsoOffset]
+        end
+        response.body
       rescue Faraday::Error => e
         handle_faraday_error e
       end
 
-      def DELETE(path, params, body)
-        response = @connection.delete("api#{path}", params, headers) do |req|
-          req.body = body
+      def DELETE(path, body)
+        response = @connection.delete("api#{path}") do |req|
+          req.headers = headers
+          req.body = OsoCloud::Helpers.to_hash(body) unless body.nil?
         end
-        handle_faraday_response response
+        response.body
       rescue Faraday::Error => e
         handle_faraday_error e
       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)
+        resp = error.response
+        err = if resp.respond_to? :body
+            resp.body[:message]
+        else
+          error.message
+        end
+        raise ApiError.new(message: err)
       end
     end
   end

data/lib/oso/version.rb

@@ -1,3 +1,3 @@
 module OsoCloud
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday