conjur-api 4.25.1 → 4.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a4d39e4a78aca87161fdd361e061d8fa61eb103
-  data.tar.gz: 18c7f65ecd58167229788f3d01ffd55c22198341
+  metadata.gz: e955d64cd6ce130071bad4809bfe207dc3fb8b6c
+  data.tar.gz: b0f1cf6e8960332a9a06ec806cbb52866bd39ecc
 SHA512:
-  metadata.gz: 92e237543b838497692b062f514d3bf17693f82a1705a3527146e262417629c667a3bd5f2c4cf9247eac630bf0985d990a45f31b5d8f1bc93d0e557b1305b2ee
-  data.tar.gz: ab2049acd3830d358897ab9b3bc4c2450c088c6c94bc8ac7bab5c03fa4ae320b9294d661ca87a1360944ebe95ef8c1f8bbdfd1aa66c65025d60277b1fc633d32
+  metadata.gz: 26bf9521c171451e4820aed4636071b735e7876e5b71707377e07e36d450a842d9e627ecd69e2456d8966708b3854c3bfbf9b7a7dea515067007e9ec969862f2
+  data.tar.gz: cff05fb02234c561bbbfbf8d7130b48a72c741c9bc80db1d540212d02d7f3334b1abc3fdf72dbe6bc60d14a703713550d7670e5ce2f9e1a3f14814a2c37bef82

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.26.0
+
+* expose admin_option in the role graph (only populated by Conjur 4.8 and later)
+
 # v4.25.1
 
 * Fix token refresh when using `with_privilege`, `with_audit_roles`,

data/jenkins.sh

@@ -10,7 +10,7 @@ if [ -z "$CONJUR_CONTAINER" ]; then
 	    docker pull $DOCKER_IMAGE
 	fi
 	
-	cid=$(docker run -d -v ${PWD}:/src/conjur-api $DOCKER_IMAGE)
+	cid=$(docker run --privileged -d -v ${PWD}:/src/conjur-api $DOCKER_IMAGE)
 	function finish {
     	if [ "$NOKILL" != "1" ]; then
 			docker rm -f ${cid}

data/lib/conjur-api/version.rb

@@ -19,6 +19,6 @@
 
 module Conjur
   class API
-    VERSION = "4.25.1"
+    VERSION = "4.26.0"
   end
 end

data/lib/conjur/graph.rb

@@ -212,13 +212,19 @@ module Conjur
       # @return [Conjur::Role] the child role
       attr_reader :child
 
+      # Was the role granted with admin_option? May be nil if unknown
+      # (e.g. if the server doesn't return it).
+      attr_reader :admin_option
+      alias :admin_option? :admin_option
+
       # Create a directed edge with a parent and child
       #
       # @param [Conjur::Role] parent the parent or source of this edge
       # @param  [Conjur::Role] child the child or destination of this edge
-      def initialize parent, child
+      def initialize parent, child, admin_option = nil
         @parent = parent
         @child = child
+        @admin_option = admin_option
       end
 
       # Serialize this edge as JSON.
@@ -248,20 +254,20 @@ module Conjur
       # @return [Hash] a Hash representing this edge
       def to_h
         # return string keys to make testing less brittle
-        {'parent' => @parent, 'child' => @child}
+        {'parent' => @parent, 'child' => @child}.tap {|h| h['admin_option'] = @admin_option unless @admin_option.nil?}
       end
 
       # Return this edge as an Array like ["parent", "child"]
       #
       # @return [Array<String>] the edge as an Array
       def to_a
-        [@parent, @child]
+        [@parent, @child].tap {|a| a.push(@admin_option) unless @admin_option.nil?}
       end
 
       # @api private
       # :nodoc:
       def to_s
-        "<Edge #{parent.id} --> #{child.id}>"
+        "<Edge #{parent.id} --> #{child.id} (admin: #{@admin_option.inspect})>"
       end
 
       # Support using edges as hash keys

data/spec/api/graph_spec.rb

@@ -11,13 +11,12 @@ describe Conjur::Graph do
     ['o', 'q'],
     ['x', 'o']
   ]}
-  let(:hash_graph){ {'graph' => edges} }
-  let(:json_graph){ hash_graph.to_json }
+  let(:edges_with_admin) { edges.each {|e| e.push(false)} }
+
   let(:short_json_graph){ edges.to_json }
   let(:long_edges){ edges.map{|e| {'parent' => e[0], 'child' => e[1]}} }
   let(:long_hash_graph){ {'graph' => long_edges} }
   let(:long_json_graph){ long_hash_graph.to_json }
-  let(:edge_objects){ edges.map{|e| Conjur::Graph::Edge.new(*e) }}
 
   describe "json methods" do
     subject{described_class.new edges}
@@ -77,9 +76,12 @@ describe Conjur::Graph do
     end
   end
 
-  describe "Graph.new" do
-    let(:arg){ edges }
+  shared_examples "it creates a new Graph" do
+    let(:arg) { graph_edges }
+    let(:edge_objects){ graph_edges.map{|e| Conjur::Graph::Edge.new(*e) }}
+
     subject{ described_class.new arg }
+
     def self.it_accepts_the_argument
       it "accepts the argument" do
         expect(subject.edges.to_set).to eq(edge_objects.to_set)
@@ -90,13 +92,26 @@ describe Conjur::Graph do
     end
 
     describe "given a hash of {'graph' => <array of edges>}" do
-      let(:arg){ hash_graph }
+      let(:arg){ {'graph' => graph_edges} }
       it_accepts_the_argument
     end
 
     describe "given a JSON string" do
-      let(:arg){ json_graph }
+      let(:arg){ {'graph' => graph_edges}.to_json }
       it_accepts_the_argument
     end
   end
-end
+
+  describe "Graph.new" do
+    it_should_behave_like "it creates a new Graph" do
+      let(:graph_edges) { edges }
+    end
+  end
+
+  describe "Graph.new with admin_option present" do
+    it_should_behave_like "it creates a new Graph" do
+      let(:graph_edges) { edges_with_admin }
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 4.25.1
+  version: 4.26.0
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client