zuora_api 1.7.65f → 1.7.65g

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7d938d4f3650b7d013c75dd8331ff79d18892c3608f4a37e2709e5053203d4e
-  data.tar.gz: 97d6019971a7d1fe835e4dad6c58aa3768851dbd2193708811927baaafa864b8
+  metadata.gz: 844d4f29e48548bf298907952d760386687b8d9f0cc4b6f1ce26defe42d9ce30
+  data.tar.gz: 38661f9da6c4032fe418941f1dddb1581680df7297e6eb8164deab377f82c54a
 SHA512:
-  metadata.gz: f6926089bf23d4762906a3f292f42b8e66a7b6ec7c55e0fab3e38b78785f8fdb0e18e669e98227b13d0dc3e467476606e0634297ab1ca4535e8f09fa95faff9a
-  data.tar.gz: 6803980d193339f1eba377d6591716660cca17a21fb9b873f112d6308883314336fb308d97fd222d2009e2772a24c595dc4751428d502a900ccd3cc3f8e05e12
+  metadata.gz: 7c149b5fbb73d911e7b55dd10bf3f2d2149695a2d42866936dc43eeb1916191b54d3f666e187c08db69d84467f6e90e13750ab8f5c127b7d3610cc0484b07853
+  data.tar.gz: ab1ecee455a237c5b2077a8e331b25d9aa2fbc82ec46ad5be9579898d1b8c4c879f8c213efe2dd494c3941f9376557af1ee5d698ec093f60729b8f198ac8b174

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zuora_api (1.7.65f)
+    zuora_api (1.7.65g)
       httparty
       nokogiri
       railties (>= 4.1.0, < 6)
@@ -51,7 +51,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0425)
+    mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     multi_xml (0.6.0)

data/lib/zuora_api/login.rb

@@ -557,24 +557,33 @@ module ZuoraAPI
     end
 
     def raise_errors(type: :SOAP, body: nil, response: nil)
-      request = response.request
-      match_string = "#{request.http_method.to_s.split("Net::HTTP::").last.upcase}::#{response.code}::#{request.path.path}"
+      request_uri, request_path, match_string = "", "", ""
+      if response.class.to_s == "HTTP::Message"
+        request_uri = response.http_header.request_uri.to_s
+        request_path = response.http_header.request_uri.path
+        match_string = "#{response.http_header.request_method}::#{response.code}::#{request_uri}"
+      else
+        request = response.request
+        request_uri = response.request.uri
+        request_path = request.path.path
+        match_string = "#{request.http_method.to_s.split("Net::HTTP::").last.upcase}::#{response.code}::#{request_path}"
+      end
 
       if [502,503].include?(response.code)
-        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from #{response.request.uri}", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from #{request_uri}", response)
       end
 
       # Check failure response code
       case response.code
       when 504
-        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from #{response.request.uri}", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from #{request_uri}", response)
       when 429
         raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
       when 401
         
       else
         if body.class == Hash
-          case response.request.path.path
+          case request_path
           when /^\/v1\/connections$/
             response_headers = response.headers.to_h      
             raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Missing cookies for authentication call", response) if response_headers['set-cookie'].blank?
@@ -598,7 +607,7 @@ module ZuoraAPI
             reason = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
             if reason.present?
               message = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
-              error = message.match(/^[\w\d]{16}\: (Unexpected error.|No HTTP Response|Socket Timeout)/).present? ? 'UNEXPECTED_ERROR' : 'FATAL_ERROR'  
+              error = message.match(/^[\w\d]{16}\: (Unexpected error.|No HTTP Response|Socket Timeout|There is an internal error, please try again later)/).present? ? 'UNEXPECTED_ERROR' : 'FATAL_ERROR'  
             else
               error = 'FATAL_ERROR'
               message = 'Export failed due to unknown reason. Consult api logs.'
@@ -636,7 +645,7 @@ module ZuoraAPI
         end
 
       when :JSON
-        case request.path.path
+        case request_path
         when /^\/query\/jobs.*/  #DataQuery Paths
           return if body.class != Hash
           case match_string
@@ -874,7 +883,7 @@ module ZuoraAPI
       when /.*UNEXPECTED_ERROR/
         raise ZuoraAPI::Exceptions::ZuoraUnexpectedError.new(message, response, errors, success)
       when /.*soapenv:Server.*/
-        if /^Invalid value.*for type.*|^Id is invalid/.match(message).present?
+        if /^Invalid value.*for type.*|^Id is invalid|^date string can not be less than 19 charactors$/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
         elsif /^Invalid white space character \(.*\) in text to output$/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIUnkownError.new(message, response, errors, success)
@@ -1304,75 +1313,113 @@ module ZuoraAPI
       end
     end
 
-    def getDataSourceExport(query, extract: true, encrypted: false, zip: true)
-      request = Nokogiri::XML::Builder.new do |xml|
-        xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
-          xml['SOAP-ENV'].Header do
-            xml['ns1'].SessionHeader do
-              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic)
+    def getDataSourceExport(query, extract: true, encrypted: false, zip: true, z_track_id: nil)
+      begin
+        tries ||= 3
+        request = Nokogiri::XML::Builder.new do |xml|
+          xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
+            xml['SOAP-ENV'].Header do
+              xml['ns1'].SessionHeader do
+                xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
+              end
             end
-          end
-          xml['SOAP-ENV'].Body do
-            xml['ns1'].create do
-              xml['ns1'].zObjects('xsi:type' => "ns2:Export") do
-                xml['ns2'].Format 'csv'
-                xml['ns2'].Zip zip
-                xml['ns2'].Name 'googman'
-                xml['ns2'].Query query
-                xml['ns2'].Encrypted encrypted
+            xml['SOAP-ENV'].Body do
+              xml['ns1'].create do
+                xml['ns1'].zObjects('xsi:type' => "ns2:Export") do
+                  xml['ns2'].Format 'csv'
+                  xml['ns2'].Zip zip
+                  xml['ns2'].Name 'googman'
+                  xml['ns2'].Query query
+                  xml['ns2'].Encrypted encrypted
+                end
               end
             end
           end
         end
-      end
 
-      response_query = HTTParty.post(self.url, body: request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8"}, :timeout => 120)
+        response_query = HTTParty.post(self.url, body: request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 120)
 
-      output_xml = Nokogiri::XML(response_query.body)
-      raise 'Export Creation Unsuccessful : ' + output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text if  output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
-      id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
+        output_xml = Nokogiri::XML(response_query.body)
+        raise_errors(type: :SOAP, body: output_xml, response: response_query) if output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
 
-      confirmRequest = Nokogiri::XML::Builder.new do |xml|
-        xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
-          xml['SOAP-ENV'].Header do
-            xml['ns1'].SessionHeader do
-              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic)
+        # raise "Export Creation Unsuccessful : #{response_query.code}: #{response_query.parsed_response}" if  output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
+        
+        id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
+
+        confirmRequest = Nokogiri::XML::Builder.new do |xml|
+          xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
+            xml['SOAP-ENV'].Header do
+              xml['ns1'].SessionHeader do
+                xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
+              end
             end
-          end
-          xml['SOAP-ENV'].Body do
-            xml['ns1'].query do
-              xml['ns1'].queryString "SELECT  Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where Id = '#{id}'"
+            xml['SOAP-ENV'].Body do
+              xml['ns1'].query do
+                xml['ns1'].queryString "SELECT  Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where Id = '#{id}'"
+              end
             end
           end
         end
-      end
-      result = 'Waiting'
+        result = 'Waiting'
 
