smart_proxy_vault 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65273d38422ca44e608f96ae9ae8817d400474ee
-  data.tar.gz: 29a3c9736686f61bea73aea03aa14fb6e142961c
+  metadata.gz: 59bbf36d677feac1a85674ef5b6e4592cbaabef9
+  data.tar.gz: 9eb12ef4c3225de70436601091f30dcc0dc61e64
 SHA512:
-  metadata.gz: 5e5d49e23187f0e440b7183a4796dccb69bddb27ed2a91a6af1131e03d022bdbd323b2c3ffb3039a10b1ec86e83189b75c5b79fde36d2a4aee85a07d40e264db
-  data.tar.gz: 32d359e5abce0c2e6e7990a36c476e83f9778743afc3d22fea16d38c0b726a618b1a0fed2f303b3482bb6eefe1ec8de129f1682dd08b70cb0caba4240c7063da
+  metadata.gz: 52623d07b6e789637e376e452128e6a6c198554aad07dcb1da727f20b5885675cc11f16b1bff5fc64505b95ae9e4359dd841a1fa5fac5dbe69ba914220d4f6dd
+  data.tar.gz: 48f28cecae0135f976ddc9a601c92dc37ad0119c9566003a6f4feda0c64778f53c379daddb3070540e536acb72f1a7845540c4a59590bafc2d1a32e1316d31b6

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [v0.4.1](https://github.com/theforeman/smart_proxy_vault/tree/v0.4.1)
+- Fix for https://github.com/hashicorp/vault-ruby/issues/121
+
 ## [v0.4.0](https://github.com/theforeman/smart_proxy_vault/tree/v0.4.0)
 - Added creating tokens from roles
 - Fixed days to seconds calculation

data/lib/smart_proxy_vault/api.rb

@@ -13,28 +13,22 @@ module VaultPlugin
       include ::VaultPlugin::Helpers
 
       class Client
-        attr_reader :connection
+        extend ::VaultPlugin::Helpers
 
-        include ::VaultPlugin::Helpers
-
-        def initialize
-          @connection = ::Vault::Client.new(vault_settings)
-        end
-
-        def issue_token(options)
-          @connection.auth_token.create(options).auth.client_token
+        def self.issue_token(options)
+          Vault.auth_token.create(options).auth.client_token
         end
 
-        def issue_role_token(role, options)
-          @connection.auth_token.create_with_role(role, options).auth.client_token
+        def self.issue_role_token(role, options)
+          Vault.auth_token.create_with_role(role, options).auth.client_token
         end
 
-        def lookup_self
-          @connection.auth_token.lookup_self
+        def self.lookup_self
+          Vault.auth_token.lookup_self
         end
 
-        def renew_self
-          @connection.auth_token.renew_self(lookup_self.data[:creation_ttl])
+        def self.renew_self
+          Vault.auth_token.renew_self(lookup_self.data[:creation_ttl])
         end
       end
 
@@ -49,26 +43,22 @@ module VaultPlugin
         options.merge(ttl: ttl) unless ttl.nil?
       end
 
-      def vault
-        Client.new
-      end
-
       def issue(ttl, role)
         begin
           opts = options ttl
-          role.nil? ? vault.issue_token(opts) : vault.issue_role_token(role, opts)
+          role.nil? ? Client.issue_token(opts) : Client.issue_role_token(role, opts)
         rescue StandardError => e
           log_halt 500, 'Failed to generate Vault token ' + e.message
         end
       end
 
       def creation_ttl
-        vault.lookup_self[:data][:creation_ttl]
+        Client.lookup_self[:data][:creation_ttl]
       end
 
       def renew
         begin
-          vault.renew_self
+          Client.renew_self
         rescue StandardError => e
           puts 'Failed to renew Vault token ' + e.message
         end

data/lib/smart_proxy_vault/endpoint.rb

@@ -16,6 +16,7 @@ module VaultPlugin
       authorized?
     end
 
+    vault_client_configure
     start_renewal
 
     get '/token/issue' do

data/lib/smart_proxy_vault/helpers.rb

@@ -16,6 +16,14 @@ module VaultPlugin
       ::VaultPlugin::Plugin.settings.add_token_metadata
     end
 
+    def vault_client_configure
+      Vault.configure do |config|
+        vault_settings.each do |k, v|
+          config.send("#{k}=", v)
+        end
+      end
+    end
+
     def to_seconds(string)
       case string.slice(-1)
       when 'd'

data/lib/smart_proxy_vault/version.rb

@@ -1,3 +1,3 @@
 module VaultPlugin
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/test/helpers/helpers.rb

@@ -0,0 +1,18 @@
+module RequestHelpers
+  extend RR::DSL
+  extend self
+
+  # Need to stub this before we require smart_proxy_vault/endpoint
+  def configure_settings
+    stub.proxy(::VaultPlugin::Plugin.settings).token_options {{
+      ttl: '12h'
+    }}
+    stub.proxy(::VaultPlugin::Plugin.settings).vault {{
+      address: 'https://vault.example.com',
+      token: 'GUID',
+      ssl_verify: true
+    }}
+  end
+
+  RequestHelpers.configure_settings
+end

data/test/request_test.rb

@@ -1,9 +1,11 @@
 require_relative './test_helper'
 require 'smart_proxy_vault'
+require_relative './helpers/helpers'
 require 'smart_proxy_vault/endpoint'
 
 class RequestTest < Test::Unit::TestCase
   include Rack::Test::Methods
+  include RequestHelpers
   include VaultPlugin::API
 
   ###
@@ -122,14 +124,7 @@ class RequestTest < Test::Unit::TestCase
   def setup
     stub_authorized?(true)
     stub_client
-    stub.proxy(::VaultPlugin::Plugin.settings).token_options {{
-      ttl: '12h'
-    }}
-    stub.proxy(::VaultPlugin::Plugin.settings).vault {{
-      address: 'https://vault.example.com',
-      token: 'GUID',
-      ssl_verify: true
-    }}
+    configure_settings
   end
 
   def test_vault_token_issue
@@ -154,4 +149,9 @@ class RequestTest < Test::Unit::TestCase
     stub_response_renew
     renew
   end
+
+  def test_vault_settings
+    failure_msg = 'Unexpected Vault Configuration'
+    assert_equal [], vault_settings.values - Vault.options.values.compact, failure_msg
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_vault
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Riley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,6 +234,7 @@ files:
 - test/factories/rsa.rb
 - test/fixtures/authentication/chef/bender.pem
 - test/fixtures/authentication/chef/fry.pem
+- test/helpers/helpers.rb
 - test/request_test.rb
 - test/test_helper.rb
 homepage: http://github.com/theforeman/smart_proxy_vault
@@ -265,5 +266,6 @@ test_files:
 - test/factories/rsa.rb
 - test/fixtures/authentication/chef/bender.pem
 - test/fixtures/authentication/chef/fry.pem
+- test/helpers/helpers.rb
 - test/request_test.rb
 - test/test_helper.rb