morpheus-cli 3.1.2.1 → 3.2.0

data/lib/morpheus/cli/monitoring_incidents_command.rb

@@ -5,14 +5,9 @@ class Morpheus::Cli::MonitoringIncidentsCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::MonitoringHelper
 
-  set_command_name :incidents  # :'monitoring-incidents'
-  register_subcommands :list, :stats, :get, :history, :notifications, :update, :close, :reopen, :quarantine
-  set_default_subcommand :list
+  set_command_name :'monitor-incidents'
+  register_subcommands :list, :stats, :get, :history, :notifications, :update, :close, :reopen, :mute, :unmute
   
-  def initialize()
-    # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-  end
-
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @monitoring_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).monitoring
@@ -33,7 +28,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       opts.on('--severity LIST', Array, "Filter by severity. critical, warning, info") do |list|
         params['severity'] = list
       end
-      build_common_options(opts, options, [:list, :last_updated, :json, :csv, :fields, :json, :dry_run])
+      build_common_options(opts, options, [:list, :last_updated, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
@@ -41,27 +36,26 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
-      # JD: lastUpdated 500ing, incidents don't have that property ? =o  Fix it!
-
       if options[:dry_run]
         print_dry_run @monitoring_interface.incidents.dry.list(params)
         return
       end
-
       json_response = @monitoring_interface.incidents.list(params)
+      if options[:include_fields]
+        json_response = {"incidents" => filter_data(json_response["incidents"], options[:include_fields]) }
+      end
       if options[:json]
-        if options[:include_fields]
-          json_response = {"incidents" => filter_data(json_response["incidents"], options[:include_fields]) }
-        end
         puts as_json(json_response, options)
         return 0
-      end
-      if options[:csv]
+      elsif options[:yaml]
+        puts as_yaml(json_response, options)
+        return 0
+      elsif options[:csv]
         puts records_as_csv(json_response['incidents'], options)
         return 0
       end
       incidents = json_response['incidents']
-      title = "Morpheus Incidents"
+      title = "Morpheus Monitoring Incidents"
       subtitles = []
       # if group
       #   subtitles << "Group: #{group['name']}".strip
@@ -104,7 +98,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       opts.on( '-o', '--offset OFFSET', "Offset open incidents results for pagination." ) do |offset|
         options[:offset] = offset.to_i.abs
       end
-      build_common_options(opts, options, [:json, :fields, :json, :dry_run])
+      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
@@ -186,7 +180,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       opts.on(nil,'--notifications', "Display Incident Notifications") do |val|
         options[:show_notifications] = true
       end
-      build_common_options(opts, options, [:json, :csv, :fields, :dry_run, :remote])
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -211,14 +205,17 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       json_response = @monitoring_interface.incidents.get(incident['id'])
       incident = json_response['incident']
       
+      if options[:include_fields]
+        json_response = {"incident" => filter_data(json_response["incident"], options[:include_fields]) }
+      end
       if options[:json]
-        if options[:include_fields]
-          json_response = {"incident" => filter_data(json_response["incident"], options[:include_fields]) }
-        end
         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([json_response['incident']], options)
+        puts records_as_csv(json_response['incident'], options)
         return 0
       end
 
@@ -232,6 +229,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
         "End" => lambda {|it| format_local_dt(it['endDate']) },
         "Duration" => lambda {|it| format_duration(it['startDate'], it['endDate']) },
         "Status" => lambda {|it| format_monitoring_issue_status(it) },
+        "Muted" => lambda {|it| it['inUptime'] ? 'No' : 'Yes' },
         "Visibility" => 'visibility',
         "Last Check" => lambda {|it| format_local_dt(it['lastCheckTime']) },
         "Last Error" => lambda {|it| it['lastError'] },
@@ -302,13 +300,10 @@ class Morpheus::Cli::MonitoringIncidentsCommand
     params = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[id] [options]")
-      # opts.on('--status LIST', Array, "Filter by status. open, closed") do |list|
-      #   params['status'] = list
-      # end
       opts.on('--severity LIST', Array, "Filter by severity. critical, warning, info") do |list|
         params['severity'] = list
       end
-      build_common_options(opts, options, [:list, :last_updated, :json, :csv, :fields, :json, :dry_run])
+      build_common_options(opts, options, [:list, :last_updated, :json, :csv, :fields, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -366,7 +361,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[id] [options]")
-      build_common_options(opts, options, [:list, :json, :csv, :fields, :json, :dry_run])
+      build_common_options(opts, options, [:list, :json, :csv, :fields, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -505,55 +500,92 @@ class Morpheus::Cli::MonitoringIncidentsCommand
   end
 
 
-  def quarantine(args)
+  def mute(args)
     options = {}
     params = {'enabled' => true}
-    optparse = OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[id list]")
-      # this one is a bit weird.. it's a way to toggle incident.inUptime
-      # opts.on("--enabled BOOL", String, "Quarantine can be removed with --enabled false") do |val|
-      #   params['enabled'] = ['on','true'].include?(val.to_s.downcase)
-      # end
-      opts.on("-d", "--disabled", "Disable Quarantine instead") do
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      opts.on(nil, "--disable", "Disable mute state instead, the same as unmute") do
         params['enabled'] = false
       end
-      build_common_options(opts, options, [:json, :dry_run, :quiet])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
+      opts.footer = "Mute an incident." + "\n" +
+                    "[id] is required. This is the id of an incident."
     end
     optparse.parse!(args)
-    if args.count < 1
+    if args.count != 1
       puts optparse
-      exit 1
+      return 1
     end
     connect(options)
-
     begin
       incident = find_incident_by_id(args[0])
-
-      if params.empty?
-        print_red_alert "Specify atleast one option to update"
-        puts optparse
-        exit 1
+      # construct payload
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+      else
+        payload = params
+      end
+      if options[:dry_run]
+        print_dry_run @monitoring_interface.incidents.dry.quarantine(incident["id"], payload)
+        return 0
+      end
+      json_response = @monitoring_interface.incidents.quarantine(incident["id"], payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      elsif !options[:quiet]
+        if params['enabled']
+          print_green_success "Muted incident #{incident['id']}"
+        else
+          print_green_success "Unmuted incident #{incident['id']}"
+        end
+        _get(incident['id'], {})
       end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
 
-      # payload = {
-      #   'incident' => {id: incident["id"]}
-      # }
-      # payload['incident'].merge!(params)
-      payload = params
+  def unmute(args)
+    options = {}
+    params = {'enabled' => false}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      build_common_options(opts, options, [:payload, :json, :dry_run, :quiet, :remote])
+      opts.footer = "Unmute an incident." + "\n" +
+                    "[id] is required. This is the id of an incident."
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      puts optparse
+      return 1
+    end
+    connect(options)
 
+    begin
+      incident = find_incident_by_id(args[0])
+      # construct payload
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+      else
+        payload = params
+      end
       if options[:dry_run]
-        print_dry_run @monitoring_interface.incidents.dry.update(incident["id"], payload)
-        return
+        print_dry_run @monitoring_interface.incidents.dry.quarantine(incident["id"], payload)
+        return 0
       end
-
-      json_response = @monitoring_interface.incidents.update(incident["id"], payload)
+      json_response = @monitoring_interface.incidents.quarantine(incident["id"], payload)
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
-        print_green_success "Quarantined incident #{incident['id']}"
+        print_green_success "Unmuted incident #{incident['id']}"
         _get(incident['id'], {})
       end
-
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/remote.rb

@@ -555,6 +555,8 @@ EOT
     end
     print_green_success "Deleted remote #{appliance_name}"
     list([])
+    # recalcuate echo vars
+    Morpheus::Cli::Echo.recalculate_variable_map()
     # recalculate shell prompt after this change
     if Morpheus::Cli::Shell.instance
       Morpheus::Cli::Shell.instance.reinitialize()
@@ -595,6 +597,8 @@ EOT
     appliance[:active] = true
     appliance = ::Morpheus::Cli::Remote.save_remote(appliance_name, appliance)
     
+    # recalcuate echo vars
+    Morpheus::Cli::Echo.recalculate_variable_map()
     # recalculate shell prompt after this change
     if Morpheus::Cli::Shell.instance
       Morpheus::Cli::Shell.instance.reinitialize()
@@ -623,6 +627,8 @@ EOT
     end
     Morpheus::Cli::Remote.clear_active_appliance()
     puts "You are no longer using the appliance #{@appliance_name}"
+    # recalcuate echo vars
+    Morpheus::Cli::Echo.recalculate_variable_map()
     # recalculate shell prompt after this change
     if Morpheus::Cli::Shell.instance
       Morpheus::Cli::Shell.instance.reinitialize()

data/lib/morpheus/cli/roles.rb

@@ -151,7 +151,7 @@ class Morpheus::Cli::Roles
         print cyan
         description_cols = {
           "ID" => 'id',
-          "Name" => 'name',
+          "Name" => 'authority',
           "Description" => 'description',
           "Scope" => lambda {|it| it['scope'] },
           "Type" => lambda {|it| format_role_type(it) },

data/lib/morpheus/cli/set_prompt_command.rb

@@ -43,6 +43,7 @@ EOT
     self.my_terminal.prompt = args[0]
     # Morpheus::Terminal.instance.prompt = args[0]
     Morpheus::Cli::Shell.instance.recalculate_prompt()
+    # Morpheus::Cli::Echo.recalculate_variable_map()
 
     return true
   end

data/lib/morpheus/cli/shell.rb

@@ -63,14 +63,15 @@ class Morpheus::Cli::Shell
     #@prompt = Morpheus::Terminal.instance.prompt.to_s #.dup
     @prompt = my_terminal.prompt
 
-    var_map = {
-      '%cyan' => cyan, '%magenta' => magenta, '%reset' => reset, '%dark' => dark,
-      '%remote' => @appliance_name.to_s, '%username' => @current_username.to_s, 
-      '%remote_url' => @appliance_url.to_s
-    }
+    variable_map = Morpheus::Cli::Echo.variable_map
+    # variable_map = {
+    #   '%cyan' => cyan, '%magenta' => magenta, '%red' => red, '%mgreen' => green, '%yellow' => yellow, '%dark' => dark, '%reset' => reset,
+    #   '%remote' => @appliance_name.to_s, '%remote_url' => @appliance_url.to_s, 
+    #   '%username' => @current_username.to_s
+    # }
     @calculated_prompt = @prompt.to_s.dup
-    var_map.each do |var_key, var_value|
-      @calculated_prompt.gsub!(var_key.to_s, var_value.to_s)
+    variable_map.each do |k, v|
+      @calculated_prompt.gsub!(k.to_s, v.to_s)
     end
     # cleanup empty brackets caused by var value
     @calculated_prompt = @calculated_prompt.gsub("[]", "").gsub("<>", "").gsub("{}", "")
@@ -237,11 +238,19 @@ class Morpheus::Cli::Shell
         n_commands = input.sub(/^history\s?/, '').sub(/\-n\s?/, '')
         n_commands = n_commands.empty? ? 25 : n_commands.to_i
         cmd_numbers = @history.keys.last(n_commands)
-        puts "Last #{cmd_numbers.size} commands"
+        if cmd_numbers.size == 1
+          puts "Last command"
+        else
+          puts "Last #{cmd_numbers.size} commands"
+        end
         cmd_numbers.each do |cmd_number|
           cmd = @history[cmd_number]
           puts "#{cmd_number.to_s.rjust(3, ' ')}  #{cmd}"
         end
+        last_cmd = cmd_numbers.last ? @history[cmd_numbers.last] : nil
+        if input != last_cmd # no consecutive
+          log_history_command(input)
+        end
         return 0
       elsif input == 'clear'
         print "\e[H\e[2J"

data/lib/morpheus/cli/user_groups_command.rb

@@ -0,0 +1,574 @@
+require 'morpheus/cli/cli_command'
+require 'morpheus/cli/mixins/accounts_helper'
+
+class Morpheus::Cli::UserGroupsCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::AccountsHelper
+
+  set_command_name :'user-groups'
+  register_subcommands :list, :get, :add, :update, :remove
+  register_subcommands :'add-user' => :add_user
+  register_subcommands :'remove-user' => :remove_user
+  
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @user_groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).user_groups
+    @users_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).users
+    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
+  end
+
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def list(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
+        params[k] = options[k] unless options[k].nil?
+      end
+
+      if options[:dry_run]
+        print_dry_run @user_groups_interface.dry.list(nil, params)
+        return
+      end
+
+      json_response = @user_groups_interface.list(nil, params)
+      if options[:include_fields]
+        json_response = {"userGroups" => filter_data(json_response["userGroups"], options[:include_fields]) }
+      end
+      if options[:json]
+        puts as_json(json_response, options)
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response['userGroups'], options)
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options)
+        return 0
+      end
+      user_groups = json_response['userGroups']
+      title = "Morpheus User Groups"
+      subtitles = []
+      # if group
+      #   subtitles << "Group: #{group['name']}".strip
+      # end
+      # if cloud
+      #   subtitles << "Cloud: #{cloud['name']}".strip
+      # end
+      if params[:phrase]
+        subtitles << "Search: #{params[:phrase]}".strip
+      end
+      print_h1 title, subtitles
+      if user_groups.empty?
+        print cyan,"No user groups found.",reset,"\n"
+      else
+        print_user_groups_table(user_groups, options)
+        print_results_pagination(json_response, {:label => "user group", :n_label => "user groups"})
+        # print_results_pagination(json_response)
+      end
+      print reset,"\n"
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+  
+  def get(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, options)
+    end
+  end
+
+  def _get(id, options)
+
+    begin
+      user_group = find_user_group_by_name_or_id(nil, id)
+      if user_group.nil?
+        return 1
+      end
+      if options[:dry_run]
+        print_dry_run @user_groups_interface.dry.get(nil, user_group['id'])
+        return
+      end
+      json_response = @user_groups_interface.get(nil, user_group['id'])
+      user_group = json_response['userGroup']
+      users = user_group['users'] || []
+      if options[:include_fields]
+        json_response = {"userGroup" => filter_data(json_response["userGroup"], options[:include_fields]) }
+      end
+      if options[:json]
+        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([json_response['userGroup']], options)
+        return 0
+      end
+
+      print_h1 "User Group Details"
+      print cyan
+      description_cols = {
+        "ID" => lambda {|it| it['id'] },
+        #"Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+        "Name" => lambda {|it| it['name'] },
+        "Description" => lambda {|it| it['description'] },
+        "Server Group" => lambda {|it| it['serverGroup'] },
+        "Sudo Access" => lambda {|it| format_boolean it['sudoAccess'] },
+        # "Shared User" => lambda {|it| format_boolean it['sharedUser'] },
+        "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+        "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+      }
+      print_description_list(description_cols, user_group)
+
+      ## Users
+      if users.size == 1
+        print_h2 "User (1)"
+      else
+        print_h2 "Users (#{users.size})"
+      end
+      if users.size == 0
+        print yellow,"No users",reset,"\n"
+      else
+        user_columns = [
+          {"ID" => lambda {|user| user['id'] } },
+          {"USERNAME" => lambda {|user| user['username'] } },
+          {"NAME" => lambda {|user| user['displayName'] } },
+        ]
+        print as_pretty_table(users, user_columns)
+      end
+
+      print reset,"\n"
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def add(args)
+    options = {}
+    params = {}
+    user_ids = nil
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      opts.on('--name VALUE', String, "Name") do |val|
+        params['name'] = val
+      end
+      opts.on('--description VALUE', String, "Description") do |val|
+        params['description'] = val
+      end
+      opts.on('--sudoUser [on|off]', String, "Sudo Access") do |val|
+        params['sudoUser'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
+      end
+      opts.on('--serverGroup VALUE', String, "Server Group") do |val|
+        params['name'] = val
+      end
+      opts.on('--users LIST', Array, "Users to include in this group, comma separated list of IDs or usernames") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          user_ids = []
+        else
+          user_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
+      opts.footer = "Create a new user group." + "\n" +
+                    "[name] is required and can be passed as --name instead."
+    end
+    optparse.parse!(args)
+    if args.count > 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 0-1 and got #{args.count}\n#{optparse}"
+      return 1
+    end
+    # support [name] as first argument
+    if args[0]
+      params['name'] = args[0]
+    end
+    connect(options)
+    begin
+      # construct payload
+      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]
+        users = []
+        if user_ids
+          user_ids.each do |user_id|
+            user = find_user_by_username_or_id(nil, user_id)
+            return 1 if user.nil?
+            users << user
+          end
+          params['users'] = users.collect {|it| it['id'] }
+        end
+        # todo: prompt?
+        payload = {'userGroup' => params}
+      end
+      if options[:dry_run]
+        print_dry_run @user_groups_interface.dry.create(nil, payload)
+        return
+      end
+      json_response = @user_groups_interface.create(nil, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      elsif !options[:quiet]
+        user_group = json_response['userGroup']
+        print_green_success "Added user group #{user_group['name']}"
+        _get(user_group['id'], {})
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+
+  def update(args)
+    options = {}
+    params = {}
+    user_ids = nil
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      opts.on('--name VALUE', String, "Name for this user group") do |val|
+        params['name'] = val
+      end
+      opts.on('--description VALUE', String, "Description") do |val|
+        params['description'] = val
+      end
+      opts.on('--sudoUser [on|off]', String, "Sudo Access. Default is off.") do |val|
+        params['sudoUser'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
+      end
+      opts.on('--users LIST', Array, "Users to include in this group, comma separated list of IDs or usernames") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          user_ids = []
+        else
+          user_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
+      opts.footer = "Update a user group." + "\n" +
+                    "[name] is required. This is the name or id of a user group."
+    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}"
+      return 1
+    end
+    connect(options)
+    begin
+      user_group = find_user_group_by_name_or_id(nil, args[0])
+      if user_group.nil?
+        return 1
+      end
+      # construct payload
+      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]
+        if user_ids
+          users = []
+          user_ids.each do |user_id|
+            user = find_user_by_username_or_id(nil, user_id)
+            return 1 if user.nil?
+            users << user
+          end
+          params['users'] = users.collect {|it| it['id'] }
+        else
+          # prevent server from clearing this!
+          params['users'] = user_group['users'] #.collect {|it| it['id'] }
+        end
+        # todo: prompt?
+        payload = {'userGroup' => params}
+      end
+      if options[:dry_run]
+        print_dry_run @user_groups_interface.dry.update(nil, user_group["id"], payload)
+        return
+      end
+      json_response = @user_groups_interface.update(nil, user_group["id"], payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      elsif !options[:quiet]
+        print_green_success "Updated user group #{user_group['name']}"
+        _get(user_group['id'], {})
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def add_user(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name] [user]")
+      build_common_options(opts, options, [:json, :dry_run, :remote, :quiet])
+      opts.footer = "Add a user to a user group.\n" +
+                    "[name] is required. This is the name or id of a user group.\n" +
+                    "[user] is required. This is the username or id of a user. More than one can be passed."
+    end
+    optparse.parse!(args)
+    if args.count < 2
+      puts optparse
+      return 1
+    end
+    connect(options)
+    begin
+      user_group = find_user_group_by_name_or_id(nil, args[0])
+      if user_group.nil?
+        return 1
+      end
+      
+
+      # construct payload
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+      else
+        user_ids = args[1..-1]
+        users = []
+        user_ids.each do |user_id|
+          user = find_user_by_username_or_id(nil, user_id)
+          return 1 if user.nil?
+          users << user
+        end
+        add_user_ids = users.collect {|it| it['id'] }
+        current_users = (user_group['users'] || [])
+        current_user_ids = current_users.collect {|it| it['id'] }
+        new_user_ids = (current_user_ids + add_user_ids).uniq
+        user_group_payload = {} # user_group
+        user_group_payload['users'] = new_user_ids
+        payload = {'userGroup' => user_group_payload}
+      end
+      if options[:dry_run]
+        print_dry_run @user_groups_interface.dry.update(nil, user_group["id"], payload)
+        return 0
+      end
+      json_response = @user_groups_interface.update(nil, user_group["id"], payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      elsif !options[:quiet]
+        if users.size == 1
+            print_green_success  "Added #{users[0]['username']} to user group #{user_group['name']}"
+          else
+            print_green_success "Added #{users.size} users to user group #{user_group['name']}"
+          end
+        _get(user_group['id'], {})
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove_user(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name] [user]")
+      build_common_options(opts, options, [:json, :dry_run, :remote, :quiet])
+      opts.footer = "Remove a user from a user group.\n" +
+                    "[name] is required. This is the name or id of a user group.\n" +
+                    "[user] is required. This is the username or id of a user. More than one can be passed."
+    end
+    optparse.parse!(args)
+    if args.count < 2
+      puts optparse
+      return 1
+    end
+    connect(options)
+    begin
+      user_group = find_user_group_by_name_or_id(nil, args[0])
+      if user_group.nil?
+        return 1
+      end
+
+      # construct payload
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+      else
+        user_ids = args[1..-1]
+        users = []
+        user_ids.each do |user_id|
+          user = find_user_by_username_or_id(nil, user_id)
+          return 1 if user.nil?
+          users << user
+        end
+        remove_user_ids = users.collect {|it| it['id'] }
+        current_users = (user_group['users'] || [])
+        current_user_ids = current_users.collect {|it| it['id'] }
+        new_user_ids = (current_user_ids - remove_user_ids).uniq
+        user_group_payload = {} # user_group
+        user_group_payload['users'] = new_user_ids
+        payload = {'userGroup' => user_group_payload}
+      end
+      if options[:dry_run]
+        print_dry_run @user_groups_interface.dry.update(nil, user_group["id"], payload)
+        return 0
+      end
+      json_response = @user_groups_interface.update(nil, user_group["id"], payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      elsif !options[:quiet]
+        if users.size == 1
+            print_green_success  "Added #{users[0]['username']} to user group #{user_group['name']}"
+          else
+            print_green_success "Added #{users.size} users to user group #{user_group['name']}"
+          end
+        _get(user_group['id'], {})
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      build_common_options(opts, options, [:json, :dry_run, :quiet, :auto_confirm])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      return 127
+    end
+    connect(options)
+
+    begin
+      user_group = find_user_group_by_name_or_id(nil, args[0])
+      if user_group.nil?
+        return 1
+      end
+
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to delete user group '#{user_group['name']}'?", options)
+        return false
+      end
+
+      # payload = {
+      #   'userGroup' => {id: user_group["id"]}
+      # }
+      # payload['userGroup'].merge!(user_group)
+      payload = params
+
+      if options[:dry_run]
+        print_dry_run @user_groups_interface.dry.destroy(nil, user_group["id"])
+        return
+      end
+
+      json_response = @user_groups_interface.destroy(nil, user_group["id"])
+      if options[:json]
+        puts as_json(json_response, options)
+      elsif !options[:quiet]
+        print_green_success "Deleted user group #{user_group['name']}"
+      end
+      return 0, nil
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+
+  private
+
+  def print_user_groups_table(user_groups, opts={})
+    columns = [
+      {"ID" => lambda {|user_group| user_group['id'] } },
+      {"NAME" => lambda {|user_group| user_group['name'] } },
+      {"DESCRIPTION" => lambda {|user_group| user_group['description'] } },
+      {"USERS" => lambda {|user_group| 
+        users = user_group['users']
+        if users
+          n_users = 3
+          if users.size > n_users
+            users.first(n_users).collect { |user| user['username'] }.join(", ") + ", (#{users.size - n_users} more)"
+          else
+            users.collect { |user| user['username'] }.join(", ")
+          end
+        else
+          ""
+        end
+      } },
+      # {"KEY PAIR" => lambda {|user_group| 
+      #   user_group['keyPair'] ? user_group['keyPair']['name'] : user_group['sharedKeyPairId']
+      # } },
+      # {"SUDO" => lambda {|user_group| format_boolean(user_group['sudoUser']) } },
+    ]
+    if opts[:include_fields]
+      columns = opts[:include_fields]
+    end
+    print as_pretty_table(user_groups, columns, opts)
+  end
+
+  def find_user_group_by_name_or_id(account_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_user_group_by_id(account_id, val)
+    else
+      return find_user_group_by_name(account_id, val)
+    end
+  end
+
+  def find_user_group_by_id(account_id, id)
+    begin
+      json_response = @user_groups_interface.get(account_id, id.to_i)
+      return json_response['userGroup']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "User Group not found by id #{id}"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_user_group_by_name(account_id, name)
+    user_groups = @user_groups_interface.list(account_id, {name: name.to_s})['userGroups']
+    if user_groups.empty?
+      print_red_alert "User Group not found by name #{name}"
+      return nil
+    elsif user_groups.size > 1
+      print_red_alert "#{user_groups.size} user groups found by name #{name}"
+      print_user_groups_table(user_groups, {color: red})
+      print_red_alert "Try using ID instead"
+      print reset,"\n"
+      return nil
+    else
+      return user_groups[0]
+    end
+  end
+
+end