oso-cloud 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7747b42bd66825a62104ba2873c1b86fba9886b79e9b23b2de498e78bdf4240b
-  data.tar.gz: 78841fd6edb4eb87bd80b3372e75a9db1e9f56ad71955a95e2f3796a99ff74a6
+  metadata.gz: c6dfcfe3d534a83d8c96e9fe04ae500921a483507c386baa4133143677fbac17
+  data.tar.gz: e61cb97030c944f5038e5214bc7573145c22f1d8674884a3c46fd57bc334d490
 SHA512:
-  metadata.gz: e93b2627d5245dad5b20fa2bbddaada1783e4d2a71192d225c2dd89f1682e181fb4334ef34cba7a74fc670cb419dfaa07c44c727e8720ddde6777a2fc6dc6918
-  data.tar.gz: 0272c0446e6ebc4b1d6be4d9773710c4e236e7608e5af4fe93b83a5dc33ec21a8e1e68a56e30ef15225b4d765cc4c7a4be42fb07cca0265c6709cb761d9b4b5d
+  metadata.gz: e3492c5a64c6a57aa72800736b096993fef0420c0719cfd86b0a98ed08c4ef30ca4a50a3802c01e4d8be5879078123820672119c6c9178d751124e20a8013ee8
+  data.tar.gz: 16e736b6a0e8fed24aa24f449be5065b83f88b8eb9de4908299d2069b6fc02d165479d04354d0011e7ad451e8a80498ef24f46191e9370a20f3674942328464f

data/Gemfile.lock

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

data/lib/oso/api.rb

@@ -22,7 +22,10 @@ module OsoCloud
 
     # @!visibility private
     class ApiError < StandardError
-      def initialize(message:)
+      attr_reader :status_code, :retry_after
+      def initialize(message:, status_code: nil, retry_after: nil)
+        @status_code = status_code
+        @retry_after = retry_after
         super(message)
       end
     end
@@ -164,23 +167,26 @@ module OsoCloud
 
     # @!visibility private
     class ListResult
-      attr_reader :results
+      attr_reader :results, :next_page_token
 
-      def initialize(results:)
+      def initialize(results:, next_page_token: nil)
         @results = results
+        @next_page_token = next_page_token
       end
     end
 
     # @!visibility private
     class ListQuery
-      attr_reader :actor_type, :actor_id, :action, :resource_type, :context_facts
+      attr_reader :actor_type, :actor_id, :action, :resource_type, :context_facts, :page_size, :page_token
 
-      def initialize(actor_type:, actor_id:, action:, resource_type:, context_facts:)
+      def initialize(actor_type:, actor_id:, action:, resource_type:, context_facts:, page_size: nil, page_token: nil)
         @actor_type = actor_type
         @actor_id = actor_id
         @action = action
         @resource_type = resource_type
         @context_facts = context_facts.map { |v| (v.is_a? Fact) ? v : Fact.new(**v) }
+        @page_size = page_size
+        @page_token = page_token
       end
     end
 
@@ -287,6 +293,9 @@ module OsoCloud
             interval_randomness: 0.005,
             max_interval: 1,
             backoff_factor: 2,
+            # 409 (Conflict) is intentionally not retried here. The server uses 409
+            # with Retry-After for paginated results not yet ready, which needs
+            # longer delays than HTTP-level backoff. Handled by per-page retry in list().
             retry_statuses: [429, 500, 502, 503, 504],
             # This is the default set of methods plus POST.
             # ref: https://github.com/lostisland/faraday-retry#specify-which-methods-will-be-retried
@@ -581,10 +590,13 @@ module OsoCloud
 
       def handle_faraday_error(error)
         resp = error.response
-        create_api_error(resp, error.message)
+        status_code = resp && resp[:status]
+        retry_after = resp && resp[:headers] && resp[:headers]['Retry-After']
+        retry_after = retry_after.to_f if retry_after
+        create_api_error(resp, error.message, status_code: status_code, retry_after: retry_after)
       end
 
-      def create_api_error(resp, message)
+      def create_api_error(resp, message, status_code: nil, retry_after: nil)
         formatted_request_id = if resp.nil? || resp[:headers].nil? || resp[:headers]['X-Request-ID'].nil?
                                  ''
                                else
@@ -596,7 +608,11 @@ module OsoCloud
               else
                 resp[:body][:message]
               end
-        raise ApiError.new(message: err + formatted_request_id)
+
+        sc = status_code || (resp && resp[:status])
+        ra = retry_after || (resp && resp[:headers] && resp[:headers]['Retry-After'] ? resp[:headers]['Retry-After'].to_f : nil)
+
+        raise ApiError.new(message: err + formatted_request_id, status_code: sc, retry_after: ra)
       end
 
       def post_expected_result(expected_result)

data/lib/oso/oso.rb

@@ -228,15 +228,50 @@ module OsoCloud
     # @return [Array<String>]
     # @see Oso for more information about facts
     def list(actor, action, resource_type, context_facts = [])
+      all_results = []
+      page_token = nil
+      loop do
+        page = list_paginated(actor, action, resource_type, 10000, page_token: page_token, context_facts: context_facts)
+        all_results.concat(page.results)
+        break if page.next_page_token.nil?
+        page_token = page.next_page_token
+      end
+      all_results
+    end
+
+    ##
+    # List authorized resources with pagination
+    #
+    # Fetches a page of resource ids on which an actor can perform a
+    # particular action. Returns a ListResult with `results` and `next_page_token`.
+    # Pass `next_page_token` to fetch subsequent pages.
+    #
+    # @param actor [OsoCloud::Value]
+    # @param action [String]
+    # @param resource_type [String]
+    # @param page_size [Integer]
+    # @param page_token [String, nil]
+    # @param context_facts [Array<fact>]
+    # @return [OsoCloud::Core::ListResult]
+    def list_paginated(actor, action, resource_type, page_size, page_token: nil, context_facts: [])
       actor_typed_id = actor.to_api_value
-      result = @api.post_list(OsoCloud::Core::ListQuery.new(
-                                actor_type: actor_typed_id.type,
-                                actor_id: actor_typed_id.id,
-                                action: action,
-                                resource_type: resource_type,
-                                context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
-                              ))
-      result.results
+      10.times do |attempt|
+        begin
+          return @api.post_list(OsoCloud::Core::ListQuery.new(
+                                  actor_type: actor_typed_id.type,
+                                  actor_id: actor_typed_id.id,
+                                  action: action,
+                                  resource_type: resource_type,
+                                  context_facts: OsoCloud::Helpers.params_to_facts(context_facts),
+                                  page_size: page_size,
+                                  page_token: page_token
+                                ))
+        rescue OsoCloud::Core::ApiError => e
+          raise unless e.status_code == 409 && e.retry_after && attempt < 9
+          sleep(e.retry_after)
+        end
+      end
+      raise OsoCloud::Core::ApiError.new(message: 'Page not available after retries', status_code: 409)
     end
 
     ##

data/lib/oso/version.rb

@@ -2,5 +2,5 @@
 
 # !! IMPORTANT: Update the ruby docs to reflect the latest version !!
 module OsoCloud
-  VERSION = '1.10.1'
+  VERSION = '1.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-03 00:00:00.000000000 Z
+date: 2026-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday