conjur-cli 4.7.1 → 4.7.2

data/lib/conjur/command/audit.rb

@@ -10,7 +10,7 @@ class Conjur::Command
       private
       SHORT_FORMATS = {
         'resource:check' => lambda{|e| "checked that they can #{e[:privilege]} #{e[:resource]} (#{e[:allowed]})" },
-        'resource:create' => lambda{|e| "created resource #{e[:resource_id]} owned by #{e[:owner]}" },
+        'resource:create' => lambda{|e| "created resource #{e[:resource]} owned by #{e[:owner]}" },
         'resource:update' => lambda{|e| "gave #{e[:resource]} to #{e[:owner]}" },
         'resource:destroy' => lambda{|e| "destroyed resource #{e[:resource]}" },
         'resource:permit' => lambda{|e| "permitted #{e[:grantee]} to #{e[:privilege]} #{e[:resource]} (grant option: #{!!e[:grant_option]})" },
@@ -19,19 +19,15 @@ class Conjur::Command
         'role:check' => lambda{|e| "checked that #{e[:role] == e[:conjur_user] ? 'they' : e[:role]} can #{e[:privilege]} #{e[:resource]} (#{e[:allowed]})" },
         'role:grant' => lambda{|e| "granted role #{e[:role]} to #{e[:member]} #{e[:admin_option] ? ' with ' : ' without '}admin" },
         'role:revoke' => lambda{|e| "revoked role #{e[:role]} from #{e[:member]}" },
-        'role:create' => lambda{|e| "created role #{e[:role_id]}" }
+        'role:create' => lambda{|e| "created role #{e[:role]}" }
       }
       
       
       def short_event_format e
         e.symbolize_keys!
-        # hack: sometimes resource is a hash.  We don't want that!
-        if e[:resource] && e[:resource].kind_of?(Hash)
-          e[:resource] = e[:resource]['id']
-        end
-        s = "[#{Time.parse(e[:timestamp])}] "
-        s << " #{e[:conjur_user]}"
-        s << " (as #{e[:conjur_role]})" if e[:conjur_role] != e[:conjur_user]
+        s = "[#{Time.parse(e[:timestamp])}]"
+        s << " #{e[:user]}"
+        s << " (as #{e[:acting_as]})" if e[:acting_as] != e[:user]
         formatter = SHORT_FORMATS["#{e[:kind]}:#{e[:action]}"]
         if formatter
           s << " " << formatter.call(e)
@@ -64,9 +60,9 @@ class Conjur::Command
       def show_audit_events events, options
         events = [events] unless events.kind_of?(Array)
         if options[:short]
-          events.map(&:to_h).each{|e| puts short_event_format(e)}
+          events.each{|e| puts short_event_format(e)}
         else
-          events.map(&:to_h).each{|e| puts JSON.pretty_generate(e) }
+          events.each{|e| puts JSON.pretty_generate(e) }
         end
       end
 

data/lib/conjur/version.rb

@@ -19,6 +19,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Conjur
-  VERSION = "4.7.1"
+  VERSION = "4.7.2"
   ::Version=VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -300,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2027099206837494229
+      hash: 3901863290320006006
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2027099206837494229
+      hash: 3901863290320006006
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25