-      while result != "Completed"
-        sleep 3
-        response_query = HTTParty.post(self.url, body: confirmRequest.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8"}, :timeout => 120)
+        while result != "Completed"
+          sleep 3
+          response_query = HTTParty.post(self.url, body: confirmRequest.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 120)
 
-        output_xml = Nokogiri::XML(response_query.body)
-        result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
-        status_code = response_query.code if response_query
-        raise "Export Creation Unsuccessful : #{output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text}" if result.blank? || result == "Failed"
-      end
+          output_xml = Nokogiri::XML(response_query.body)
+          result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
+          status_code = response_query.code if response_query
 
-      file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
-      export_file = get_file(:url => self.fileURL(file_id))
-      export_file_path = export_file.path
-      Rails.logger.debug("=====> Export path #{export_file.path}")
-
-      if extract && zip
-        require "zip"
-        new_path = export_file_path.partition('.zip').first
-        zipped = Zip::File.open(export_file_path)
-        file_handle = zipped.entries.first
-        file_handle.extract(new_path)
-        File.delete(export_file_path)
-        return new_path
-      else
-        return export_file_path
+          raise_errors(type: :SOAP, body: output_xml, response: response_query) if result.blank? || result == "Failed"
+          # raise "Export Creation Unsuccessful : #{response_query.code}: #{response_query.parsed_response}" if result.blank? || result == "Failed"
+        end
+
+        file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
+        export_file = get_file(:url => self.fileURL(file_id))
+        export_file_path = export_file.path
+        Rails.logger.debug("=====> Export path #{export_file.path}")
+
+        if extract && zip
+          require "zip"
+          new_path = export_file_path.partition('.zip').first
+          zipped = Zip::File.open(export_file_path)
+          file_handle = zipped.entries.first
+          file_handle.extract(new_path)
+          File.delete(export_file_path)
+          return new_path
+        else
+          return export_file_path
+        end
+      rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
+        if !(tries -= 1).zero?
+          Rails.logger.info("Export call failed - Trace ID: #{z_track_id}")
+          self.new_session
+          retry
+        else
+          raise ex
+        end
+
+      rescue *ZUORA_API_ERRORS => ex
+        raise ex
+
+      rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
+        if !(tries -= 1).zero?
+          Rails.logger.info("Trace ID: #{z_track_id} Timed out will retry after 5 seconds")
+          sleep 5
+          retry
+        else
+          raise ex
+        end
+
+      rescue Errno::ECONNRESET => ex
+        if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
+          retry
+        else
+          raise ex
+        end
+
+      rescue ZuoraAPI::Exceptions::BadEntityError => ex
+        raise ex
       end
     end
 

data/lib/zuora_api/logins/oauth.rb

@@ -46,34 +46,28 @@ module ZuoraAPI
         Rails.logger.debug {"Session Invalid"}
         self.new_session(auth_type: :bearer)
         retry
-      else
-        if errors.include?(ex.class)
-          raise ex
-        else
-          return [output_json, response]
-        end
       end
+      raise ex if errors.include?(ex.class)
+      return [output_json, response]
+
     rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
-      if errors.include?(ex.class)
-        raise ex
-      else
-        return [output_json, response]
-      end
+      raise ex if errors.include?(ex.class)
+      return [output_json, response]
+
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
       if !tries.zero?
         tries -= 1
         sleep(self.timeout_sleep)
         retry
+      end
+      if Rails.logger.class.to_s == "Ougai::Logger"
+        Rails.logger.error("OAuthLogin - Timed out", ex) 
       else
-        if Rails.logger.class.to_s == "Ougai::Logger"
-          Rails.logger.error("OAuthLogin - Timed out", ex) 
-        else
-          Rails.logger.error("OAuthLogin - #{ex.class} Timed out") 
-        end
-        self.current_error = "Request timed out. Try again"
-        self.status = 'Timeout'
-        return self.status
+        Rails.logger.error("OAuthLogin - #{ex.class} Timed out") 
       end
+      self.current_error = "Request timed out. Try again"
+      self.status = 'Timeout'
+      return self.status
     end
 
     def get_bearer_token(zuora_track_id: nil)

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.65f"
+  VERSION = "1.7.65g"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.65f
+  version: 1.7.65g
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler