zuora_connect 3.1.2 → 3.1.5.pre.a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e7d747f5419f91b21caca64a6e6a23cba1d35f0698c6bb2ad1a675ef30cfecb
-  data.tar.gz: 8375c348a777bfb628cc0bda0f5feca421ac7366e6b1d9adaa46677de9705b69
+  metadata.gz: 19aedfac159e02a6098ddd1d40b8c05c76ed0198a31fefb059fc1efee21f9680
+  data.tar.gz: 1e404cfa4449dca2f20380fb25252178739a694115b7335909dd20f500a4cf72
 SHA512:
-  metadata.gz: b676e5e8922bd5b1b8de5955391b12be819498a6a9e6b0e0a7c04a0484d08891dd1f3cf26c4bb6d762c8cea9eb1851566035a2af8c44d8b998d033ec0d7be0af
-  data.tar.gz: 88883530f0a643369c645e47ed7ed545f5088cf904af9d92c31ca320527bc19cae8773169067cf339abb68c251299b8e9f10a1dd0874d3d9b0d7e30bc208f428
+  metadata.gz: e0b52c5b8639d0ead9c33ea46951eb71f6f543bb01e911ef140fa3c55bab38d3c7cbc3445f38ec5064d91093fc1d39427cc0f7be52e4d27652d82a436a708e04
+  data.tar.gz: 0a73154220907b992dcf750a036e654c64989f16e45ecb3d24bb89f894da008516efd0ab7853190852dd2ea22ec3edd2490184194d38d877aad29150a40aa377

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?
@@ -52,6 +51,10 @@ module ZuoraConnect
     end
 
     def provision
+      if ZuoraConnect.configuration.disable_provisioning
+        render(json: { status: 403, message: 'Provisioning is suspended until 2022-08-17' }, status: 403) && return
+      end
+
       create_new_instance
       unless performed?
         render json: {
@@ -119,6 +122,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/configuration.rb

@@ -7,7 +7,7 @@ module ZuoraConnect
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
-    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :insert_migrations, :skip_connect, :encryption_type, :local_task_data
+    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :insert_migrations, :skip_connect, :encryption_type, :local_task_data, :disable_provisioning
 
     def initialize
       @default_locale = :en
@@ -23,6 +23,7 @@ module ZuoraConnect
       @skip_connect = false
       @encryption_type = :direct
       @local_task_data = false
+      @disable_provisioning = false
 
       # Setting the app name for telegraf write
       @enable_metrics = false

data/lib/zuora_connect/controllers/helpers.rb

@@ -446,6 +446,10 @@ module ZuoraConnect
 
             #We have no deployed instance for this tenant
             else
+              if ZuoraConnect.configuration.disable_provisioning
+                raise ZuoraConnect::Exceptions::AccessDenied.new("Provisioning is suspended")
+              end
+
               #Ensure user can access oauth creation API
               if !session["ZuoraCurrentUserInfo"]['permissions'].include?("permission.userManagement")
                 Thread.current[:appinstance] = nil
@@ -601,6 +605,10 @@ module ZuoraConnect
           @appinstance = ZuoraConnect::AppInstance.find_by(:id => values["appInstance"].to_i)
 
           if @appinstance.blank?
+            if ZuoraConnect.configuration.disable_provisioning
+              raise ZuoraConnect::Exceptions::AccessDenied.new("Provisioning is suspended")
+            end
+
             Apartment::Tenant.switch!("public")
             begin
               Apartment::Tenant.create(values["appInstance"].to_s)

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.1.2"
+  VERSION = "3.1.5-a"
 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.pre.a
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-08-10 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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key: