conjur-api 4.29.0 → 4.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0564b6aa766b949e956c83932c25994999c8e03
-  data.tar.gz: 03be39ecd89a7b370115ce168c4b3c54acd45b09
+  metadata.gz: 3501dba172c6c99ebdc99ad7fef80634e39cf2c3
+  data.tar.gz: 620f5813442acedbcd510ac2756bd5a6e8d700a8
 SHA512:
-  metadata.gz: d04e0fb688351001e486bc01613ecd5e1cd4ec66e7790f0ed802b9a7d4eb5280fef68498cf720ebe4a3cfc5a270e190a2e970fea8c9419cec16dbd77060b69d1
-  data.tar.gz: c64f11b333a74bfa8f5af3ad0985daa7b25f82d55db7514f00589f210be408d04079792b7a5ff8efe23922a5967e04e8759457b62c4fd8209b02d6daf7984232
+  metadata.gz: a090764853263323c9d21afcde4069a9481aabb1dcd668c2407f0a8e349cf50439e6dd80924b51a86e35cf6dbc951ee93baa9e03524164452b95600955914c28
+  data.tar.gz: a6bb48a6b4fe8b4a505a847f7915904d00ddcd4e86a13e7b5dcd059ae269ef5dd82d565bb20431babc2d48992ded7227e85bb9381dbb355473edc5283340da01

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v4.29.2
+
+* `Conjur::API#resources` now supports `:owner` to retrieve all resources owned (directly or indirectly) by the indicated role. This capability has always been provided by the service, but was not exposed by the Ruby API.
+
+# v4.29.1
+
+* `Conjur::API#audit` now supports `:has_annotation` to retrieve audit events for resources annotated with the given name.
+
 # v4.29.0
 
 * Add `Conjur::API#new_from_token_file` to create an API instance from a file which contains an access token, which should be periodically updated by another process.

data/lib/conjur-api/version.rb

@@ -19,6 +19,6 @@
 
 module Conjur
   class API
-    VERSION = "4.29.0"
+    VERSION = "4.29.2"
   end
 end

data/lib/conjur/api/audit.rb

@@ -33,6 +33,7 @@ module Conjur
     # @param options [Hash]
     # @option options [Time, nil] :till only show events before this time
     # @option options [Time, nil] :since only show events after this time
+    # @option options [String, nil] :has_annotation only show events for resources with an annotation with this name
     # @option options [Boolean] :follow block the current thread and call `block` with `Array` of
     #   audit events as the occur.
     #
@@ -74,6 +75,7 @@ module Conjur
     # @param options [Hash]
     # @option options [Time, nil] :till only show events before this time
     # @option options [Time, nil] :since only show events after this time
+    # @option options [String, nil] :has_annotation only show events for resources with an annotation with this name
     # @option options [Boolean] :follow block the current thread and call `block` with `Array` of
     #   audit events as the occur.
     #
@@ -99,7 +101,7 @@ module Conjur
 
     private
     def audit_event_feed path, options={}, &block
-      query = options.slice(:since, :till)
+      query = options.slice(:since, :till, :has_annotation)
       path << "?#{query.to_param}" unless query.empty? 
       if options[:follow]
         follow_events path, &block

data/lib/conjur/resource.rb

@@ -270,6 +270,7 @@ module Conjur
     # - host - authz url,
     # - credentials,
     # - account,
+    # - owner (optional),
     # - kind (optional),
     # - search (optional),
     # - limit (optional),
@@ -282,7 +283,7 @@ module Conjur
 
       path = "#{account}/resources" 
       path += "/#{kind}" if kind
-      query = opts.slice(:acting_as, :limit, :offset, :search, :has_annotation)
+      query = opts.slice(:owner, :acting_as, :limit, :offset, :search, :has_annotation)
       path += "?#{query.to_query}" unless query.empty?
       resource = RestClient::Resource.new(host, credentials)[path]
       

data/spec/lib/audit_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Conjur::API, api: :dummy do 
   describe "audit API methods" do
     
-    let(:options){ {since:Time.at(0).to_s, till: Time.now.to_s, some_unwanted_option: 'heloo!'} }
-    let(:expected_options){ options.slice(:since, :till) }
+    let(:options){ {since:Time.at(0).to_s, till: Time.now.to_s, :has_annotation => 'puppet', some_unwanted_option: 'heloo!'} }
+    let(:expected_options){ options.slice(:since, :till, :has_annotation) }
     let(:response){ ['some event'] }
     let(:include_options){ false }
     let(:query){ include_options ? '?' + expected_options.to_query : '' }
@@ -37,7 +37,7 @@ describe Conjur::API, api: :dummy do
         it_behaves_like "gets all visible events"
       end
       
-      context "when called with time options" do
+      context "when called with all options" do
         let(:include_options){ true }
         it_behaves_like "gets all visible events"
       end
@@ -66,7 +66,7 @@ describe Conjur::API, api: :dummy do
         it_behaves_like "gets roles feed"
       end
       
-      context "when called with time options" do
+      context "when called with all options" do
         let(:include_options){ true }
         let(:args){ [ role_id ] }
         it_behaves_like  "gets roles feed"
@@ -97,7 +97,7 @@ describe Conjur::API, api: :dummy do
         it_behaves_like "gets the resource feed"
       end
       
-      context "when called with time options" do
+      context "when called with all options" do
         let(:include_options) { true }
         it_behaves_like "gets the resource feed"
       end

data/spec/lib/resource_spec.rb

@@ -162,6 +162,17 @@ describe Conjur::Resource, api: :dummy, logging: :temp do
       expect(Conjur::Resource.all host: authz_host, account: account).to eql(%w(foo bar))
     end
 
+    it "can filter by owner" do
+      expect_request(
+        method: :get,
+        url: "http://authz.example.com/the-account/resources/chunky?owner=alice",
+        headers: {}
+      ).and_return '["foo", "bar"]'
+
+      expect(Conjur::Resource.all host: authz_host, account: account, kind: :chunky, owner: 'alice')
+        .to eql(%w(foo bar))
+    end
+
     it "can filter by kind" do
       expect_request(
         method: :get,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 4.29.0
+  version: 4.29.2
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client