Merge pull request #53 from 18F/brody/config

Rewrite config delivery, and actually request and display LOA3 data
18F · Mar 12, 2019 · a63e41c · a63e41c
2 parents b16cea7 + 965f5c9
commit a63e41c
Show file tree

Hide file tree

Showing 13 changed files with 320 additions and 238 deletions.
diff --git a/.env.example b/.env.example
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,4 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile '~/.gitignore_global'
 
-.env
+/config/application.yml
diff --git a/Gemfile b/Gemfile
@@ -6,13 +6,13 @@ source 'https://rubygems.org'
 
 ruby '~> 2.3.5'
 
-gem 'activesupport'
-gem 'dotenv'
-gem 'httparty'
+gem 'activesupport', '~> 5.2'
+gem 'aws-sdk-secretsmanager', '~> 1.21'
+gem 'httparty', '~> 0.16'
 gem 'identity-hostdata', github: '18F/identity-hostdata', branch: 'master'
-gem 'json-jwt'
-gem 'jwt'
-gem 'sinatra'
+gem 'json-jwt', '~> 1.9.4'
+gem 'jwt', '~> 2.1'
+gem 'sinatra', '~> 2.0', '>= 2.0.2'
 
 group :development do
   gem 'pry-byebug'
@@ -22,7 +22,7 @@ end
 
 group :test do
   gem 'fakefs', require: 'fakefs/safe'
-  gem 'nokogiri'
+  gem 'nokogiri', '~> 1.10'
   gem 'rack-test'
   gem 'rspec', '~> 3.5.0'
   gem 'webmock'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,89 +1,109 @@
 GIT
   remote: https://github.com/18F/identity-hostdata.git
-  revision: 2751e7df330986c7effbb66d8c7ecf8f039ab767
+  revision: b5587588601670f762bbc79f0f4a8468064d9401
   branch: master
   specs:
-    identity-hostdata (0.3.2)
-      aws-sdk-core (~> 2.10.23)
+    identity-hostdata (0.3.3)
+      aws-sdk-s3 (~> 1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.4)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     aes_key_wrap (1.0.1)
     ast (2.4.0)
-    aws-sdk-core (2.10.118)
+    aws-eventstream (1.0.1)
+    aws-partitions (1.142.0)
+    aws-sdk-core (3.46.2)
+      aws-eventstream (~> 1.0)
+      aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sigv4 (1.0.2)
+    aws-sdk-kms (1.13.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-s3 (1.30.1)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-secretsmanager (1.21.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sigv4 (1.0.3)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bindata (2.4.3)
-    byebug (10.0.2)
+    bindata (2.4.4)
+    byebug (11.0.0)
     codeclimate-engine-rb (0.4.1)
       virtus (~> 1.0)
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    dotenv (2.2.2)
     equalizer (0.0.11)
-    fakefs (0.13.3)
-    hashdiff (0.3.7)
-    httparty (0.16.2)
+    fakefs (0.19.2)
+    hashdiff (0.3.8)
+    httparty (0.16.4)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (0.9.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    jmespath (1.3.1)
-    json-jwt (1.9.2)
+    jaro_winkler (1.5.2)
+    jmespath (1.4.0)
+    json-jwt (1.9.4)
       activesupport
       aes_key_wrap
       bindata
-      securecompare
-      url_safe_base64
     jwt (2.1.0)
-    method_source (0.9.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.1)
+    kwalify (0.7.2)
+    method_source (0.9.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
     multi_xml (0.6.0)
-    mustermann (1.0.2)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    parallel (1.12.1)
-    parser (2.5.0.5)
+    mustermann (1.0.3)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.14.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
-    pry (0.11.3)
+    powerpack (0.1.2)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (3.0.2)
-    rack (2.0.4)
-    rack-protection (2.0.1)
+    psych (3.1.0)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-protection (2.0.5)
       rack
-    rack-test (1.0.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    reek (4.8.0)
+    reek (5.3.1)
       codeclimate-engine-rb (~> 0.4.0)
-      parser (>= 2.5.0.0, < 2.6)
-      rainbow (~> 3.0)
+      kwalify (~> 0.7.0)
+      parser (>= 2.5.0.0, < 2.7, != 2.5.1.1)
+      psych (~> 3.1.0)
+      rainbow (>= 2.0, < 4.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -97,33 +117,33 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.52.1)
+    rubocop (0.65.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
+      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    safe_yaml (1.0.4)
-    securecompare (1.0.0)
-    sinatra (2.0.1)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.0)
+    safe_yaml (1.0.5)
+    sinatra (2.0.5)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.1)
+      rack-protection (= 2.0.5)
       tilt (~> 2.0)
     thread_safe (0.3.6)
-    tilt (2.0.8)
-    tzinfo (1.2.4)
+    tilt (2.0.9)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-    url_safe_base64 (0.2.2)
+    unicode-display_width (1.4.1)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    webmock (3.3.0)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -132,24 +152,24 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  dotenv
+  activesupport (~> 5.2)
+  aws-sdk-secretsmanager (~> 1.21)
   fakefs
-  httparty
+  httparty (~> 0.16)
   identity-hostdata!
-  json-jwt
-  jwt
-  nokogiri
+  json-jwt (~> 1.9.4)
+  jwt (~> 2.1)
+  nokogiri (~> 1.10)
   pry-byebug
   rack-test
   reek
   rspec (~> 3.5.0)
   rubocop
-  sinatra
+  sinatra (~> 2.0, >= 2.0.2)
   webmock
 
 RUBY VERSION
    ruby 2.3.5p376
 
 BUNDLED WITH
-   1.16.0
+   1.17.1
diff --git a/Makefile b/Makefile
@@ -10,9 +10,6 @@ all: check
 
 setup:
 	bundle check || bundle install
-	[ -f .env ] && echo ".env exists" || cat .env.example >> .env
-
-.env: setup
 
 check: lint test
 
@@ -25,5 +22,5 @@ lint:
 run:
 	bundle exec rackup -p $(PORT)
 
-test: .env $(CONFIG)
+test: $(CONFIG)
 	bundle exec rspec