zuora_connect 3.1.2 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e7d747f5419f91b21caca64a6e6a23cba1d35f0698c6bb2ad1a675ef30cfecb
-  data.tar.gz: 8375c348a777bfb628cc0bda0f5feca421ac7366e6b1d9adaa46677de9705b69
+  metadata.gz: 3ce9871a6d530d5d0146cf591445fd21ec4f1cba986944b8b966ddc493c5f1a1
+  data.tar.gz: db1756a9a29035a6180ce3370021432a6b255567b8aeaea1eb36ad3f25651ff6
 SHA512:
-  metadata.gz: b676e5e8922bd5b1b8de5955391b12be819498a6a9e6b0e0a7c04a0484d08891dd1f3cf26c4bb6d762c8cea9eb1851566035a2af8c44d8b998d033ec0d7be0af
-  data.tar.gz: 88883530f0a643369c645e47ed7ed545f5088cf904af9d92c31ca320527bc19cae8773169067cf339abb68c251299b8e9f10a1dd0874d3d9b0d7e30bc208f428
+  metadata.gz: aea09cd52f629f8feb5a57a2e200040ad0371a64086c15a662f3408f77ef930211dceb2b01ebbfecc7ca437f268b262a60f52f05d43a3b0ca17e830db72a7e63
+  data.tar.gz: b324ac9bd0f233b04e641efafc2e62e4344218c84f99005fbe67a31a301ececb56411966b67b7a7333ee6581500ee72af4780aea6fa7c58dc15abd60c29c8169

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,12 +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]
-
-    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]
+    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, :instance_drop]
+    http_basic_authenticate_with name: ENV['PROVISION_USER'], password: ENV['PROVISION_SECRET'], :only => [:provision, :instance_user, :instance_drop]
 
     def health
       if params[:error].present?
@@ -119,6 +118,45 @@ module ZuoraConnect
       }, status: 500
     end
 
+    def instance_drop
+      host = request.headers.fetch("HOST", nil)
+      if host.present? && ZuoraConnect::AppInstance::INTERNAL_HOSTS.include?(host)
+        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
+      else
+        render json: { "message" => "Host #{host} is not internal" }, status: :bad_request
+      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/config/initializers/redis.rb

@@ -18,10 +18,29 @@ class Redis
   def self.current=(redis)
     @current = redis
   end
+
+  def self.subscriber
+    @subscriber ||= Redis.new
+  end
+
+  def self.subscriber=(redis)
+    @subscriber = redis
+  end
+
+  def self.publisher
+    @publisher ||= Redis.new
+  end
+
+  def self.publisher=(redis)
+    @publisher = redis
+  end
 end
 
 if defined?(Redis.current)
   Redis.current = Redis.new(:id => "#{ZuoraObservability::Env.full_process_name(process_name: 'Redis')}", :url => redis_url, :timeout => 6, :reconnect_attempts => 2)
+  Redis.subscriber = Redis.new(:id => "#{ZuoraObservability::Env.full_process_name(process_name: 'RedisSubscriber')}", :url => redis_url, :timeout => 6, :reconnect_attempts => 2)
+  Redis.publisher = Redis.new(:id => "#{ZuoraObservability::Env.full_process_name(process_name: 'RedisPublisher')}", :url => redis_url, :timeout => 6, :reconnect_attempts => 2)
+
   browser_urls['Redis'] = { "url" => redis_url }
   if defined?(Resque.redis)
     if resque_url != redis_url

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/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.2"
+  VERSION = "3.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.5
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment