zuora_connect 3.0.0.pre.a → 3.0.0.pre.f

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e63c10c8405375ad7cb2c28073c6181ed055266fb8d61e3ac5725e8f5b8ca8d5
-  data.tar.gz: c5124fe3590fd14c0acdad0cfe6e567997195eaa728245f620bfff5bbda285fe
+  metadata.gz: b446d43b611937f6dd159be0509d2baade4dce7db52381560ec571ef3b4e638a
+  data.tar.gz: 0bde587c9f97c73708e3f47a07138b81a4948c99f41250f4043625757d84fe07
 SHA512:
-  metadata.gz: 1beb3e3c0531b3035051711670de269814122c20269086ffd31257b02dc4e6ff8c515ac812abc436360ebc9f1506e3ae8e15e859d6098913e08f2dfed67e1284
-  data.tar.gz: bff9fca90e302be4fe97b3cac4ac54bb8dc6c841ad6762939f9b0b2c6c7e66417bb108105d6d8372965ae9090d813c97cff8a4a4a6b513665beed63c9229f0e4
+  metadata.gz: 817077fec00084059fe4eeff8809e6b340e55a57a35b4d267c89bdd9ceda2fabeb1f925113ae8a95e8380b504587d53539bbc7ab97416924413d9e061d4ce916
+  data.tar.gz: 85ac6b9700e02395ed1bcb73eec74163780f284de4cefe7c76db6e6c4dd636d1868115e1c0bf06be9ae5034c06b7b460274265635d59e447c4dd3157d65f81cd

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,6 +169,7 @@ 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
@@ -289,10 +291,7 @@ 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
 
@@ -352,7 +351,7 @@ module ZuoraConnect
       skip_connect ||= false
       begin
         #Check how app was deployed
-        if self.id < 25000000 && !skip_connect
+        if !self.auto_deployed? && !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})
 
@@ -363,17 +362,9 @@ module ZuoraConnect
               raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("JSON parse error", response.body, response.code)
             end
 
-            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
+            self.build_task(task_data: parsed_json, session: session)  
+            self.set_backup_creds
+            self.save(validate: false) if self.changed?    
           else
             raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
           end
@@ -418,8 +409,16 @@ 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
@@ -582,7 +581,7 @@ module ZuoraConnect
           parsed_json =  JSON.parse(response.body)
 
           #Set Org
-          if self.id >= 25000000 && parsed_json['organization'].present?
+          if self.auto_deployed? && parsed_json['organization'].present?
             login_cache = self.zuora_logins
             login_cache.delete('organization')
             self.zuora_logins = login_cache.merge({'organizations' => [parsed_json['organization']]})

data/config/initializers/resque.rb

@@ -34,15 +34,3 @@ 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,37 +1,6 @@
 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"
@@ -86,13 +55,6 @@ 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/zuora_connect/controllers/helpers.rb

@@ -677,27 +677,30 @@ module ZuoraConnect
 
       def setup_instance_via_dev_mode
         session["appInstance"] = ZuoraConnect.configuration.dev_mode_appinstance
-        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)
+        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)
         ZuoraConnect::ZuoraUser.current_user_id = 0
         if @appinstance.blank?
           Apartment::Tenant.switch!("public")
           begin
-            Apartment::Tenant.create(values[:appinstance].to_s)
+            Apartment::Tenant.create(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
           rescue Apartment::TenantExists => ex
-            Apartment::Tenant.drop(values[:appinstance].to_s)
+            Apartment::Tenant.drop(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
             retry
           end
-
-          @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]}")
+          @appinstance = ZuoraConnect::AppInstance.new()
         end
-        session["#{@appinstance.id}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
+        @appinstance.assign_attributes(values)
+        @appinstance.save(:validate => false)
       end
     end
   end

data/lib/zuora_connect/railtie.rb

@@ -5,17 +5,6 @@ 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"
@@ -43,8 +32,5 @@ 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.0-a"
+  VERSION = "3.0.0-f"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.a
+  version: 3.0.0.pre.f
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -186,16 +186,16 @@ dependencies:
   name: zuora_observability
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre.b
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre.b
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement