oso-cloud 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 747cf1fda61eae9e9a96076e782a503e3c440a3aa7049a6b8f74ce8d0c697273
-  data.tar.gz: 5a3fcbb8574c21416fa81dbf8e1054dfef59337da6c72ff686c06304b3c27711
+  metadata.gz: 78d81ade4fd246a2398c1a0224ecc8a6ff3852b968e03c0c79c1d28295358cfd
+  data.tar.gz: cdfa7bb5f957f1aaf7d801d8b5bca4e3e2dc4b1df8044d9cc30114aae5d012fe
 SHA512:
-  metadata.gz: 1f0a4732c2f76b499f1dc962a0ee806fd6d2c17abdb734d2a1ce448c35eff4781dafce6aec90f39ede78e06fac44bcdbbb11033949867d562007c3f15a3fcee7
-  data.tar.gz: 41b95a2e852e431e1e1598277abeaad8b76bb174ea562d52a6e9c1d9c644f12a5799e1cde75063bf1d6757eb4cd62be0463c369192f8644353bb791a69391e43
+  metadata.gz: dc3fa7da1c706b47ffe89e6d9ed03ed9950cb8c756051ef2cc3e7ed81e2931f34dbdad8e6c8e217f9d061a4c9a2d5ad36784acdbba0772a3d16102bc43d8e09f
+  data.tar.gz: e48be352ec530bfb99afe81723abbfca673a9c63d295388d68f34bebf97b973a8c911d68133cc11668622cef26553cb92e5336346b1410d081bd1dac41c9c881

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.7.0)
+    oso-cloud (1.7.1)
       faraday (~> 2.5.2)
       faraday-net_http_persistent (~> 2.0)
       faraday-retry (~> 2.0.0)

data/lib/oso/api.rb

@@ -3,6 +3,7 @@ require 'uri'
 require 'faraday'
 require 'faraday/retry'
 require 'faraday/net_http_persistent'
+require 'securerandom'
 
 require 'oso/helpers'
 require 'oso/version'
@@ -332,6 +333,7 @@ module OsoCloud
         @user_agent = "Oso Cloud (ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; rv:#{VERSION})"
         @last_offset = nil
         @data_bindings = IO.read(data_bindings) unless data_bindings.nil?
+        @client_id = SecureRandom.uuid
       end
 
       def fallback_eligible(path)
@@ -484,6 +486,8 @@ module OsoCloud
           Accept: 'application/json',
           'Content-Type': 'application/json',
           'X-OsoApiVersion': '0',
+          'X-Request-ID' => SecureRandom.uuid,
+          'X-Oso-Instance-Id' => @client_id
         }
         # set OsoOffset is last_offset is not nil
         default_headers[:OsoOffset] = @last_offset unless @last_offset.nil?
@@ -549,12 +553,18 @@ module OsoCloud
 
       def handle_faraday_error(error)
         resp = error.response
+        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
         else
           resp[:body][:message]
         end
-        raise ApiError.new(message: err)
+        raise ApiError.new(message: err + formatted_request_id)
       end
     end
   end

data/lib/oso/version.rb

@@ -1,3 +1,3 @@
 module OsoCloud
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday