vault-tools 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe49ccd1b29f332961d47073c6856e30b2505c27ecac92560683963d2835d370
-  data.tar.gz: dd30f52a76a9cfdcbcd0f1e44a99b33b0677111ebd80819fa8986597cee0102d
+  metadata.gz: 9265591e92a631fd1b996644985ee742c622ac3259412dc5b7ca2e6ff3c7aebe
+  data.tar.gz: b01e51fe465c1a001685bd909fcbfec83757005cad808b34918328af0fca4906
 SHA512:
-  metadata.gz: 975dca6c4728fbc1fde722298f5b55e874eca041e92e23c43ead2dd13bfd4a71718702f30a1de48c058fd93700302bf48fb0c26af4a1cc945f3fce77fbeafd28
-  data.tar.gz: 64b8630df783acf88d09fc2c807f9b611626b3209679bdaf27d35f0afd99f8a9084931bc62c4e9f4cbdf5751e4e238f8e8c65faee6922ca90a483506f226cfeb
+  metadata.gz: 3910495873e72ce2299d303118e790fa42f22ec6acd0fe440d2d1ca595a394e50afc30e58751a352db9b5ed87f6448aa88db042ab8059bee6b9b58da53376df7
+  data.tar.gz: 4dd78be8dec844bb89a2729309ffe80f8084736c9535e0d74ecf8a352cffde2fa9f548cc303443732aa0e750ae5c0074257adeae54e28f38c72548c804dab6d8

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.5.0
-  - 2.4.0
-  - 2.3.0
+  - 2.6.0
+  - 2.5.3
+before_install:
+  - gem install bundler -v '< 2'

data/Gemfile

@@ -4,12 +4,13 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rake', '~> 10.4'
+  gem 'rake', '~> 12.3'
   gem 'shotgun', '~> 0.9.2'
   gem 'yard-sinatra'
 end
 
 group :test do
   gem 'guard-minitest'
-  gem 'vault-test-tools', '~> 0.4.2'
+  gem 'minitest-around'
+  gem 'vault-test-tools', '~> 1.0.0'
 end

data/Gemfile.lock

@@ -1,84 +1,82 @@
 PATH
   remote: .
   specs:
-    vault-tools (1.0.1)
-      aws-sdk (~> 1.0)
+    vault-tools (2.0.0)
+      aws-sdk-s3 (~> 1.0)
       coderay
       excon
-      fernet (= 2.0.rc2)
-      heroku-api
+      fernet (= 2.0)
       rack (~> 2.0)
       rack-ssl-enforcer
-      rollbar (~> 2.7.1)
+      rollbar (~> 2.18.2)
       scrolls (~> 0.9)
       sinatra (~> 2.0.4)
       uuidtools
-      zipkin-tracer (~> 0.27)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (1.67.0)
-      aws-sdk-v1 (= 1.67.0)
-    aws-sdk-v1 (1.67.0)
-      json (~> 1.4)
-      nokogiri (~> 1)
+    aws-eventstream (1.0.1)
+    aws-partitions (1.127.0)
+    aws-sdk-core (3.44.1)
+      aws-eventstream (~> 1.0)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.13.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-s3 (1.30.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.0)
+    aws-sigv4 (1.0.3)
     coderay (1.1.2)
-    concurrent-ruby (1.1.3)
     dotenv (2.5.0)
     excon (0.62.0)
-    faraday (0.15.3)
-      multipart-post (>= 1.2, < 3)
-    fernet (2.0.rc2)
+    fernet (2.0)
       valcro (= 0.1)
-    finagle-thrift (1.4.2)
-      thrift (~> 0.9.3)
     guard-compat (1.2.1)
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    heroku-api (0.4.3)
-      excon (~> 0.45)
-      multi_json (~> 1.8)
-    json (1.8.6)
+    jmespath (1.4.0)
     logfmt (0.0.8)
     method_source (0.9.2)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
+    minitest-around (0.5.0)
+      minitest (~> 5.0)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
     mustermann (1.0.3)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rack (2.0.6)
-    rack-protection (2.0.4)
+    rack-protection (2.0.5)
       rack
     rack-ssl-enforcer (0.2.9)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (10.5.0)
-    rdoc (6.0.4)
-    rollbar (2.7.1)
+    rake (12.3.2)
+    rdoc (6.1.1)
+    rollbar (2.18.2)
       multi_json
     rr (1.2.1)
     scrolls (0.9.0)
     shotgun (0.9.2)
       rack (>= 1.0)
-    sinatra (2.0.4)
+    sinatra (2.0.5)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.4)
+      rack-protection (= 2.0.5)
       tilt (~> 2.0)
-    sucker_punch (2.1.1)
-      concurrent-ruby (~> 1.0)
-    thrift (0.9.3.0)
-    tilt (2.0.8)
+    tilt (2.0.9)
     uuidtools (2.1.5)
     valcro (0.1)
-    vault-test-tools (0.4.2)
+    vault-test-tools (1.0.0)
       logfmt
       minitest (~> 5.11)
       nokogiri
@@ -88,11 +86,6 @@ GEM
     yard (0.9.16)
     yard-sinatra (1.0.0)
       yard (~> 0.7)
-    zipkin-tracer (0.29.1)
-      faraday (~> 0.8)
-      finagle-thrift (~> 1.4.2)
-      rack (>= 1.0)
-      sucker_punch (~> 2.0)
 
 PLATFORMS
   ruby
@@ -100,11 +93,12 @@ PLATFORMS
 DEPENDENCIES
   dotenv
   guard-minitest
+  minitest-around
   pry
-  rake (~> 10.4)
+  rake (~> 12.3)
   rdoc
   shotgun (~> 0.9.2)
-  vault-test-tools (~> 0.4.2)
+  vault-test-tools (~> 1.0.0)
   vault-tools!
   yard
   yard-sinatra

data/README.md

@@ -26,9 +26,6 @@ calling `Vault.setup` will:
 - if the `CONFIG_APP` environment variable is defined and this is
   the production environment, it will attempt to use the Heroku API
   to load the config vars from another app into `Vault::Config`
-- enable distributed tracing via Zipkin, if the [required config
-  vars](#configs-for-tracing) are set
-
 
 ### `Vault::Config`
 
@@ -93,16 +90,6 @@ Generate the API documentation:
 
     vendor/bin/d
 
-## Configs for tracing
-
-The following are config vars to be set in the consumer app for tracing with
-Zipkin:
-* `APP_NAME` (required) what the trace will show up as in the Zipkin interface.
-* `ZIPKIN_ENABLED` (required) must be set to `true` to start tracing.
-* `ZIPKIN_API_HOST` (required) where to post traces to. URL must contain the
-  basic auth creds from the Tools team.
-* `ZIPKIN_SAMPLE_RATE` defaults to `0.1`.
-
 ## Releasing
 
     > bundle exec rake release

data/lib/vault-tools.rb

@@ -3,8 +3,8 @@ require "vault-tools/version"
 require 'sinatra/base'
 require 'scrolls'
 require 'rack/ssl-enforcer'
-require 'heroku-api'
 require 'rollbar'
+require 'excon'
 
 # Yes, there's a lot of stuff on STDERR.  But its on
 # stderr and not stdout so you can pipe to /dev/null if
@@ -72,7 +72,6 @@ module Vault
     self.override_global_config
     self.load_shared_config
     self.init_scrolls
-    Tracing.configure
   end
 end
 
@@ -90,9 +89,6 @@ require 'vault-tools/time'
 require 'vault-tools/s3'
 require 'vault-tools/statement_store'
 require 'vault-tools/rollbar_helper'
-require 'vault-tools/tracing/sidekiq_client'
-require 'vault-tools/tracing/sidekiq_server'
-require 'vault-tools/tracing'
 
 Rollbar.configure do |config|
   config.environment = ENV['RACK_ENV'] || ENV['RAILS_ENV'] || ENV['APP_ENV'] || ENV['ROLLBAR_ENV'] || 'unassigned'

data/lib/vault-tools/app.rb

@@ -5,7 +5,7 @@ module Vault
     ID_CAPTURE = /\Aapp(\d+)\@[\w\.]+com\z/
     # Convert a core app ID into a Heroku app ID.
     #
-    # @param app_id [Fixnum] A core app ID.
+    # @param app_id [Integer] A core app ID.
     # @return [String] A Heroku ID that uniquely represents the app.
     def self.id_to_hid(app_id)
       "app#{app_id}@heroku.com"
@@ -13,7 +13,7 @@ module Vault
 
     # Convert a core app ID into a v5 UUID.
     #
-    # @param app_id [Fixnum] An app ID.
+    # @param app_id [Integer] An app ID.
     # @return [String] A v5 UUID that uniquely represents the app.
     def self.id_to_uuid(app_id)
       url = "https://vault.heroku.com/apps/#{app_id}"
@@ -24,7 +24,7 @@ module Vault
     #
     # @param heroku_id [String] A Heroku app ID, such as `app1234@heroku.com`.
     # @raise [ArgumentError] Raised if a malformed Heroku ID is provided.
-    # @return [Fixnum] The core app ID that uniquely represents the app.
+    # @return [Integer] The core app ID that uniquely represents the app.
     def self.hid_to_id(heroku_id)
       if app_id = heroku_id.slice(ID_CAPTURE, 1)
         app_id.to_i

data/lib/vault-tools/config.rb

@@ -32,30 +32,12 @@ module Vault
       ENV[var_name] || @@shared[var_name] || @@defaults[default_name]
     end
 
-    # Loads config from another app.
-    def self.load_shared!(app = nil)
-      heroku   = Heroku::API.new
-      @@shared = heroku.get_config_vars(app).body
-    end
-
     # Reset defaults and shared values
     def self.reset!
       @@defaults = {}
       @@shared   = {}
     end
 
-    # An environment variable from another app.
-    #
-    # @param app [String] The name of the app to get the value from.
-    # @param name [String] The name of the environment variable to fetch a
-    #   value for.
-    # @return [String] The value of an environment variable from another
-    #   Heroku app or nil if no match is available.
-    def self.remote_env(app, name)
-      heroku = Heroku::API.new
-      heroku.get_config_vars(app).body[name]
-    end
-
     # An environment variable.
     #
     # @param name [String] The name of the environment variable to fetch a
@@ -126,7 +108,7 @@ module Vault
 
     # The port to listen on for web requests.
     #
-    # @return [Fixnum] The port to listen on for web requests.
+    # @return [Integer] The port to listen on for web requests.
     def self.port
       env!("PORT").to_i
     end
@@ -148,12 +130,12 @@ module Vault
       !bool?('VAULT_TOOLS_DISABLE_SSL')
     end
 
-    # An environment variable converted to a Fixnum.
+    # An environment variable converted to a Integer.
     #
     # @param name [String] The name of the environment variable to fetch a
-    #   Fixnum for.
-    # @return [Fixnum] The number or nil if the value couldn't be coerced to a
-    #   Fixnum.
+    #   Integer for.
+    # @return [Integer] The number or nil if the value couldn't be coerced to a
+    #   Integer.
     def self.int(name)
       self[name] && self[name].to_i
     end
@@ -194,7 +176,7 @@ module Vault
 
     # The number of threads to use in Sidekiq workers.
     #
-    # @return [Fixnum] The number of threads from the `SIDEKIQ_CONCURRENCY`
+    # @return [Integer] The number of threads from the `SIDEKIQ_CONCURRENCY`
     #   environment variable or 25 if no variable is defined.
     def self.sidekiq_concurrency
       int('SIDEKIQ_CONCURRENCY') || 25

data/lib/vault-tools/log.rb

@@ -19,7 +19,7 @@ module Vault
     # This makes it possible to easily measure individual HTTP status codes as
     # well as classes of HTTP status codes.
     #
-    # @param status [Fixnum] The HTTP status code to record.
+    # @param status [Integer] The HTTP status code to record.
     def self.count_status(status)
       count("http.#{status}")
       if status_prefix = status.to_s.match(/\d/)[0]
@@ -39,7 +39,7 @@ module Vault
     # Log a timing metric.
     #
     # @param name [String] A Sinatra-formatted route URL.
-    # @param duration [Fixnum] The duration to record, in milliseconds.
+    # @param duration [Integer] The duration to record, in milliseconds.
     def self.time(name, duration)
       if name
         name.gsub(/\/:\w+/, '').            # Remove param names from path.

data/lib/vault-tools/pipeline.rb

@@ -20,7 +20,7 @@ module Vault
     end
 
     def self.filters
-      @filters
+      @filters ||= nil
     end
 
     def self.process(thing)

data/lib/vault-tools/s3.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-s3'
 
 module S3
   extend self
@@ -10,7 +10,7 @@ module S3
   # @param value [String]
   def write(bucket, key, value)
     Vault::Log.log(:fn => __method__, :key => key) do
-      s3.buckets[bucket].objects[key].write(value)
+      s3.put_object({bucket: bucket, key: key, body: value})
     end
   end
 
@@ -20,17 +20,17 @@ module S3
   # @param key [String]
   def read(bucket, key)
     Vault::Log.log(:fn => __method__, :key => key) do
-      s3.buckets[bucket].objects[key].read
+      s3.get_object({bucket: bucket, key: key}).body.read
     end
   end
 
-  # Get the underlying AWS::S3 instance, creating it using environment vars
-  # if necessary.
+  # Get the underlying AWS::S3::Client instance, creating it using environment
+  # vars if necessary.
   def s3
-    @s3 ||= AWS::S3.new(
-      :access_key_id => Config.env('AWS_ACCESS_KEY_ID'),
-      :secret_access_key => Config.env('AWS_SECRET_ACCESS_KEY'),
-      :use_ssl => true
+    @s3 ||= Aws::S3::Client.new(
+      credentials: Aws::Credentials.new(Config.env('AWS_ACCESS_KEY_ID'),
+                                        Config.env('AWS_SECRET_ACCESS_KEY')),
+      region: Config.env('AWS_REGION')
     )
   end
 

data/lib/vault-tools/statement_store.rb

@@ -2,8 +2,9 @@ module Vault
   # The StatementStore knows how to save and retrieve invoices from S3
   class StatementStore
     def initialize(opts = {})
-      @key_id = opts.fetch(:key_id, ENV['AWS_ACCESS_KEY_ID'])
-      @key = opts.fetch(:key, ENV['AWS_SECRET_ACCESS_KEY'])
+      @credentials = Aws::Credentials.new(opts.fetch(:key_id, Config[:aws_access_key_id]),
+                                          opts.fetch(:key, Config[:aws_secret_access_key]))
+      @region = opts.fetch(:region, Config[:aws_region])
     end
 
     # Retrieve invoice JSON from S3
@@ -34,20 +35,24 @@ module Vault
 
     # Retrieve the contents in a given format of a given file from S3
     def retrieve(format, opts)
-      s3.buckets[bucket_for(format, opts)].objects[path_for(opts)].read
+      s3.get_object({
+        bucket: bucket_for(format, opts),
+        key: path_for(opts)
+      }).body.read
     end
 
     # Write the contents in the given format to S3
     def write(format, opts)
-      obj = s3.buckets[bucket_for(format, opts)].objects[path_for(opts)]
-      obj.write(opts[:contents])
-      obj
+      s3.put_object({
+        bucket: bucket_for(format, opts),
+        key: path_for(opts),
+        body: opts[:contents]
+      })
     end
 
     # Get an instance of the S3 client to work with
     def s3
-      @s3 ||= AWS::S3.new(access_key_id: @key_id, secret_access_key: @key,
-                          use_ssl: true)
+      @s3 ||= Aws::S3::Client.new(credentials: @credentials, region: @region)
     end
 
     # Determine which bucket an invoice should live in
@@ -73,10 +78,11 @@ module Vault
     private
 
     def validate_path_opts(opts)
+      user = opts[:user_hid] || opts[:user_id]
+
       fail(ArgumentError, 'start_time required!') unless opts[:start_time]
       fail(ArgumentError, 'stop_time required!') unless opts[:stop_time]
       fail(ArgumentError, 'version required!') unless opts[:version]
-      user = opts[:user_hid] || opts[:user_id]
       fail(ArgumentError, 'user_hid or or user_id required!') unless user
     end
   end

data/lib/vault-tools/time.rb

@@ -16,7 +16,7 @@ class Time
   end
 end
 
-class Fixnum
+class Integer
   def weeks
     self.days * 7
   end

data/lib/vault-tools/user.rb

@@ -5,7 +5,7 @@ module Vault
     ID_CAPTURE = /^user(\d+)\@[\w\.]+com$/
     # Convert a user ID into a Heroku user ID.
     #
-    # @param user_id [Fixnum] A user ID.
+    # @param user_id [Integer] A user ID.
     # @return [String] A Heroku ID that uniquely represents the user.
     def self.id_to_hid(user_id)
       "user#{user_id}@heroku.com"
@@ -13,7 +13,7 @@ module Vault
 
     # Convert a user ID into a v5 UUID.
     #
-    # @param user_id [Fixnum] A user ID.
+    # @param user_id [Integer] A user ID.
     # @return [String] A v5 UUID that uniquely represents the user.
     def self.id_to_uuid(user_id)
       url = "https://vault.heroku.com/users/#{user_id}"
@@ -25,7 +25,7 @@ module Vault
     # @param heroku_id [String] A Heroku user ID, such as
     #   `user1234@heroku.com`.
     # @raise [ArgumentError] Raised if a malformed Heroku ID is provided.
-    # @return [Fixnum] The core user ID that uniquely represents the user.
+    # @return [Integer] The core user ID that uniquely represents the user.
     def self.hid_to_id(heroku_id)
       if user_id = heroku_id.slice(ID_CAPTURE, 1)
         user_id.to_i

data/lib/vault-tools/version.rb

@@ -2,6 +2,6 @@
 
 module Vault
   module Tools
-    VERSION = '1.0.1'
+    VERSION = '2.0.0'
   end
 end

data/lib/vault-tools/web.rb

@@ -104,6 +104,7 @@ module Vault
 
     # Log details about the request including how long it took.
     after do
+      @action ||= 'unknown'
       Log.count_status(response.status)
       Log.time("http.#{@action}", (Time.now - @start_request) * 1000)
     end

data/test/config_test.rb

@@ -9,35 +9,6 @@ class ConfigTest < Vault::TestCase
     Config.reset!
   end
 
-  # Config.remote_env uses the Heroku API to read config vars from
-  # other apps.
-  def test_remote_env
-    api_mock = MiniTest::Mock.new
-    api_response = OpenStruct.new(body: {'DATABASE_URL' => 'postgres:///foo'})
-    Heroku::API.stub(:new, api_mock) do
-      api_mock.expect(:get_config_vars, api_response, ['app'])
-      assert_equal('postgres:///foo',
-                   Config.remote_env('app', 'DATABASE_URL'))
-    end
-  end
-
-  # Config.remote_env uses the Heroku API to read config vars from
-  # other apps.
-  def test_shared_config_loads_shared_with_correct_precedence
-    set_env('CONFIG_APP', 'vault-config')
-    api_mock = MiniTest::Mock.new
-    api_response = OpenStruct.new(body: {'HELLO' => 'world'})
-    Heroku::API.stub(:new, api_mock) do
-      api_mock.expect(:get_config_vars, api_response, ['vault-config'])
-      assert_equal(nil, Config[:hello])
-      Config.default(:hello, 'foo')
-      assert_equal('foo', Config[:hello])
-      # this is how we'll call it in the code
-      Config.load_shared!(Config[:config_app])
-      assert_equal('world', Config[:hello])
-    end
-  end
-
   # Config.env returns the value matching the specified environment
   # variable name.
   def test_env
@@ -55,7 +26,7 @@ class ConfigTest < Vault::TestCase
   # Config.env return nil if an unknown environment variable is
   # requested.
   def test_env_with_unknown_name
-    assert_equal(Config.env('UNKNOWN'), nil)
+    assert_nil(Config.env('UNKNOWN'))
   end
 
   # Config.env! returns the value matching the specified environment
@@ -132,7 +103,7 @@ class ConfigTest < Vault::TestCase
     end
   end
 
-  # Config.port converts the value from the environment to a Fixnum
+  # Config.port converts the value from the environment to a Integer
   def test_port_convert_to_int
     set_env 'PORT', "3000"
     assert_equal(3000, Config.port)
@@ -150,14 +121,14 @@ class ConfigTest < Vault::TestCase
 
   # Config.int(VAR) returns nil or VAR as integer.
   def test_int
-    assert_equal(nil, Config.int('FOO'))
+    assert_nil Config.int('FOO')
     set_env 'FOO', "3000"
     assert_equal(3000, Config.int('FOO'))
   end
 
   # Config.time returns nil or VAR as time
   def test_time
-    assert_equal(nil, Config.time('T'))
+    assert_nil(Config.time('T'))
     set_env 'T', '2000'
     assert_equal(Time.utc(2000), Config.time(:t))
     set_env 'T', '2000-2'
@@ -170,7 +141,7 @@ class ConfigTest < Vault::TestCase
 
   # Config.time returns nil or VAR as URI
   def test_uri
-    assert_equal(nil, Config.uri('URL'))
+    assert_nil(Config.uri('URL'))
     set_env 'URL', 'http://user:password@the-web.com/path/to/greatness?foo=bar'
     uri = Config.uri('URL')
     assert_equal('http', uri.scheme)

data/test/defaults_test.rb

@@ -8,13 +8,13 @@ class DefaultsTest < Vault::TestCase
   end
 
   def test_default_when_no_value
-    assert_equal(Config[:max_connections], nil)
+    assert_nil(Config[:max_connections])
     Config.default(:max_connections, 10)
     assert_equal(Config[:max_connections], 10)
   end
 
   def test_default_with_int
-    assert_equal(Config[:max_connections], nil)
+    assert_nil(Config[:max_connections])
     Config.default(:max_connections, '10')
     assert_equal('10', Config[:max_connections])
     assert_equal(10, Config.int(:max_connections))
@@ -23,7 +23,7 @@ class DefaultsTest < Vault::TestCase
   end
 
   def test_default_with_time
-    assert_equal(Config[:date], nil)
+    assert_nil(Config[:date])
     Config.default(:date, '2013-01-01')
     assert_equal('2013-01-01', Config[:date])
     assert_equal(Time.utc(2013), Config.time(:date))
@@ -33,7 +33,7 @@ class DefaultsTest < Vault::TestCase
   end
 
   def test_default_with_array
-    assert_equal(Config[:array], nil)
+    assert_nil(Config[:array])
     Config.default(:array, '10')
     assert_equal('10', Config[:array])
     assert_equal(['10'], Config.array(:array))

data/test/helper.rb

@@ -1,8 +1,11 @@
 require 'vault-test-tools'
 require 'vault-tools'
 require 'rr'
+require 'minitest/around/unit'
+require 'pry'
 
 ENV['RACK_ENV'] = 'test'
+ENV['AWS_REGION'] = 'us-east-1'
 
 module LoggedDataHelper
   def logged_data
@@ -39,69 +42,32 @@ class Vault::TestCase
 end
 
 module StubbedS3
-  class FakeFile
-    def initialize(contents=nil)
-      @contents = contents
-    end
-
-    def write(contents)
-      @contents = contents
-    end
-
-    def read
-      @contents
-    end
-  end
-
-  class FakeBucket
-    def initialize
-      @files = {}
-    end
-
-    def [](file_name)
-      @files[file_name] ||= FakeFile.new
-    end
-
-    def write(file_name, contents)
-      @files[file_name].write(contents)
-    end
-
-    def objects
-      self
-    end
-  end
-
   class FakeClient
     def initialize
-      @buckets = {}
+      @files = {}
     end
 
-    def [](bucket_name)
-      @buckets[bucket_name] ||= FakeBucket.new
+    def put_object(opts)
+      @files["#{opts[:bucket]}::#{opts[:key]}"] = opts[:body]
     end
 
-    def buckets
-      self
+    def get_object(opts)
+      val = @files["#{opts[:bucket]}::#{opts[:key]}"]
+      OpenStruct.new(body: OpenStruct.new(read: val))
     end
   end
 
   class << self
     def seed(bucket, file, contents)
-      fake_client.buckets[bucket].objects[file].write(contents)
+      fake_client.put_object({bucket: bucket, key: file, body: contents})
     end
 
     def fake_client
       @client ||= FakeClient.new
     end
 
-    def enable!(env, opts={})
-      AWS.stub!
-      expected_aws_args = {
-        access_key_id: opts.fetch(:access_key_id, 'FAKE_ID'),
-        secret_access_key: opts.fetch(:secret_access_key, 'FAKE_KEY'),
-        use_ssl: opts.fetch(:use_ssl, true)
-      }
-      env.stub(AWS::S3).new(expected_aws_args) { fake_client }
+    def enable!(opts={}, &block)
+      Aws::S3::Client.stub(:new, fake_client) { yield }
     end
   end
 end

data/test/s3_test.rb

@@ -7,13 +7,14 @@ end
 class S3Test < Vault::TestCase
   include LoggedDataHelper
 
-  def setup
-    super
+  def around
     set_env 'APP_DEPLOY', 'test'
     set_env 'AWS_ACCESS_KEY_ID', 'fake access key id'
     set_env 'AWS_SECRET_ACCESS_KEY', 'fake secret access key'
-    AWS.stub!
-    @consumer = SomeS3Consumer.new
+    StubbedS3.enable! do
+      @consumer = SomeS3Consumer.new
+      yield
+    end
   end
 
   def log_output
@@ -23,33 +24,32 @@ class S3Test < Vault::TestCase
   # S3 writes should be logged.
   def test_write_logs
     @consumer.write('fake bucket', 'fake key', 'fake value')
-    assert_match /fake key/, log_output
+    assert_match(/fake key/, log_output)
   end
 
   # S3 reads should be logged.
   def test_read_logs
     @consumer.read('fake bucket', 'fake key')
-    assert_match /fake key/, log_output
+    assert_match(/fake key/, log_output)
   end
 
   # Should use S3 to write to bucket
   def test_writes_to_s3_bucket
-    mock(@consumer).s3.mock!.buckets.
-      mock!.[]('fake bucket').
-      mock!.objects.
-      mock!.[]('fake key').
-      mock!.write('fake value')
+    mock(@consumer).s3.mock!.put_object({
+      bucket: 'fake bucket',
+      key: 'fake key',
+      body: 'fake value'
+    })
     @consumer.write('fake bucket', 'fake key', 'fake value')
   end
 
   # Should use S3 to read from bucket
   def test_reads_from_s3_bucket
       #s3.buckets[bucket].objects[key].read
-    mock(@consumer).s3.mock!.buckets.
-      mock!.[]('fake bucket').
-      mock!.objects.
-      mock!.[]('fake key').
-      mock!.read
+    mock(@consumer).s3.mock!.get_object({
+      bucket: 'fake bucket',
+      key: 'fake key'
+    }).mock!.body.mock!.read
     @consumer.read('fake bucket', 'fake key')
   end
 end

data/test/statement_store_test.rb

@@ -1,12 +1,12 @@
 require 'helper'
 
 class StatementStoreTest < Vault::TestCase
-  def setup
-    super
-    StubbedS3.enable!(self)
-    StubbedS3.seed('vault-v2-json-invoice-test',
-                   '2014-10-01/2014-11-01/user8@heroku.com_v2', '{"foo": 1}')
-
+  def around(&block)
+    StubbedS3.enable! do
+      StubbedS3.seed('vault-v2-json-invoice-test',
+                     '2014-10-01/2014-11-01/user8@heroku.com_v2', '{"foo": 1}')
+      yield
+    end
   end
 
   def test_invoice_path_with_user_id
@@ -36,15 +36,12 @@ class StatementStoreTest < Vault::TestCase
     # Nothing Before Write
     doc = inv.get_json(start_time: '2014-10-01', stop_time: '2014-11-01',
                        user_hid: 'user9@heroku.com', version: 2)
-    expected = nil
-    assert_equal expected, doc
+    assert_nil doc
 
     # Write to S3 updating expectation
     expected = {"bar" => 3}
-    obj = inv.write_json(start_time: '2014-10-01', stop_time: '2014-11-01',
-                         user_hid: 'user9@heroku.com', version: 2,
-                         contents: expected)
-    assert obj.is_a? StubbedS3::FakeFile
+    inv.write_json(start_time: '2014-10-01', stop_time: '2014-11-01',
+                   user_hid: 'user9@heroku.com', version: 2, contents: expected)
 
     # There after write
     doc = inv.get_json(start_time: '2014-10-01', stop_time: '2014-11-01',

data/vault-tools.gemspec

@@ -7,11 +7,14 @@ require 'vault-tools/version'
 Gem::Specification.new do |gem|
   gem.name          = "vault-tools"
   gem.version       = Vault::Tools::VERSION
-  gem.authors       = ["Chris Continanza", "Jamu Kakar"]
-  gem.email         = ["christopher.continanza@gmail.com", "csquared@heroku.com","jkakar@heroku.com","jkakar@kakar.ca"]
+  gem.authors       = ["Chris Continanza", "Jamu Kakar", "Kenny Parnell"]
+  gem.email         = ["csquared@heroku.com", "christopher.continanza@gmail.com",
+                       "jkakar@heroku.com","jkakar@kakar.ca",
+                       "kennyp@heroku.com", "k.parnell@gmail.com"]
   gem.description   = "Basic tools for Heroku Vault's Ruby projects"
   gem.summary       = "Test classes, base web classes, and helpers - oh my!"
   gem.homepage      = ""
+  gem.required_ruby_version = '>= 2.5.3'
 
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep('^(test|spec|features)/')
@@ -21,14 +24,12 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sinatra', '~> 2.0.4'
   gem.add_dependency 'uuidtools'
   gem.add_dependency 'rack-ssl-enforcer'
-  gem.add_dependency 'heroku-api'
-  gem.add_dependency 'fernet', '2.0.rc2'
-  gem.add_dependency 'rollbar', '~> 2.7.1'
-  gem.add_dependency 'aws-sdk', '~> 1.0'
+  gem.add_dependency 'fernet', '2.0'
+  gem.add_dependency 'rollbar', '~> 2.18.2'
+  gem.add_dependency 'aws-sdk-s3', '~> 1.0'
   gem.add_dependency 'excon'
   gem.add_dependency 'rack', '~> 2.0'
   gem.add_dependency 'coderay'
-  gem.add_dependency 'zipkin-tracer', '~> 0.27'
 
   gem.add_development_dependency 'dotenv'
   gem.add_development_dependency 'pry'

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: vault-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Continanza
 - Jamu Kakar
+- Kenny Parnell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrolls
@@ -67,50 +68,36 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: heroku-api
-  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: fernet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.rc2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.rc2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rollbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.18.2
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -165,20 +152,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: zipkin-tracer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -237,10 +210,12 @@ dependencies:
         version: '0'
 description: Basic tools for Heroku Vault's Ruby projects
 email:
-- christopher.continanza@gmail.com
 - csquared@heroku.com
+- christopher.continanza@gmail.com
 - jkakar@heroku.com
 - jkakar@kakar.ca
+- kennyp@heroku.com
+- k.parnell@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -272,9 +247,6 @@ files:
 - lib/vault-tools/tasks.rb
 - lib/vault-tools/text_processor.rb
 - lib/vault-tools/time.rb
-- lib/vault-tools/tracing.rb
-- lib/vault-tools/tracing/sidekiq_client.rb
-- lib/vault-tools/tracing/sidekiq_server.rb
 - lib/vault-tools/usage_db_tasks.rb
 - lib/vault-tools/user.rb
 - lib/vault-tools/vault_db_tasks.rb
@@ -292,7 +264,6 @@ files:
 - test/statement_store_test.rb
 - test/text_processor_test.rb
 - test/time_test.rb
-- test/tracing_test.rb
 - test/user_test.rb
 - test/web_test.rb
 - vault-tools.gemspec
@@ -307,7 +278,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/vault-tools/tracing.rb

@@ -1,92 +0,0 @@
-require 'zipkin-tracer'
-
-module Vault
-  module Tracing
-    ZIPKIN_API_HOST_STAGING = 'https://zipkin-staging.heroku.tools'.freeze
-
-    # Injects the zipkin middleware into the Web class, add Zipkin middleware to
-    # Excon.
-    #
-    # @example
-    #   Vault::Tracing.configure
-    #
-    # @return nil
-    def self.configure
-      return unless Vault::Tracing.enabled?
-
-      Vault::Web.instance_eval { require 'zipkin-tracer' }
-      Vault::Web.use ZipkinTracer::RackHandler, config
-      setup_excon
-    end
-
-    # Traces a local component. Useful to track down long running implementation
-    # methods within an app, instead of only tracing external calls.
-    #
-    # @param name [String] the name of the span to record in Zipkin.
-    # @param tracer [Constant] the const that should respond to :local_component_span
-    # @param options [Hash] the options to create a message with.
-    #
-    # @example
-    #   Vault::Tracing.trace_local 'cashier_middleware_x', internal: true do
-    #     # some expensive task
-    #   end
-    #
-    # @yield [the_block_passed_in]
-    def self.trace_local(name, tracer = ZipkinTracer::TraceClient, **options)
-      return yield unless Vault::Tracing.enabled?
-
-      tracer.local_component_span(name) do |span|
-        span.name = name
-        span.record_tag('options', options.to_s) unless options.empty?
-        yield
-      end
-    end
-
-    # Configuration options for the Zipkin RackHandler.
-    #
-    # @return [Hash] config options for Zipkin tracer
-    def self.config
-      {
-        service_name: "#{Config.app_name}.herokuapp.com",
-        service_port: 443,
-        json_api_host: Config[:zipkin_api_host],
-        sample_rate: (Config[:zipkin_sample_rate] || 0.1).to_f,
-        sampled_as_boolean: false
-      }
-    end
-
-    # A helper to guard against injecting Zipkin when not desired.
-    #
-    # @return [true] if so
-    def self.enabled?
-      Config.app_name &&
-        Config[:zipkin_enabled] == 'true' &&
-        Config[:zipkin_api_host]
-    end
-
-    # Adds ZipkinTracer::ExconHandler to Excon's default middlewares if Excon is
-    # defined
-    #
-    # @private
-    #
-    # @return nil
-    def self.setup_excon
-      if add_to_excon_middlewares?
-        Excon.defaults[:middlewares].push(ZipkinTracer::ExconHandler)
-      end
-    end
-    private_class_method :setup_excon
-
-    # Checks to see if Excon is defined and if the Zipkin middleware has already
-    # been inserted.
-    #
-    # @private
-    #
-    # @return [true] if Excon is defined and the middleware is not already
-    # inserted
-    def self.add_to_excon_middlewares?
-      defined?(Excon) && !Excon.defaults[:middlewares].include?(ZipkinTracer::ExconHandler)
-    end
-    private_class_method :add_to_excon_middlewares?
-  end
-end

data/lib/vault-tools/tracing/sidekiq_client.rb

@@ -1,37 +0,0 @@
-module Vault
-  module Tracing
-    # Tracing info for sidekiq, adding them as params
-    # This was lifted straight out of heroku/coal_car
-    class SidekiqClient
-      def trace_information(trace_id)
-        {
-          "trace_id"  => trace_id.trace_id,
-          "parent_id" => trace_id.parent_id,
-          "span_id"   => trace_id.span_id,
-          "sampled"   => trace_id.sampled,
-          "flags"     => trace_id.flags
-        }
-      end
-
-      def call(worker_class, job, _queue, _redis_pool)
-        trace_id = ::ZipkinTracer::TraceGenerator.new.next_trace_id
-        ::ZipkinTracer::TraceContainer.with_trace_id(trace_id) do
-          job["zipkin_trace_information"] = trace_information(trace_id)
-          if trace_id.sampled?
-            ::Trace.tracer.with_new_span(trace_id, "sidekiq") do |span|
-              local_endpoint = Trace.default_endpoint
-              klass = job["wrapped".freeze] || worker_class
-              span.record_tag("job_class",
-                              klass,
-                              ::Trace::BinaryAnnotation::Type::STRING,
-                              local_endpoint)
-              yield
-            end
-          else
-            yield
-          end
-        end
-      end
-    end
-  end
-end

data/lib/vault-tools/tracing/sidekiq_server.rb

@@ -1,54 +0,0 @@
-module Vault
-  module Tracing
-    # Tracing info for sidekiq
-    # This was lifted straight out of heroku/coal_car
-    class SidekiqServer
-      def initialize(config = nil)
-        @config = ZipkinTracer::Config.new(nil, config).freeze
-        @tracer = ZipkinTracer::TracerFactory.new.tracer(@config)
-      end
-
-      def call(worker, job, _queue)
-        result = nil
-        id = trace_id(job)
-        klass = job["wrapped".freeze] || worker.class.to_s
-        ::ZipkinTracer::TraceContainer.with_trace_id(id) do
-          if id.sampled?
-            @tracer.with_new_span(id, klass) do |span|
-              span.record("sidekiq.start")
-              result = yield
-              span.record("sidekiq.end")
-            end
-          else
-            yield
-          end
-        end
-        ::Trace.tracer.flush! if ::Trace.tracer.respond_to?(:flush!)
-        result
-      end
-
-      private
-
-      def trace_id(job)
-        info = job["zipkin_trace_information"]
-        if info
-          trace_id = info["trace_id"]
-          span_id  = info["span_id"]
-          parent_span_id = info["parent_id"]
-          sampled = info["sampled"]
-          flags = info["flags"].to_i
-        else
-          trace_id = span_id = ::Trace.generate_id
-          parent_span_id = nil
-          sampled = sample?
-          flags = ::Trace::Flags::EMPTY
-        end
-        ::Trace::TraceId.new(trace_id, parent_span_id, span_id, sampled, flags)
-      end
-
-      def sample?
-        rand < @config.sample_rate
-      end
-    end
-  end
-end

data/test/tracing_test.rb

@@ -1,86 +0,0 @@
-require 'helper'
-
-class TracingTest < Vault::TestCase
-  # Anonymous Web Frontend
-  def app
-    @app ||= Class.new(Vault::Web)
-  end
-
-  # Middleware is attached at load time, so we have to delete the Vault::Web
-  # class and reload it to simulate being loaded with different environment
-  # variables.
-  def reload_web!
-    # remove the constant to force a clean reload
-    Vault.send(:remove_const, 'Web')
-    load 'lib/vault-tools/web.rb'
-  end
-
-  # Always reload the web class to eliminate test leakage
-  def setup
-    super
-    reload_web!
-    enable
-  end
-
-  def teardown
-    super
-    @app = nil
-  end
-
-  def enable
-    set_env('APP_NAME', 'test_app')
-    set_env('ZIPKIN_ENABLED', 'true')
-    set_env('ZIPKIN_API_HOST', 'http://localhost')
-  end
-
-  def disable
-    set_env('ZIPKIN_ENABLED', nil)
-  end
-
-  def test_service_name_gets_herokuapp
-    assert_equal 'test_app.herokuapp.com', Vault::Tracing.config[:service_name]
-  end
-
-  def test_configure_enabled
-    Vault::Tracing.configure
-    middleware_constants = app.middleware.map(&:first)
-    assert middleware_constants.include?(ZipkinTracer::RackHandler),
-      "expected ZipkinTracer::RackHandler to be in the middleware stack, got #{middleware_constants}"
-  end
-
-  def test_configure_not_enabled
-    disable
-    refute Vault::Tracing.configure,
-      'Vault::Tracing.configure should return nil when not enabled'
-  end
-
-  def test_excon
-    Vault::Tracing.configure
-    assert Excon.defaults[:middlewares].include?(ZipkinTracer::ExconHandler),
-      "Vault::Tracing.setup_excon should add ZipkinTracer::ExconHandler to excon's middleware"
-  end
-
-  def test_enabled_true
-    assert Vault::Tracing.enabled?,
-      'Vault::Tracing.enabled? should return true when enabled'
-  end
-
-  def test_enabled_false
-    disable
-    refute Vault::Tracing.enabled?,
-      'Vault::Tracing.enabled? should return false when not enabled'
-  end
-
-  def test_trace_local_yield
-    result = Vault::Tracing.trace_local('testing', opt: 'foo') { 1 + 1 }
-    assert_equal 2, result, 'trace_local should yield the result of the block given'
-  end
-
-  def test_trace_local_calls_tracer
-    tracer_mock = Minitest::Mock.new
-    tracer_mock.expect :local_component_span, true, ['testing']
-    Vault::Tracing.trace_local('testing', tracer_mock, opt: 'foo') { 1 + 1 }
-    assert tracer_mock.verify,
-      'trace_local should call :local_component_span on the tracer'
-  end
-end