conjur-api 4.24.0 → 4.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a400415b1a2ace3c70bfa63befe1155411e689
-  data.tar.gz: da597b98f100670f494de01da0c7ec3e14f23164
+  metadata.gz: 5947d8b6da3129ef22780755b92550a5fbfd57b0
+  data.tar.gz: 0acd1390453eae96cb6040f0fa167c35f6aa732b
 SHA512:
-  metadata.gz: 7cd91330ebb3ca97d512e639ee35256dd79723b55528fef64290e4d2c5c863048d4667598604e61145de22316045fe6a13a2a7bc5ba156819f7c440b52c0d3c1
-  data.tar.gz: beb95a4206bf8ffed5d1bd8bee7a799d0d9984d7f7dffb729b3e29bb1832ed576e77c083e00988e0e6bb5e0e77e4e39a381cd360090946ba478fab9f7c12a579
+  metadata.gz: 92e2760b149238a95b86f1db50e59e21c04482cb8858581447fbe3edb9d12eb8ab60a5b72e628daa63908b116a37616052ce1a8d71e369d545c5989a8a5e869b
+  data.tar.gz: 5458008ccacf7c28e04de0d63ed00883e0df8120a06ac725816921ede7f6046936c069f14a72c8dfe4a88aa698ee202f69cf5ecbffc46a5913849cf4d871a00d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.24.1
+
+* Clarify the handling of the dry-run argument to `Conjur::API#ldap_sync_now`.
+
 # v4.24.0
 
 * Add `Conjur::API#ldap_sync_now` (requires Conjur 4.7 or later).

data/lib/conjur-api/version.rb

@@ -19,6 +19,6 @@
 
 module Conjur
   class API
-    VERSION = "4.24.0"
+    VERSION = "4.24.1"
   end
 end

data/lib/conjur/api/ldapsync.rb

@@ -33,7 +33,9 @@ module Conjur
       opts = credentials.dup.tap{ |h|
         h[:headers][:accept] = format
       }
-      
+
+      dry_run = !!dry_run
+
       resp = RestClient::Resource.new(Conjur.configuration.appliance_url, opts)['ldap-sync']['sync'].post({
         config_name: config_name,
         dry_run: dry_run

data/spec/api/ldapsync_spec.rb

@@ -4,23 +4,15 @@
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
 # the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 require 'spec_helper'
+require 'helpers/request_helpers'
 
 describe Conjur::API, api: :dummy do
+  include RequestHelpers
+
   let(:appliance_url){ "http://example.com/api" }
   let(:ldapsync_url){ "#{appliance_url}/ldap-sync/sync" }
   let(:response_json){
@@ -34,21 +26,50 @@ describe Conjur::API, api: :dummy do
     }
   }
   let(:response){ double('response', body: response_json.to_json) }
+  let(:dry_run) { true }
 
   before do
     allow(Conjur.configuration).to receive(:appliance_url).and_return appliance_url
     allow(Conjur::API).to receive_messages(ldap_sync_now: ldapsync_url)
+    expect_request(
+      url: ldapsync_url,
+      method: :post,
+      headers: credentials[:headers],
+      payload: {config_name: 'default', dry_run: dry_run}
+    ).and_return response
   end
 
   describe "#ldap_sync_now" do
     it "POSTs /sync" do
-      expect_request(
-          url: ldapsync_url,
-          method: :post,
-          headers: credentials[:headers],
-          payload: {config_name: 'default', dry_run: true}
-      ).and_return response
       api.ldap_sync_now('default', 'application/json', true)
     end
   end
+
+  describe "#ldap_sync_now" do
+    let(:dry_run) { true }
+    it "POSTs /sync with dry_run set to true" do
+      api.ldap_sync_now('default', 'application/json', true)
+    end
+  end
+
+  describe "#ldap_sync_now" do
+    let(:dry_run) { false }
+    it "POSTs /sync with dry_run set to false" do
+      api.ldap_sync_now('default', 'application/json', false)
+    end
+  end
+
+  describe "#ldap_sync_now" do
+    let(:dry_run) { true }
+    it "POSTs /sync with truthy dry_run value" do
+      api.ldap_sync_now('default', 'application/json', 1)
+    end
+  end
+
+  describe "#ldap_sync_now" do
+    let(:dry_run) { false }
+    it "POSTs /sync with falsey dry_run value" do
+      api.ldap_sync_now('default', 'application/json', nil)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 4.24.0
+  version: 4.24.1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client