zuora_connect 3.0.0.pre.d → 3.0.0.pre.i

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34c3f287eb840ceed24b0d22bc012f24de5a70a2fff4c94a3e68bcb01f03f2bd
-  data.tar.gz: 4262c8ba701c7492a56f9744cf458a2adb8f67477aeaec0bd86faba066500083
+  metadata.gz: d50ef7f71f058f62d07317b7cbd801b858b49b5068472170fb067f14904ae0b6
+  data.tar.gz: bb79eeaaeb9e3923b30ae8727f0faee76bb8c4d7f99ba51db0d82391f14f9483
 SHA512:
-  metadata.gz: 5c45b9b85008fed91af0b8f3811283cdc0cb385db32835169aa13a25625d1d5652076ca63a36eab526960df9a88332188c31b0912807cfe05679c448e79de91e
-  data.tar.gz: a5c174283aa01be4b830a9a3931b0ed05d725b98b6148ef76d68c8fb1fad4ffbe7d88f09aa82829cd180d847860137c851b9383b7b0ede41b6225ea39dfa673b
+  metadata.gz: ef4103085477c552e5d35b5c3969f5095cf67506c177ce2dce9d78ddb86a27b80c5a975b4facb646c60deaf68e5a4d7b4ee1d688d7a465fdd065bb91c105efce
+  data.tar.gz: 8f49d6547fca5bc40769b229beb59c9f95a6cb07db1de4c76d4ef972279add50a6ee804eb5793ca92e2d7a78d2601a88933d674881c963beebe8998531d695c7

data/Rakefile

@@ -15,7 +15,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 

data/app/models/zuora_connect/app_instance_base.rb

@@ -152,7 +152,8 @@ module ZuoraConnect
       if ZuoraConnect.configuration.mode != "Production"
         mock_task_data = {
           "id" => ZuoraConnect.configuration.dev_mode_appinstance,
-          "mode" => ZuoraConnect.configuration.dev_mode_mode
+          "mode" => ZuoraConnect.configuration.dev_mode_mode,
+          "name" => "Developer Instance"
         }
 
         case ZuoraConnect.configuration.dev_mode_options.class
@@ -168,7 +169,7 @@ module ZuoraConnect
         end
 
         self.build_task(task_data: mock_task_data, session: session)
-        self.set_backup_creds
+        self.set_backup_creds if !self['zuora_logins'].present?
         self.last_refresh = Time.now.to_i
       else
         time_expire = (session["#{self.id}::last_refresh"] || Time.now).to_i - INSTANCE_REFRESH_WINDOW.ago.to_i

data/config/initializers/postgresql_adapter.rb

@@ -26,7 +26,7 @@ module ActiveRecord
           if oids
             query += "WHERE t.oid::integer IN (%s)" % oids.join(", ")
           else
-            query += initializer.query_conditions_for_initial_load(type_map)
+            query += initializer.query_conditions_for_initial_load
           end
 
           execute_and_clear(query, "SCHEMA", []) do |records|

data/lib/middleware/metrics_middleware.rb

@@ -34,8 +34,11 @@ module ZuoraConnect
         @bad_headers.each { |header| env.delete(header) }
 
         if defined?(Prometheus) && env['PATH_INFO'] == '/connect/internal/metrics'
+
           # Prometheus Stuff
-          metrics = ZuoraObservability::Metrics.resque
+          metrics = ZuoraObservability::Metrics.resque 
+          metrics = defined?(ZuoraConnect::AppInstance.get_metrics) ? ZuoraConnect::AppInstance.get_metrics(metrics) : metrics
+         
           redis_up = metrics.present? && metrics.dig(:Resque, :Workers_Total).present? ? 1 : 0
           Prometheus::REDIS_CONNECTION.set(redis_up)
 

data/lib/resque/plugins/app_instance_job.rb

@@ -12,14 +12,14 @@ module Resque
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
-        if Rails.logger.is_a?(Ougai::Logger) 
+        if Rails.logger.is_a?(Ougai::Logger) && !Rails.env.development?
           Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"}
         end
 
         begin
-          connection_count ||= 0 
+          connection_count ||= 0
           @appinstance = ZuoraConnect::AppInstance.find(args['app_instance_id'].to_i)
-          Rails.logger.info('Starting job') 
+          job_start_log(args)
 
           @appinstance.new_session(holding_pattern: true)
         rescue ActiveRecord::RecordNotFound => exception
@@ -52,12 +52,12 @@ module Resque
           return
         rescue ZuoraConnect::Exceptions::ConnectCommunicationError => exception
           Rails.logger.warn("Enqueue Job Again ~ 2 mins", exception)
-          @appinstance.queue_pause(time: 2.minutes.to_i) 
+          @appinstance.queue_pause(time: 2.minutes.to_i)
           Resque.enqueue_to(self.job.queue, self.job.payload['class'], args)
           return
         rescue Net::ReadTimeout, Net::OpenTimeout, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => exception
           Rails.logger.warn("Enqueue Job Again ~ 2 mins", exception)
-          @appinstance.queue_pause(time: 2.minutes.to_i) 
+          @appinstance.queue_pause(time: 2.minutes.to_i)
           Resque.enqueue_to(self.job.queue, self.job.payload['class'], args)
           return
         end
@@ -68,6 +68,10 @@ module Resque
         @appinstance.cache_app_instance if defined?(@appinstance)
         Rails.logger.flush if Rails.logger.methods.include?(:flush)
       end
+
+      def job_start_log(args)
+       Rails.logger.info("Starting job")
+      end
     end
   end
-end
+end

data/lib/resque/plugins/custom_logger.rb

@@ -17,7 +17,7 @@ module Resque
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
-        if Rails.logger.is_a?(Ougai::Logger) 
+        if Rails.logger.is_a?(Ougai::Logger) && !Rails.env.development?
           Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"}
         end
         data = {:msg => 'Starting job', :job => data}

data/lib/zuora_connect/controllers/helpers.rb

@@ -680,7 +680,7 @@ module ZuoraConnect
         session["#{ZuoraConnect.configuration.dev_mode_appinstance}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
  
         values = {
-          id: ZuoraConnect.configuration.dev_mode_appinstance, 
+          id: ZuoraConnect.configuration.dev_mode_appinstance,
           access_token: ZuoraConnect.configuration.dev_mode_user, 
           refresh_token: ZuoraConnect.configuration.dev_mode_pass, 
           token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass, 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.0-d"
+  VERSION = "3.0.0-i"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.d
+  version: 3.0.0.pre.i
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -56,40 +56,40 @@ dependencies:
   name: zuora_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.00
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.00
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.00
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.00
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.4
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.4
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.4
 - !ruby/object:Gem::Dependency
@@ -210,6 +210,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +252,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -445,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Summary of Connect.