users.rb in conjur-cli-6.0.0.rc1

- old
+ new

@@ -22,120 +22,10 @@
 class Conjur::Command::Users < Conjur::Command
 
   desc "Manage users"
   command :user do |user|
 
-    user.desc "Create a new user [DEPRECATED]"
-    user.arg_name "NAME"
-    user.command :create do |c|
-      c.desc "Prompt for a password for the user (default: --no-password)"
-      c.switch [:p,:password]
-
-      c.desc "UID number to be associated with user (optional)"
-      c.flag [:uidnumber]
-
-      c.desc "A comma-delimited list of CIDR addresses to restrict user to (optional)"
-      c.flag [:cidr]
-
-      acting_as_option(c)
-
-      interactive_option c
-
-      c.action do |global_options,options,args|
-        notify_deprecated
-
-        login = args.shift
-
-        interactive = options[:interactive] || login.blank?
-
-        groupid = options[:ownerid]
-        uidnumber = options[:uidnumber]
-        cidr = format_cidr(options[:cidr])
-        password = nil
-
-        validate_uidnumber(uidnumber)
-
-        if interactive
-          login ||= prompt_for_id :user, "login name"
-          
-          groupid ||= prompt_for_group hint: "press enter to have the user own their own record"
-          uidnumber ||= prompt_for_uidnumber
-          password = prompt_for_password unless options[:"no-password"]
-          
-          attributes = {
-            "Login"    => login,
-            "Owner" => groupid,
-            "UID Number"  => uidnumber,
-            "CIDR" => cidr
-          }
-          attributes["Password"] = "********" unless password.blank?
-          prompt_to_confirm :user, attributes
-        end
-        
-        if options[:p] && password.blank?
-          password = prompt_for_password
-        end
-        
-        user_options = { }
-        user_options[:ownerid] = groupid if groupid
-        user_options[:uidnumber] = uidnumber.to_i if uidnumber
-        user_options[:cidr] = cidr unless cidr.nil?
-        user_options[:password] = password if password
-        user = api.create_user(login, user_options)
-
-        display user
-        
-        if interactive
-          public_key = prompt_for_public_key
-          if public_key
-            api.add_public_key user.login, public_key
-            puts "Public key added"
-          end
-        end
-      end
-    end
-
-    user.desc "Show a user"
-    user.arg_name "USER"
-    user.command :show do |c|
-      c.action do |global_options,options,args|
-        id = require_arg(args, 'USER')
-        display(api.user(id), options)
-      end
-    end
-
-    user.desc "Decommission a user [DEPRECATED]"
-    user.arg_name "USER"
-    user.command :retire do |c|
-      retire_options c
-
-      c.action do |global_options,options,args|
-        notify_deprecated
-
-        id = require_arg(args, 'USER')
-        
-        user = api.user(id)
-        
-        validate_retire_privileges user, options
-
-        retire_resource user
-        retire_role user
-        give_away_resource user, options
-        
-        puts "User retired"
-      end
-    end
-
-    user.desc "List users"
-    user.command :list do |c|
-      command_options_for_list c
-
-      c.action do |global_options, options, args|
-        command_impl_for_list global_options, options.merge(kind: "user"), args
-      end
-    end
-
     user.desc "Update the password of the logged-in user"
     user.command :update_password do |c|
       c.desc "Password to use, otherwise you will be prompted"
       c.flag [:p,:password]
 
@@ -153,77 +43,30 @@
       c.flag [:user, :u]
       c.action do |_global, options, _args|
         if options.include?(:user)
           # Make sure we're not trying to rotate our own key with the user flag.
           if api.username == options[:user]
-            exit_now! 'To rotate your own API key, use this command without the --user flag'
+            exit_now! 'To rotate the API key of the currently logged-in user, use this command without any flags or options'
           end
-          puts api.user(options[:user]).rotate_api_key
+          puts api.resource([ Conjur.configuration.account, "user", options[:user] ].join(":")).rotate_api_key
         else
           username, password = Conjur::Authn.read_credentials
           new_api_key = Conjur::API.rotate_api_key username, password
           # Show the new one before saving credentials so we don't lose it on failure.
           puts new_api_key
           Conjur::Authn.save_credentials username: username, password: new_api_key
         end
       end
     end
-
-    user.desc "Update a user's attributes [DEPRECATED]"
-    user.arg_name "USER"
-    user.command :update do |c|
-      c.desc "UID number to be associated with user (optional)"
-      c.flag [:uidnumber]
-
-      c.desc "A comma-delimited list of CIDR addresses to restrict user to (optional). Use 'all' to reset"
-      c.flag [:cidr]
-
-      c.action do |global_options, options, args|
-        notify_deprecated
-
-        login=require_arg(args,'USER')
-
-        uidnumber = options[:uidnumber]
-        cidr = format_cidr(options[:cidr])
-
-        validate_uidnumber(uidnumber)
-
-        user_options = { }
-        user_options[:uidnumber] = uidnumber.to_i if uidnumber
-        user_options[:cidr] = cidr unless cidr.nil?
-
-        api.user(login).update(user_options)
-        puts "User updated"
-      end
-    end
-
-    user.desc "Find the user by UID" 
-    user.arg_name "uid"
-    user.command :uidsearch do |c| 
-      c.action do |global_options, options, args| 
-        uidnumber = require_arg(args,'uid')
-        raise "Uidnumber should be integer" unless /\d+/ =~ uidnumber
-        uidnumber=uidnumber.to_i
-        display api.find_users(uidnumber: uidnumber)
-      end
-    end
   end
-    
-  def self.prompt_for_uidnumber
-    prompt_for_idnumber "uid number"
-  end
 
   def self.format_cidr(cidr)
     case cidr
     when 'all'
       []
     when nil
       nil
     else
       cidr.split(',').each {|x| x.strip!}
     end
-  end
-
-  def self.validate_uidnumber(uidnumber)
-    exit_now! 'uidnumber should be integer' unless uidnumber.blank? || /\d+/ =~ uidnumber
   end
 end