hako-vault 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21475bdb503e7b0347e3d05a82f189016d37dfea
-  data.tar.gz: 0066b14fe3640971fbe62cc0bff8145a477d14ac
+  metadata.gz: 22c6fcbd129b51b0c3ade5c375f03f1b2a398c3e
+  data.tar.gz: 258e19161da4d0fce2b195b21a5b6bf9e5d02111
 SHA512:
-  metadata.gz: 11591f9c354a062c631ac04f46f187d7e4430b2bde05c4c57bd4a9abbaa3f9d10ed1082df6664441e4272d3b11e18d2dc38b96af4071138d4b021f5e43b24c81
-  data.tar.gz: bdf208b50769cf9a49128f58ff453299e4391641f1dd4b5748a150a90f94497c2fcc72f5222ce6db9c944cdc6b32def9c55a62498ee558e61f99dc780ddc33ef
+  metadata.gz: 33b7621675c97fcc07e609ca5ffcc8a50e5f619819f7962fe377800a547140139ef3104ffbe7f5404dd26febafcd1af1acdff7a37db02688549dbb5e9acabe63
+  data.tar.gz: 798a41387e80ad8b82ef2886cac5bb7875b62a07a9dd2e0f04e1ca3b20c1f008052e6a5f1c6aa3d79fe6faabc260e3d1d2fa9781b6bd2a8d7ed3aaa98d595d69

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# 0.2.2 (2017-06-26)
+## Bug fixes
+- Retry when Vault returns 5xx
+
+# 0.2.1 (2017-03-02)
+## Bug fixes
+- Add missing require
+
+# 0.2.0 (2017-02-28)
+## New features
+- Support `ask_keys` method for latest hako
+
+# 0.1.1 (2017-01-16)
+## Bug fixes
+- Do not hold VAULT_TOKEN as ivar for security reason
+
+# 0.1.0 (2017-01-12)
+- Initial release

data/README.md

@@ -48,7 +48,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/hako-vault.
+Bug reports and pull requests are welcome on GitHub at https://github.com/eagletmt/hako-vault.
 
 
 ## License

data/hako-vault.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'hako-vault'
-  spec.version       = '0.2.1'
+  spec.version       = '0.2.2'
   spec.authors       = ['Kohei Suzuki']
   spec.email         = ['eagletmt@gmail.com']
 

data/lib/hako/env_providers/vault.rb

@@ -35,9 +35,7 @@ module Hako
         env = {}
         @http.start do
           variables.each do |key|
-            req = Net::HTTP::Get.new("/v1/secret/#{@directory}/#{key}")
-            req['X-Vault-Token'] = ENV['VAULT_TOKEN']
-            res = @http.request(req)
+            res = get_with_retry("/v1/secret/#{@directory}/#{key}")
             case res.code
             when '200'
               env[key] = JSON.parse(res.body)['data']['value']
@@ -62,9 +60,7 @@ module Hako
         keys = []
         @http.start do
           parent_directories_for(variables).each do |parent_dir|
-            req = Net::HTTP::Get.new("/v1/secret/#{@directory}/#{parent_dir}?list=true")
-            req['X-Vault-Token'] = ENV['VAULT_TOKEN']
-            res = @http.request(req)
+            res = get_with_retry("/v1/secret/#{@directory}/#{parent_dir}?list=true")
             case res.code
             when '200'
               keys += JSON.parse(res.body)['data']['keys'].map { |key| "#{parent_dir}#{key}" }
@@ -78,6 +74,8 @@ module Hako
         keys.select { |key| variables.include?(key) }
       end
 
+      private
+
       # @param [Array<String>] variables
       # @return [Array<String>]
       def parent_directories_for(variables)
@@ -87,6 +85,28 @@ module Hako
           (base_uri + variable + '.').request_uri.sub(%r{\A/}, '')
         end.uniq
       end
+
+      # @param [String] path
+      # @return [Net::HTTPResponse]
+      def get_with_retry(path)
+        last_error = nil
+        10.times do |i|
+          req = Net::HTTP::Get.new(path)
+          req['X-Vault-Token'] = ENV['VAULT_TOKEN']
+          res = @http.request(req)
+          code = res.code.to_i
+          if code >= 500 && code < 600
+            Hako.logger.warn("Vault HTTP Error: #{res.code}: #{res.body}")
+            last_error = res
+            interval = 1.5**i
+            Hako.logger.warn("Retrying after #{interval} seconds")
+            sleep(interval)
+          else
+            return res
+          end
+        end
+        raise Error.new("Vault HTTP Error: #{last_error.code}: #{last_error.body}")
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako-vault
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hako
@@ -76,6 +76,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -104,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Provide variables from Vault to hako