morpheus-cli 3.1.2.1 → 3.2.0

data/lib/morpheus/cli/users.rb

@@ -11,6 +11,7 @@ class Morpheus::Cli::Users
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
   register_subcommands :list, :get, :add, :update, :remove
+  register_subcommands :'passwd' => :change_password
   alias_subcommand :details, :get
   set_default_subcommand :list
 
@@ -32,9 +33,10 @@ class Morpheus::Cli::Users
 
   def list(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:account, :list, :json, :dry_run])
+      build_common_options(opts, options, [:account, :list, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
+      opts.footer = "List users."
     end
     optparse.parse!(args)
     connect(options)
@@ -53,10 +55,18 @@ class Morpheus::Cli::Users
       end
       json_response = @users_interface.list(account_id, params)
       users = json_response['users']
-
+      if options[:include_fields]
+        json_response = {"users" => filter_data(users, options[:include_fields]) }
+      end
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options)
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(users, options)
+        return 0
       else
         title = "Morpheus Users"
         subtitles = []
@@ -77,15 +87,15 @@ class Morpheus::Cli::Users
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
   end
 
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[username]")
-      opts.on(nil,'--feature-access', "Display Feature Access") do |val|
+      opts.on('-f','--feature-access', "Display Feature Access") do |val|
         options[:include_feature_access] = true
       end
       # opts.on(nil,'--group-access', "Display Group Access") do
@@ -103,13 +113,15 @@ class Morpheus::Cli::Users
         options[:include_cloud_access] = true
         options[:include_instance_type_access] = true
       end
-      build_common_options(opts, options, [:account, :json, :dry_run])
+      build_common_options(opts, options, [:account, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about a user." + "\n" +
+                    "[username] is required. This is the username or id of a user."
     end
     optparse.parse!(args)
 
     if args.count < 1
       puts optparse
-      exit 1
+      return 1
     end
 
     connect(options)
@@ -130,24 +142,32 @@ class Morpheus::Cli::Users
       # todo: users_response = @users_interface.list(account_id, {name: name})
       #       there may be response data outside of user that needs to be displayed
       user = find_user_by_username_or_id(account_id, args[0])
-      exit 1 if user.nil?
-
-      # meh, this should just always be returned with GET /api/users/:id
-      user_feature_permissions_json = nil
-      user_feature_permissions = nil
-      if options[:include_feature_access]
-        user_feature_permissions_json = @users_interface.feature_permissions(account_id, user['id'])
-        user_feature_permissions = user_feature_permissions_json['featurePermissions']
-      end
+      return 1 if user.nil?
+      
+      json_response =  {'user' => user}
+      # json_response['user']['featurePermissions'] = user_feature_permissions if options[:include_feature_access]
 
+      if options[:include_fields]
+        json_response = {'user' => filter_data(user, options[:include_fields]) }
+      end
       if options[:json]
-        print JSON.pretty_generate({user:user})
-        print "\n"
-        if (user_feature_permissions_json)
-          print JSON.pretty_generate(user_feature_permissions_json)
-          print "\n"
-        end
+        puts as_json(json_response, options)
+        puts as_json(@users_interface.feature_permissions(account_id, user['id']), options) if options[:include_feature_access]
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options)
+        puts as_yaml(@users_interface.feature_permissions(account_id, user['id']), options) if options[:include_feature_access]
+        return 0
+      elsif options[:csv]
+        puts records_as_csv([user], options)
+        return 0
       else
+        user_feature_permissions_json = nil
+        user_feature_permissions = nil
+        if options[:include_feature_access]
+          user_feature_permissions_json = @users_interface.feature_permissions(account_id, user['id'])
+          user_feature_permissions = user_feature_permissions_json['featurePermissions']
+        end
         print_h1 "User Details"
         print cyan
         description_cols = {
@@ -191,16 +211,17 @@ class Morpheus::Cli::Users
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
   end
 
   def add(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
       build_option_type_options(opts, options, add_user_option_types)
-      build_common_options(opts, options, [:account, :options, :json, :dry_run])
+      build_common_options(opts, options, [:account, :options, :payload, :json, :dry_run])
     end
     optparse.parse!(args)
 
@@ -210,27 +231,32 @@ class Morpheus::Cli::Users
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
 
-      # remove role option_type, it is just for help display, the role prompt is separate down below
-      prompt_option_types = add_user_option_types().reject {|it| ['role'].include?(it['fieldName']) }
-      params = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, options[:options], @api_client, options[:params])
-
-      #puts "parsed params is : #{params.inspect}"
-      user_keys = ['username', 'firstName', 'lastName', 'email', 'password', 'passwordConfirmation', 'instanceLimits']
-      user_payload = params.select {|k,v| user_keys.include?(k) }
-      if !user_payload['instanceLimits']
-        user_payload['instanceLimits'] = {}
-        user_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
-        user_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
-        user_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
-      end
-
-      roles = prompt_user_roles(account_id, nil, options)
-      if !roles.empty?
-        user_payload['roles'] = roles.collect {|r| {id: r['id']} }
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+      else
+        # merge -O options into normally parsed options
+        params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        # remove role option_type, it is just for help display, the role prompt is separate down below
+        prompt_option_types = add_user_option_types().reject {|it| 'role' == it['fieldName'] }
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, options[:options], @api_client, options[:params])
+        params.deep_merge!(v_prompt)
+        if params['instanceLimits']
+          params['instanceLimits']['maxStorage'] = params['instanceLimits']['maxStorage'].to_i if params['instanceLimits']['maxStorage'].to_s.strip != ''
+          params['instanceLimits']['maxMemory'] = params['instanceLimits']['maxMemory'].to_i if params['instanceLimits']['maxMemory'].to_s.strip != ''
+          params['instanceLimits']['maxCpu'] = params['instanceLimits']['maxCpu'].to_i if params['instanceLimits']['maxCpu'].to_s.strip != ''
+        end
+        # prompt for roles
+        selected_roles = []
+        selected_roles += params.delete('role').split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if params['role']
+        selected_roles += params.delete('roles').split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if params['roles']
+        roles = prompt_user_roles(account_id, nil, selected_roles, options)
+        if !roles.empty?
+          params['roles'] = roles.collect {|r| {id: r['id']} }
+        end      
+        payload = {'user' => params}
       end
 
-      payload = {user: user_payload}
-
       if options[:dry_run]
         print_dry_run @users_interface.dry.create(account_id, payload)
         return
@@ -240,38 +266,40 @@ class Morpheus::Cli::Users
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        if account
-          print_green_success "Added user #{user_payload['username']} to account #{account['name']}"
-        else
-          print_green_success "Added user #{user_payload['username']}"
-        end
-
-        details_options = [user_payload["username"]]
-        if account
-          details_options.push "--account-id", account['id'].to_s
-        end
-        get(details_options)
+      username = "" # json_response['user']['username']
+      username = payload['user']['username'] if payload['user'] && payload['user']['username']
+      if account
+        print_green_success "Added user #{username} to account #{account['name']}"
+      else
+        print_green_success "Added user #{username}"
+      end
+      details_options = [username]
+      if account
+        details_options.push "--account-id", account['id'].to_s
       end
+      get(details_options)
+    end
+      
 
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
   end
 
   def update(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[username] [options]")
       build_option_type_options(opts, options, update_user_option_types)
-      build_common_options(opts, options, [:account, :options, :json, :dry_run])
+      build_common_options(opts, options, [:account, :options, :payload, :json, :dry_run])
     end
     optparse.parse!(args)
 
     if args.count < 1
-      print_red_alert "Specify atleast one option to update"
       puts optparse
-      exit 1
+      return 1
     end
 
     connect(options)
@@ -281,47 +309,59 @@ class Morpheus::Cli::Users
       account_id = account ? account['id'] : nil
 
       user = find_user_by_username_or_id(account_id, args[0])
-      exit 1 if user.nil?
+      return 1 if user.nil?
 
-      #params = Morpheus::Cli::OptionTypes.prompt(update_user_option_types, options[:options], @api_client, options[:params])
-      params = options[:options] || {}
-      if params.empty?
-        puts optparse
-        exit 1
-      end
-      roles = prompt_user_roles(account_id, user['id'], options.merge(no_prompt: true))
-      if !roles.empty?
-        params['roles'] = roles.collect {|r| {id: r['id']} }
-      end
-      if params.empty?
-        puts optparse.banner
-        puts Morpheus::Cli::OptionTypes.display_option_types_help(update_user_option_types)
-        exit 1
-      end
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+      else
+        #params = Morpheus::Cli::OptionTypes.prompt(update_user_option_types, options[:options], @api_client, options[:params])
+        # merge -O options into normally parsed options
+        params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        # if params.empty?
+        #   print_red_alert "Specify atleast one option to update"
+        #   puts optparse
+        #   return 1
+        # end
+        # prompt_option_types = update_user_option_types().reject {|it| 'role' == it['fieldName'] }
+        # params = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, params, @api_client)
+        selected_roles = []
+        selected_roles += params.delete('role').split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if params['role']
+        selected_roles += params.delete('roles').split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if params['roles']
+        roles = prompt_user_roles(account_id, user['id'], selected_roles, options.merge(no_prompt: true))
+        if !roles.empty?
+          params['roles'] = roles.collect {|r| {id: r['id']} }
+        end
+        if params.empty?
+          puts optparse.banner
+          puts Morpheus::Cli::OptionTypes.display_option_types_help(update_user_option_types)
+          return 1
+        end
+
+        #puts "parsed params is : #{params.inspect}"
+        if params['instanceLimits']
+          params['instanceLimits']['maxStorage'] = params['instanceLimits']['maxStorage'].to_i if params['instanceLimits']['maxStorage'].to_s.strip != ''
+          params['instanceLimits']['maxMemory'] = params['instanceLimits']['maxMemory'].to_i if params['instanceLimits']['maxMemory'].to_s.strip != ''
+          params['instanceLimits']['maxCpu'] = params['instanceLimits']['maxCpu'].to_i if params['instanceLimits']['maxCpu'].to_s.strip != ''
+        end
 
-      #puts "parsed params is : #{params.inspect}"
-      user_keys = ['username', 'firstName', 'lastName', 'email', 'password', 'instanceLimits', 'roles']
-      user_payload = params.select {|k,v| user_keys.include?(k) }
-      if !user_payload['instanceLimits']
-        user_payload['instanceLimits'] = {}
-        user_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
-        user_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
-        user_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
+        payload = {'user' => params}
       end
 
-      payload = {user: user_payload}
-      json_response = @users_interface.update(account_id, user['id'], payload)
       if options[:dry_run]
         print_dry_run @users_interface.dry.update(account_id, user['id'], payload)
         return
       end
+      json_response = @users_interface.update(account_id, user['id'], payload)
 
       if options[:json]
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print_green_success "Updated user #{user_payload['username']}"
-        details_options = [user_payload["username"] || user['username']]
+        username = user['username'] # json_response['user']['username']
+        username = payload['user']['username'] if payload['user'] && payload['user']['username']
+        print_green_success "Updated user #{username}"
+        details_options = [username]
         if account
           details_options.push "--account-id", account['id'].to_s
         end
@@ -330,14 +370,83 @@ class Morpheus::Cli::Users
 
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
+    end
+  end
+
+  def change_password(args)
+    options = {}
+    new_password = nil
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[username] [options]")
+      opts.on('--password VALUE', String, "New password") do |val|
+        new_password = val
+      end
+      build_common_options(opts, options, [:account, :options, :json, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+
+    if args.count < 1
+      # print_error Morpheus::Terminal.angry_prompt
+      # puts_error  "wrong number of arguments, expected 1 and got #{args.count}\n#{optparse}"
+      puts optparse
+      return 1
+    end
+
+    connect(options)
+    begin
+
+      account = find_account_from_options(options)
+      account_id = account ? account['id'] : nil
+
+      user = find_user_by_username_or_id(account_id, args[0])
+      return 1 if user.nil?
+
+      if new_password.nil?
+        
+        password_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'password', 'fieldLabel' => 'New Password', 'type' => 'password', 'required' => true}], options[:options], @api_client)
+        new_password = password_prompt['password']
+
+        confirm_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true}], options[:options], @api_client)
+        confirm_password = confirm_prompt['passwordConfirmation']
+        if confirm_password != new_password
+          print_red_alert "Confirm password did not match."
+          return 1
+        end
+      end
+
+      if new_password.nil? || new_password.empty?
+        print_red_alert "A new password is required"
+        return 1
+      end
+
+      payload = {
+        'user' => {
+          'password' => new_password, 
+          'passwordConfirmation' => new_password
+        } 
+      }
+      json_response = @users_interface.update(account_id, user['id'], payload)
+      if options[:dry_run]
+        print_dry_run @users_interface.dry.update(account_id, user['id'], payload)
+        return
+      end
+
+      if options[:json]
+        puts JSON.pretty_generate(json_response)
+      else
+        print_green_success "Updated password for user #{user['username']}"
+      end
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
     end
   end
 
   def remove(args)
-    usage = "Usage: morpheus users remove [username]"
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[username]")
       build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run])
     end
@@ -345,7 +454,7 @@ class Morpheus::Cli::Users
 
     if args.count < 1
       puts optparse
-      exit 1
+      return 1
     end
 
     connect(options)
@@ -355,7 +464,7 @@ class Morpheus::Cli::Users
       account_id = account ? account['id'] : nil
 
       user = find_user_by_username_or_id(account_id, args[0])
-      exit 1 if user.nil?
+      return 1 if user.nil?
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the user #{user['username']}?")
         exit
       end
@@ -374,7 +483,7 @@ class Morpheus::Cli::Users
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
   end
 
@@ -388,9 +497,9 @@ class Morpheus::Cli::Users
       {'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => true, 'displayOrder' => 4},
       {'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => true, 'displayOrder' => 6},
       {'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'displayOrder' => 7},
-      {'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8},
-      {'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9},
-      {'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10},
+      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8},
+      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9},
+      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10},
       {'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'displayOrder' => 11, 'description' => "Role names (comma separated)"},
     ]
   end
@@ -403,9 +512,9 @@ class Morpheus::Cli::Users
       {'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => false, 'displayOrder' => 4},
       {'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => false, 'displayOrder' => 6},
       {'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => false, 'displayOrder' => 7},
-      {'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8},
-      {'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9},
-      {'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10},
+      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8},
+      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9},
+      {'fieldContext' => 'instanceLimits', 'fieldName' => 'maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10},
       {'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'displayOrder' => 11, 'description' => "Role names (comma separated)"},
     ]
   end
@@ -414,36 +523,33 @@ class Morpheus::Cli::Users
   # options['role'] can be passed as comma separated role names
   # if so, it will be used instead of prompting
   # returns array of role objects
-  def prompt_user_roles(account_id, user_id, options={})
-
-    passed_role_string = nil
-    if options['role'] || (options[:options] && (options[:options]['role'] || options[:options]['roles']))
-      passed_role_string = options['role'] || (options[:options] && (options[:options]['role'] || options[:options]['roles']))
-    end
+  def prompt_user_roles(account_id, user_id, selected_roles=[], options={})
     passed_role_names = []
-    if !passed_role_string.empty?
-      passed_role_names = passed_role_string.split(',').uniq.compact.collect {|r| r.strip}
+    if !selected_roles.empty?
+      if selected_roles.is_a?(String)
+        passed_role_names = selected_roles.split(',').uniq.compact.collect {|r| r.strip}
+      else
+        passed_role_names = selected_roles
+      end
     end
 
     available_roles = @users_interface.available_roles(account_id, user_id)['roles']
 
     if available_roles.empty?
       print_red_alert "No available roles found."
-      exit 1
+      return 1
     end
     role_options = available_roles.collect {|role|
       {'name' => role['authority'], 'value' => role['id']}
     }
 
-    # found_roles = []
     roles = []
 
     if !passed_role_names.empty?
       invalid_role_names = []
       passed_role_names.each do |role_name|
-        found_role = available_roles.find {|ar| ar['authority'] == role_name}
+        found_role = available_roles.find {|ar| ar['authority'] == role_name || ar['id'] == role_name.to_i}
         if found_role
-          # found_roles << found_role
           roles << found_role
         else
           invalid_role_names << role_name