zuora_connect 3.0.0.pre.h → 3.0.0.pre.o

data/lib/zuora_connect.rb

@@ -9,6 +9,7 @@ require 'resque/silence_done'
 require 'resque/self_lookup'
 require 'resque/plugins/custom_logger'
 require 'resque/plugins/app_instance_job'
+require 'metrics/influx/point_value'
 require 'metrics/net'
 require 'mono_logger'
 require 'zuora_connect/zuora_audit'

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, :json_logging, :insert_migrations
+    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, :json_logging, :insert_migrations, :skip_connect
 
     def initialize
       @default_locale = :en
@@ -20,6 +20,7 @@ module ZuoraConnect
       @silencer_resque_finish = true
       @blpop_queue = false
       @insert_migrations = true
+      @skip_connect = false
 
       # Setting the app name for telegraf write
       @enable_metrics = false

data/lib/zuora_connect/controllers/helpers.rb

@@ -280,6 +280,7 @@ module ZuoraConnect
                 next_instance_id,
                 zuora_entity_id,
                 rest_domain,
+                tenant_id: request.headers['zuora-tenant-id'],
                 retry_count: retry_count
               )
             rescue ActiveRecord::RecordNotUnique
@@ -302,7 +303,8 @@ module ZuoraConnect
     private
       def setup_instance_via_prod_mode
         zuora_entity_id = request.headers['ZuoraCurrentEntity'] || cookies['ZuoraCurrentEntity']
-
+        ZuoraConnect::ZuoraUser.current_user_id = nil 
+        
         if zuora_entity_id.present?
           zuora_tenant_id = cookies['Zuora-Tenant-Id']
           zuora_user_id = cookies['Zuora-User-Id']
@@ -636,7 +638,7 @@ module ZuoraConnect
         (ZuoraConnect::AppInstance.all.where("id > #{min_instance_id}").order(id: :desc).limit(1).pluck(:id).first || min_instance_id) + 1
       end
 
-      def new_instance(id, zuora_entity_id, rest_domain, task_data: nil, retry_count: 0)
+      def new_instance(id, zuora_entity_id, rest_domain, tenant_id: nil, task_data: nil, retry_count: 0)
         app_instance = ZuoraConnect::AppInstance.new(
           :id => id,
           :api_token => generate_token,
@@ -646,6 +648,8 @@ module ZuoraConnect
           :zuora_entity_ids => [zuora_entity_id]
         )
 
+        app_instance[:zuora_tenant_ids] = [tenant_id.to_s] if tenant_id.present?
+
         if task_data.nil?
           # no encryption
           app_instance['zuora_logins'] = task_data

data/lib/zuora_connect/railtie.rb

@@ -32,5 +32,8 @@ 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-h"
+  VERSION = "3.0.0-o"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.h
+  version: 3.0.0.pre.o
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -56,40 +56,40 @@ dependencies:
   name: zuora_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.00
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.00
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.00
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.00
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.4
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.4
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.4
 - !ruby/object:Gem::Dependency
@@ -210,6 +210,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +253,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -253,7 +281,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: derailed
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -332,6 +360,7 @@ files:
 - app/models/zuora_connect/app_instance.rb
 - app/models/zuora_connect/app_instance_base.rb
 - app/models/zuora_connect/login.rb
+- app/models/zuora_connect/telegraf.rb
 - app/models/zuora_connect/zuora_user.rb
 - app/views/layouts/zuora_connect/application.html.erb
 - app/views/sql/refresh_aggregate_table.txt
@@ -366,6 +395,7 @@ files:
 - db/migrate/20190520232222_add_unique_index.rb
 - db/migrate/20190520232223_add_provisioning_fields.rb
 - db/migrate/20190520232224_add_environment_fields.rb
+- lib/metrics/influx/point_value.rb
 - lib/metrics/net.rb
 - lib/middleware/bad_multipart_form_data_sanitizer.rb
 - lib/middleware/json_parse_errors.rb
@@ -386,47 +416,6 @@ files:
 - lib/zuora_connect/railtie.rb
 - lib/zuora_connect/version.rb
 - lib/zuora_connect/zuora_audit.rb
-- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/fixtures/zuora_connect/app_instances.yml
-- test/integration/navigation_test.rb
-- test/lib/generators/zuora_connect/datatable_generator_test.rb
-- test/models/zuora_connect/app_instance_test.rb
-- test/test_helper.rb
-- test/zuora_connect_test.rb
 homepage: 
 licenses: []
 metadata: {}
@@ -445,49 +434,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Summary of Connect.
-test_files:
-- test/fixtures/zuora_connect/app_instances.yml
-- test/models/zuora_connect/app_instance_test.rb
-- test/integration/navigation_test.rb
-- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
-- test/zuora_connect_test.rb
-- test/lib/generators/zuora_connect/datatable_generator_test.rb
-- test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/422.html
-- test/dummy/Rakefile
-- test/dummy/config.ru
-- test/dummy/config/secrets.yml
-- test/dummy/config/boot.rb
-- test/dummy/config/application.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/routes.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/README.rdoc
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/bin/rails
-- test/dummy/bin/bundle
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/test_helper.rb
+test_files: []

data/test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb

@@ -1,13 +0,0 @@
-require 'test_helper'
-
-module ZuoraConnect
-  class Api::V1::AppInstanceControllerTest < ActionController::TestCase
-    setup do
-      @routes = Engine.routes
-    end
-
-    # test "the truth" do
-    #   assert true
-    # end
-  end
-end

data/test/dummy/README.rdoc

@@ -1,28 +0,0 @@
-== README
-
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.

data/test/dummy/Rakefile

@@ -1,6 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Rails.application.load_tasks

data/test/dummy/app/assets/javascripts/application.js

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .

data/test/dummy/app/assets/stylesheets/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/test/dummy/app/controllers/application_controller.rb

@@ -1,5 +0,0 @@
-class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
-end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/test/dummy/bin/bundle

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')

data/test/dummy/bin/rails

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'

data/test/dummy/bin/rake

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
-Rake.application.run

data/test/dummy/bin/setup

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-require 'pathname'
-
-# path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
-
-Dir.chdir APP_ROOT do
-  # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
-
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
-
-  # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
-  # end
-
-  puts "\n== Preparing database =="
-  system "bin/rake db:setup"
-
-  puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
-
-  puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
-end