morpheus-cli 3.6.8 → 3.6.9

data/lib/morpheus/cli/error_handler.rb

@@ -35,6 +35,9 @@ class Morpheus::Cli::ErrorHandler
       # @stderr.puts "#{red}#{err.message}#{reset}"
       puts_angry_error err.message
       do_print_stacktrace = false
+      if err.exit_code
+        exit_code = err.exit_code
+      end
       # @stderr.puts "Try -h for help with this command."
     when Morpheus::Cli::ExpressionParser::InvalidExpression
       # @stderr.puts "#{red}#{err.message}#{reset}"
@@ -112,8 +115,15 @@ class Morpheus::Cli::ErrorHandler
         return
       end
       if err.response.code == 400
-        response = JSON.parse(err.response.to_s)
-        print_rest_errors(response, options)
+        begin
+          print_rest_errors(JSON.parse(err.response.to_s), options)
+        rescue TypeError, JSON::ParserError => ex
+        end
+      elsif err.response.code == 404
+        begin
+          print_rest_errors(JSON.parse(err.response.to_s), options)
+        rescue TypeError, JSON::ParserError => ex
+        end
       else
         @stderr.print red, "Error Communicating with the Appliance. #{e}", reset, "\n"
         if options[:json] || options[:debug]

data/lib/morpheus/cli/groups.rb

@@ -36,22 +36,25 @@ class Morpheus::Cli::Groups
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :remote])
-      opts.footer = "This outputs a paginated list of groups."
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List groups (sites)."
     end
     optparse.parse!(args)
     connect(options)
     begin
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
+      params.merge!(parse_list_options(options))
+      @groups_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @groups_interface.get(params)
+        return 0
       end
       json_response = @groups_interface.get(params)
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-        return
-      end
+      render_result = render_with_format(json_response, options, 'groups')
+      return 0 if render_result
+
       groups = json_response['groups']
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
       print_h1 "Morpheus Groups"
       if groups.empty?
         print yellow,"No groups currently configured.",reset,"\n"
@@ -81,8 +84,9 @@ class Morpheus::Cli::Groups
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :remote])
-      opts.footer = "This outputs details about a specific group."
+      build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about a group.\n" + 
+                    "[name] is required. This is the name or id of a group. Supports 1-N arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -90,14 +94,31 @@ class Morpheus::Cli::Groups
       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(arg, options={})
     begin
-      group = find_group_by_name_or_id(args[0])
+      if options[:dry_run]
+        @groups_interface.setopts(options)
+        if arg.to_s =~ /\A\d{1,}\Z/
+          print_dry_run @groups_interface.dry.get(arg.to_i)
+        else
+          print_dry_run @groups_interface.dry.get({name:arg})
+        end
+        return 0
+      end
+      group = find_group_by_name_or_id(arg)
+      @groups_interface.setopts(options)
       #json_response = @groups_interface.get(group['id'])
       json_response = {'group' => group}
-      if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
-        return
-      end
+      
+      render_result = render_with_format(json_response, options)
+      return 0 if render_result
+
       group = json_response['group']
       is_active = @active_group_id && (@active_group_id == group['id'])
       print_h1 "Group Details"
@@ -169,7 +190,7 @@ class Morpheus::Cli::Groups
       params = Morpheus::Cli::OptionTypes.prompt(all_option_types, options[:options], @api_client, {})
       group_payload.merge!(params)
       payload = {group: group_payload}
-
+      @groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @groups_interface.dry.create(payload)
         return
@@ -212,7 +233,7 @@ class Morpheus::Cli::Groups
     connect(options)
     begin
       group = find_group_by_name_or_id(args[0])
-      group_payload = {id: group['id']}
+      group_payload = {}
 
       #params = Morpheus::Cli::OptionTypes.prompt(update_group_option_types, options[:options], @api_client, {})
       params = options[:options] || {}
@@ -225,7 +246,7 @@ class Morpheus::Cli::Groups
       group_payload.merge!(params)
 
       payload = {group: group_payload}
-
+      @groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @groups_interface.dry.update(group['id'], payload)
         return
@@ -268,6 +289,7 @@ class Morpheus::Cli::Groups
       end
       new_zones = current_zones + [{'id' => cloud['id']}]
       payload = {group: {id: group["id"], zones: new_zones}}
+      @groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @groups_interface.dry.update_zones(group["id"], payload)
         return
@@ -311,6 +333,7 @@ class Morpheus::Cli::Groups
       end
       new_zones = current_zones.reject {|it| it["id"] == cloud["id"] }
       payload = {group: {id: group["id"], zones: new_zones}}
+      @groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @groups_interface.dry.update_zones(group["id"], payload)
         return
