zuora_connect 3.1.1.pre.b → 3.1.2.pre.a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dd5e2ff6670df441c2724f6aeabea79b29ee265c7bea135041a9373702c51d6
-  data.tar.gz: 922c6b8010adfc8b6cf0e90f734ff71830cde9d54e864ff548ea4dfc6074be4a
+  metadata.gz: 71565c519f52d6be0809d472180939cd58d19e68458870c59b02a2fee0a5b2b8
+  data.tar.gz: 0d84051d7b89cba49350eab6dfb0cecd2735f6b7977ee8311ac179941b70f4c7
 SHA512:
-  metadata.gz: 32052d8b5ffe9ab9d059012c90073d23eff3d21cd79b01db9cfe7e861899b354053e044d62675cde97161b7b16305f3980bb6e47c1a9d430dbf2b7eb6882d478
-  data.tar.gz: a8f6926fc4090116cc19034b7390807e0283d185aa033ffcf190d8fd922c470a4fafed645beed473c7a051757a986f21d13bb92a760f9f7efe77f1ab6b402ed2
+  metadata.gz: e32a55f439c3cdfcdb237d6b4cd6f6d52bc86566503c9089e37a98215d16ec65c8607da6b3612fffbf9aca6b2730bc0c07a524e7feb2b4f089fb0a4302f9c850
+  data.tar.gz: f1ba32eedf0ded2b2c2e923776a0a8bb7485e1b7ec9aa5eb731dc92b185a23ddf0bb3a82bc8badafdc3e1cd591a5e20d0b7cd50813605b3ebf56dacd878c84a8

data/app/controllers/zuora_connect/api/v1/app_instance_controller.rb

@@ -43,7 +43,6 @@ module ZuoraConnect
 
     def cache_bust
       if defined?(Redis.current)
-        @appinstance.reload
         @appinstance.fetch_connect_data   #Fetch data and set in database if kms key is used
         @appinstance.cache_app_instance(force_cache: true)  #Update cache in redis
         Redis.current.del("AppInstance:#{@appinstance.id}")

data/app/models/zuora_connect/app_instance_base.rb

@@ -353,6 +353,7 @@ module ZuoraConnect
     end
 
     def fetch_connect_data(session: {})
+      refresh_count ||= 0
       self.check_oauth_state
       request_url = ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json"
       response = HTTParty.get(request_url,:body => {:access_token => self.access_token})
@@ -370,43 +371,41 @@ module ZuoraConnect
       else
         raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error communicating with Connect for '#{request_url}' with #{response.code}", response.body, response.code)
       end
+    rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
+      refresh_count += 1
+      if refresh_count < 3
+        sleep(10)
+        ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
+        retry
+      else
+        ZuoraConnect.logger.fatal("REFRESH TASK - Connection Failed", ex)
+        raise
+      end
+    rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
+      refresh_count += 1
+      if refresh_count < 3
+        ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
+        self.refresh_oauth if ex.code == 401
+        retry
+      else
+        ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex, self.default_ougai_items)
+        raise
+      end
     end
 
-
     def refresh(session: {})
       refresh_count ||= 0
       skip_connect ||= ZuoraConnect.configuration.skip_connect
-      begin
-        #Check how app was deployed
-        if !self.auto_deployed? && (!skip_connect || self['zuora_logins'].blank?)
-          self.fetch_connect_data(session: session)
-        else
-          self.build_task(task_data: self.zuora_logins, session: session)
-        end
-        self.last_refresh = Time.now.to_i
-        self.cache_app_instance
-        self.reset_mark_for_refresh
-      rescue *(ZuoraAPI::Login::CONNECTION_EXCEPTIONS + ZuoraAPI::Login::CONNECTION_READ_EXCEPTIONS) => ex
-        refresh_count += 1
-        if refresh_count < 3
-          sleep(10)
-          ZuoraConnect.logger.debug("REFRESH TASK - Connection Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
-          retry
-        else
-          ZuoraConnect.logger.fatal("REFRESH TASK - Connection Failed", ex)
-          raise
-        end
-      rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
-        refresh_count += 1
-        if refresh_count < 3
-          ZuoraConnect.logger.debug("REFRESH TASK - Communication Failure Retrying(#{refresh_count})", ex, self.default_ougai_items)
-          self.refresh_oauth if ex.code == 401
-          retry
-        else
-          ZuoraConnect.logger.fatal("REFRESH TASK - Communication Failed #{ex.code}", ex, self.default_ougai_items)
-          raise
-        end
+      #Check how app was deployed
+      if !self.auto_deployed? && (!skip_connect || self['zuora_logins'].blank?)
+        self.fetch_connect_data(session: session)
+      else
+        self.build_task(task_data: self.zuora_logins, session: session)
       end
+      self.last_refresh = Time.now.to_i
+      self.cache_app_instance
+      self.reset_mark_for_refresh
+     
     rescue => ex
       refresh_count += 1
       if self['zuora_logins'].present? && refresh_count < 3

data/lib/middleware/metrics_middleware.rb

@@ -42,7 +42,7 @@ module ZuoraConnect
     end
 
     def call(env)
-      @bad_headers = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST", "HTTP_X_FORWARDED_PORT", "HTTP_X_FORWARDED_PROTO", "HTTP_X_FORWARDED_SCHEME", "HTTP_X_FORWARDED_SSL"]
+      @bad_headers = ["HTTP_X_FORWARDED_HOST", "HTTP_X_FORWARDED_PORT", "HTTP_X_FORWARDED_PROTO", "HTTP_X_FORWARDED_SCHEME", "HTTP_X_FORWARDED_SSL"]
       if !ActionDispatch::Request::HTTP_METHODS.include?(env["REQUEST_METHOD"].upcase)
         [405, {"Content-Type" => "text/plain"}, ["Method Not Allowed"]]
       else

data/lib/tasks/zuora_connect_tasks.rake

@@ -2,15 +2,18 @@ namespace :db do
   desc 'Also create shared_extensions Schema'
   task :extensions => :environment  do
     # Create Schema
-    at_exit {
-      ActiveRecord::Base.connection.execute 'CREATE SCHEMA IF NOT EXISTS shared_extensions;'
-      # Enable Hstore
-      ActiveRecord::Base.connection.execute 'CREATE EXTENSION IF NOT EXISTS HSTORE SCHEMA shared_extensions;'
-      # Enable UUID-OSSP
-      ActiveRecord::Base.connection.execute 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp" SCHEMA shared_extensions;'
-    } 
+    ActiveRecord::Base.connection.execute 'CREATE SCHEMA IF NOT EXISTS shared_extensions;'
+    # Enable Hstore
+    ActiveRecord::Base.connection.execute 'CREATE EXTENSION IF NOT EXISTS HSTORE SCHEMA shared_extensions;'
+    # Enable UUID-OSSP
+    ActiveRecord::Base.connection.execute 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp" SCHEMA shared_extensions;'
   end
 end
 
-Rake::Task["db:create"].enhance [:extensions]
-Rake::Task["db:test:purge"].enhance  [:extensions]
+Rake::Task["db:create"].enhance do
+  Rake::Task["db:extensions"].invoke
+end
+
+Rake::Task["db:test:purge"].enhance do
+  Rake::Task["db:extensions"].invoke
+end

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.1.1-b"
+  VERSION = "3.1.2-a"
 end

data/lib/zuora_connect.rb

@@ -65,13 +65,15 @@ module ZuoraConnect
     case Rails.env.to_s
     when 'production'
       defaults = {
-        server_url: "http://apm-server.logging:8200",
+        server_url: "https://apm-server.logging.svc.cluster.local:8200",
+        secret_token:'afhfkulsahgcanriu2c7n8638w59cb67572YCAFAF38839095253',
         transaction_sample_rate: 0.20,
         capture_body: 'errors'
       }
     when 'staging'
       defaults = {
-        server_url: "http://apm-server.logging:8200",
+        server_url: "https://apm-server.logging.svc.cluster.local:8200",
+        secret_token:'afhfkulsahgcanriu2c7n8638w59cb67572YCAFAF38839095253',
         transaction_sample_rate: 1.0
       }
     when 'development'
@@ -90,9 +92,10 @@ module ZuoraConnect
       disable_start_message: true,
       pool_size: 1,
       transaction_max_spans: 500,
-      transaction_ignore_urls: ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*'],
+      ignore_url_patterns: ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*'],
       verify_server_cert: false,
-      log_level: Logger::INFO,
+      log_level: Logger::WARN,
+      service_version: ENV['Z_APPLICATION_VERSION'].present? ? ENV['Z_APPLICATION_VERSION'] : '0.0.0',
       service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : ZuoraConnect.app_name,
       logger: ZuoraObservability::Logger.custom_logger(name: "ElasticAPM", level: Logger::WARN)
     })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.1.pre.b
+  version: 3.1.2.pre.a
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment