zuora_connect 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eedfed1cc9d304e303303bbda985be007df987f6c50c8cebf4bef6ee2f630a2
-  data.tar.gz: 77bbf5a323c63814cb50521ffd244c601b40e3f5c07bc8208f9996b83fe5090e
+  metadata.gz: 669d11bc2e10ece9fb5f4d014b412739545cf7d17c6858b0588f8d6c566be41e
+  data.tar.gz: a077b09e7c4e5e3bdb10742c99100a11842d6d5bb31ca520a97d44c8e9ac51c0
 SHA512:
-  metadata.gz: 519cf6f3002ff33a5849e297e74ccd7a541a9677fdbf28e7481848d3ef74f2521555c129fa215db87dc5565fa7c0afa4ea3ce19c6555ad0bec8878fe41d48d78
-  data.tar.gz: 6db95ad4869e55739c648492a830054c8f59b574a6ddabf80b8de24ff1e67356e7df492fcf742a6afea5bb65f34f215252dd2466d5c264578c5c0cd224866fe4
+  metadata.gz: b043fa5b788040e781843eb2c2f20aba5a7b2d1f8d014e89ac31aa3574a451473dd1d89a08d479f71215f6f386d288e5fdb315316fcf31de8121d39224778d7c
+  data.tar.gz: f151cb64ecddc869299c25f9a1012601ededb097e469fd86a060ca0c8b82e074559df24724600880a8afea9f3995550c9c504af311d1e24248fbdcfaa6013197

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,11 +1,11 @@
 module ZuoraConnect
   class StaticController < ApplicationController
-    before_action :authenticate_connect_app_request, :except => [:health, :initialize_app, :provision, :instance_user]
-    before_action :clear_connect_app_session,        :only =>   [:health, :initialize_app, :provision, :instance_user]
-    after_action :persist_connect_app_session,       :except => [:health, :initialize_app, :provision, :instance_user]
+    before_action :authenticate_connect_app_request, :except => [:health, :initialize_app, :provision, :instance_user, :instance_drop]
+    before_action :clear_connect_app_session,        :only =>   [:health, :initialize_app, :provision, :instance_user, :instance_drop]
+    after_action :persist_connect_app_session,       :except => [:health, :initialize_app, :provision, :instance_user, :instance_drop]
 
     skip_before_action :verify_authenticity_token, :only => [:initialize_app, :provision]
-    http_basic_authenticate_with name: ENV['PROVISION_USER'], password: ENV['PROVISION_SECRET'], :only => [:provision, :instance_user]
+    http_basic_authenticate_with name: ENV['PROVISION_USER'], password: ENV['PROVISION_SECRET'], :only => [:provision, :instance_user, :instance_drop]
 
 
     def health
@@ -119,6 +119,40 @@ module ZuoraConnect
       }, status: 500
     end
 
+    def instance_drop
+      ZuoraConnect::AppInstance.read_master_db do
+        instance_id = params[:id]
+        @appinstance = ZuoraConnect::AppInstance.find(instance_id)
+        if @appinstance.drop_instance
+          ZuoraConnect::AppInstance.destroy(instance_id)
+          msg = Apartment::Tenant.drop(instance_id)
+
+          if msg.error_message.present?
+            render json: { "message" => msg.error_message }, status: :bad_request
+          else
+            render json: {
+              status: 200,
+              message: 'Success',
+              app_instance_id: instance_id
+            }, status: 200
+          end
+        else
+          render json: { "message" => @appinstance.drop_message }, status: :bad_request
+        end
+      end
+    rescue StandardError => e
+      message = 'Failed to drop instance'
+      if performed?
+        Rails.logger.error("#{message}: #{performed?}", e)
+      else
+        Rails.logger.error(message, e)
+        render json: {
+          status: 500,
+          message: message
+        }, status: 500
+      end
+    end
+
     private
 
     def clear_connect_app_session

data/app/models/zuora_connect/app_instance_base.rb

@@ -353,8 +353,10 @@ module ZuoraConnect
     end
 
     def fetch_connect_data(session: {})
+      refresh_count ||= 0
       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})
+      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})
 
       if response.code == 200
         begin
@@ -367,45 +369,43 @@ module ZuoraConnect
         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)
+        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/config/routes.rb

@@ -4,6 +4,7 @@ ZuoraConnect::Engine.routes.draw do
 
   if ENV['PROVISION_USER'].present? && ENV['PROVISION_SECRET'].present?
     post '/provision' => 'static#provision'
+    post '/instance/:id/drop' => 'static#instance_drop'
     get '/instance/:id/user' => 'static#instance_user'
   end
 

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"
+  VERSION = "3.1.3"
 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
+  version: 3.1.3
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment