zuora_connect 3.0.0l → 3.0.0.pre.a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9a8f69b209e1762d0c1972e864b17330becc946114bd8c78313bf5221e7f4fc
-  data.tar.gz: ff25b1fe4224b67bd2e8c387406a04237b9828e3e21adf3ed75ab282694f061d
+  metadata.gz: e63c10c8405375ad7cb2c28073c6181ed055266fb8d61e3ac5725e8f5b8ca8d5
+  data.tar.gz: c5124fe3590fd14c0acdad0cfe6e567997195eaa728245f620bfff5bbda285fe
 SHA512:
-  metadata.gz: 13fb0d5ad358b91fa77a23fe72091482df39bf2dbd5acc846419666550d7f1d1078cf1e150444237c3554eebb1c8d6484beec541562ce1e5180507a1cbd8a6da
-  data.tar.gz: 99007a267042763f665a2d195e160682a346d96388f081c548f26c6730a7c0ef6adc9633e9576f230ac4665e91e073289de110a212e9f41f66e964704e55e6f1
+  metadata.gz: 1beb3e3c0531b3035051711670de269814122c20269086ffd31257b02dc4e6ff8c515ac812abc436360ebc9f1506e3ae8e15e859d6098913e08f2dfed67e1284
+  data.tar.gz: bff9fca90e302be4fe97b3cac4ac54bb8dc6c841ad6762939f9b0b2c6c7e66417bb108105d6d8372965ae9090d813c97cff8a4a4a6b513665beed63c9229f0e4

data/Rakefile

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

data/app/models/zuora_connect/app_instance_base.rb

@@ -152,8 +152,7 @@ module ZuoraConnect
       if ZuoraConnect.configuration.mode != "Production"
         mock_task_data = {
           "id" => ZuoraConnect.configuration.dev_mode_appinstance,
-          "mode" => ZuoraConnect.configuration.dev_mode_mode,
-          "name" => "Developer Instance"
+          "mode" => ZuoraConnect.configuration.dev_mode_mode
         }
 
         case ZuoraConnect.configuration.dev_mode_options.class
@@ -169,7 +168,6 @@ module ZuoraConnect
         end
 
         self.build_task(task_data: mock_task_data, session: session)
-        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
@@ -291,7 +289,10 @@ module ZuoraConnect
       elsif type == :user
         begin
           sql = <<-eos
-            SELECT zuora_users.zuora_identity_response FROM "#{self.id}".zuora_users ORDER BY zuora_users.updated_at DESC LIMIT 1;
+            SELECT zuora_users.zuora_identity_response 
+            FROM "#{self.id}".zuora_users 
+            ORDER BY zuora_users.updated_at DESC 
+            LIMIT 1;
           eos
           user = ActiveRecord::Base.connection.execute(sql).to_a.first
 
@@ -351,7 +352,7 @@ module ZuoraConnect
       skip_connect ||= false
       begin
         #Check how app was deployed
-        if !self.auto_deployed? && !skip_connect
+        if self.id < 25000000 && !skip_connect
           self.check_oauth_state
           response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
 
@@ -362,9 +363,17 @@ module ZuoraConnect
               raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("JSON parse error", response.body, response.code)
             end
 
-            self.build_task(task_data: parsed_json, session: session)  
-            self.set_backup_creds
-            self.save(validate: false) if self.changed?    
+            self.build_task(task_data: parsed_json, session: session)
+            if self.kms_key.present? && self.kms_key.match(/^arn:aws:.*/)
+              begin
+                self.zuora_logins = self.strip_cache_data(object: parsed_json.dup, keys: ['applications', 'tokens', 'user_settings'])
+                self.save(:validate => false)
+              rescue Aws::KMS::Errors::ValidationException, *AWS_AUTH_ERRORS => ex
+                Rails.logger.warn(AWS_AUTH_ERRORS_MSG, ex)
+              rescue => ex
+                Rails.logger.error(AWS_AUTH_ERRORS_MSG, ex)
+              end
+            end
           else
             raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
           end
@@ -409,16 +418,8 @@ module ZuoraConnect
     end
 
     #### START KMS ENCRYPTION Methods ####
-      def set_backup_creds
-        if self.kms_key.present? && self.kms_key.match(/^arn:aws:.*/) && self.task_data.present?
-          self.zuora_logins = self.strip_cache_data(object: self.task_data.dup, keys: ['applications', 'tokens', 'user_settings'])
-        end  
-      end 
-
       def zuora_logins=(val)
         write_attribute(:zuora_logins, kms_encrypt(val.to_json))
-      rescue Aws::KMS::Errors::ValidationException, Aws::KMS::Errors::NotFoundException, *AWS_AUTH_ERRORS => ex
-        Rails.logger.warn(AWS_AUTH_ERRORS_MSG, ex)
       end
 
       def zuora_logins
@@ -581,7 +582,7 @@ module ZuoraConnect
           parsed_json =  JSON.parse(response.body)
 
           #Set Org
-          if self.auto_deployed? && parsed_json['organization'].present?
+          if self.id >= 25000000 && parsed_json['organization'].present?
             login_cache = self.zuora_logins
             login_cache.delete('organization')
             self.zuora_logins = login_cache.merge({'organizations' => [parsed_json['organization']]})
@@ -1029,7 +1030,7 @@ module ZuoraConnect
             catalog_container = catalog_container[object_id]
           end
 
-          return catalog_container || {}
+          return catalog_container
         end
 
         if defined?(Redis.current) && object_id.present? && object_id.class == String && object_id.present?

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
+            query += initializer.query_conditions_for_initial_load(type_map)
           end
 
           execute_and_clear(query, "SCHEMA", []) do |records|

data/config/initializers/resque.rb

@@ -34,3 +34,15 @@ Resque.module_eval do
     Hash[queue_names.zip(sizes)]
   end
 end
+
+if defined?(Resque.logger)
+  Resque.logger = ZuoraObservability::Logger.custom_logger(name: "Resque", type: 'Monologger', level: MonoLogger::INFO)
+  Resque::Scheduler.logger = ZuoraObservability::Logger.custom_logger(name: "ResqueScheduler") if defined?(Resque::Scheduler)
+end
+if defined?(Delayed::Worker.logger)
+  Delayed::Worker.logger = ZuoraObservability::Logger.custom_logger(name: "DelayedJob", type: 'Monologger', level: MonoLogger::INFO)
+end
+
+Makara::Logging::Logger.logger = ZuoraObservability::Logger.custom_logger(name: "Makara") if defined?(Makara)
+ElasticAPM.agent.config.logger = ZuoraObservability::Logger.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN) if defined?(ElasticAPM) && ElasticAPM.running?
+ActionMailer::Base.logger = ZuoraObservability::Logger.custom_logger(name: "ActionMailer", type: 'Monologger') if defined?(ActionMailer)

data/lib/middleware/metrics_middleware.rb

@@ -1,6 +1,37 @@
 module ZuoraConnect
   require 'uri'
 
+  # Object of this class is passed to the ActiveSupport::Notification hook
+  class PageRequest
+
+    # This method is triggered when a non error page is loaded (not 404)
+    def call(name, started, finished, unique_id, payload)
+      # If the url contains any css or JavaScript files then do not collect metrics for them
+      return nil if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| payload[:path].include?(word) }
+
+      # Getting the endpoint and the content_type
+      content_hash = {:html => "text/html", :js => "application/javascript", :json => "application/json", :csv => "text/csv"}
+      content_type = content_hash.key?(payload[:format]) ? content_hash[payload[:format]] : payload[:format]
+      content_type = content_type.to_s.gsub('text/javascript', 'application/javascript')
+
+      # payloads with 500 requests do not have status as it is not set by the controller
+      # https://github.com/rails/rails/issues/33335
+      #status_code = payload[:status] ? payload[:status] : payload[:exception_object].present? ? 500 : ""
+      if payload[:exception].present?
+        status_code, exception = [500, payload[:exception].first]
+      else
+        status_code, exception = [payload[:status], nil]
+      end
+
+      tags = {method: payload[:method], status: status_code, error_type: exception, content_type: content_type, controller: payload[:controller], action: payload[:action]}.compact
+
+      values = {view_time: payload[:view_runtime], db_time: payload[:db_runtime], response_time: ((finished-started)*1000)}.compact
+      values = values.map{ |k,v| [k,v.round(2)]}.to_h
+
+      ZuoraObservability::Metrics.write_to_telegraf(direction: :inbound, tags: tags, values: values)
+    end
+  end
+
   class MetricsMiddleware
 
     require "zuora_connect/version"
@@ -34,11 +65,8 @@ 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 = defined?(ZuoraConnect::AppInstance.get_metrics) ? ZuoraConnect::AppInstance.get_metrics(metrics) : metrics
-         
+          metrics = ZuoraObservability::Metrics.resque
           redis_up = metrics.present? && metrics.dig(:Resque, :Workers_Total).present? ? 1 : 0
           Prometheus::REDIS_CONNECTION.set(redis_up)
 
@@ -58,6 +86,13 @@ module ZuoraConnect
           @status, @headers, @response = @app.call(env)
         ensure
 
+          # If the url contains any CSS or JavaScript files then do not collect metrics for them
+          if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| env['PATH_INFO'].include?(word) } || /.*\.js$/.match(env['PATH_INFO'])
+            tags = {status: @status, controller: 'ActionController', action: 'Assets', app_instance: 0}
+            values = {response_time: ((Time.now - start_time)*1000).round(2) }
+            ZuoraObservability::Metrics.write_to_telegraf(direction: 'request-inbound-assets', tags: tags, values: values)
+          end
+
           # Uncomment following block of code for handling engine requests/requests without controller
           # else
           #   # Handling requests which do not have controllers (engines)

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) && !Rails.env.development?
+        if Rails.logger.is_a?(Ougai::Logger) 
           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)
-          job_start_log(args)
+          Rails.logger.info('Starting job') 
 
           @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,10 +68,6 @@ 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) && !Rails.env.development?
+        if Rails.logger.is_a?(Ougai::Logger) 
           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

@@ -280,7 +280,6 @@ module ZuoraConnect
                 next_instance_id,
                 zuora_entity_id,
                 rest_domain,
-                tenant_id: request.headers['zuora-tenant-id'],
                 retry_count: retry_count
               )
             rescue ActiveRecord::RecordNotUnique
@@ -303,8 +302,7 @@ module ZuoraConnect
     private
       def setup_instance_via_prod_mode
         zuora_entity_id = request.headers['ZuoraCurrentEntity'] || cookies['ZuoraCurrentEntity']
-        ZuoraConnect::ZuoraUser.current_user_id = nil 
-        
+
         if zuora_entity_id.present?
           zuora_tenant_id = cookies['Zuora-Tenant-Id']
           zuora_user_id = cookies['Zuora-User-Id']
@@ -638,7 +636,7 @@ module ZuoraConnect
         (ZuoraConnect::AppInstance.all.where("id > #{min_instance_id}").order(id: :desc).limit(1).pluck(:id).first || min_instance_id) + 1
       end
 
-      def new_instance(id, zuora_entity_id, rest_domain, tenant_id: nil, task_data: nil, retry_count: 0)
+      def new_instance(id, zuora_entity_id, rest_domain, task_data: nil, retry_count: 0)
         app_instance = ZuoraConnect::AppInstance.new(
           :id => id,
           :api_token => generate_token,
@@ -648,8 +646,6 @@ module ZuoraConnect
           :zuora_entity_ids => [zuora_entity_id]
         )
 
-        app_instance[:zuora_tenant_ids] = [tenant_id.to_s] if tenant_id.present?
-
         if task_data.nil?
           # no encryption
           app_instance['zuora_logins'] = task_data
@@ -681,30 +677,27 @@ module ZuoraConnect
 
       def setup_instance_via_dev_mode
         session["appInstance"] = ZuoraConnect.configuration.dev_mode_appinstance
-        session["#{ZuoraConnect.configuration.dev_mode_appinstance}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
- 
-        values = {
-          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, 
-          api_token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass
-        }
-        
-        @appinstance = ZuoraConnect::AppInstance.find_by(:id => ZuoraConnect.configuration.dev_mode_appinstance.to_i)
+        user = ZuoraConnect.configuration.dev_mode_user
+        key = ZuoraConnect.configuration.dev_mode_pass
+        values = {:user => user , :key => key, :appinstance => session["appInstance"]}
+        @appinstance = ZuoraConnect::AppInstance.find_by(:id => values[:appinstance].to_i)
         ZuoraConnect::ZuoraUser.current_user_id = 0
         if @appinstance.blank?
           Apartment::Tenant.switch!("public")
           begin
-            Apartment::Tenant.create(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
+            Apartment::Tenant.create(values[:appinstance].to_s)
           rescue Apartment::TenantExists => ex
-            Apartment::Tenant.drop(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
+            Apartment::Tenant.drop(values[:appinstance].to_s)
             retry
           end
-          @appinstance = ZuoraConnect::AppInstance.new()
+
+          @appinstance = ZuoraConnect::AppInstance.new(:id => values[:appinstance].to_i, :access_token => values[:user], :refresh_token => values[:key], :token => "#{values[:key]}#{values[:key]}", :api_token => "#{values[:key]}#{values[:key]}")
+          @appinstance.save(:validate => false)
+        end
+        if @appinstance.access_token.blank? || @appinstance.refresh_token.blank? || @appinstance.token.blank? || @appinstance.api_token.blank?
+          @appinstance.update_attributes!(:access_token =>  values["user"], :refresh_token =>  values["key"], :token => "#{values[:key]}#{values[:key]}", :api_token => "#{values[:key]}#{values[:key]}")
         end
-        @appinstance.assign_attributes(values)
-        @appinstance.save(:validate => false)
+        session["#{@appinstance.id}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
       end
     end
   end

data/lib/zuora_connect/railtie.rb

@@ -5,6 +5,17 @@ require 'middleware/bad_multipart_form_data_sanitizer'
 
 module ZuoraConnect
   class Railtie < Rails::Railtie
+    REQUEST_HEADERS_TO_IGNORE = %W(
+      RAW_POST_DATA
+      REQUEST_METHOD
+      REQUEST_URI
+      REQUEST_PATH
+      PATH_INFO
+      CONTENT_TYPE
+      ORIGINAL_FULLPATH
+      QUERY_STRING
+    )
+
     config.before_initialize do
       version = Rails.version
       if version >= "5.0.0"
@@ -32,5 +43,8 @@ module ZuoraConnect
         app.config.middleware.use Rack::Deflater, if: ->(env, *) { env['PATH_INFO'] == '/connect/internal/metrics' }
       end
     end
+
+    # hook to process_action
+    ActiveSupport::Notifications.subscribe('process_action.action_controller', ZuoraConnect::PageRequest.new)
   end
 end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.0l"
+  VERSION = "3.0.0-a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0l
+  version: 3.0.0.pre.a
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2020-11-30 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
@@ -186,16 +186,16 @@ dependencies:
   name: zuora_observability
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre.b
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre.b
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -210,20 +210,6 @@ 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
@@ -252,34 +238,6 @@ 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
@@ -487,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Summary of Connect.