morpheus-cli 3.6.8 → 3.6.9

data/lib/morpheus/cli.rb

@@ -65,20 +65,14 @@ module Morpheus
       Dir[File.dirname(__FILE__)  + "/cli/commands/standard/**/*.rb"].each {|file| load file }
 
       # shell scripting commands
-      load 'morpheus/cli/source_command.rb'
-      load 'morpheus/cli/echo_command.rb'
-      load 'morpheus/cli/sleep_command.rb'
-      load 'morpheus/cli/coloring_command.rb'
-      load 'morpheus/cli/log_level_command.rb'
-      load 'morpheus/cli/ssl_verification_command.rb'
-      load 'morpheus/cli/edit_profile_command.rb'
-      load 'morpheus/cli/edit_rc_command.rb'
 
       # all the known commands
       load 'morpheus/cli/remote.rb'
       load 'morpheus/cli/login.rb'
       load 'morpheus/cli/logout.rb'
       load 'morpheus/cli/whoami.rb'
+      # load 'morpheus/cli/auth_command.rb'
+      load 'morpheus/cli/access_token_command.rb'
       load 'morpheus/cli/user_settings_command.rb'
       load 'morpheus/cli/dashboard_command.rb'
       load 'morpheus/cli/power_schedules_command.rb'
@@ -103,9 +97,11 @@ module Morpheus
       load 'morpheus/cli/instance_types.rb'
       load 'morpheus/cli/security_groups.rb'
       load 'morpheus/cli/security_group_rules.rb'
+      load 'morpheus/cli/tenants_command.rb'
       load 'morpheus/cli/accounts.rb'
       load 'morpheus/cli/account_groups_command.rb'
       load 'morpheus/cli/users.rb'
+      load 'morpheus/cli/change_password_command.rb'
       load 'morpheus/cli/user_groups_command.rb'
       load 'morpheus/cli/user_sources_command.rb'
       load 'morpheus/cli/roles.rb'
@@ -120,14 +116,6 @@ module Morpheus
       load 'morpheus/cli/library_container_templates_command.rb'
       load 'morpheus/cli/library_option_types_command.rb'
       load 'morpheus/cli/library_option_lists_command.rb'
-      load 'morpheus/cli/packages_command.rb'
-
-      load 'morpheus/cli/version_command.rb'
-      load 'morpheus/cli/alias_command.rb'
-      # todo: combine checks, incidents, apps, and goups under monitoring?
-      # `monitoring apps|groups` still needed, 
-      # maybe they should go under the apps and groups commands instead?
-      # load 'morpheus/cli/monitoring_command.rb'
       load 'morpheus/cli/monitoring_incidents_command.rb'
       load 'morpheus/cli/monitoring_checks_command.rb'
       load 'morpheus/cli/monitoring_contacts_command.rb'
@@ -142,6 +130,7 @@ module Morpheus
       load 'morpheus/cli/network_domains_command.rb'
       load 'morpheus/cli/network_proxies_command.rb'
       load 'morpheus/cli/cypher_command.rb'
+      load 'morpheus/cli/old_cypher_command.rb'
       load 'morpheus/cli/image_builder_command.rb'
       load 'morpheus/cli/preseed_scripts_command.rb'
       load 'morpheus/cli/boot_scripts_command.rb'
@@ -150,12 +139,7 @@ module Morpheus
       load 'morpheus/cli/execution_request_command.rb'
       load 'morpheus/cli/file_copy_request_command.rb'
       load 'morpheus/cli/processes_command.rb'
-
-      # nice to have commands
-      load 'morpheus/cli/curl_command.rb'
-      load 'morpheus/cli/set_prompt_command.rb'
-      load 'morpheus/cli/man_command.rb' # please implement me
-
+      load 'morpheus/cli/packages_command.rb'
 
       # Your new commands go here...
 

data/lib/morpheus/cli/access_token_command.rb

@@ -0,0 +1,172 @@
+require 'morpheus/cli/cli_command'
+
+# This provides commands for authentication 
+# This also includes credential management.
+class Morpheus::Cli::AccessTokenCommand
+  include Morpheus::Cli::CliCommand
+
+  set_command_name :'access-token'
+  #set_command_name :'access'
+  register_subcommands :get => :print_access_token
+  register_subcommands :details => :details
+  register_subcommands :refresh => :use_refresh_token
+
+  def initialize()
+    # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
+  end
+
+  # connect overridden to skip login and return an exit_code
+  def connect(options)
+    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true}))
+    # automatically get @appliance_name, @appliance_url, @wallet
+    if !@appliance_name
+      unless options[:quiet]
+        print yellow,"Please specify a Morpheus Appliance with -r or see the command `remote use`#{reset}\n"
+      end
+      return 1
+    end
+    if !@appliance_url
+      unless options[:quiet]
+        print red,"Unable to determine remote appliance url. Review your remote configuration.#{reset}\n"
+      end
+      return 1
+    end
+    #@wallet = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
+    if @wallet.nil? || @wallet['access_token'].nil?
+      unless options[:quiet]
+        print_error yellow,"You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}",reset,"\n"
+        print_error yellow,"Use the 'login' command.",reset,"\n"
+      end
+      return 1
+    end
+  end
+
+  def handle(args)
+    if args.empty?
+      print_access_token(args)
+    else
+      handle_subcommand(args)
+    end
+  end
+
+  def details(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:remote, :quiet])
+      opts.footer = "Print your current authentication credentials.\n" +
+                    "This contains tokens that should be kept secret, be careful."
+    end
+    optparse.parse!(args)
+    if args.count != 0
+      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect_result = connect(options)
+    return connect_result if (connect_result.is_a?(Numeric) && connect_result != 0)
+  
+    # could fetch and show whoami info as well eh?
+    # extra api call though..
+
+    #print_h1 "Morpheus Credentials", [display_appliance(@appliance_name, @appliance_url)], options
+    print_h1 "Morpheus Credentials", options
+    description_cols = {
+      "Username" => lambda {|wallet| wallet['username'] },
+      "Remote" => lambda {|wallet| "#{display_appliance(@appliance_name, @appliance_url)}" },
+      "Access Token" => lambda {|wallet| wallet['access_token'] },
+      "Refresh Token" => lambda {|wallet| wallet['refresh_token'] },
+      "Login Date" => lambda {|wallet| format_local_dt(wallet['login_date']) },
+      "Expire Date" => lambda {|wallet| wallet['expire_date'] ? format_local_dt(wallet['expire_date']) : "" },
+    }
+    print cyan
+    puts as_description_list(@wallet, description_cols)
+    print reset
+    return 0
+  end
+
+  def print_access_token(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:remote, :quiet])
+      opts.footer = "Print your current access token.\n" +
+                    "This token should be kept secret. Be careful."
+    end
+    optparse.parse!(args)
+    if args.count != 0
+      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect_result = connect(options)
+    return connect_result if (connect_result.is_a?(Numeric) && connect_result != 0)
+    unless options[:quiet]
+      print cyan
+      puts @wallet['access_token']
+      print reset
+    end
+    return @wallet['access_token'] ? 0 : 1
+  end
+
+  def use_refresh_token(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      build_common_options(opts, options, [:auto_confirm, :remote, :dry_run, :json, :quiet])
+      opts.footer = "Use your refresh token.\n" +
+                    "This will replace your current access and refresh tokens with a new values.\n" +
+                    "Your current access token will be invalidated\n" +
+                    "All other users or applications with access to your token will need to update to the new token."
+    end
+    optparse.parse!(args)
+    if args.count != 0
+      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+
+    connect(options)
+
+    if options[:dry_run]
+      auth_interface = Morpheus::AuthInterface.new(@appliance_url)
+      print_dry_run auth_interface.dry.use_refresh_token(@wallet['refresh_token'])
+      return 0
+    end
+    unless options[:quiet]
+      access_token = @wallet['access_token'].to_s
+      visible_part = access_token[0..7]
+      if visible_part
+        masked_access_token = visible_part + access_token[8..-1].gsub(/[^-]/, '*')
+      else
+        masked_access_token = access_token.gsub(/[^-]/, '*')
+      end
+      print cyan,"#{bold}WARNING!#{reset}#{cyan} You are about to invalidate your current access token '#{masked_access_token}'.",reset,"\n"
+      print cyan, "You will need to update everywhere this token is used.",reset, "\n"
+    end
+    
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to refresh your access token?")
+      return 9, "aborted command"
+    end
+
+    # ok, let's use our refresh token
+    # this regenerates the current access token.
+    refresh_result = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).use_refresh_token(options)
+    new_wallet = refresh_result
+    if options[:json]
+      puts as_json(refresh_result, options)
+      return new_wallet ? 0 : 1
+    end
+    if new_wallet
+      unless options[:quiet]
+        print_green_success "Access token refreshed: #{new_wallet['access_token']}"
+        #print_green_success "Access token refreshed"
+        details([])
+      end
+      return 0
+    else
+      print_red_alert "Failed to use refresh token."
+      return 1
+    end
+  end
+
+  protected
+
+end

data/lib/morpheus/cli/accounts.rb

@@ -10,6 +10,10 @@ require 'json'
 class Morpheus::Cli::Accounts
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
+
+  # deprecated and replaced with tenants, remove soon
+  set_command_hidden
+  
   register_subcommands :list, :count, :get, :add, :update, :remove
   alias_subcommand :details, :get
   set_default_subcommand :list
@@ -29,6 +33,7 @@ class Morpheus::Cli::Accounts
   end
 
   def handle(args)
+    print_error "#{yellow}DEPRECATION WARNING: `morpheus accounts` has been replaced with `morpheus tenants`. Please use `tenants` instead.#{reset}\n"
     handle_subcommand(args)
   end
 

data/lib/morpheus/cli/apps.rb

@@ -5,14 +5,17 @@ require 'optparse'
 require 'filesize'
 require 'table_print'
 require 'morpheus/cli/cli_command'
+require 'morpheus/cli/mixins/accounts_helper'
 require 'morpheus/cli/mixins/provisioning_helper'
 require 'morpheus/cli/mixins/processes_helper'
 
 class Morpheus::Cli::Apps
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::AccountsHelper
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::ProcessesHelper
-
+  set_command_name :apps
+  set_command_description "View and manage apps."
   register_subcommands :list, :get, :add, :update, :remove, :add_instance, :remove_instance, :logs, :firewall_disable, :firewall_enable, :security_groups, :apply_security_groups, :history
   register_subcommands :stop, :start, :restart
   #register_subcommands :validate # add --validate instead
@@ -25,6 +28,8 @@ class Morpheus::Cli::Apps
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
+    @accounts_interface = @api_client.accounts
+    @users_interface = @api_client.users
     @apps_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).apps
     @blueprints_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).blueprints
     @instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instance_types
@@ -44,6 +49,9 @@ class Morpheus::Cli::Apps
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
+        options[:created_by] = val
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List apps."
     end
@@ -57,7 +65,13 @@ class Morpheus::Cli::Apps
     begin
       params = {}
       params.merge!(parse_list_options(options))
-
+      account = nil
+      if options[:created_by]
+        created_by_ids = find_all_user_ids(account ? account['id'] : nil, options[:created_by])
+        return if created_by_ids.nil?
+        params['createdBy'] = created_by_ids
+      end
+      @apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @apps_interface.dry.get(params)
         return
@@ -65,19 +79,25 @@ class Morpheus::Cli::Apps
 
       json_response = @apps_interface.get(params)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-        return
+        puts as_json(json_response, options, "apps")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "apps")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response['apps'], options)
+        return 0
       end
+      
       apps = json_response['apps']
       title = "Morpheus Apps"
       subtitles = []
       subtitles += parse_list_subtitles(options)
-      print_h1 title, subtitles
+      print_h1 title, subtitles, options
       if apps.empty?
         print cyan,"No apps found.",reset,"\n"
       else
-        print_apps_table(apps)
+        print_apps_table(apps, options)
         print_results_pagination(json_response)
       end
       print reset,"\n"
@@ -320,7 +340,8 @@ class Morpheus::Cli::Apps
 
                       #instance_prompt_options[:name_required] = true
                       instance_prompt_options[:instance_type_code] = instance_type_code
-                      
+                      # todo: an effort to render more useful help eg.  -O Web.0.instance.name
+                      instance_prompt_options[:extra_field_context] = "#{tier_name}.#{instance_index}" 
                       # this provisioning helper method handles all (most) of the parsing and prompting
                       instance_config_payload = prompt_new_instance(instance_prompt_options)
                       
@@ -358,7 +379,8 @@ class Morpheus::Cli::Apps
         end
       end
 
-            
+      @apps_interface.setopts(options)
+
       # Validate Only
       if options[:validate_only] == true
         # Validate Only Dry run 
@@ -410,15 +432,9 @@ class Morpheus::Cli::Apps
         end
       end
 
-      # Dry Run?
+      @apps_interface.setopts(options)
       if options[:dry_run]
-        if options[:json]
-          puts as_json(payload, options)
-        elsif options[:yaml]
-          puts as_yaml(payload, options)
-        else
-          print_dry_run @apps_interface.dry.create(payload)
-        end
+        print_dry_run @apps_interface.dry.create(payload)
         return 0
       end
 
@@ -489,6 +505,7 @@ class Morpheus::Cli::Apps
   def _get(arg, options={})
     begin
       app = find_app_by_name_or_id(arg)
+      @apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @apps_interface.dry.get(app['id'])
         return
@@ -499,7 +516,8 @@ class Morpheus::Cli::Apps
       return 0 if render_result
 
       app = json_response['app']
-      print_h1 "App Details"
+      app_tiers = app['appTiers']
+      print_h1 "App Details", [], options
       print cyan
       description_cols = {
         "ID" => 'id',
@@ -508,6 +526,35 @@ class Morpheus::Cli::Apps
         "Blueprint" => lambda {|it| it['blueprint'] ? it['blueprint']['name'] : '' },
         "Group" => lambda {|it| it['group'] ? it['group']['name'] : it['siteId'] },
         "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+        "Tiers" => lambda {|it| 
+          # it['instanceCount']
+          tiers = []
+          app_tiers = it['appTiers'] || []
+          app_tiers.each do |app_tier|
+            tiers << app_tier['tier']
+          end
+          "#{tiers.collect {|it| it.is_a?(Hash) ? it['name'] : it }.join(',')}"
+        },
+        "Instances" => lambda {|it| 
+          # it['instanceCount']
+          instances = []
+          app_tiers = it['appTiers'] || []
+          app_tiers.each do |app_tier|
+            instances += (app_tier['appInstances'] || []).collect {|it| it['instance']}.flatten().compact
+          end
+          #"(#{instances.count})"
+          "(#{instances.count}) #{instances.collect {|it| it['name'] }.join(',')}"
+        },
+        "Containers" => lambda {|it| 
+          #it['containerCount'] 
+          containers = []
+          app_tiers = it['appTiers'] || []
+          app_tiers.each do |app_tier|
+            containers += (app_tier['appInstances'] || []).collect {|it| it['instance']['containers']}.flatten().compact
+          end
+          #"(#{containers.count})"
+          "(#{containers.count}) #{containers.collect {|it| it }.join(',')}"
+        },
         "Status" => lambda {|it| format_app_status(it) }
       }
       if app['blueprint'].nil?
@@ -520,16 +567,16 @@ class Morpheus::Cli::Apps
 
       stats = app['stats']
       if app['instanceCount'].to_i > 0
-        print_h2 "App Usage"
+        print_h2 "App Usage", options
         print_stats_usage(stats, {include: [:memory, :storage]})
       end
 
-      app_tiers = app['appTiers']
       if app_tiers.empty?
         puts yellow, "This app is empty", reset
       else
         app_tiers.each do |app_tier|
-          print_h2 "Tier: #{app_tier['tier']['name']}"
+          # print_h2 "Tier: #{app_tier['tier']['name']}", options
+          print_h2 "#{app_tier['tier']['name']}", options
           print cyan
           instances = (app_tier['appInstances'] || []).collect {|it| it['instance']}
           if instances.empty?
@@ -557,7 +604,7 @@ class Morpheus::Cli::Apps
             end
             instances_rows = instances_rows.sort {|x,y| x[:id] <=> y[:id] } #oldest to newest..
             print cyan
-            print as_pretty_table(instances_rows, [:id, :name, :cloud, :type, :environment, :nodes, :connection, :status])
+            print as_pretty_table(instances_rows, [:id, :name, :cloud, :type, :environment, :nodes, :connection, :status], {border_style: options[:border_style]})
             print reset
             print "\n"
           end
@@ -653,7 +700,7 @@ class Morpheus::Cli::Apps
           payload['group'] = payload['app']['group']
         end
       end
-
+      @apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @apps_interface.dry.update(app["id"], payload)
         return
@@ -722,7 +769,7 @@ class Morpheus::Cli::Apps
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'tier', 'fieldLabel' => 'Tier', 'type' => 'text', 'required' => true, 'description' => 'Enter the name of the tier'}], options[:options])
         payload[:tierName] = v_prompt['tier']
       end
-
+      @apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @apps_interface.dry.add_instance(app['id'], payload)
         return
@@ -754,7 +801,7 @@ class Morpheus::Cli::Apps
       opts.on('--preserve-volumes [on|off]', ['on','off'], "Preserve Volumes. Default is off. Applies to certain types only.") do |val|
         query_params[:preserveVolumes] = val.nil? ? 'on' : val
       end
-      opts.on( '-B', '--keep-backups', "Preserve copy of backups" ) do
+      opts.on( '--keep-backups', '--keep-backups', "Preserve copy of backups" ) do
         query_params[:keepBackups] = 'on'
       end
       opts.on('--releaseEIPs [on|off]', ['on','off'], "Release EIPs. Default is on. Applies to Amazon only.") do |val|
@@ -784,6 +831,7 @@ class Morpheus::Cli::Apps
       if query_params[:preserveVolumes].nil?
         query_params[:removeVolumes] = 'on'
       end
+      @apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @apps_interface.dry.destroy(app['id'], query_params)
         return
@@ -834,7 +882,7 @@ class Morpheus::Cli::Apps
         instance = find_instance_by_name_or_id(v_prompt['instance'])
       end
       payload[:instanceId] = instance['id']
-
+      @apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @apps_interface.dry.remove_instance(app['id'], payload)
         return
@@ -886,6 +934,7 @@ class Morpheus::Cli::Apps
         params[k] = options[k] unless options[k].nil?
       end
       params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      @apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @logs_interface.dry.container_logs(containers, params)
         return
@@ -901,7 +950,7 @@ class Morpheus::Cli::Apps
           subtitles << "Search: #{params[:query]}".strip
         end
         # todo: startMs, endMs, sorts insteaad of sort..etc
-        print_h1 title, subtitles
+        print_h1 title, subtitles, options
         logs['data'].reverse.each do |log_entry|
           log_level = ''
           case log_entry['level']
@@ -956,7 +1005,7 @@ class Morpheus::Cli::Apps
     return 1 if app.nil?
     tier_records = extract_app_tiers(app)
     if options[:dry_run]
-      print_h1 "Dry Run"
+      print_h1 "Dry Run", [], options
     end
     tier_records.each do |tier_record|
       tier_record[:instances].each do |instance|
@@ -1000,7 +1049,7 @@ class Morpheus::Cli::Apps
     return 1 if app.nil?
     tier_records = extract_app_tiers(app)
     if options[:dry_run]
-      print_h1 "Dry Run"
+      print_h1 "Dry Run", [], options
     end
     tier_records.each do |tier_record|
       tier_record[:instances].each do |instance|
@@ -1044,7 +1093,7 @@ class Morpheus::Cli::Apps
     return 1 if app.nil?
     tier_records = extract_app_tiers(app)
     if options[:dry_run]
-      print_h1 "Dry Run"
+      print_h1 "Dry Run", [], options
     end
     tier_records.each do |tier_record|
       tier_record[:instances].each do |instance|
@@ -1075,6 +1124,7 @@ class Morpheus::Cli::Apps
 
     begin
       app = find_app_by_name_or_id(args[0])
+      @apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @apps_interface.dry.firewall_disable(app['id'])
         return
@@ -1103,6 +1153,7 @@ class Morpheus::Cli::Apps
 
     begin
       app = find_app_by_name_or_id(args[0])
+      @apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @apps_interface.dry.firewall_enable(app['id'])
         return
@@ -1131,13 +1182,14 @@ class Morpheus::Cli::Apps
 
     begin
       app = find_app_by_name_or_id(args[0])
+      @apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @apps_interface.dry.security_groups(app['id'])
         return
       end
       json_response = @apps_interface.security_groups(app['id'])
       securityGroups = json_response['securityGroups']
-      print_h1 "Morpheus Security Groups for App: #{app['name']}"
+      print_h1 "Morpheus Security Groups for App: #{app['name']}", options
       print cyan
       print_description_list({"Firewall Enabled" => lambda {|it| format_boolean it['firewallEnabled'] } }, json_response)
       if securityGroups.empty?
@@ -1158,18 +1210,19 @@ class Morpheus::Cli::Apps
 
   def apply_security_groups(args)
     options = {}
+    params = {}
     clear_or_secgroups_specified = false
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[app] [--clear] [-s]")
       opts.on( '-c', '--clear', "Clear all security groups" ) do
-        options[:securityGroupIds] = []
+        params[:securityGroupIds] = []
         clear_or_secgroups_specified = true
       end
       opts.on( '-s', '--secgroups SECGROUPS', "Apply the specified comma separated security group ids" ) do |secgroups|
-        options[:securityGroupIds] = secgroups.split(",")
+        params[:securityGroupIds] = secgroups.split(",")
         clear_or_secgroups_specified = true
       end
-      opts.on( '-h', '--help', "Prints this help" ) do
+      opts.on( '-h', '--help', "Print this help" ) do
         puts opts
         exit
       end
@@ -1191,11 +1244,13 @@ class Morpheus::Cli::Apps
 
     begin
       app = find_app_by_name_or_id(args[0])
+      payload = params
+      @apps_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @apps_interface.dry.apply_security_groups(app['id'], options)
+        print_dry_run @apps_interface.dry.apply_security_groups(app['id'], payload)
         return
       end
-      @apps_interface.apply_security_groups(app['id'], options)
+      @apps_interface.apply_security_groups(app['id'], payloaad)
       security_groups([args[0]])
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -1247,6 +1302,7 @@ class Morpheus::Cli::Apps
       params['instanceIds'] = instance_ids
       params.merge!(parse_list_options(options))
       # params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      @processes_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @processes_interface.dry.list(params)
         return
@@ -1269,7 +1325,7 @@ class Morpheus::Cli::Apps
           subtitles << "Search: #{params[:query]}".strip
         end
         subtitles += parse_list_subtitles(options)
-        print_h1 title, subtitles
+        print_h1 title, subtitles, options
         if json_response['processes'].empty?
           print "#{cyan}No process history found.#{reset}\n\n"
         else