roo_on_rails 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2087a16081bf1826323d093e4a69ed2e6242e10
-  data.tar.gz: f48656fe62c5deb2c09cd137eb8cd1b73c94d4a6
+  metadata.gz: a4f7beb1235b80ea826919a641b7b44754702cda
+  data.tar.gz: 06aa080ac742fc3fb7a4154ea5c0311d3f67e70c
 SHA512:
-  metadata.gz: c10e9b4be3c0a5151595a4e144d8b8a1c2eb4fab4736cb7941e388c59d4ff81722efcb76482c5466c55071e6fd78eeaf306a88cefa45971baa4dd2dadebf7d0e
-  data.tar.gz: 39d2b995f0e7cdd65941e08949bd6b3e54c725829dd7b1e588e4f104c908187529da5cfb704b4ea156dde53ccc2827b1c2650d2ffee407b37a427413148ed46b
+  metadata.gz: f8afc738c99dc50e34e2e21acd8b531678a07c39d574352bcd8028df0defa0653ca3763b2480a8423e9711bfcb445bc68d2320fcfa5b11e94d5d591c6b7418a8
+  data.tar.gz: 43f9e982df0696736b88b8eb09ac73aaaec5b638163f777d04e6f832f408dbe0dd635391929c56466536747d985a4aca51507cb1d1f1f74717657f5b1e8da6a3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v2.1.2
+
+Bug fix:
+
+- fixes PopulateEnvFromJWT caching issue where a key that couldn't be fetched would be cached
+
 # v2.1.0
 
 Features:

data/README.md

@@ -21,9 +21,6 @@
     - [Disabling SSL enforcement](#disabling-ssl-enforcement)
   - [Database configuration](#database-configuration)
   - [Sidekiq](#sidekiq)
-  - [HireFire](#hirefire)
-    - [For Web Dynos](#for-web-dynos)
-    - [For Sidekiq Workers](#for-sidekiq-workers)
   - [Logging](#logging)
   - [Identity](#identity)
   - [Google OAuth authentication](#google-oauth-authentication)
@@ -137,48 +134,6 @@ NB. If you are migrating to SLA-based queue names, do not set `SIDEKIQ_ENABLED`
 to `true` before your old queues have finished processing (this will prevent
 Sidekiq from seeing the old queues at all).
 
-### HireFire
-
-#### For Web Dynos
-
-Web dynos can be autoscaled by HireFire _only_ if it has been configured to use the `Web.Logplex.Load` source and the Heroku runtime metrics lab feature has been enabled:
-
-```bash
-$ heroku labs:enable log-runtime-metrics -a your-service-name-here
-```
-
-You will also need a log drain for HireFire, but the RooOnRails helper below should configure this for you. You can check with
-
-```bash
-$ heroku drains | grep hirefire
-https://logdrain.hirefire.io (d.00000000-0000-0000-0000-000000000000)
-
-# No drain? Add with:
-$ heroku drains:add -a your-service-name-here https://logdrain.hirefire.io
-```
-
-([HireFire docs for set up](https://help.hirefire.io/guides/logplex/load-logplex))
-
-#### For Sidekiq Workers
-
-When `HIREFIRE_TOKEN` is set an endpoint will be mounted at `/hirefire` that
-reports the required worker count as a function of queue latency. By default we
-add queue names in the style 'within1day', so if we notice an average latency in
-that queue of more than an set threshold we'll request one more worker. If we
-notice less than a threshold we'll request one less worker. These settings can
-be customised via the following ENV variables
-
-- `WORKER_INCREASE_THRESHOLD` (default 0.5)
-- `WORKER_DECREASE_THRESHOLD` (default 0.1)
-
-When setting the manager up in the HireFire web ui, the following settings must
-be used:
-
-- name: 'worker'
-- type: 'Worker.HireFire.JobQueue'
-- ratio: 1
-- decrementable: 'true'
-
 ### Logging
 
 For clearer and machine-parseable log output, the Rails logger is replaced by an
@@ -382,6 +337,11 @@ The command is designed to fix issues in many cases.
 Pull requests are welcome on GitHub at
 `https://github.com/deliveroo/roo_on_rails`.
 
+## Releasing
+
+1. Bump the version number in `lib/roo_on_rails/version.rb
+1. Add an entry to the changelog
+1. After merging to master release e.g. `bundle exec rake release`
 
 ## License
 

data/lib/roo_on_rails/rack/populate_env_from_jwt.rb

@@ -22,7 +22,8 @@ module RooOnRails
         @app = app
         @logger = logger
         @url_mappings = url_mappings
-        @keys = @mapped_urls = {}
+        @keys = {}
+        @mapped_urls = {}
 
         if skip_sig_verify && non_prod?
           @logger.warn "JWTs signature verifification has been switched off in development."

data/lib/roo_on_rails/railties/sidekiq_integration.rb

@@ -14,19 +14,9 @@ module RooOnRails
         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)
-        unless ENV['HIREFIRE_TOKEN']
-          Rails.logger.warn 'No HIREFIRE_TOKEN token set, auto scaling not enabled'
-          return
-        end
-        add_middleware(app)
       end
 
       def config_sidekiq

data/lib/roo_on_rails/version.rb

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

data/roo_on_rails.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   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', '< 6.0.0'
   spec.add_runtime_dependency 'dogstatsd-ruby'
   spec.add_runtime_dependency 'omniauth-google-oauth2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roo_on_rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Julien Letessier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv-rails
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hirefire-resource
-  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: sidekiq
   requirement: !ruby/object:Gem::Requirement