lib/conjur/command/resources.rb in conjur-cli-2.1.2 vs lib/conjur/command/resources.rb in conjur-cli-2.1.3

@@ -1,6 +1,7 @@
 require 'conjur/authn'
+require 'conjur/resource'
 require 'conjur/command'
 
 class Conjur::Command::Resources < Conjur::Command
   self.prefix = :resource
   
@@ -10,32 +11,32 @@
     acting_as_option(c)
     
     c.action do |global_options,options,args|
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
-      resource = api.resource(kind, id)
+      resource = api.resource([ Conjur.account, kind, id ].join(':'))
       resource.create(options)
     end
   end
   
   desc "Show a resource"
   arg_name "kind resource-id"
   command :show do |c|
     c.action do |global_options,options,args|
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
-      display api.resource(kind, id).attributes
+      display api.resource([ Conjur.account, kind, id ].join(':')).attributes
     end
   end
   
   desc "Determines whether a resource exists"
   arg_name "kind resource-id"
   command :exists do |c|
     c.action do |global_options,options,args|
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
-      resource = api.resource(kind, id)
+      resource = api.resource([ Conjur.account, kind, id ].join(':'))
       puts resource.exists?
     end
   end
 
   desc "Grant a privilege on a resource"
@@ -44,11 +45,11 @@
     c.action do |global_options,options,args|
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
       role = require_arg(args, "role")
       privilege = require_arg(args, "privilege")
-      api.resource(kind, id).permit privilege, role
+      api.resource([ Conjur.account, kind, id ].join(':')).permit privilege, role
     end
   end
 
   desc "Revoke a privilege on a resource"
   arg_name "kind resource-id role privilege"
@@ -56,31 +57,31 @@
     c.action do |global_options,options,args|
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
       role = require_arg(args, "role")
       privilege = require_arg(args, "privilege")
-      api.resource(kind, id).deny privilege, role
+      api.resource([ Conjur.account, kind, id ].join(':')).deny privilege, role
     end
   end
 
   desc "Grant ownership on a resource to a new owner"
   arg_name "kind resource-id owner"
   command :give do |c|
     c.action do |global_options,options,args|
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
       owner = require_arg(args, "owner")
-      api.resource(kind, id).give_to owner
+      api.resource([ Conjur.account, kind, id ].join(':')).give_to owner
     end
   end
 
   desc "List roles with a specified permission on the resource"
   arg_name "kind resource-id permission"
   command :permitted_roles do |c|
     c.action do |global_options,options,args|
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
       permission = require_arg(args, "permission")
-      display api.resource(kind, id).permitted_roles(permission)
+      display api.resource([ Conjur.account, kind, id ].join(':')).permitted_roles(permission)
     end
   end
 end