roo_on_rails 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05edf07734c3e18175c4b7f10d220b4443e8b23f
-  data.tar.gz: fd09c771c91cfb18b2c1cc31ec0566f4585eee19
+  metadata.gz: 5dcc5b196608b3a05692de3dbd1933cd5941fea2
+  data.tar.gz: c6464bba5c6cc5acefc6cc95efeb027b309ebebb
 SHA512:
-  metadata.gz: 9bbcfae06c1983dddf2bf86a037207bd93dc59ec86ba9772320a8e90e1d16bf6b034b848cf23292f755eb6e50557a99a0c6952d3099d5070386838db3904e404
-  data.tar.gz: d7c935d825c03932d8cea692b4f9fefd8b971433283b4e4fe480143d3e4f043ae5260c4240a29369add01af2e62110d5fbef0062400dcca4b5b3daf88f366e14
+  metadata.gz: 2bcb66d9da64e40f1cc1862602b1bbed89c052c3e5d6f1a303e4cb1b61aae635f572c0e83d9a72c8d5d9e8683afff17c031ca6439f821e3223706cf8bf590c3b
+  data.tar.gz: 8b497f06d565b9148d3ed0798b5d87a66a14f764b62fc9d2ae383516ffdfea6398df5b1d9455d7b56769a3b2ec7f0419bffd2962b26253ff50a2dd6e50cb843c

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v1.12.0 (2017-10-12)
+
+Features:
+
+- Provide `ROUTEMASTER_VERIFY_SSL` environment variable to disable
+  routemaster-client's SSL verification. (#68)
+
+Bug fix:
+
+- Fixes issue with `fix` command of the service setup scripts for papertrail (#66)
+- Fixes issue with API authentication concern where service name was incorrect (#71)
+
 # v1.12.0 (2017-09-27)
 
 Features (library):

data/README.md

@@ -21,7 +21,7 @@
   - [Rack middleware](#rack-middleware)
   - [Database configuration](#database-configuration)
   - [Sidekiq](#sidekiq)
-  - [HireFire (for Sidekiq workers)](#hirefire-for-sidekiq-workers)
+  - [HireFire](#hirefire)
   - [Logging](#logging)
   - [Google OAuth authentication](#google-oauth-authentication)
   - [Datadog Integration](#datadog-integration)
@@ -128,7 +128,29 @@ 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 Sidekiq workers)
+### 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
@@ -249,10 +271,11 @@ These extra required variables are automatically set by Heroku:
 
 ### Routemaster Client
 
-When `ROUTEMASTER_ENABLED` is set to `true` we attempt to configure [`routemaster-client`](https://github.com/deliveroo/routemaster-client) on your application. In order for this to happen you need to set the following environment variables:
+When `ROUTEMASTER_ENABLED` is set to `true` we attempt to configure [`routemaster-client`](https://github.com/deliveroo/routemaster-client) on your application. In order for this to happen, set the following environment variables:
 
 * `ROUTEMASTER_URL` – the full URL of your Routemaster application (mandatory)
 * `ROUTEMASTER_UUID` – the UUID of your application, e.g. `logistics-dashboard` (mandatory)
+* `ROUTEMASTER_VERIFY_SSL` – set to false if your Routemaster application is not served with a valid cert. (optional)
 
 If you then want to enable the publishing of events onto the event bus, you need to set `ROUTEMASTER_PUBLISHING_ENABLED` to `true` and implement publishers as needed. An example of how to do this is detailed in [`README.routemaster_client.md`](README.routemaster_client.md).
 

data/lib/roo_on_rails/checks/papertrail/system_named.rb

@@ -33,7 +33,7 @@ module RooOnRails
         end
 
         def fix
-          context.papertrail.client.update_system(name: app_name)
+          context.papertrail.client.update_system(system_id, app_name)
         end
 
         private

data/lib/roo_on_rails/concerns/require_api_key.rb

@@ -86,7 +86,8 @@ module RooOnRails
           return false if service_name == '' || client_key == ''
 
           client_keys = @cache[normalize(service_name)]
-          client_keys && client_keys.include?(client_key)
+          return false unless client_keys
+          client_keys.include?(client_key)
         end
 
         private
@@ -96,7 +97,7 @@ module RooOnRails
         end
 
         def normalize(service_name)
-          service_name.upcase.gsub(/[A-Z0-9]+/, '_')
+          service_name.upcase.gsub(/[^A-Z0-9]+/, '_')
         end
 
         def parse_client_keys(str)

data/lib/roo_on_rails/papertrail_client.rb

@@ -21,7 +21,7 @@ module RooOnRails
     end
 
     def update_system(id, data)
-      _conn.put('systems/%s.json' % id, system: data).body
+      _conn.put('systems/%s.json' % id, system: { name: data }).body
     end
 
     # private

data/lib/roo_on_rails/railties/routemaster.rb

@@ -15,6 +15,7 @@ module RooOnRails
           ::Routemaster::Client.configure do |config|
             config.url = routemaster_url
             config.uuid = routemaster_uuid
+            config.verify_ssl = routemaster_verify_ssl
           end
         end
       end
@@ -32,6 +33,10 @@ module RooOnRails
       def routemaster_uuid
         ENV.fetch('ROUTEMASTER_UUID')
       end
+
+      def routemaster_verify_ssl
+        ENV.fetch('ROUTEMASTER_VERIFY_SSL', 'true') != 'false'
+      end
     end
   end
 end

data/lib/roo_on_rails/version.rb

@@ -1,3 +1,3 @@
 module RooOnRails
-  VERSION = '1.12.0'.freeze
+  VERSION = '1.13.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roo_on_rails
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv-rails