configuration_service-provider-vault 2.0.13 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 190e81b31bf02336313b32fff476262984e1498b
-  data.tar.gz: f20de4c7945adf0170650400725f61ddc091158d
+  metadata.gz: 58dccf02a9c8b0bbb2b3a45a41feca76dbbdd433
+  data.tar.gz: 40007d246d0b2050cba3dd9905c9afafc589f17a
 SHA512:
-  metadata.gz: a2af6602ef9b0b14b7ad017f04692c546ef16619ce87b052210d8cc694697558dd917a52dee284498f207ddc2cca6d3d531a2a5c64ae54306c7b1ad18c0e7812
-  data.tar.gz: f6b4b736b867da5ea9d2aefe9366b027b6833f821d8e53b4d52b274e1614c1b2b73ee6e6b59ded246d93e4f5d40fe1b3f039a0e7e0f6318141c22fb36076cb24
+  metadata.gz: a95a3cd249b9b67321c0802bc5de1f2dcbff4d194493da815cac1ae54846b3347f78d9cbb5610d92f56d3e090ffbc76552e26e09a74a8c3fed6ff73a1a88b060
+  data.tar.gz: 6f2db51f0fe4f75a620b249d1642445550dc5647ae09d033c10dcd60debc679ba4ad98a2e778b5b10729da21a50930439a095270d22c692246981fef317a24c7

data/.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "cucumber", "~> 2.0"
-  spec.add_development_dependency "rspec-expectations", "~> 3.3"
+  spec.add_development_dependency "rspec", "~> 3.4"
 end

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -1,22 +1,22 @@
 ---
-language: ruby
-rvm:
-  - ruby-2.0.0
-  - ruby-2.3.0
-  - jruby-9.0.4.0
-before_install:
-  - r=$(rvm current)
-  - v=${r#*-}; v=${v%-clang}
-  - p=${r%%-*}
-  - if [ "$p" = "ruby" ]; then rebuild=true; fi
-  - if [ -n "$rebuild" ]; then git clone https://github.com/openssl/openssl.git; fi
-  - if [ -n "$rebuild" ]; then (cd openssl && git checkout OpenSSL_1_0_1n); fi
-  - if [ -n "$rebuild" ]; then (cd openssl && ./config -fPIC --prefix=/usr/local/ssl shared && make && sudo make install) >/dev/null; fi
-  - if [ -n "$rebuild" ]; then git clone https://github.com/rbenv/ruby-build.git; fi
-  - if [ -n "$rebuild" ]; then (cd ruby-build && sudo ./install.sh); fi
-  - if [ -n "$rebuild" ]; then RUBY_CONFIGURE_OPTS=--with-openssl-dir=/usr/local/ssl ruby-build $v ~/.rvm/rubies/$r; fi
-  - rm -f vault_0.3.1_linux_amd64.zip
-  - wget https://dl.bintray.com/mitchellh/vault/vault_0.3.1_linux_amd64.zip
-  - unzip vault_0.3.1_linux_amd64.zip
-  - sudo mv vault /usr/local/bin/
-  - gem install bundler
+language: c
+env:
+  - TRUBY=ruby-2.0.0-p648 OPENSSL=openssl-1.0.1d
+  - TRUBY=ruby-2.3.0 OPENSSL=openssl-1.0.2f
+  - TRUBY=jruby-9.0.0.0 OPENSSL=none
+  - TRUBY=jruby-9.0.4.0 OPENSSL=none
+install:
+  - RUBY_URL=https://s3-eu-west-1.amazonaws.com/hetznerza/travis-ci/precise/no-rvm/${TRUBY}-${OPENSSL}.tar.gz
+  - rvm implode --force
+  - sudo mkdir -p /opt/rubies
+  - curl ${RUBY_URL} | sudo tar -C /opt/rubies -xzf -
+  - git clone https://github.com/postmodern/chruby.git
+  - (cd chruby && sudo ./scripts/setup.sh)
+  - chruby-exec ${TRUBY} -- ruby --version
+  - chruby-exec ${TRUBY} -- gem install --no-ri --no-rdoc bundler
+  - curl -O https://releases.hashicorp.com/vault/0.4.1/vault_0.4.1_linux_amd64.zip
+  - sudo unzip vault_0.4.1_linux_amd64.zip -d /usr/local/bin
+script:
+  - chruby-exec ${TRUBY} -- ruby --version
+  - chruby-exec ${TRUBY} -- bundle
+  - chruby-exec ${TRUBY} -- bundle exec rake

data/Rakefile

@@ -1,15 +1,43 @@
 require "open3"
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 task :default => :test
 
-desc "Test the Vault provider for Configuration Service against a Vault development server"
-task :test do
+RSpec::Core::RakeTask.new(:just_spec)
+
+desc "Run all tests (rspec and cucumber)"
+task :test => :preflight do
+  with_devserver do
+    Rake::Task["just_spec"].invoke
+    Rake::Task["just_features"].invoke
+  end
+end
+
+desc "Run RSpec code examples against a Vault development server"
+task :spec => :preflight do
+  with_devserver do
+    Rake::Task["just_spec"].invoke
+  end
+end
+
+desc "Pre-flight checks"
+task :preflight do
   if File.exists?("#{ENV["HOME"]}/.vault-token")
     raise "cannot test with ~/.vault-token present"
   end
+  unless ENV["VAULT_TOKEN"].to_s.empty?
+    raise "cannot test with VAULT_TOKEN environment variable set"
+  end
+  unless ENV["VAULT_ADDR"].to_s.empty?
+    raise "cannot test with VAULT_ADDR environment variable set"
+  end
+end
+
+desc "Test the Vault provider for Configuration Service against a Vault development server"
+task :features => :preflight do
   with_devserver do
-    Rake::Task["just_test"].invoke
+    Rake::Task["just_features"].invoke
   end
 end
 
@@ -24,7 +52,7 @@ task :scramble do
 end
 
 desc "Run cucumber without starting a Vault development server"
-task :just_test do
+task :just_features do
   gem = Gem::Specification.find_by_name("configuration_service")
   features_path = gem.full_gem_path + "/features"
   ENV["TEST_ORCHESTRATION_PROVIDER"] ||= "vault"

data/bin/start-dev-server.sh

@@ -1,5 +1,15 @@
 #!/bin/sh -e
 
+if [ -n "$VAULT_TOKEN" ]; then
+	echo "error: cannot start vault dev server with VAULT_TOKEN environmant variable set" 1>&2
+	exit 1
+fi
+
+if [ -n "$VAULT_ADDR" ]; then
+	echo "error: cannot start vault dev server with VAULT_ADDR environmant variable set" 1>&2
+	exit 1
+fi
+
 vault server -config fixtures/vault.d/configuration.json 1>&2 &
 pid=$!
 echo $pid > fixtures/vault.pid

data/lib/configuration_service/provider/vault/version.rb

@@ -4,7 +4,7 @@ module ConfigurationService
 
     class Vault
 
-      VERSION = "2.0.13"
+      VERSION = "2.0.14"
 
     end
 

data/lib/configuration_service/provider/vault.rb

@@ -1,6 +1,7 @@
 require "configuration_service"
 require "vault"
 require "json"
+require "thread"
 require "time"
 
 require_relative "vault/path_helper"
@@ -31,6 +32,7 @@ module ConfigurationService
         if ca_cert = options[:ca_cert]
           @vault.ssl_ca_cert = ca_cert
         end
+        @mutex = Mutex.new
       end
 
       ##
@@ -52,14 +54,16 @@ module ConfigurationService
       # @see #publish_configuration
       #
       def request_configuration(identifier, token)
-        authenticate(token)
-
-        adapt_exceptions do
-          if revision = get_latest_revision(identifier)
-            path = build_path(identifier, revision)
-            if response = @vault.logical.read(path)
-              data, metadata = JSON.parse(response.data[:data]), JSON.parse(response.data[:metadata])
-              ConfigurationService::Configuration.new(identifier, data, metadata)
+        @mutex.synchronize do
+          authenticate(token)
+
+          adapt_exceptions do
+            if revision = get_latest_revision(identifier)
+              path = build_path(identifier, revision)
+              if response = @vault.logical.read(path)
+                data, metadata = JSON.parse(response.data[:data]), JSON.parse(response.data[:metadata])
+                ConfigurationService::Configuration.new(identifier, data, metadata)
+              end
             end
           end
         end
@@ -88,16 +92,18 @@ module ConfigurationService
       # @todo make revision history queryable (blocked by https://github.com/hashicorp/vault/issues/111)
       #
       def publish_configuration(configuration, token)
-        authenticate(token)
+        @mutex.synchronize do
+          authenticate(token)
 
-        identifier, data, metadata = configuration.identifier, configuration.data, configuration.metadata
-        revision = metadata["revision"] or raise "can't publish configuration without revision in metadata"
+          identifier, data, metadata = configuration.identifier, configuration.data, configuration.metadata
+          revision = metadata["revision"] or raise "can't publish configuration without revision in metadata"
 
-        adapt_exceptions do
-          path = build_path(identifier, revision)
-          @vault.logical.write(path, data: JSON.generate(data), metadata: JSON.generate(metadata), format: "json")
-          set_latest_revision(identifier, metadata["revision"])
-          ConfigurationService::Configuration.new(identifier, data, metadata)
+          adapt_exceptions do
+            path = build_path(identifier, revision)
+            @vault.logical.write(path, data: JSON.generate(data), metadata: JSON.generate(metadata), format: "json")
+            set_latest_revision(identifier, metadata["revision"])
+            ConfigurationService::Configuration.new(identifier, data, metadata)
+          end
         end
       end
 

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: configuration_service-provider-vault
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.14
 platform: ruby
 authors:
 - Sheldon Hearn
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: vault
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-  name: vault
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
+  name: configuration_service
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.5
-  name: configuration_service
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.5
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  name: cucumber
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-  name: rspec-expectations
-  prerelease: false
+        version: '3.4'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 description: A HashiCorp Vault provider for the Configuration Service
 email:
 - sheldonh@starjuice.net
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gemspec"
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
@@ -130,7 +131,7 @@ files:
 homepage: https://github.com/hetznerZA/configuration_service-provider-vault
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -145,9 +146,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Vault provider for Configuration Service
 test_files: []
+has_rdoc: