roo_on_rails 1.20.0 → 2.1.0

data/lib/roo_on_rails/config.rb

@@ -25,14 +25,6 @@ module RooOnRails
         ENV.fetch('GOOGLE_AUTH_CONTROLLER')
       end
 
-      def routemaster_enabled?
-        enabled? 'ROUTEMASTER_ENABLED', default: false
-      end
-
-      def routemaster_publishing_enabled?
-        enabled? 'ROUTEMASTER_PUBLISHING_ENABLED', default: false
-      end
-
       private
 
       ENABLED_PATTERN = /\A(YES|TRUE|ON|1)\Z/i

data/lib/roo_on_rails/default.env

@@ -4,21 +4,8 @@ GOOGLE_AUTH_CLIENT_SECRET=''
 GOOGLE_AUTH_ALLOWED_DOMAINS=''
 GOOGLE_AUTH_PATH_PREFIX=/auth
 GOOGLE_AUTH_CONTROLLER=sessions
-NEW_RELIC_LOG=stdout
-NEW_RELIC_AGENT_ENABLED=true
-NEW_RELIC_MONITOR_MODE=true
-NEW_RELIC_BROWSER_MONITORING_AUTO_INSTRUMENT=true
-NEW_RELIC_CAPTURE_PARAMS=true
-NEW_RELIC_TRANSACTION_TRACER_RECORD_SQL=obfuscated
-NEW_RELIC_TRANSACTION_TRACER_RECORD_REDIS_ARGUMENTS=true
-NEW_RELIC_DEVELOPER_MODE=false
-NEW_RELIC_LICENSE_KEY=override-me
 RACK_SERVICE_TIMEOUT=10
 RACK_WAIT_TIMEOUT=30
-ROUTEMASTER_URL=''
-ROUTEMASTER_UUID=''
-ROUTEMASTER_ENABLED=false
-ROUTEMASTER_PUBLISHING_ENABLED=false
 SIDEKIQ_ENABLED=true
 SIDEKIQ_THREADS=25
 SIDEKIQ_DATABASE_REAPING_FREQUENCY=10

data/lib/roo_on_rails/rack/populate_env_from_jwt.rb

@@ -7,15 +7,22 @@ module RooOnRails
     class PopulateEnvFromJWT
       UnacceptableKeyError = Class.new(RuntimeError)
       VALID_PREFIXES_KEY = 'VALID_IDENTITY_URL_PREFIXES'.freeze
+      DEFAULT_MAPPED_URLS = {
+        'https://test.deliveroo.co.uk/' => 'https://orderweb.rooenv-staging.io/',
+        'https://deliveroo.co.uk/' => 'https://orderweb.deliverooapp.com/',
+        'https://identity-staging.deliveroo.com/' => 'https://internal-identity.rooenv-staging.io/',
+        'https://identity.deliveroo.com/' => 'https://internal-identity.deliverooapp.com/'
+      }.freeze
 
       def self.configured?
         ENV[VALID_PREFIXES_KEY].present?
       end
 
-      def initialize(app, logger:, skip_sig_verify: true)
+      def initialize(app, logger:, skip_sig_verify: true, url_mappings: DEFAULT_MAPPED_URLS)
         @app = app
-        @keys = {}
         @logger = logger
+        @url_mappings = url_mappings
+        @keys = @mapped_urls = {}
 
         if skip_sig_verify && non_prod?
           @logger.warn "JWTs signature verifification has been switched off in development."
@@ -34,7 +41,7 @@ module RooOnRails
       rescue UnacceptableKeyError, JSON::JWT::Exception => e
         # Identifying user is clearly attempting to hack or has been given a totally incorrect
         # token, log this and flag as Forbidden, without executing the rest of the middleware stack.
-        ::NewRelic::Agent.notice_error(e) if defined?(NewRelic)
+        Raven.report_exception(e) if defined?(Raven)
         [401, {}, []]
       end
 
@@ -86,7 +93,7 @@ module RooOnRails
         return @keys[key_url] if @keys.key?(key_url)
 
         @logger.info "Downloading identity public key from #{key_url}"
-        json = http_request.get(key_url).body
+        json = http_request.get(mapped_url(key_url)).body
         @keys[key_url] = JSON::JWK.new(json)
       rescue Faraday::ParsingError
         raise JSON::JWT::InvalidFormat, 'Downloaded JWK is not a valid JSON file'
@@ -101,6 +108,20 @@ module RooOnRails
           conf.adapter Faraday.default_adapter
         end
       end
+
+      # Allows us to use internal URLs instead of external ones where appropriate
+      def mapped_url(url)
+        return @mapped_urls[url] unless @mapped_urls[url].nil?
+
+        @url_mappings.each do |prefix, replacement|
+          next unless url.starts_with?(prefix)
+          mapped = url.sub(prefix, replacement)
+          @mapped_urls[url] = mapped
+          return mapped
+        end
+
+        url
+      end
     end
   end
 end

data/lib/roo_on_rails/railties/database.rb

@@ -3,18 +3,19 @@ module RooOnRails
     class Database < Rails::Railtie
       initializer 'roo_on_rails.database', after: 'active_record.initialize_database' do
         ActiveSupport.on_load :active_record do
-          Rails.logger.with(initializer: 'roo_on_rails.database') do |log|
-            log.debug 'loading'
+          Rails.logger.debug('[roo_on_rails.database] loading')
 
-            config = ActiveRecord::Base.configurations[Rails.env]
-            config['variables'] ||= {}
-            config['variables']['statement_timeout'] = ENV.fetch('DATABASE_STATEMENT_TIMEOUT', 200)
-            if ENV.key?('DATABASE_REAPING_FREQUENCY')
-              config['reaping_frequency'] = ENV['DATABASE_REAPING_FREQUENCY']
-            end
-
-            ActiveRecord::Base.establish_connection
+          config = ActiveRecord::Base.configurations[Rails.env]
+          config['variables'] ||= {}
+          statement_timeout = ENV.fetch('DATABASE_STATEMENT_TIMEOUT', 200)
+          # Use -1 to disable setting the statement timeout
+          unless statement_timeout == '-1'
+            config['variables']['statement_timeout'] = statement_timeout
+          end
+          if ENV.key?('DATABASE_REAPING_FREQUENCY')
+            config['reaping_frequency'] = ENV['DATABASE_REAPING_FREQUENCY']
           end
+          ActiveRecord::Base.establish_connection
         end
       end
     end

data/lib/roo_on_rails/railties/env.rb

@@ -1,11 +1,9 @@
 module RooOnRails
   class Railtie < Rails::Railtie
     initializer 'roo_on_rails.default_env' do
-      Rails.logger.with initializer: 'roo_on_rails.default_env' do |log|
-        log.debug 'loading'
-        require 'roo_on_rails/environment'
-        RooOnRails::Environment.load
-      end
+      Rails.logger.debug '[roo_on_rails.default_env] loading'
+      require 'roo_on_rails/environment'
+      RooOnRails::Environment.load
     end
   end
 end

data/lib/roo_on_rails/railties/google_oauth.rb

@@ -4,12 +4,10 @@ module RooOnRails
   module Railties
     class GoogleOAuth < Rails::Railtie
       initializer 'roo_on_rails.google_auth.middleware' do |app|
-        Rails.logger.with initializer: 'roo_on_rails.google_auth' do |log|
-          next unless Config.google_auth_enabled?
-          log.debug 'loading'
-          _add_middleware(app)
-          _add_routes(app)
-        end
+        next unless Config.google_auth_enabled?
+        Rails.logger.debug '[roo_on_rails.google_auth] loading'
+        _add_middleware(app)
+        _add_routes(app)
       end
 
       private

data/lib/roo_on_rails/railties/http.rb

@@ -2,45 +2,47 @@ module RooOnRails
   module Railties
     class HTTP < Rails::Railtie
       initializer 'roo_on_rails.http' do |app|
-        Rails.logger.with initializer: 'roo_on_rails.http' do |log|
-          log.debug 'loading'
+        Rails.logger.debug '[roo_on_rails.http] loading'
 
-          require 'rack/timeout/base'
-          require 'rack/ssl-enforcer'
-          require 'roo_on_rails/rack/safe_timeouts'
+        require 'rack/timeout/base'
+        require 'rack/ssl-enforcer'
+        require 'roo_on_rails/rack/safe_timeouts'
 
-          ::Rack::Timeout.service_timeout = ENV.fetch('RACK_SERVICE_TIMEOUT', 15).to_i
-          ::Rack::Timeout.wait_timeout = ENV.fetch('RACK_WAIT_TIMEOUT', 30).to_i
-          ::Rack::Timeout::Logger.level = ::Logger::WARN
+        ::Rack::Timeout::Logger.level = ::Logger::WARN
 
-          app.config.middleware.insert_before(
-            ::Rack::Runtime,
-            ::Rack::Timeout
-          )
+        app.config.middleware.insert_before(
+          ::Rack::Runtime,
+          ::Rack::Timeout,
+          service_timeout: ENV.fetch('RACK_SERVICE_TIMEOUT', 15).to_i,
+          wait_timeout: ENV.fetch('RACK_WAIT_TIMEOUT', 30).to_i
+        )
 
-          middleware_to_insert_before = Rails::VERSION::MAJOR < 4 ? ::ActionDispatch::Cookies : ::Rack::Head
+        if Rails::VERSION::MAJOR < 4
+          middleware_to_insert_before = ::ActionDispatch::Cookies
+        else
+          middleware_to_insert_before = ::Rack::Head
+        end
 
-          # This needs to be inserted low in the stack, before Rails returns the
-          # thread-current connection to the pool.
-          if defined?(ActiveRecord)
-            app.config.middleware.insert_before(
-              middleware_to_insert_before,
-              RooOnRails::Rack::SafeTimeouts
-            )
-          end
+        # This needs to be inserted low in the stack, before Rails returns the
+        # thread-current connection to the pool.
+        if defined?(ActiveRecord)
+          app.config.middleware.insert_before(
+            middleware_to_insert_before,
+            RooOnRails::Rack::SafeTimeouts
+          )
+        end
 
-          if ENV.fetch('ROO_ON_RAILS_RACK_DEFLATE', 'YES').to_s =~ /\A(YES|TRUE|ON|1)\Z/i
-            app.config.middleware.use ::Rack::Deflater
-          end
+        if ENV.fetch('ROO_ON_RAILS_RACK_DEFLATE', 'YES').to_s =~ /\A(YES|TRUE|ON|1)\Z/i
+          app.config.middleware.use ::Rack::Deflater
+        end
 
-          # Don't use SslEnforcer in test environment as it breaks Capybara
-          unless Rails.env.test? ||
-                 ENV.fetch('ROO_ON_RAILS_DISABLE_SSL_ENFORCEMENT', '') =~ /\A(YES|TRUE|ON|1)\Z/i
-            app.config.middleware.insert_before(
-              middleware_to_insert_before,
-              ::Rack::SslEnforcer
-            )
-          end
+        # Don't use SslEnforcer in test environment as it breaks Capybara
+        unless Rails.env.test? ||
+               ENV.fetch('ROO_ON_RAILS_DISABLE_SSL_ENFORCEMENT', '') =~ /\A(YES|TRUE|ON|1)\Z/i
+          app.config.middleware.insert_before(
+            middleware_to_insert_before,
+            ::Rack::SslEnforcer
+          )
         end
       end
     end

data/lib/roo_on_rails/railties/roo_identity.rb

@@ -4,13 +4,14 @@ module RooOnRails
   module Railties
     class RooIdentity < Rails::Railtie
       initializer 'roo_on_rails.roo_identity.middleware' do |app|
-        Rails.logger.with initializer: 'roo_on_rails.roo_identity' do |log|
-          if RooOnRails::Rack::PopulateEnvFromJWT.configured?
-            log.debug 'loading'
-            _add_middleware(app, log)
-          else
-            log.warn 'not configured, roo.identity will be unavailable'
-          end
+        if RooOnRails::Rack::PopulateEnvFromJWT.configured?
+          Rails.logger.debug '[roo_on_rails.roo_identity.middleware] loading'
+          _add_middleware(app, Rails.logger)
+        else
+          Rails.logger.warn(
+            '[roo_on_rails.roo_identity.middleware] ' \
+            ' not configured, roo.identity will be unavailable'
+          )
         end
       end
 
@@ -19,7 +20,10 @@ module RooOnRails
       def _add_middleware(app, log)
         app.config.middleware.use RooOnRails::Rack::PopulateEnvFromJWT, logger: log
       rescue LoadError
-        log.error 'the json-jwt gem is not in the bundle so Roo Identity will not be available'
+        log.error(
+          '[roo_on_rails.roo_identity.middleware] ' \
+          'the json-jwt gem is not in the bundle so Roo Identity will not be available'
+        )
       end
     end
   end

data/lib/roo_on_rails/railties/{sidekiq.rb → sidekiq_integration.rb}

@@ -6,22 +6,19 @@ require 'roo_on_rails/sidekiq/sla_metric'
 
 module RooOnRails
   module Railties
-    class Sidekiq < Rails::Railtie
+    class SidekiqIntegration < Rails::Railtie
       initializer 'roo_on_rails.sidekiq' do |app|
-        Rails.logger.with initializer: 'roo_on_rails.sidekiq' do |log|
-          
-          unless RooOnRails::Config.sidekiq_enabled?
-            log.debug 'skipping'
-            next
-          end
-
-          log.debug 'loading'
-          require 'hirefire-resource'
-         
-          config_sidekiq
-          config_sidekiq_metrics
-          config_hirefire(app)
+        unless RooOnRails::Config.sidekiq_enabled?
+          Rails.logger.debug '[roo_on_rails.sidekiq] skipping'
+          next
         end
+
+        Rails.logger.debug '[roo_on_rails.sidekiq] loading'
+        require 'hirefire-resource'
+
+        config_sidekiq
+        config_sidekiq_metrics
+        config_hirefire(app)
       end
 
       def config_hirefire(app)
@@ -40,11 +37,14 @@ module RooOnRails
       end
 
       def config_sidekiq_metrics
-        require 'sidekiq/middleware/server/statsd'
+        # https://github.com/mperham/sidekiq/wiki/Pro-Metrics
+        require 'sidekiq-pro'
+        ::Sidekiq::Pro.dogstatsd = -> { RooOnRails.statsd }
 
-        ::Sidekiq.configure_server do |x|
-          x.server_middleware do |chain|
-            chain.add ::Sidekiq::Middleware::Server::Statsd, client: RooOnRails.statsd
+        ::Sidekiq.configure_server do |config|
+          config.server_middleware do |chain|
+            require 'sidekiq/middleware/server/statsd'
+            chain.add ::Sidekiq::Middleware::Server::Statsd
           end
         end
       rescue LoadError

data/lib/roo_on_rails/version.rb

@@ -1,3 +1,3 @@
 module RooOnRails
-  VERSION = '1.20.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/roo_on_rails.gemspec

@@ -22,23 +22,22 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'dotenv-rails', '~> 2.1'
-  spec.add_runtime_dependency 'newrelic_rpm'
-  spec.add_runtime_dependency 'rails', '>= 3.2.22', '< 5.2'
+  spec.add_runtime_dependency 'rails', '>= 3.2.22'
+  spec.add_runtime_dependency 'sprockets', '~>3.0'
   spec.add_runtime_dependency 'platform-api', '~> 2.0'
   spec.add_runtime_dependency 'hashie', '~> 3.4'
-  spec.add_runtime_dependency 'rack-timeout'
+  spec.add_runtime_dependency 'rack-timeout', '>= 0.4.0'
   spec.add_runtime_dependency 'rack-ssl-enforcer'
   spec.add_runtime_dependency 'octokit'
   spec.add_runtime_dependency 'hirefire-resource'
-  spec.add_runtime_dependency 'sidekiq'
+  spec.add_runtime_dependency 'sidekiq', '< 6.0.0'
   spec.add_runtime_dependency 'dogstatsd-ruby'
   spec.add_runtime_dependency 'omniauth-google-oauth2'
   spec.add_runtime_dependency 'faraday'
   spec.add_runtime_dependency 'faraday_middleware'
-  spec.add_runtime_dependency 'routemaster-client'
   spec.add_runtime_dependency 'json-jwt', '~> 1.8'
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'thor', '~> 0.19'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roo_on_rails
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Julien Letessier
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv-rails
@@ -25,39 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: newrelic_rpm
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.22
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.22
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.22
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: platform-api
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rack-ssl-enforcer
   requirement: !ruby/object:Gem::Requirement
@@ -146,16 +140,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: dogstatsd-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -212,20 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: routemaster-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
@@ -244,16 +224,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -396,7 +376,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -405,17 +384,17 @@ files:
 - LICENSE.txt
 - README.google_oauth2.md
 - README.md
-- README.routemaster_client.md
 - Rakefile
 - appraise
 - bin/console
 - bin/setup
 - exe/roo_on_rails
 - gemfiles/.bundle/config
-- gemfiles/rails_3.gemfile
 - gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
 - gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6.gemfile
 - lib/roo_on_rails.rb
 - lib/roo_on_rails/checks.rb
 - lib/roo_on_rails/checks/base.rb
@@ -459,16 +438,9 @@ files:
 - lib/roo_on_rails/railties/env.rb
 - lib/roo_on_rails/railties/google_oauth.rb
 - lib/roo_on_rails/railties/http.rb
-- lib/roo_on_rails/railties/logging.rb
-- lib/roo_on_rails/railties/new_relic.rb
 - lib/roo_on_rails/railties/rake_tasks.rb
 - lib/roo_on_rails/railties/roo_identity.rb
-- lib/roo_on_rails/railties/routemaster.rb
-- lib/roo_on_rails/railties/sidekiq.rb
-- lib/roo_on_rails/routemaster/lifecycle_events.rb
-- lib/roo_on_rails/routemaster/publish_lifecycle_events.rb
-- lib/roo_on_rails/routemaster/publisher.rb
-- lib/roo_on_rails/routemaster/publishers.rb
+- lib/roo_on_rails/railties/sidekiq_integration.rb
 - lib/roo_on_rails/shell.rb
 - lib/roo_on_rails/sidekiq/loader.rb
 - lib/roo_on_rails/sidekiq/metrics_worker.rb
@@ -478,14 +450,13 @@ files:
 - lib/roo_on_rails/sidekiq/sla_metric.rb
 - lib/roo_on_rails/statsd.rb
 - lib/roo_on_rails/tasks/db.rake
-- lib/roo_on_rails/tasks/newrelic.rake
 - lib/roo_on_rails/version.rb
 - roo_on_rails.gemspec
 homepage: https://github.com/deliveroo/roo_on_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -500,9 +471,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.11
+signing_key:
 specification_version: 4
 summary: Scaffolding for building services
 test_files: []