From 1da1da6e3c828f83e4d69feba6a5008351e9a161 Mon Sep 17 00:00:00 2001 From: Drew Dara-Abrams Date: Mon, 10 Oct 2016 22:09:48 -0700 Subject: [PATCH 1/2] updating gems again after the failure in #809 and #810 --- Gemfile.lock | 62 +++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3d027413e..8df8fd8fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,8 +50,8 @@ GEM rails-html-sanitizer (~> 1.0, >= 1.0.2) active_model_serializers (0.9.5) activemodel (>= 3.2) - active_record_doctor (1.2.0) - rails (~> 4.2) + active_record_doctor (1.2.1) + rails (>= 4.2, < 5.1) activejob (4.2.7.1) activesupport (= 4.2.7.1) globalid (>= 0.3.0) @@ -62,7 +62,7 @@ GEM activemodel (= 4.2.7.1) activesupport (= 4.2.7.1) arel (~> 6.0) - activerecord-import (0.15.0) + activerecord-import (0.16.0) activerecord (>= 3.2) activerecord-postgis-adapter (3.1.4) activerecord (~> 4.2) @@ -85,12 +85,12 @@ GEM rake (>= 10.4, < 12.0) arel (6.0.3) ast (2.3.0) - aws-sdk (2.5.7) - aws-sdk-resources (= 2.5.7) - aws-sdk-core (2.5.7) + aws-sdk (2.6.6) + aws-sdk-resources (= 2.6.6) + aws-sdk-core (2.6.6) jmespath (~> 1.0) - aws-sdk-resources (2.5.7) - aws-sdk-core (= 2.5.7) + aws-sdk-resources (2.6.6) + aws-sdk-core (= 2.6.6) bcrypt (3.1.11) better_errors (2.1.1) coderay (>= 1.0.0) @@ -99,10 +99,10 @@ GEM binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) - bullet (5.3.0) + bullet (5.4.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.10.0) - byebug (9.0.5) + byebug (9.0.6) c_geohash (1.1.2) choice (0.2.0) chronic (0.10.2) @@ -121,14 +121,14 @@ GEM warden (~> 1.2.3) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20160615) + domain_name (0.5.20160826) unf (>= 0.0.5, < 1.0.0) email_validator (1.6.0) activemodel enumerize (2.0.0) activesupport (>= 3.2) erubis (2.7.0) - excon (0.52.0) + excon (0.53.0) factory_girl (4.7.0) activesupport (>= 3.0.0) factory_girl_rails (4.7.0) @@ -139,12 +139,12 @@ GEM ffaker (2.2.0) figaro (1.1.1) thor (~> 0.14) - fog-aws (0.11.0) + fog-aws (0.12.0) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.42.0) + fog-core (1.43.0) builder excon (~> 0.49) formatador (~> 0.2) @@ -160,7 +160,7 @@ GEM globalid (0.3.7) activesupport (>= 4.1.0) hashdiff (0.3.0) - http-cookie (1.0.2) + http-cookie (1.0.3) domain_name (~> 0.5) i18n (0.7.0) interception (0.5) @@ -189,22 +189,20 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.1.0) - minitest (5.9.0) + minitest (5.9.1) multi_json (1.12.1) multipart-post (2.0.0) netrc (0.11.0) - nokogiri (1.6.8) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - oj (2.17.3) + oj (2.17.4) oj_mimic_json (1.0.1) orm_adapter (0.5.0) - parser (2.3.1.2) + parser (2.3.1.4) ast (~> 2.2) - pg (0.18.4) - pghero (1.4.1) + pg (0.19.0) + pghero (1.5.3) activerecord - pkg-config (1.1.7) polyamorous (1.1.0) activerecord (>= 3.0) powerpack (0.1.1) @@ -260,7 +258,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.1.0) raindrops (0.17.0) - rake (11.2.2) + rake (11.3.0) rcsv (0.3.1) redis (3.3.1) redis-actionpack (5.0.0) @@ -296,7 +294,7 @@ GEM rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.2) + rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -319,7 +317,7 @@ GEM rspec_junit_formatter (0.2.2) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.42.0) + rubocop (0.43.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -331,13 +329,13 @@ GEM ruby-progressbar (1.8.1) rubyzip (1.2.0) safe_yaml (1.0.4) - sentry-raven (1.2.3) + sentry-raven (2.0.2) faraday (>= 0.7.6, < 0.10.x) - sidekiq (4.1.4) + sidekiq (4.2.2) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) + rack-protection (~> 1.5) redis (~> 3.2, >= 3.2.1) - sinatra (>= 1.4.7) sidekiq-limit_fetch (3.3.0) sidekiq (>= 4) sidekiq-logging-json (0.0.16) @@ -358,7 +356,7 @@ GEM sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.1.1) + sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -376,7 +374,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.0) + unicode-display_width (1.1.1) unicorn (5.1.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -458,4 +456,4 @@ DEPENDENCIES whenever BUNDLED WITH - 1.12.5 + 1.13.2 From 8f207a5d6cad958cf566e2cfa6bfe51b5e056c6a Mon Sep 17 00:00:00 2001 From: Drew Dara-Abrams Date: Mon, 10 Oct 2016 22:12:11 -0700 Subject: [PATCH 2/2] fix Sidekiq middleware changes The web dashboard has been internally refactored in SIdekiq 4.2.0. It now uses straight Rack, rather than Rack and Sinatra: https://github.com/mperham/sidekiq/blob/master/Changes.md#420 Removing a hack that was useful in the past but no longer works (and now causes the error that led to having to revert in #810). --- components/datastore_admin/config/routes.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/components/datastore_admin/config/routes.rb b/components/datastore_admin/config/routes.rb index 3f2d5e8e7..fb4447acc 100644 --- a/components/datastore_admin/config/routes.rb +++ b/components/datastore_admin/config/routes.rb @@ -1,11 +1,6 @@ require 'sidekiq/web' if Rails.env.production? || Rails.env.staging? - # Disable Rack::Protection because it doesn't always work nicely behind load balancers. - Sidekiq::Web.instance_variable_get(:@middleware).delete_if do |middleware| - middleware.first == Rack::Protection - end - Sidekiq::Web.use Rack::Auth::Basic do |username, password| username == Figaro.env.admin_username && password == Figaro.env.admin_password end