@@ -350,6 +373,7 @@ class Morpheus::Cli::Groups
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the group #{group['name']}?")
         exit
       end
+      @groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @groups_interface.dry.destroy(group['id'])
         return
@@ -439,7 +463,7 @@ class Morpheus::Cli::Groups
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [])
-      opts.footer = "Prints the name of the current active group"
+      opts.footer = "Print the name of the current active group"
     end
     optparse.parse!(args)
     connect(options)

data/lib/morpheus/cli/hosts.rb

@@ -12,6 +12,8 @@ class Morpheus::Cli::Hosts
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
   include Morpheus::Cli::ProvisioningHelper
+  set_command_name :hosts
+  set_command_description "View and manage hosts (servers)."
   register_subcommands :list, :count, :get, :stats, :add, :update, :remove, :logs, :start, :stop, :resize, :run_workflow, {:'make-managed' => :install_agent}, :upgrade_agent, :server_types
   register_subcommands :exec => :execution_request
   alias_subcommand :details, :get
@@ -23,6 +25,8 @@ class Morpheus::Cli::Hosts
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
+    @accounts_interface = @api_client.accounts
+    @users_interface = @api_client.users
     @clouds_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).clouds
     @options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
     @tasks_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).tasks
@@ -89,12 +93,16 @@ class Morpheus::Cli::Hosts
       opts.on( '', '--noagent', "Show only Servers with No agent" ) do |val|
         params[:agentInstalled] = false
       end
+      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 hosts."
     end
     optparse.parse!(args)
     connect(options)
     begin
+      params.merge!(parse_list_options(options))
       account = nil
       if options[:account]
         account = find_account_by_name_or_id(options[:account])
@@ -116,8 +124,13 @@ class Morpheus::Cli::Hosts
         params['zoneId'] = cloud['id']
       end
 
-      params.merge!(parse_list_options(options))
+      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
 
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.list(params)
         return
@@ -154,7 +167,7 @@ class Morpheus::Cli::Hosts
           subtitles << "Cloud: #{cloud['name']}".strip
         end
         subtitles += parse_list_subtitles(options)
-        print_h1 title, subtitles
+        print_h1 title, subtitles, options
         if servers.empty?
           print yellow,"No hosts found.",reset,"\n"
         else
@@ -233,6 +246,7 @@ class Morpheus::Cli::Hosts
     begin
       params = {}
       params.merge!(parse_list_options(options))
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.list(params)
         return
@@ -281,14 +295,14 @@ class Morpheus::Cli::Hosts
     begin
       if options[:dry_run]
         if arg.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @servers_interface.dry.get(arg.to_i)
+          print_dry_run @servers_interface.setopts(options).get(arg.to_i)
         else
-          print_dry_run @servers_interface.dry.list({name: arg})
+          print_dry_run @servers_interface.setopts(options).list({name: arg})
         end
         return
       end
       server = find_host_by_name_or_id(arg)
-      json_response = @servers_interface.get(server['id'])
+      json_response = @servers_interface.setopts(options).get(server['id'])
       if options[:json]
         json_response.delete('stats') if options[:include_fields]
         puts as_json(json_response, options, "server")
@@ -306,7 +320,7 @@ class Morpheus::Cli::Hosts
       #stats = server['stats'] || json_response['stats'] || {}
       stats = json_response['stats'] || {}
       title = "Host Details"
-      print_h1 title
+      print_h1 title, [], options
       print cyan
       print_description_list({
         "ID" => 'id',
@@ -324,7 +338,7 @@ class Morpheus::Cli::Hosts
         "Power" => lambda {|it| format_server_power_state(it) },
       }, server)
       
-      print_h2 "Host Usage"
+      print_h2 "Host Usage", options
       print_stats_usage(stats)
       print reset, "\n"
 
@@ -372,14 +386,14 @@ class Morpheus::Cli::Hosts
     begin
       if options[:dry_run]
         if arg.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @servers_interface.dry.get(arg.to_i)
+          print_dry_run @servers_interface.setopts(options).get(arg.to_i)
         else
-          print_dry_run @servers_interface.dry.list({name: arg})
+          print_dry_run @servers_interface.setopts(options).list({name: arg})
         end
         return
       end
       server = find_host_by_name_or_id(arg)
-      json_response = @servers_interface.get(server['id'])
+      json_response = @servers_interface.setopts(options).get(server['id'])
       if options[:json]
         puts as_json(json_response, options, "stats")
         return 0
@@ -394,11 +408,11 @@ class Morpheus::Cli::Hosts
       #stats = server['stats'] || json_response['stats'] || {}
       stats = json_response['stats'] || {}
       title = "Host Stats: #{server['name']} (#{server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged'})"
-      print_h1 title
+      print_h1 title, [], options
       puts cyan + "Power: ".rjust(12) + format_server_power_state(server).to_s
       puts cyan + "Status: ".rjust(12) + format_host_status(server).to_s
       puts cyan + "Nodes: ".rjust(12) + (server['containers'] ? server['containers'].size : '').to_s
-      #print_h2 "Host Usage"
+      #print_h2 "Host Usage", options
       print_stats_usage(stats, {label_width: 10})
 
       print reset, "\n"
@@ -428,6 +442,7 @@ class Morpheus::Cli::Hosts
         params[k] = options[k] unless options[k].nil?
       end
       params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      @logs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @logs_interface.dry.server_logs([server['id']], params)
         return
@@ -443,7 +458,7 @@ class Morpheus::Cli::Hosts
           subtitles << "Search: #{params[:query]}".strip
         end
         # todo: startMs, endMs, sorts insteaad of sort..etc
-        print_h1 title, subtitles
+        print_h1 title, subtitles, options
         if logs['data'].empty?
           output << "#{cyan}No logs found.#{reset}\n"
         else
@@ -495,7 +510,7 @@ class Morpheus::Cli::Hosts
       print JSON.pretty_generate(cloud_server_types)
       print "\n"
     else
-      print_h1 "Morpheus Server Types - Cloud: #{zone['name']}"
+      print_h1 "Morpheus Server Types - Cloud: #{zone['name']}", [], options
       if cloud_server_types.nil? || cloud_server_types.empty?
         print yellow,"No server types found for the selected cloud",reset,"\n"
       else
@@ -660,6 +675,7 @@ class Morpheus::Cli::Hosts
         payload.deep_merge!(params)
         
       end
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.create(payload)
         return
@@ -733,6 +749,7 @@ class Morpheus::Cli::Hosts
         payload['server'] = params
       end
 
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.update(server["id"], payload)
         return
@@ -789,6 +806,7 @@ class Morpheus::Cli::Hosts
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the server '#{server['name']}'?", options)
         exit 1
       end
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.destroy(server['id'], query_params)
         return
@@ -833,6 +851,7 @@ class Morpheus::Cli::Hosts
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to start #{objects_label}?", options)
         return 9, "aborted command"
       end
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.start(hosts.collect {|it| it['id'] })
         return
@@ -877,6 +896,7 @@ class Morpheus::Cli::Hosts
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop #{objects_label}?", options)
         return 9, "aborted command"
       end
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.stop(hosts.collect {|it| it['id'] })
         return
@@ -968,7 +988,7 @@ class Morpheus::Cli::Hosts
       # only amazon supports this option
       # for now, always do this
       payload[:deleteOriginalVolumes] = true
-
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.resize(server['id'], payload)
         return
@@ -1021,7 +1041,7 @@ class Morpheus::Cli::Hosts
         payload['server']['account'] = {id: account}
       end
       payload['server'].merge!(params)
-
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.install_agent(host['id'], payload)
         return
@@ -1055,6 +1075,7 @@ class Morpheus::Cli::Hosts
     connect(options)
     begin
       host = find_host_by_name_or_id(args[0])
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.upgrade(host['id'])
         return
@@ -1134,6 +1155,7 @@ class Morpheus::Cli::Hosts
     end
 
     begin
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @servers_interface.dry.workflow(host['id'],workflow['id'], payload)
         return
@@ -1209,6 +1231,7 @@ class Morpheus::Cli::Hosts
         payload['script'] = script_content
       end
       # dry run?
+      @servers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execution_request_interface.dry.create(params, payload)
         return 0

data/lib/morpheus/cli/instances.rb

@@ -4,15 +4,18 @@ 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'
 require 'morpheus/cli/option_types'
 
 class Morpheus::Cli::Instances
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::AccountsHelper
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::ProcessesHelper
-
+  set_command_name :instances
+  set_command_description "View and manage instances."
   register_subcommands :list, :count, :get, :add, :update, :update_notes, :remove, :logs, :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}, :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :backup, :backups, :stop_service, :start_service, :restart_service, :resize, :clone, :envs, :setenv, :delenv, :security_groups, :apply_security_groups, :firewall_enable, :firewall_disable, :run_workflow, :import_snapshot, :console, :status_check, {:containers => :list_containers}, :scaling, {:'scaling-update' => :scaling_update}
   register_subcommands :exec => :execution_request
   # register_subcommands {:'lb-update' => :load_balancer_update}
@@ -25,6 +28,8 @@ class Morpheus::Cli::Instances
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
+    @accounts_interface = @api_client.accounts
+    @users_interface = @api_client.users
     @instances_interface = @api_client.instances
     @task_sets_interface = @api_client.task_sets
     @logs_interface = @api_client.logs
@@ -55,6 +60,9 @@ class Morpheus::Cli::Instances
       opts.on( '-H', '--host HOST', "Host Name or ID" ) do |val|
         options[:host] = val
       end
+      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 instances."
     end
@@ -62,6 +70,7 @@ class Morpheus::Cli::Instances
     connect(options)
     begin
       params = {}
+      params.merge!(parse_list_options(options))
       group = options[:group] ? find_group_by_name_or_id_for_provisioning(options[:group]) : nil
       if group
         params['siteId'] = group['id']
@@ -79,11 +88,17 @@ class Morpheus::Cli::Instances
         params['serverId'] = host['id']
       end
 
-      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
 
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.list(params)
-        return
+        return 0
       end
       json_response = @instances_interface.list(params)
       if options[:json]
@@ -117,8 +132,11 @@ class Morpheus::Cli::Instances
         if host
           subtitles << "Host: #{host['name']}".strip
         end
+        if options[:created_by]
+          subtitles << "Created By: #{options[:created_by]}"
+        end
         subtitles += parse_list_subtitles(options)
-        print_h1 title, subtitles
+        print_h1 title, subtitles, options
         if instances.empty?
           print yellow,"No instances found.",reset,"\n"
         else
@@ -191,6 +209,7 @@ class Morpheus::Cli::Instances
     begin
       params = {}
       params.merge!(parse_list_options(options))
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.list(params)
         return
@@ -331,7 +350,7 @@ class Morpheus::Cli::Instances
         lb_payload = prompt_instance_load_balancer(payload['instance'], nil, options)
         payload.deep_merge!(lb_payload)
       end
-
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.create(payload)
         return 0
@@ -443,7 +462,7 @@ class Morpheus::Cli::Instances
         payload = {}
         payload['instance'] = params
       end
-
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.update(instance["id"], payload)
         return
@@ -519,7 +538,7 @@ class Morpheus::Cli::Instances
         payload = {}
         payload['instance'] = params
       end
-
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.update_notes(instance["id"], payload)
         return
@@ -595,6 +614,7 @@ class Morpheus::Cli::Instances
   def _stats(arg, options)
     begin
       instance = find_instance_by_name_or_id(arg)
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.get(instance['id'])
         return 0
@@ -610,11 +630,11 @@ class Morpheus::Cli::Instances
       instance = json_response['instance']
       stats = instance['stats'] || json_response['stats'] || {}
       title = "Instance Stats: #{instance['name']} (#{instance['instanceType']['name']})"
-      print_h1 title
+      print_h1 title, [], options
       puts cyan + "Status: ".rjust(12) + format_instance_status(instance).to_s
       puts cyan + "Nodes: ".rjust(12) + (instance['containers'] ? instance['containers'].count : '').to_s
       # print "\n"
-      #print_h2 "Instance Usage"
+      #print_h2 "Instance Usage", options
       print_stats_usage(stats)
       print reset, "\n"
     rescue RestClient::Exception => e
@@ -684,6 +704,7 @@ class Morpheus::Cli::Instances
       params = {}
       params.merge!(parse_list_options(options))
       params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      @logs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @logs_interface.dry.container_logs(container_ids, params)
         return
@@ -700,7 +721,7 @@ class Morpheus::Cli::Instances
           subtitles << "Search: #{params[:query]}".strip
         end
         # todo: startMs, endMs, sorts insteaad of sort..etc
-        print_h1 title, subtitles
+        print_h1 title, subtitles, options
         if logs['data'].empty?
           puts "#{cyan}No logs found.#{reset}"
         else
@@ -761,7 +782,7 @@ class Morpheus::Cli::Instances
       # opts.on( nil, '--lb', "Display Load Balancer Details" ) do
       #   options[:include_lb] = true
       # end
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Get details about an instance.\n" + 
                     "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
@@ -780,6 +801,7 @@ class Morpheus::Cli::Instances
   def _get(arg, options={})
     begin
       if options[:dry_run]
+        @instances_interface.setopts(options)
         if arg.to_s =~ /\A\d{1,}\Z/
           print_dry_run @instances_interface.dry.get(arg.to_i)
         else
@@ -788,7 +810,11 @@ class Morpheus::Cli::Instances
         return
       end
       instance = find_instance_by_name_or_id(arg)
+      @instances_interface.setopts(options)
       json_response = @instances_interface.get(instance['id'])
+      if options[:quiet]
+        return 0
+      end
       if options[:json]
         puts as_json(json_response, options, "instance")
         return 0
@@ -830,7 +856,7 @@ class Morpheus::Cli::Instances
         #current_load_balancer = current_instance_lb['loadBalancer']
       end
 
