conjur-api 4.7.2 → 4.8.0

data/lib/conjur-api/version.rb

@@ -20,6 +20,6 @@
 #
 module Conjur
   class API
-    VERSION = "4.7.2"
+    VERSION = "4.8.0"
   end
 end

data/lib/conjur/api/variables.rb

@@ -29,5 +29,18 @@ module Conjur
     def variable id
       standard_show Conjur::Core::API.host, :variable, id
     end
+
+    def variable_values(varlist)
+      raise ArgumentError, "Variables list must be an array" unless varlist.kind_of? Array 
+      raise ArgumentError, "Variables list is empty" if varlist.empty?
+      opts = "?vars=#{varlist.map { |v| fully_escape(v) }.join(',')}"
+      begin 
+        resp = RestClient::Resource.new(Conjur::Core::API.host, self.credentials)['variables/values'+opts].get
+        return JSON.parse( resp.body ) 
+      rescue RestClient::ResourceNotFound 
+        return Hash[ *varlist.map { |v| [ v, variable(v).value ]  }.flatten ]  
+      end
+    end
+
   end
-end
+end

data/lib/conjur/configuration.rb

@@ -42,7 +42,7 @@ module Conjur
       # @param [Hash] options
       # @option options [Boolean] :boolean (false) whether this option should have a '?' accessor 
       # @option options [Boolean, String] :env Environment variable for this option.  Set to false
-      #   to disallow environment based configuration.  Default is VM2_OPTION_NAME.
+      #   to disallow environment based configuration.  Default is CONJUR_<OPTION_NAME>.
       # @option options [Proc, *] :default Default value or proc to provide it
       # @option options [Boolean] :required (false) when true, raise an exception if the option is
       #   not set
@@ -172,4 +172,4 @@ module Conjur
       @supplied ||= {}
     end
   end
-end
+end

data/spec/api/variables_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'standard_methods_helper'
 
+
 describe Conjur::API, api: :dummy do
   describe '#create_variable' do
     let(:invoke) { api.create_variable :type, :kind, other: true }
@@ -11,4 +12,70 @@ describe Conjur::API, api: :dummy do
     let(:invoke) { api.variable :id }
     it_should_behave_like 'standard_show with', :variable, :id
   end
+
+  describe "#variable_values" do
+
+    let (:varlist) { ["var/1","var/2","var/3" ] }
+
+    it 'requires non-empty array of variables' do
+      expect { api.variable_values("something") }.to raise_exception(ArgumentError)
+      expect { api.variable_values([]) }.to raise_exception(ArgumentError)
+    end 
+
+    shared_context "Stubbed API" do
+      let (:expected_url) { "#{core_host}/variables/values?vars=#{varlist.map {|v| api.fully_escape(v) }.join(",")}"  }
+      before {
+        RestClient::Request.should_receive(:execute).with(
+          method: :get,
+          url: expected_url,
+          headers: credentials[:headers]
+          ).and_return { 
+            if defined? return_error 
+              raise return_error
+            else
+              double( code: return_code, body: return_body ) 
+            end
+          }
+      }
+    end
+
+    let (:invoke) { api.variable_values(varlist) }
+
+    describe "if '/variables/values' method is responding with JSON" do
+      include_context "Stubbed API"
+      let (:return_code) { '200' }
+      let (:return_body) { '{"var/1":"val1","var/2":"val2","var/3":"val3"}' }
+      it "returns Hash of values built from the response" do  
+        api.should_not_receive(:variable)
+        invoke.should == { "var/1"=>"val1", "var/2"=>"val2", "var/3"=>"val3" }
+      end
+    end 
+
+    describe "if '/variables/values' method is returning 404 error" do
+      include_context "Stubbed API"
+      let (:return_error) { RestClient::ResourceNotFound }
+      before {  
+        api.should_receive(:variable).with("var/1").and_return(double(value:"val1_obtained_separately"))
+        api.should_receive(:variable).with("var/2").and_return(double(value:"val2_obtained_separately"))
+        api.should_receive(:variable).with("var/3").and_return(double(value:"val3_obtained_separately"))
+      }
+      it 'tries variables one by one and returns Hash of values' do
+        invoke.should == { "var/1"=>"val1_obtained_separately", 
+                           "var/2"=>"val2_obtained_separately", 
+                           "var/3"=>"val3_obtained_separately" 
+                          }
+      end
+    end 
+    
+    describe "if '/variables/values' method is returning any other error" do
+      include_context "Stubbed API"
+      let (:return_error) { RestClient::Forbidden }
+      it 're-raises error without checking particular variables' do 
+        api.should_not_receive(:variable)
+        expect { invoke }.to raise_error(return_error)
+      end
+    end 
+
+  end
+
 end

data/spec/lib/audit_spec.rb

@@ -13,9 +13,7 @@ describe Conjur::API, api: :dummy do
     
     def expect_request
       RestClient::Request.should_receive(:execute).with(
-        user: credentials,
-        password: nil,
-        headers: {},
+        headers: credentials[:headers],
         url: expected_url,
         method: :get
       ).and_return response.to_json
@@ -105,4 +103,4 @@ describe Conjur::API, api: :dummy do
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -96,7 +96,7 @@ shared_context api: :dummy do
   let(:api){ Conjur::API.new_from_key username, 'key' }
   let(:authz_host) { 'http://authz.example.com' }
   let(:audit_host) { 'http://audit.example.com' }
-  let(:credentials) { double "fake credentials" }
+  let(:credentials) { { headers: { authorization: "Token token=\"stub\"" } } } #, username: username } }
   let(:core_host) { 'http://core.example.com' }
   let(:account) { 'the-account' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 4.7.2
+  version: 4.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -307,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3076546680650394555
+      hash: 2336930098172204581
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25