iron_bank 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 853859a45aaabdcfc831dca27a70882b28aa19f68b214a666cb0830ce4fa702f
-  data.tar.gz: 3c755dd00fad7455b402dd04ae7f649f554fce6127608e11f28c2e16f31c85d9
+  metadata.gz: c5f447a2b12293785811cd3e1f6d170e4ff3186b7de4ce4cac6d12b4322171a4
+  data.tar.gz: '068e99b0fc9fb71eaa3adfa252bf455d2622579feaa6ee1893922d7667130e01'
 SHA512:
-  metadata.gz: 50f8865e78282701c705fd9e5b1b0f9978f152d54b7594784806153d9ffc3654d57871f6a9c4dbe1917611853915e27ff16e9b893e2bc2d848a27f963596aa32
-  data.tar.gz: 41e18fea0a4047734d49c8a495dfb28c2c13b7a40ef4a4737f6ccf909e4894bca44048124793cb9924ed375000e12245be67eefe559967f943b1391f7f2024f3
+  metadata.gz: 1daac2047a0798f1471aeeb5872830f413b00135b25fd88f325ffe6b882d192cd9ab30df2bfe2971b3fd8409283935ff5075da6712bad2dd6b79f2c7bc6a6a34
+  data.tar.gz: b09ddb6a6873b5564ba6f552a24228e2e8cb951479125e6605580db0ed1780d8370e5b215084a5217a8f481ddc8fc92a7ea59a262b00ff71252948d3bbeb4d23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iron_bank (5.4.0)
+    iron_bank (5.4.1)
       faraday (~> 1)
       faraday_middleware (~> 1)
       nokogiri (~> 1)
@@ -9,19 +9,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.3)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.4)
     bump (0.10.0)
     byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
     dotenv (2.8.1)
+    drb (2.2.0)
+      ruby2_keywords
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     faraday (1.10.3)
@@ -57,6 +67,7 @@ GEM
     mini_portile2 (2.8.2)
     minitest (5.18.0)
     multipart-post (2.3.0)
+    mutex_m (0.2.0)
     nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
@@ -141,4 +152,4 @@ DEPENDENCIES
   timecop (~> 0.9)
 
 BUNDLED WITH
-   2.3.16
+   2.4.19

data/Rakefile

@@ -31,6 +31,14 @@ task :excluded_fields, [:filename] do |_t, args|
   setup_iron_bank
 
   destination = args[:filename] || IronBank.configuration.excluded_fields_file
+  # NOTE: In some instances the error message from Zuora will not include the
+  # unqueryable fields that need to be excluded. When that happens IronBank's
+  # strategy will be to perform a binary search through the fields listed in the
+  # query -- at the cost of performance due to repeated requests sent to Zuora
+  # as it tries to identify the offending field.
+  #
+  # See:
+  # - https://github.com/zendesk/iron_bank/pull/107
   fields      = IronBank::Schema.excluded_fields.sort.to_h
 
   File.write(destination, Psych.dump(fields))

data/lib/iron_bank/describe/excluded_fields/deduce_from_query.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module IronBank
+  module Describe
+    # NOTE: Beware there could be a performance hit as the search repeatedly
+    # executes queries to perform the search for invalid fields in the query
+    # included in the query statement.
+
+    # rubocop:disable Style/ClassAndModuleChildren
+    class ExcludedFields::DeduceFromQuery
+      INVALID_OBJECT_ID = "InvalidObjectId"
+
+      private_class_method :new
+
+      def self.call(object)
+        new(object).call
+      end
+
+      def call
+        query_fields = object.query_fields.clone
+        divide_and_execute(query_fields)
+        object.query_fields.concat(query_fields)
+        invalid_fields
+      end
+
+      private
+
+      attr_reader :object, :valid_fields, :invalid_fields
+
+      def initialize(object)
+        @object         = object
+        @valid_fields   = []
+        @invalid_fields = []
+      end
+
+      def divide_and_execute(query_fields)
+        # clear state before queries
+        object.query_fields.clear
+
+        # we repeat dividing until only a single field remains
+        invalid_fields.push(query_fields.pop) if query_fields.one?
+        return if query_fields.empty?
+
+        left, right = divide_fields(query_fields)
+        execute_or_divide_again(left)
+        execute_or_divide_again(right)
+      end
+
+      def divide_fields(query_fields)
+        mid = query_fields.size / 2
+        [query_fields[0..mid - 1], query_fields[mid..]]
+      end
+
+      def execute_or_divide_again(fields)
+        if execute_query(fields)
+          valid_fields.concat(fields)
+        else
+          divide_and_execute(fields)
+        end
+      end
+
+      def execute_query(fields)
+        object.query_fields.concat(valid_fields + fields)
+        object.where({ id: INVALID_OBJECT_ID })
+        true
+      rescue IronBank::InternalServerError
+        false
+      end
+    end
+    # rubocop:enable Style/ClassAndModuleChildren
+  end
+end

data/lib/iron_bank/describe/excluded_fields/extract_from_message.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module IronBank
+  module Describe
+    # Extracts invalid fields from an exception message.
+    # Returns from a call if an exception message does not contain invalid field
+
+    # rubocop:disable Style/ClassAndModuleChildren
+    class ExcludedFields::ExtractFromMessage
+      FAULT_FIELD_MESSAGES = Regexp.union(
+        # Generic fault field
+        /invalid field for query: \w+\.(\w+)/,
+        # Invoice Bill Run is not selectable in ZOQL
+        /Cannot use the (BillRunId) field in the select clause/,
+        # Invoice Body, implemented as a separate call
+        /Can only query one invoice (body) at a time/,
+        # Catalog tier should only query the price field
+        /use Price or (DiscountAmount) or (DiscountPercentage)/,
+        # Catalog plan currencies, implemented as a separate call
+        /When querying for (active currencies)/,
+        # Catalog charge rollover balance
+        /You can only query (RolloverBalance) in particular/,
+        # (Subscription) charge should only query the price field
+        /
+          (OveragePrice),
+          \ Price,
+          \ (IncludedUnits),
+          \ (DiscountAmount)
+          \ or\ (DiscountPercentage)
+        /x
+      ).freeze
+
+      private_class_method :new
+
+      def self.call(message)
+        new(message).call
+      end
+
+      def call
+        return unless FAULT_FIELD_MESSAGES.match(message)
+
+        Regexp.last_match.captures.compact.
+          map { |capture| capture.delete(" ") }
+      end
+
+      private
+
+      attr_reader :message
+
+      def initialize(message)
+        @message = message
+      end
+    end
+    # rubocop:enable Style/ClassAndModuleChildren
+  end
+end

data/lib/iron_bank/describe/excluded_fields.rb

@@ -5,32 +5,10 @@ module IronBank
     # Returns an array of non-queryable fields for the given object in the
     # current Zuora tenant, despites Zuora clearly marking these fields as
     # `<selectable>true</true>` in their Describe API... /rant
-    #
     class ExcludedFields
       extend Forwardable
 
-      FAULT_FIELD_MESSAGES = Regexp.union(
-        # Generic fault field
-        /invalid field for query: \w+\.(\w+)/,
-        # Invoice Bill Run is not selectable in ZOQL
-        /Cannot use the (BillRunId) field in the select clause/,
-        # Invoice Body, implemented as a separate call
-        /Can only query one invoice (body) at a time/,
-        # Catalog tier should only query the price field
-        /use Price or (DiscountAmount) or (DiscountPercentage)/,
-        # Catalog plan currencies, implemented as a separate call
-        /When querying for (active currencies)/,
-        # Catalog charge rollover balance
-        /You can only query (RolloverBalance) in particular/,
-        # (Subscription) charge should only query the price field
-        %r{
-          (OveragePrice),
-          \ Price,
-          \ (IncludedUnits),
-          \ (DiscountAmount)
-          \ or\ (DiscountPercentage)
-        }x
-      ).freeze
+      INVALID_OBJECT_ID = "InvalidObjectId"
 
       private_class_method :new
 
@@ -39,43 +17,36 @@ module IronBank
       end
 
       def call
-        remove_last_failure_fields until valid_query?
-
+        remove_invalid_fields until valid_query?
         (excluded_fields - single_resource_query_fields).sort
       end
 
       private
 
-      INVALID_OBJECT_ID = "InvalidObjectId"
-
-      attr_reader :object_name, :last_failed_fields
+      attr_reader :object_name, :invalid_fields
 
       def_delegators "IronBank.logger", :info
       def_delegators :object, :single_resource_query_fields
 
       def initialize(object_name)
-        @object_name        = object_name
-        @last_failed_fields = nil
+        @object_name    = object_name
+        @invalid_fields = []
       end
 
       def object
-        IronBank::Resources.const_get(object_name)
+        @object ||= IronBank::Resources.const_get(object_name)
       end
 
       def excluded_fields
         @excluded_fields ||= object.excluded_fields.dup
       end
 
-      def remove_last_failure_fields
-        query_fields = object.query_fields
-
+      def remove_invalid_fields
+        query_fields  = object.query_fields
         failed_fields = query_fields.select do |field|
-          last_failed_fields.any? { |failed| field.casecmp?(failed) }
+          invalid_fields.any? { |failed| field.casecmp?(failed) }
         end
-
         excluded_fields.push(*failed_fields)
-
-        # Remove the field for the next query
         query_fields.delete_if { |field| failed_fields.include?(field) }
       end
 
@@ -83,30 +54,16 @@ module IronBank
         # Querying using the ID (which is an indexed field) should return an
         # empty collection very quickly when successful
         object.where({ id: INVALID_OBJECT_ID })
-
         info "Successful query for #{object_name}"
-
         true
-      rescue IronBank::InternalServerError, IronBank::BadRequestError => e
-        @last_failed_fields = extract_fields_from_exception(e)
-
+      rescue IronBank::BadRequestError, InternalServerError => e
+        @invalid_fields = Array(
+          ExtractFromMessage.call(e.message) ||
+          DeduceFromQuery.call(object)
+        )
+        info "Invalid fields '#{@invalid_fields}' for #{object_name} query"
         false
       end
-
-      def extract_fields_from_exception(exception)
-        message = exception.message
-
-        raise "Could not parse error message: #{message}" unless FAULT_FIELD_MESSAGES.match(message)
-
-        failed_fields = Regexp.last_match.
-                        captures.
-                        compact.
-                        map { |capture| capture.delete(" ") }
-
-        info "Invalid fields '#{failed_fields}' for #{object_name} query"
-
-        failed_fields
-      end
     end
   end
 end

data/lib/iron_bank/schema.rb

@@ -39,6 +39,14 @@ module IronBank
     end
 
     def self.excluded_fields
+      # NOTE: In some instances the error message from Zuora will not include the
+      # unqueryable fields that need to be excluded. When that happens IronBank's
+      # strategy will be to perform a binary search through the fields listed in the
+      # query -- at the cost of performance due to repeated requests sent to Zuora
+      # as it tries to identify the offending field.
+      #
+      # See:
+      # - https://github.com/zendesk/iron_bank/pull/107
       @excluded_fields ||= IronBank::Resources.constants.each.with_object({}) do |resource, fields|
         fields[resource.to_s] =
           IronBank::Describe::ExcludedFields.call(object_name: resource)

data/lib/iron_bank/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module IronBank
-  VERSION     = "5.4.0"
+  VERSION     = "5.4.1"
   API_VERSION = "v1"
 end

data/lib/iron_bank.rb

@@ -83,6 +83,8 @@ require "iron_bank/authentications/token"
 require "iron_bank/client"
 require "iron_bank/describe/field"
 require "iron_bank/describe/excluded_fields"
+require "iron_bank/describe/excluded_fields/deduce_from_query"
+require "iron_bank/describe/excluded_fields/extract_from_message"
 require "iron_bank/describe/object"
 require "iron_bank/describe/related"
 require "iron_bank/describe/tenant"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_bank
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Mickael Pham
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -107,6 +107,8 @@ files:
 - lib/iron_bank/configuration.rb
 - lib/iron_bank/csv.rb
 - lib/iron_bank/describe/excluded_fields.rb
+- lib/iron_bank/describe/excluded_fields/deduce_from_query.rb
+- lib/iron_bank/describe/excluded_fields/extract_from_message.rb
 - lib/iron_bank/describe/field.rb
 - lib/iron_bank/describe/object.rb
 - lib/iron_bank/describe/related.rb