-      print_h1 "Instance Details"
+      print_h1 "Instance Details", [], options
       print cyan
       description_cols = {
         "ID" => 'id',
@@ -856,7 +882,7 @@ class Morpheus::Cli::Instances
       print_description_list(description_cols, instance)
 
       if instance['statusMessage']
-        print_h2 "Status Message"
+        print_h2 "Status Message", options
         if instance['status'] == 'failed'
           print red, instance['statusMessage'], reset
         else
@@ -865,22 +891,22 @@ class Morpheus::Cli::Instances
         print "\n"
       end
       if instance['errorMessage']
-        print_h2 "Error Message"
+        print_h2 "Error Message", options
         print red, instance['errorMessage'], reset, "\n"
       end
       if !instance['notes'].to_s.empty?
-        print_h2 "Instance Notes"
+        print_h2 "Instance Notes", options
         print cyan, instance['notes'], reset, "\n"
       end
       if stats
-        print_h2 "Instance Usage"
+        print_h2 "Instance Usage", options
         print_stats_usage(stats)
       end
       print reset, "\n"
 
       # if options[:include_lb]
       if current_instance_lb
-        print_h2 "Load Balancer"
+        print_h2 "Load Balancer", options
         print cyan
         description_cols = {
           "LB ID" => lambda {|it| it['loadBalancer']['id'] },
@@ -900,7 +926,7 @@ class Morpheus::Cli::Instances
       # end
 
       if options[:include_containers]
-        print_h2 "Instance Containers"
+        print_h2 "Instance Containers", options
 
         if containers.empty?
           print yellow,"No containers found for instance.",reset,"\n"
@@ -942,7 +968,7 @@ class Morpheus::Cli::Instances
       end
 
       if options[:include_scaling]
-        print_h2 "Instance Scaling"
+        print_h2 "Instance Scaling", options
         if instance_threshold.nil? || instance_threshold.empty?
           print yellow,"No scaling settings applied to this instance.",reset,"\n"
         else
@@ -995,6 +1021,7 @@ class Morpheus::Cli::Instances
     begin
       instance = find_instance_by_name_or_id(arg)
       return 1 if instance.nil?
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.containers(instance['id'], params)
         return
@@ -1017,7 +1044,7 @@ class Morpheus::Cli::Instances
       containers = json_response['containers']
       containers = containers.sort { |x,y| x['id'] <=> y['id'] }
       title = "Instance Containers: #{instance['name']} (#{instance['instanceType']['name']})"
-      print_h1 title
+      print_h1 title, [], options
       if containers.empty?
         print yellow,"No containers found for instance.",reset,"\n"
       else
@@ -1077,6 +1104,7 @@ class Morpheus::Cli::Instances
     begin
       instance = find_instance_by_name_or_id(args[0])
       params = {}
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.backups(instance['id'], params)
         return
@@ -1089,7 +1117,7 @@ class Morpheus::Cli::Instances
       
       if json_response['backups'] && json_response['backups'][0] && json_response['backups'][0]['backupResults']
         # new format
-        print_h1 "Instance Backups: #{instance['name']} (#{instance['instanceType']['name']})"
+        print_h1 "Instance Backups: #{instance['name']} (#{instance['instanceType']['name']})", [], options
 
 
         backup = json_response['backups'][0]
@@ -1117,7 +1145,7 @@ class Morpheus::Cli::Instances
           {id: it['id'], startDate: format_local_dt(it['dateCreated']), duration: format_duration_milliseconds(it['durationMillis']), 
             size: format_bytes(it['sizeInMb'], 'MB'), status: status_str }
         }
-        print_h1 "Backup Results"
+        print_h1 "Backup Results", [], options
         print cyan
         puts as_pretty_table backup_rows, [
           :id,
@@ -1129,11 +1157,11 @@ class Morpheus::Cli::Instances
         print reset, "\n"
       elsif json_response['backups'].size == 0
         # no backup configured
-        print_h1 "Instance Backups: #{instance['name']} (#{instance['instanceType']['name']})"
+        print_h1 "Instance Backups: #{instance['name']} (#{instance['instanceType']['name']})", [], options
         print "#{yellow}No backups configured#{reset}\n\n"
       else
         # old format
-        print_h1 "Instance Backups: #{instance['name']} (#{instance['instanceType']['name']})"
+        print_h1 "Instance Backups: #{instance['name']} (#{instance['instanceType']['name']})", [], options
         backups = json_response['backups']
         backup_rows = backups.collect {|r| 
           it = r['backup']
@@ -1202,7 +1230,7 @@ class Morpheus::Cli::Instances
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to clone the instance '#{instance['name']}'?", options)
         exit 1
       end
-      
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.clone(instance['id'], payload)
         return
@@ -1235,6 +1263,7 @@ class Morpheus::Cli::Instances
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.get_envs(instance['id'])
         return
@@ -1244,14 +1273,14 @@ class Morpheus::Cli::Instances
         puts as_json(json_response, options)
         return
       end
-      print_h1 "Instance Envs: #{instance['name']} (#{instance['instanceType']['name']})"
+      print_h1 "Instance Envs: #{instance['name']} (#{instance['instanceType']['name']})", [], options
       print cyan
       envs = json_response['envs'] || {}
       if json_response['readOnlyEnvs']
         envs += json_response['readOnlyEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") || v['masked'] ? "********" : v['value'], :export => true}}
       end
       tp envs, :name, :value, :export
-      print_h2 "Imported Envs"
+      print_h2 "Imported Envs", options
       imported_envs = json_response['importedEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") || v['masked'] ? "********" : v['value']}}
       tp imported_envs
       print reset, "\n"
@@ -1284,6 +1313,7 @@ class Morpheus::Cli::Instances
       instance = find_instance_by_name_or_id(args[0])
       evar = {name: args[1], value: args[2], export: options[:export], masked: options[:masked]}
       payload = {envs: [evar]}
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.create_env(instance['id'], payload)
         return
@@ -1316,6 +1346,7 @@ class Morpheus::Cli::Instances
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.del_env(instance['id'], args[1])
         return
@@ -1367,10 +1398,11 @@ class Morpheus::Cli::Instances
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
         return 9, "aborted command"
       end
+      @instances_interface.setopts(options)
       if options[:dry_run]
-        print_h1 "DRY RUN"
+        print_h1 "DRY RUN", [], options
         instances.each do |instance|
-          print_dry_run @instances_interface.dry.stop(instance['id'], params), false
+          print_dry_run @instances_interface.dry.stop(instance['id'], params)
         end
         return 0
       end
@@ -1427,10 +1459,11 @@ class Morpheus::Cli::Instances
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to start #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
         return 9, "aborted command"
       end
+      @instances_interface.setopts(options)
       if options[:dry_run]
-        print_h1 "DRY RUN"
+        print_h1 "DRY RUN", [], options
         instances.each do |instance|
-          print_dry_run @instances_interface.dry.start(instance['id'], params), false
+          print_dry_run @instances_interface.dry.start(instance['id'], params)
         end
         return 0
       end
@@ -1493,10 +1526,11 @@ class Morpheus::Cli::Instances
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
         return 9, "aborted command"
       end
+      @instances_interface.setopts(options)
       if options[:dry_run]
-        print_h1 "DRY RUN"
+        print_h1 "DRY RUN", [], options
         instances.each do |instance|
-          print_dry_run @instances_interface.dry.restart(instance['id'], params), false
+          print_dry_run @instances_interface.dry.restart(instance['id'], params)
         end
         return 0
       end
@@ -1555,7 +1589,7 @@ class Morpheus::Cli::Instances
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to suspend #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
         return 9, "aborted command"
       end
-
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.suspend(instances.collect {|it| it['id'] }, params)
         return
@@ -1603,6 +1637,7 @@ class Morpheus::Cli::Instances
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to eject #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
         return 9, "aborted command"
       end
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.eject(instances.collect {|it| it['id'] }, params)
         return
@@ -1657,10 +1692,11 @@ class Morpheus::Cli::Instances
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to stop service on #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
         return 9, "aborted command"
       end
+      @instances_interface.setopts(options)
       if options[:dry_run]
-        print_h1 "DRY RUN"
+        print_h1 "DRY RUN", [], options
         instances.each do |instance|
-          print_dry_run @instances_interface.dry.stop(instance['id'], params), false
+          print_dry_run @instances_interface.dry.stop(instance['id'], params)
         end
         return 0
       end
@@ -1717,10 +1753,11 @@ class Morpheus::Cli::Instances
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to start service on #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
         return 9, "aborted command"
       end
+      @instances_interface.setopts(options)
       if options[:dry_run]
-        print_h1 "DRY RUN"
+        print_h1 "DRY RUN", [], options
         instances.each do |instance|
-          print_dry_run @instances_interface.dry.start(instance['id'], params), false
+          print_dry_run @instances_interface.dry.start(instance['id'], params)
         end
         return 0
       end
@@ -1783,10 +1820,11 @@ class Morpheus::Cli::Instances
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to restart service on #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
         return 9, "aborted command"
       end
+      @instances_interface.setopts(options)
       if options[:dry_run]
-        print_h1 "DRY RUN"
+        print_h1 "DRY RUN", [], options
         instances.each do |instance|
-          print_dry_run @instances_interface.dry.restart(instance['id'], params), false
+          print_dry_run @instances_interface.dry.restart(instance['id'], params)
         end
         return 0
       end
@@ -1847,6 +1885,7 @@ class Morpheus::Cli::Instances
     instance_ids = instances.collect {|instance| instance["id"] }
     begin
       # instance = find_instance_by_name_or_id(args[0])
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.available_actions(instance_ids)
         return 0
@@ -1856,7 +1895,7 @@ class Morpheus::Cli::Instances
         puts as_json(json_response, options)
       else
         title = "Instance Actions: #{anded_list(id_list)}"
-        print_h1 title
+        print_h1 title, [], options
         available_actions = json_response["actions"]
         if (available_actions && available_actions.size > 0)
           print as_pretty_table(available_actions, [:name, :code])
@@ -1908,7 +1947,7 @@ class Morpheus::Cli::Instances
     instance_ids = instances.collect {|instance| instance["id"] }
 
     # figure out what action to run
-    available_actions = @instances_interface.available_actions(instance_ids)["actions"]
+    available_actions = @instances_interface.available_actions(instance_ids, options)["actions"]
     if available_actions.empty?
       if instance_ids.size > 1
         print_red_alert "The specified instances have no available actions in common."
@@ -1941,6 +1980,7 @@ class Morpheus::Cli::Instances
     # return run_command_for_each_arg(containers) do |arg|
     #   _action(arg, action_id, options)
     # end
+    @instances_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @instances_interface.dry.action(instance_ids, action_id)
       return 0
@@ -1988,7 +2028,7 @@ class Morpheus::Cli::Instances
       puts "\nDue to limitations by most Guest Operating Systems, Disk sizes can only be expanded and not reduced.\nIf a smaller plan is selected, memory and CPU (if relevant) will be reduced but storage will not.\n\n"
 
       # prompt for service plan
-      service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, siteId: group_id, layoutId: layout_id})
+      service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, siteId: group_id, layoutId: layout_id}, options)
       service_plans = service_plans_json["plans"]
       service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"]} } # already sorted
       service_plans_dropdown.each do |plan|
@@ -2003,7 +2043,7 @@ class Morpheus::Cli::Instances
       #payload[:servicePlanId] = new_plan_id
       payload[:instance][:plan] = {id: service_plan["id"]}
 
-      volumes_response = @instances_interface.volumes(instance['id'])
+      volumes_response = @instances_interface.volumes(instance['id'], options)
       current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
 
       # prompt for volumes
@@ -2015,7 +2055,7 @@ class Morpheus::Cli::Instances
       # only amazon supports this option
       # for now, always do this
       payload[:deleteOriginalVolumes] = true
-
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.resize(instance['id'], payload)
         return
@@ -2051,6 +2091,7 @@ class Morpheus::Cli::Instances
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to backup the instance '#{instance['name']}'?", options)
         exit 1
       end
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.backup(instance['id'])
         return
@@ -2117,6 +2158,7 @@ class Morpheus::Cli::Instances
       if query_params[:preserveVolumes].nil?
         query_params[:removeVolumes] = 'on'
       end
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.destroy(instance['id'],query_params)
         return
@@ -2149,6 +2191,7 @@ class Morpheus::Cli::Instances
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.firewall_disable(instance['id'])
         return
@@ -2180,6 +2223,7 @@ class Morpheus::Cli::Instances
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.firewall_enable(instance['id'])
         return
@@ -2211,6 +2255,7 @@ class Morpheus::Cli::Instances
     connect(options)
     begin
       instance = find_instance_by_name_or_id(args[0])
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.security_groups(instance['id'])
         return
@@ -2221,7 +2266,7 @@ class Morpheus::Cli::Instances
         return
       end
       securityGroups = json_response['securityGroups']
-      print_h1 "Morpheus Security Groups for Instance: #{instance['name']}"
+      print_h1 "Morpheus Security Groups for Instance: #{instance['name']}", [], options
       print cyan
       print_description_list({"Firewall Enabled" => lambda {|it| format_boolean it['firewallEnabled'] } }, json_response)
       #print cyan, "Firewall Enabled=#{json_response['firewallEnabled']}\n\n"
@@ -2271,6 +2316,7 @@ class Morpheus::Cli::Instances
     begin
       instance = find_instance_by_name_or_id(args[0])
       payload = {securityGroupIds: security_group_ids}
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.apply_security_groups(instance['id'], payload)
         return
@@ -2329,6 +2375,7 @@ class Morpheus::Cli::Instances
 
     workflow_payload = {taskSet: {"#{workflow['id']}" => params }}
     begin
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.workflow(instance['id'],workflow['id'], workflow_payload)
         return
@@ -2384,7 +2431,7 @@ class Morpheus::Cli::Instances
         #print_rest_exception(e, options)
         exit 1
       end
-
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.import_snapshot(instance['id'], payload)
         return
@@ -2405,6 +2452,7 @@ class Morpheus::Cli::Instances
 
   def scaling(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
@@ -2426,11 +2474,12 @@ class Morpheus::Cli::Instances
   def _scaling(arg, options)
     instance = find_instance_by_name_or_id(arg)
     return 1 if instance.nil?
+    @instances_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @instances_interface.dry.threshold(instance['id'], params)
       return 0
     end
-    json_response = @instances_interface.threshold(instance['id'])
+    json_response = @instances_interface.threshold(instance['id'], params)
     if options[:json]
       puts as_json(json_response, options, "instanceThreshold")
       return 0
@@ -2445,11 +2494,11 @@ class Morpheus::Cli::Instances
     instance_threshold = json_response['instanceThreshold']
 
     title = "Instance Scaling: [#{instance['id']}] #{instance['name']} (#{instance['instanceType']['name']})"
-    print_h1 title
+    print_h1 title, [], options
     if instance_threshold.empty?
       print yellow,"No scaling settings applied to this instance.",reset,"\n"
     else
-      # print_h1 "Threshold Settings"
+      # print_h1 "Threshold Settings", [], options
       print cyan
       print_instance_threshold_description_list(instance_threshold)
     end
@@ -2561,7 +2610,7 @@ class Morpheus::Cli::Instances
       # unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to update the scaling settings for instance '#{instance['name']}'?", options)
       #   return 9, "aborted command"
       # end
-      
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.update_threshold(instance['id'], payload)
         return
@@ -2643,7 +2692,7 @@ class Morpheus::Cli::Instances
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to update the load balancer for instance '#{instance['name']}'?", options)
         return 9, "aborted command"
       end
-      
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.update_load_balancer(instance['id'], payload)
         return
@@ -2694,7 +2743,7 @@ class Morpheus::Cli::Instances
       
       # no options here, just send DELETE request
       payload = {}
-
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.remove_load_balancer(instance['id'], payload)
         return
@@ -2760,6 +2809,7 @@ class Morpheus::Cli::Instances
       params = {}
       params.merge!(parse_list_options(options))
       # params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.history(instance['id'], params)
         return
@@ -2782,7 +2832,7 @@ class Morpheus::Cli::Instances
           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
@@ -2892,6 +2942,7 @@ class Morpheus::Cli::Instances
       params = {}
       params.merge!(parse_list_options(options))
       params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.history_details(instance['id'], process_id, params)
         return
@@ -2912,10 +2963,10 @@ class Morpheus::Cli::Instances
         subtitles = []
         subtitles << " Process ID: #{process_id}"
         subtitles += parse_list_subtitles(options)
-        print_h1 title, subtitles
+        print_h1 title, subtitles, options
         print_process_details(process)
   
-        print_h2 "Process Events"
+        print_h2 "Process Events", options
         process_events = process['events'] || process['processEvents'] || []
         history_records = []
         if process_events.empty?
@@ -2991,6 +3042,7 @@ class Morpheus::Cli::Instances
       instance = find_instance_by_name_or_id(args[0])
       params = {}
       params.merge!(parse_list_options(options))
+      @instances_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instances_interface.dry.history_event_details(instance['id'], process_event_id, params)
         return
@@ -3010,7 +3062,7 @@ class Morpheus::Cli::Instances
         title = "Instance History Event"
         subtitles = []
         subtitles += parse_list_subtitles(options)
-        print_h1 title, subtitles
+        print_h1 title, subtitles, options
         print_process_event_details(process_event)
         print reset, "\n"
         return 0
@@ -3074,7 +3126,7 @@ class Morpheus::Cli::Instances
         end
         payload['script'] = script_content
       end
-      # dry run?
+      @execution_request_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @execution_request_interface.dry.create(params, payload)
         return 0
@@ -3345,14 +3397,14 @@ private
     print_description_list(description_cols, process)
 
     if process['error']
-      print_h2 "Error"
+      print_h2 "Error", options
       print reset
       #puts format_process_error(process_event)
       puts process['error'].to_s.strip
     end
 
     if process['output']
-      print_h2 "Output"
+      print_h2 "Output", options
       print reset
       #puts format_process_error(process_event)
       puts process['output'].to_s.strip
@@ -3376,14 +3428,14 @@ private
     print_description_list(description_cols, process_event)
 
     if process_event['error']
-      print_h2 "Error"
+      print_h2 "Error", options
       print reset
       #puts format_process_error(process_event)
       puts process_event['error'].to_s.strip
     end
 
     if process_event['output']
-      print_h2 "Output"
+      print_h2 "Output", options
       print reset
       #puts format_process_error(process_event)
       puts process_event['output'].to_s.strip