zuora_connect 3.1.2.pre.a → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71565c519f52d6be0809d472180939cd58d19e68458870c59b02a2fee0a5b2b8
-  data.tar.gz: 0d84051d7b89cba49350eab6dfb0cecd2735f6b7977ee8311ac179941b70f4c7
+  metadata.gz: 493dd9cc489602b3f459c2eb71bf944ae8e4d48dd5179a68836e6b6586ce02de
+  data.tar.gz: 79dfe48b44bf8c8fd9f95931ae8d7b9db43d4194cc62172a3ca08778678e003d
 SHA512:
-  metadata.gz: e32a55f439c3cdfcdb237d6b4cd6f6d52bc86566503c9089e37a98215d16ec65c8607da6b3612fffbf9aca6b2730bc0c07a524e7feb2b4f089fb0a4302f9c850
-  data.tar.gz: f1ba32eedf0ded2b2c2e923776a0a8bb7485e1b7ec9aa5eb731dc92b185a23ddf0bb3a82bc8badafdc3e1cd591a5e20d0b7cd50813605b3ebf56dacd878c84a8
+  metadata.gz: 887d066e13ff882c1b2a96290d88207359d710a1b87989a5442aa45e152e4312213c936e14adbc6c1b0f11c29edaaf8107803a4733b55684279803ae55e3a2ac
+  data.tar.gz: d774d37dc4adab8073d88521c59bb4d58a994626f81e17c1b9421b9273b56f5f7903c50375614d613c5961846fd0f52de94eb19b58a2d0ec956051668f41b0b0

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/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/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.1.2-a"
+  VERSION = "3.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.1.2.pre.a
+  version: 3.1.4
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -452,9 +452,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: