morpheus-cli 4.2.16 → 4.2.17

data/lib/morpheus/cli/users.rb

@@ -16,9 +16,6 @@ class Morpheus::Cli::Users
   alias_subcommand :details, :get
   set_default_subcommand :list
 
-  #todo: TOO_SIMPL_REGEX = //i
-  # TOO_SIMPLE_ERROR = "Password too simple. Password must contain at least one uppercase letter, one lowercase letter, a number, and a symbol."
-
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
   end
@@ -35,57 +32,74 @@ class Morpheus::Cli::Users
   end
 
   def list(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:account, :list, :query, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
+      opts.on('-g','--global', "Global (All Tenants). Find users across all tenants. Default is your own tenant only.") do
+        options[:global] = true
+      end
+      opts.on('--role AUTHORITY', String, "Role Name (authority)") do |val|
+        params['role'] ||= []
+        val.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }.each do |v|
+          params['role'] << v
+        end
+      end
+      opts.on('--role-id ID', String, "Role ID") do |val|
+        params['roleId'] ||= []
+        val.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }.each do |v|
+          params['roleId'] << v
+        end
+      end
+      build_standard_list_options(opts, options, [:account])
       opts.footer = "List users."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    options[:phrase] = args.join(" ") if args.count > 0
     connect(options)
-    begin
-
-      account = find_account_from_options(options)
-      account_id = account ? account['id'] : nil
-
-      params = {}
-      params.merge!(parse_list_options(options))
-      @users_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @users_interface.dry.list(account_id, params)
-        return
-      end
-      json_response = @users_interface.list(account_id, params)
-      render_result = render_with_format(json_response, options, 'users')
-      return 0 if render_result
+    account = find_account_from_options(options)
+    account_id = account ? account['id'] : nil
+    params['global'] = true if options[:global]
+    params.merge!(parse_list_options(options))
+    @users_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @users_interface.dry.list(account_id, params)
+      return 0, nil
+    end
+    json_response = @users_interface.list(account_id, params)
+    render_response(json_response, options, "users") do
       users = json_response['users']
-
       title = "Morpheus Users"
       subtitles = []
       if account
-        subtitles << "Account: #{account['name']}".strip
+        subtitles << "Tenant: #{account['name']}".strip
+      end
+      if params['global'] && json_response['global']
+        subtitles << "(All Tenants)"
       end
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles, options
       if users.empty?
         print cyan,"No users found.",reset,"\n"
       else
-        print_users_table(users, options)
+        print cyan
+        print as_pretty_table(users, list_user_column_definitions, options)
         print_results_pagination(json_response)
       end
       print reset,"\n"
-      return 0
-      
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
+    return 0, nil
   end
 
   def count(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
+      opts.on('-g','--global', "Global (All Tenants). Find users across all tenants. Default is your own tenant only.") do
+        options[:global] = true
+      end
       build_common_options(opts, options, [:account, :query, :remote, :dry_run])
       opts.footer = "Get the number of users."
     end
@@ -94,7 +108,7 @@ class Morpheus::Cli::Users
     begin
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
-      params = {}
+      params['global'] = true if options[:global]
       params.merge!(parse_list_options(options))
       @users_interface.setopts(options)
       if options[:dry_run]
@@ -118,7 +132,10 @@ class Morpheus::Cli::Users
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[username]")
+      opts.banner = subcommand_usage("[user]")
+      opts.on('-g','--global', "Global (All Tenants). Find users across all tenants. Default is your own tenant only.") do
+        options[:global] = true
+      end
       opts.on('-p','--permissions', "Display Permissions") do |val|
         options[:include_features_access] = true
         params['includeAccess'] = true
@@ -155,82 +172,51 @@ class Morpheus::Cli::Users
       opts.on('-i', '--include-none-access', "Include Items with 'None' Access in Access List") do
         options[:display_none_access] = true
       end
-      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."
+      build_standard_get_options(opts, options, [:account])
+      opts.footer = <<-EOT
+Get details about a user.
+[user] is required. This is the username or id of a user. Supports 1-N arguments.
+EOT
     end
     optparse.parse!(args)
-
-    if args.count < 1
-      puts optparse
-      return 1
-    end
-
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
-    begin
-      account = find_account_from_options(options)
-      account_id = account ? account['id'] : nil
-      @users_interface.setopts(options)
-      if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @users_interface.dry.get(account_id, args[0].to_i, params)
-        else
-          print_dry_run @users_interface.dry.get(account_id, {username: args[0]}, params)
-        end
-        return
-      end
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, params, options)
+    end
+  end
 
+  def _get(id, params, options={})
+    args = [id] # heh
+    account = find_account_from_options(options)
+    account_id = account ? account['id'] : nil
+    params['global'] = true if options[:global]
+    @users_interface.setopts(options)
+    if options[:dry_run]
       if args[0].to_s =~ /\A\d{1,}\Z/
-        user_id = args[0].to_i
+        print_dry_run @users_interface.dry.get(account_id, args[0].to_i, params)
       else
-        user = find_user_by_username(account_id, args[0])
-
-        if user.nil?
-          print_red_alert "User #{args[0]} not found"
-          exit 1
-        end
-        user_id = user['id']
-      end
-
-      user = @users_interface.get(account_id, user_id, params)['user']
-
-      if user.nil?
-        print_red_alert "User #{args[0]} not found"
-        exit 1
+        print_dry_run @users_interface.dry.list(account_id, params.merge({username: args[0]}))
       end
+      return
+    end
 
+    if args[0].to_s =~ /\A\d{1,}\Z/
+      user_id = args[0].to_i
+    else
+      user = find_user_by_username(account_id, args[0], params)
+      return 1 if user.nil?
+      user_id = user['id']
+    end
+    # always get by id, index does not return 'access'
+    json_response = @users_interface.get(account_id, user_id, params)
+    user = json_response['user']
+    render_response(json_response, options, "user") do
       is_tenant_account = current_account['id'] != user['account']['id']
-
-      json_response =  {'user' => user}
-
-      if options[:json]
-        puts as_json(json_response, options, "user")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "user")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv([user], options)
-        return 0
-      end
-
       print_h1 "User Details", options
       print cyan
-      description_cols = {
-          "ID" => 'id',
-          "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
-          "First Name" => 'firstName',
-          "Last Name" => 'lastName',
-          # "Name" => 'displayName',
-          #"Name" => lambda {|it| it['firstName'] ? it['displayName'] : '' },
-          "Username" => 'username',
-          "Email" => 'email',
-          "Notifications" => lambda {|it| it['receiveNotifications'].nil? ? '' : format_boolean(it['receiveNotifications']) },
-          "Role" => lambda {|it| format_user_role_names(it) },
-          "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
-          "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
-      }
-      print_description_list(description_cols, user)
+      print_description_list(user_column_definitions, user)
 
       # backward compatibility
       if user['access'].nil? && options[:include_features_access]
@@ -288,24 +274,25 @@ class Morpheus::Cli::Users
           end
         end
       end
-      print cyan
       print reset,"\n"
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
+    return 0
   end
 
   def permissions(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[username]")
+      opts.banner = subcommand_usage("[user]")
+      opts.on('-g','--global', "Global (All Tenants). Find users across all tenants. Default is your own tenant only.") do
+        options[:global] = true
+      end
       build_common_options(opts, options, [:account, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.on('-i', '--include-none-access', "Include Items with 'None' Access in Access List") do
         options[:display_none_access] = true
       end
       opts.footer = "Display Access for a user." + "\n" +
-                    "[username] is required. This is the username or id of a user."
+                    "[user] is required. This is the username or id of a user."
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -314,7 +301,8 @@ class Morpheus::Cli::Users
     begin
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
-      user = find_user_by_username_or_id(account_id, args[0])
+      params['global'] = true if options[:global]
+      user = find_user_by_username_or_id(account_id, args[0], params)
       return 1 if user.nil?
       @users_interface.setopts(options)
       if options[:dry_run]
@@ -414,10 +402,11 @@ class Morpheus::Cli::Users
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[username] [email] [first] [last] [options]")
       build_option_type_options(opts, options, add_user_option_types)
+      build_option_type_options(opts, options, add_user_advanced_option_types)
       build_common_options(opts, options, [:account, :options, :payload, :json, :dry_run])
       opts.footer = <<-EOT
 Create a new user.
-[username] is required. Username of the new user
+[user] is required. Username of the new user
 [email] is required. Email address
 [first] is optional. First Name
 [last] is optional. Last Name
@@ -429,6 +418,9 @@ EOT
     options[:options]['email'] = args[1] if args[1]
     options[:options]['firstName'] = args[2] if args[2]
     options[:options]['lastName'] = args[3] if args[3]
+    if options[:options]['password']
+      options[:options]['passwordConfirmation'] = options[:options]['password']
+    end
     connect(options)
     begin
 
@@ -438,24 +430,27 @@ EOT
       payload = {}
       if options[:payload]
         payload = options[:payload]
-        payload.deep_merge!(parse_passed_options(options))
+        payload.deep_merge!({'user' => parse_passed_options(options)})
       else
-        # merge -O options into normally parsed options
-        payload.deep_merge!(parse_passed_options(options))
+        payload.deep_merge!({'user' => parse_passed_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'] }
+        prompt_option_types = add_user_option_types().reject {|it| 'roles' == it['fieldName'] }
         v_prompt = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, options[:options], @api_client, options[:params])
         params.deep_merge!(v_prompt)
-
+        # do not prompt for advanced options
+        advanced_config = Morpheus::Cli::OptionTypes.no_prompt(add_user_advanced_option_types, options[:options], @api_client, options[:params])
+        advanced_config.deep_compact!
+        params.deep_merge!(advanced_config)
         # 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']
+        selected_roles += payload['user'].delete('roleId').split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if payload['user']['roleId']
+        selected_roles += payload['user'].delete('role').split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if payload['user']['role']
+        selected_roles += payload['user'].delete('roles').split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if payload['user']['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'].deep_merge!(params)
       end
       if options[:dry_run] && options[:json]
         puts as_json(payload, options)
@@ -471,21 +466,16 @@ EOT
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-      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
+        user = json_response['user']
+        username = "" # json_response['user']['username']
+        username = user['username'] if user
+        if account
+          print_green_success "Added user #{username} to account #{account['name']}"
+        else
+          print_green_success "Added user #{username}"
+        end
+        return _get(user['id'], {}, options)
       end
-      get(details_options + (options[:remote] ? ["-r",options[:remote]] : []))
-    end
-      
-
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       return 1
@@ -497,8 +487,12 @@ EOT
     params = {}
     payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[username] [options]")
+      opts.banner = subcommand_usage("[user] [options]")
+      opts.on('-g','--global', "Global (All Tenants). Find users across all tenants. Default is your own tenant only.") do
+        options[:global] = true
+      end
       build_option_type_options(opts, options, update_user_option_types)
+      build_option_type_options(opts, options, update_user_advanced_option_types)
       build_common_options(opts, options, [:account, :options, :payload, :json, :dry_run])
     end
     optparse.parse!(args)
@@ -508,26 +502,38 @@ EOT
 
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
-
-      user = find_user_by_username_or_id(account_id, args[0])
+      params['global'] = true if options[:global]
+      user = find_user_by_username_or_id(account_id, args[0], params)
       return 1 if user.nil?
 
       # use --payload
+      payload = {}
       if options[:payload]
         payload = options[:payload]
-        payload.deep_merge!(parse_passed_options(options))
+        payload.deep_merge!({'user' => parse_passed_options(options)})
       else
-        # inject -O key=value options
-        # payload.deep_merge!(parse_passed_options(options))
-        params.deep_merge!(parse_passed_options(options))
-        # user_prompt_output = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, payload['user'], @api_client)
+        payload.deep_merge!({'user' => parse_passed_options(options)})
+
+        # remove role option_type, it is just for help display, the role prompt is separate down below
+        prompt_option_types = update_user_option_types().reject {|it| 'roles' == it['fieldName'] }
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(prompt_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        params.deep_merge!(v_prompt)
+        # do not prompt for advanced options
+        advanced_config = Morpheus::Cli::OptionTypes.no_prompt(update_user_advanced_option_types, options[:options], @api_client, options[:params])
+        advanced_config.deep_compact!
+        params.deep_merge!(advanced_config)
+
         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))
-        # should it allow [] (no roles) ?
-        if !roles.empty?
-          params['roles'] = roles.collect {|r| {id: r['id']} }
+        selected_roles += payload['user'].delete('roleId').to_s.split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if payload['user']['roleId']
+        selected_roles += payload['user'].delete('role').to_s.split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if payload['user']['role']
+        selected_roles += payload['user'].delete('roles').to_s.split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if payload['user']['roles']
+        if !selected_roles.empty?
+          roles = prompt_user_roles(account_id, user['id'], selected_roles, options.merge(no_prompt: true))
+          # should it allow [] (no roles) ?
+          if !roles.empty?
+            params['roles'] = roles.collect {|r| {id: r['id']} }
+          end
         end
         payload.deep_merge!({'user' => params})
         if payload['user'].empty? # || options[:no_prompt]
@@ -541,7 +547,7 @@ EOT
         return
       end
       json_response = @users_interface.update(account_id, user['id'], payload)
-
+      user = json_response['user']
       if options[:json]
         print JSON.pretty_generate(json_response)
         print "\n"
@@ -551,13 +557,13 @@ EOT
           username = payload['user']['username']
         end
         print_green_success "Updated user #{username}"
-        details_options = [username]
-        if account
-          details_options.push "--account-id", account['id'].to_s
-        end
-        get(details_options + (options[:remote] ? ["-r",options[:remote]] : []))
+        # details_options = [username]
+        # if account
+        #   details_options.push "--account-id", account['id'].to_s
+        # end
+        # get(details_options + (options[:remote] ? ["-r",options[:remote]] : []))
+        return _get(user["id"], {}, options)
       end
-
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       return 1
@@ -565,26 +571,30 @@ EOT
   end
 
   def change_password(args)
+    params = {}
     options = {}
     new_password = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[username] [password] [options]")
+      opts.banner = subcommand_usage("[user] [password] [options]")
+      opts.on('-g','--global', "Global (All Tenants). Find users across all tenants. Default is your own tenant only.") do
+        options[:global] = true
+      end
       # opts.on('--password VALUE', String, "New password") do |val|
       #   new_password = val
       # end
       build_standard_update_options(opts, options, [:account])
     end
     optparse.parse!(args)
-    verify_args!(args:args, optparse:optparse, min:1,max:2) # [username] [password]
+    verify_args!(args:args, optparse:optparse, min:1,max:2) # [user] [password]
     connect(options)
     exit_code, err = 0, nil
 
     # user can be scoped to account (tenant)
     account = find_account_from_options(options)
     account_id = account ? account['id'] : nil
-
+    params['global'] = true if options[:global]
     # fetch the user to update
-    user = find_user_by_username_or_id(account_id, args[0])
+    user = find_user_by_username_or_id(account_id, args[0], params)
     return 1 if user.nil?
     
     new_password = args[1] if args[1]
@@ -644,10 +654,14 @@ EOT
   end
 
   def remove(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[username]")
-      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run])
+      opts.banner = subcommand_usage("[user]")
+        opts.on('-g','--global', "Global (All Tenants). Find users across all tenants. Default is your own tenant only.") do
+        options[:global] = true
+      end
+      build_standard_remove_options(opts, options, [:account])
     end
     optparse.parse!(args)
 
@@ -658,19 +672,18 @@ EOT
 
     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])
+      params['global'] = true if options[:global]
+      user = find_user_by_username_or_id(account_id, args[0], params)
       return 1 if user.nil?
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the user #{user['username']}?")
-        exit
+        exit 9, "arborted"
       end
       @users_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @users_interface.dry.destroy(account_id, user['id'])
-        return
+        return 0
       end
       json_response = @users_interface.destroy(account_id, user['id'])
 
@@ -697,19 +710,33 @@ EOT
       {'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => true, 'displayOrder' => 4},
       {'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => true, 'displayOrder' => 5},
       {'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'displayOrder' => 6},
-      {'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'description' => "Role names (comma separated)", 'displayOrder' => 7},
-      {'fieldName' => 'receiveNotifications', 'fieldLabel' => 'Receive Notifications?', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 58},
+      {'fieldName' => 'roles', 'fieldLabel' => 'Roles', 'type' => 'text', 'description' => "Role authorities or IDs (comma separated)", 'displayOrder' => 7},
+      {'fieldName' => 'receiveNotifications', 'fieldLabel' => 'Receive Notifications?', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 8}
+    ]
+  end
+
+  def add_user_advanced_option_types
+    [
       {'fieldName' => 'linuxUsername', 'fieldLabel' => 'Linux Username', 'type' => 'text', 'required' => false, 'displayOrder' => 9},
-      # {'fieldName' => 'linuxPassword', 'fieldLabel' => 'Linux Password', 'type' => 'password', 'required' => false, 'displayOrder' => 10},
-      {'fieldName' => 'windowsUsername', 'fieldLabel' => 'Windows Username', 'type' => 'text', 'required' => false, 'displayOrder' => 11},
-      # {'fieldName' => 'windowsPassword', 'fieldLabel' => 'Windows Password', 'type' => 'text', 'required' => false, 'displayOrder' => 12},
-      #  'linuxUsername','windowsUsername','linuxKeyPairId'
+      {'fieldName' => 'linuxPassword', 'fieldLabel' => 'Linux Password', 'type' => 'password', 'required' => false, 'displayOrder' => 10},
+      {'fieldName' => 'linuxKeyPairId', 'fieldLabel' => 'SSH Key', 'type' => 'select', 'optionSource' => 'keyPairs', 'required' => false, 'displayOrder' => 11},
+      {'fieldName' => 'windowsUsername', 'fieldLabel' => 'Windows Username', 'type' => 'text', 'required' => false, 'displayOrder' => 12},
+      {'fieldName' => 'windowsPassword', 'fieldLabel' => 'Windows Password', 'type' => 'text', 'required' => false, 'displayOrder' => 13},
     ]
   end
 
   def update_user_option_types
     add_user_option_types.collect {|it|
-      it['required'] = false
+      it.delete('required')
+      it.delete('defaultValue')
+      it
+    }
+  end
+
+  def update_user_advanced_option_types
+    add_user_advanced_option_types.collect {|it|
+      it.delete('required')
+      it.delete('defaultValue')
       it
     }
   end
@@ -732,7 +759,7 @@ EOT
 
     if available_roles.empty?
       print_red_alert "No available roles found."
-      return 1
+      exit 1
     end
     role_options = available_roles.collect {|role|
       {'name' => role['authority'], 'value' => role['id']}
@@ -754,30 +781,27 @@ EOT
         print_red_alert "Invalid Roles: #{invalid_role_names.join(', ')}"
         exit 1
       end
-    end
-
-    if roles.empty?
+    else
       no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
-      if !no_prompt
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'roleId', 'fieldLabel' => 'Role', 'type' => 'select', 'selectOptions' => role_options, 'required' => true}], options[:options])
-        role_id = v_prompt['roleId']
-        roles << available_roles.find {|r| r['id'].to_i == role_id.to_i }
-        add_another_role = true
-        while add_another_role do
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'roleId', 'fieldLabel' => 'Another Role', 'type' => 'select', 'selectOptions' => role_options, 'required' => false}], options[:options])
-            if v_prompt['roleId'].to_s.empty?
-              add_another_role = false
-            else
-              role_id = v_prompt['roleId']
-              roles << available_roles.find {|r| r['id'].to_i == role_id.to_i }
-            end
-          end
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'roles', 'fieldLabel' => 'Role', 'type' => 'select', 'selectOptions' => role_options, 'required' => true}], options[:options])
+      role_id = v_prompt['roles']
+      roles << available_roles.find {|r| r['id'].to_i == role_id.to_i }
+      add_another_role = !no_prompt
+      while add_another_role do
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'roles', 'fieldLabel' => 'Another Role', 'type' => 'select', 'selectOptions' => role_options, 'required' => false}], options[:options])
+        if v_prompt['roles'].to_s.empty?
+          add_another_role = false
+        else
+          role_id = v_prompt['roles']
+          roles << available_roles.find {|r| r['id'].to_i == role_id.to_i }
         end
       end
-
-      roles = roles.compact
-      return roles
-
+      
     end
 
+    roles = roles.compact
+    return roles
+
   end
+
+end