zuora_api 1.7.57 → 1.7.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71246b168a4b1c8f86cafc4fddbe7fe2c4c1358745520e89197c7158b3c6576d
-  data.tar.gz: 54cdc8fd039ffe3717fe135af7b02431a5c7147ceb188c07ddccaab4dd9082b6
+  metadata.gz: fb9e45899e7ed9dc05d9c9d18df9d279e296bcc7d6b5f7882df09982c3e6a15c
+  data.tar.gz: 3f4a4ec2eb0f56177364fd4107d785e2b8209105709642da97a9d421937b90a6
 SHA512:
-  metadata.gz: 6ca79d425ef8bfa1836300286b4ebb035a385066b4eef757cce7b490eab8fa6b9bdb6de53d13ea53fab5101f315faff5a8f4c5a938930cf59aef5ccf1067fbbc
-  data.tar.gz: c98379b9b2e200659c14403e2af816827e58a226fb4b218bcf252af1a944562cee2688f21c643213f618e28e09fb53ace851adec322d455e650b8ba82d7dab54
+  metadata.gz: 6b0a07c385a8435988cfb41417e602a57143705e11a5c9a13b7a72a4f0852b0b6a4e15fc6a5960bfed109c0d3643ced57f6425448921649c2b36e479afa78a66
+  data.tar.gz: e4b81e99bbac7512893e9aa617437a529f49ed0cff325c997d1cd90315b054c172254a3eb113deb0d2b47d2d5b8035a2dbc079db9fbff5cc201d1db79cea29a7

data/.gitlab-ci.yml

@@ -45,8 +45,8 @@ rubygems-deploy:
   - apt-get install -y git
   - apt-get clean all
   - gem install dpl
-  - if [[ "staging" == $CI_BUILD_REF_SLUG ]];then export VERSION=`git describe --exclude "[0-9]*\.[0-9]*\.[0-9]*[a-z]" --abbrev=0 --tags HEAD`; fi
-  - if [[ "master" == $CI_BUILD_REF_SLUG ]];then export VERSION=`git describe --exclude "[0-9]*\.[0-9]*\.[0-9]*[a-z]" --abbrev=0 --tags HEAD`; fi
+  - if [[ "staging"  == $CI_BUILD_REF_SLUG ]];then  export VERSION=`git describe --match "[0-9]*\.[0-9]*\.[0-9]*[a-z]" --abbrev=0 --tags HEAD`; fi
+  - if [[ "master"  == $CI_BUILD_REF_SLUG ]];then export VERSION=`git describe --exclude "[0-9]*\.[0-9]*\.[0-9]*[a-z]" --abbrev=0 --tags HEAD`; fi
   - echo $VERSION
   - sed -i "s/0.0.1/$VERSION/" lib/zuora_api/version.rb
   - git add lib/zuora_api/version.rb

data/lib/zuora_api/exceptions.rb

@@ -17,6 +17,8 @@ module ZuoraAPI
           @message = "Query failed: #{$1}"
         when /^Could not find [\w\d]{32}.$/
           @message = "Could not find object."
+        when /^Subscription [\w\d]{32} is in expired status. It is not supported to generate billing documents for expired subscriptions./
+          @message = "Subscription is in expired status. It is not supported to generate billing documents for expired subscriptions."
         else
           @message = message
         end

data/lib/zuora_api/login.rb

@@ -5,7 +5,7 @@ require 'zuora_api/exceptions'
 
 module ZuoraAPI
   class Login
-    ENVIRONMENTS = [SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown', STAGING = 'Staging' ]
+    ENVIRONMENTS = [TEST = 'Test', SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown', STAGING = 'Staging' ]
     REGIONS = [EU = 'EU', US = 'US', NA = 'NA' ]
     MIN_Endpoint = '96.0'
     XML_SAVE_OPTIONS = Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
@@ -190,10 +190,13 @@ module ZuoraAPI
     def reporting_url(path)
       map = {"US" => {"Sandbox" => "https://zconnectsandbox.zuora.com/api/rest/v1/",
                       "Production" => "https://zconnect.zuora.com/api/rest/v1/",
-                      "Services"=> ""},
+                      "Test" => "https://reporting-sbx.zan.0001.sbx.auw2.zuora.com/api/rest/v1/",
+                      "Staging" => "https://reporting-stg11.zan.svc.auw2.zuora.com/api/rest/v1/",
+                      "Performance" => "https://zconnectpt1.zuora.com/api/rest/v1/",
+                      "Services" => "https://reporting-svc08.svc.auw2.zuora.com/api/rest/v1/"},
              "EU" => {"Sandbox" => "https://zconnect.sandbox.eu.zuora.com/api/rest/v1/",
                       "Production" => "https://zconnect.eu.zuora.com/api/rest/v1/",
-                      "Services"=> ""},
+                      "Services"=> "https://reporting-sbx0000.sbx.aec1.zuora.com/api/rest/v1/"},
              "NA" => {"Sandbox" => "https://zconnect.sandbox.na.zuora.com/api/rest/v1/",
                       "Production" => "https://zconnect.na.zuora.com/api/rest/v1/",
                       "Services"=> ""}
@@ -248,7 +251,7 @@ module ZuoraAPI
     end
 
     def self.environments
-      %w(Sandbox Production Services Performance Staging)
+      %w(Sandbox Production Services Performance Staging Test)
     end
 
     def self.regions
@@ -260,7 +263,8 @@ module ZuoraAPI
                        "Production" => "https://www.zuora.com/apps/services/a/",
                        "Performance" => "https://pt1.zuora.com/apps/services/a/",
                        "Services" => "https://services347.zuora.com/apps/services/a/",
-                       "Staging" => "https://staging2.zuora.com/apps/services/a/"},
+                       "Staging" => "https://staging2.zuora.com/apps/services/a/",
+                       "Test" => "https://test.zuora.com/apps/services/a/"},
               "EU" => {"Sandbox" => "https://sandbox.eu.zuora.com/apps/services/a/",
                        "Production" => "https://eu.zuora.com/apps/services/a/",
                        "Performance" => "https://pt1.eu.zuora.com/apps/services/a/",
@@ -301,15 +305,18 @@ module ZuoraAPI
 
     def update_environment
       if !self.url.blank?
-        if /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/ === self.hostname
+        case self.hostname
+        when /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/
           self.environment = 'Sandbox'
-        elsif /(?<=\.|\/|^)(service[\d]*|services[\d]*|ep-edge)(?=\.|\/|$)/ === self.hostname
+        when /(?<=\.|\/|^)(service[\d]*|services[\d]*|ep-edge)(?=\.|\/|$)/
           self.environment = 'Services'
-        elsif /(?<=\.|\/|-|^)(pt[\d]*)(?=\.|\/|-|$)/ === self.hostname
+        when /(?<=\.|\/|-|^)(pt[\d]*)(?=\.|\/|-|$)/
           self.environment = 'Performance'
-        elsif /(?<=\.|\/|^)(staging1|staging2|stg)(?=\.|\/|$)/ === self.hostname
+        when /(?<=\.|\/|^)(staging1|staging2|stg)(?=\.|\/|$)/
           self.environment = 'Staging'
-        elsif is_prod_env
+        when /(?<=\.|\/|^)(test)(?=\.|\/|$)/
+          self.environment = 'Test'
+        when /(?<=\.|\/|^)(www|api)(?=\.|\/|$)/, /(^|tls10\.|origin-www\.|zforsf\.|eu\.|na\.)(zuora\.com)/
           self.environment = 'Production'
         else
           self.environment = 'Unknown'
@@ -319,20 +326,10 @@ module ZuoraAPI
       end
     end
 
-    def is_prod_env
-      is_prod = false
-      www_or_api = /(?<=\.|\/|^)(www|api)(?=\.|\/|$)/ === self.hostname
-      host_prefix_match = /(^|tls10\.|origin-www\.|zforsf\.|eu\.|na\.)(zuora\.com)/ === self.hostname
-      if www_or_api || host_prefix_match
-        is_prod = true
-      end
-      return is_prod
-    end
-
     def update_zconnect_provider
       region = update_region
       environment = update_environment
-      mappings = {"US" => {"Sandbox" => "ZConnectSbx", "KubeSTG" => "ZConnectDev", "KubeDEV" => "ZConnectDev", "KubePROD" => "ZConnectDev", "Services" => "ZConnectSvcUS", "Production" => "ZConnectProd", "Performance" => "ZConnectPT1", "Staging" => "ZConnectQA"},
+      mappings = {"US" => {"Sandbox" => "ZConnectSbx",   "Services" => "ZConnectSvcUS", "Production" => "ZConnectProd",   "Performance" => "ZConnectPT1", "Test" => "ZConnectTest", "Staging" => "ZConnectQA", "KubeSTG" => "ZConnectDev", "KubeDEV" => "ZConnectDev", "KubePROD" => "ZConnectDev"},
                   "NA" => {"Sandbox" => "ZConnectSbxNA", "Services" => "ZConnectSvcNA", "Production" => "ZConnectProdNA", "Performance" => "ZConnectPT1NA"},
                   "EU" => {"Sandbox" => "ZConnectSbxEU", "Services" => "ZConnectSvcEU", "Production" => "ZConnectProdEU", "Performance" => "ZConnectPT1EU"},
                   "Unknown" => {"Unknown" => "Unknown"}}
@@ -352,26 +349,16 @@ module ZuoraAPI
     def rest_endpoint(url="", domain=true, prefix='/v1/')
       update_environment
       endpoint = url
-
+      url_postfix = {"US" => ".", "EU" => ".eu.", "NA" => ".na."}[self.region]
+    
       case self.environment
+      when 'Test'
+        endpoint = "https://rest.test#{url_postfix}zuora.com"
       when 'Sandbox'
-        case self.region
-        when 'US'
-          endpoint = "https://rest.apisandbox.zuora.com"
-        when 'EU'
-          endpoint = "https://rest.sandbox.eu.zuora.com"
-        when 'NA'
-          endpoint = "https://rest.sandbox.na.zuora.com"
-        end
+        endpoint = "https://rest.sandbox#{url_postfix}zuora.com"
+        endpoint = "https://rest.apisandbox.zuora.com"  if self.region == "US"
       when 'Production'
-        case self.region
-        when 'US'
-          endpoint = "https://rest.zuora.com"
-        when 'EU'
-          endpoint = "https://rest.eu.zuora.com"
-        when 'NA'
-          endpoint = "https://rest.na.zuora.com"
-        end
+        endpoint = "https://rest#{url_postfix}zuora.com"
       when 'Performance'
         endpoint = "https://rest.pt1.zuora.com"
       when 'Services'
@@ -613,7 +600,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.include?('Unexpected error') ? 'UNEXPECTED_ERROR' : 'FATAL_ERROR'
+              error = message.match(/^[\w\d]{16}\: (Unexpected error.|No HTTP Response)/).present? ? 'UNEXPECTED_ERROR' : 'FATAL_ERROR'  
             else
               error = 'FATAL_ERROR'
               message = 'Export failed due to unknown reason. Consult api logs.'

data/lib/zuora_api/logins/basic.rb

@@ -104,9 +104,9 @@ module ZuoraAPI
         retry
       else
         if Rails.logger.class.to_s == "Ougai::Logger"
-          Rails.logger.error("BasicLogin - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+          Rails.logger.error("BasicLogin - Timed out", ex) 
         else
-          Rails.logger.error("BasicLogin - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+          Rails.logger.error("BasicLogin - #{ex.class} Timed out") 
         end
 
         self.current_error = "Request timed out. Try again"

data/lib/zuora_api/logins/oauth.rb

@@ -66,9 +66,9 @@ module ZuoraAPI
         retry
       else
         if Rails.logger.class.to_s == "Ougai::Logger"
-          Rails.logger.error("OAuthLogin - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+          Rails.logger.error("OAuthLogin - Timed out", ex) 
         else
-          Rails.logger.error("OAuthLogin - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+          Rails.logger.error("OAuthLogin - #{ex.class} Timed out") 
         end
         self.current_error = "Request timed out. Try again"
         self.status = 'Timeout'

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.57"
+  VERSION = "1.7.58"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.57
+  version: 1.7.58
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler