morpheus-cli 3.6.9 → 3.6.11

data/lib/morpheus/cli/processes_command.rb

@@ -37,6 +37,14 @@ class Morpheus::Cli::Processes
       opts.on( nil, '--output', "Display process output." ) do
         options[:show_output] = true
       end
+      opts.on(nil, '--details', "Display all details. Includes sub processes, output and error data is not truncated." ) do
+        options[:show_events] = true
+        options[:show_output] = true
+        options[:details] = true
+      end
+      opts.on('--app ID', String, "Limit results to specific app(s).") do |val|
+        params['appIds'] = val.split(',').collect {|it| it.to_s.strip }.reject { |it| it.empty? }
+      end
       opts.on('--instance ID', String, "Limit results to specific instance(s).") do |val|
         params['instanceIds'] = val.split(',').collect {|it| it.to_s.strip }.reject { |it| it.empty? }
       end
@@ -103,8 +111,8 @@ class Morpheus::Cli::Processes
               startDate: format_local_dt(process['startDate']),
               duration: format_process_duration(process),
               status: format_process_status(process),
-              error: format_process_error(process),
-              output: format_process_output(process)
+              error: format_process_error(process, options[:details] ? nil : 20),
+              output: format_process_output(process, options[:details] ? nil : 20)
             }
             history_records << row
             process_events = process['events'] || process['processEvents']
@@ -122,8 +130,8 @@ class Morpheus::Cli::Processes
                     startDate: format_local_dt(process_event['startDate']),
                     duration: format_process_duration(process_event),
                     status: format_process_status(process_event),
-                    error: format_process_error(process_event),
-                    output: format_process_output(process_event)
+                    error: format_process_error(process_event, options[:details] ? nil : 20),
+                    output: format_process_output(process_event, options[:details] ? nil : 20)
                   }
                   history_records << event_row
                 end
@@ -177,6 +185,9 @@ class Morpheus::Cli::Processes
     process_id = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
+      opts.on(nil, '--details', "Display more details. Shows everything, untruncated." ) do
+        options[:details] = true
+      end
       build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Display details for a specific process.\n"
                     "[id] is required. This is the id of the process."
@@ -233,8 +244,8 @@ class Morpheus::Cli::Processes
                     startDate: format_local_dt(process_event['startDate']),
                     duration: format_process_duration(process_event),
                     status: format_process_status(process_event),
-                    error: format_process_error(process_event),
-                    output: format_process_output(process_event)
+                    error: format_process_error(process_event, options[:details] ? nil : 20),
+                    output: format_process_output(process_event, options[:details] ? nil : 20)
                   }
             history_records << event_row
           end

data/lib/morpheus/cli/recent_activity_command.rb

@@ -45,6 +45,7 @@ class Morpheus::Cli::RecentActivityCommand
       account_id = account ? account['id'] : nil
       params = {}
       params.merge!(parse_list_options(options))
+      @dashboard_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @dashboard_interface.dry.recent_activity(account_id, params)
         return

data/lib/morpheus/cli/remote.rb

@@ -786,6 +786,7 @@ EOT
       payload.merge!(v_prompt)
 
       begin
+        @setup_interface.setopts(options)
         if options[:dry_run]
           print_dry_run @setup_interface.dry.init(payload)
           return

data/lib/morpheus/cli/roles.rb

@@ -48,7 +48,7 @@ class Morpheus::Cli::Roles
       
       params = {}
       params.merge!(parse_list_options(options))
-
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.list(account_id, params), options
         return
@@ -125,6 +125,7 @@ class Morpheus::Cli::Roles
     begin
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
+      @roles_interface.setopts(options)
       if options[:dry_run]
         if args[0].to_s =~ /\A\d{1,}\Z/
           print_dry_run @roles_interface.dry.get(account_id, args[0].to_i)
@@ -344,7 +345,7 @@ class Morpheus::Cli::Roles
       end
 
       payload = {role: role_payload}
-
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.create(account_id, payload)
         return
@@ -432,6 +433,7 @@ class Morpheus::Cli::Roles
         role_payload['multitenant'] = ['on','true'].include?(params['multitenant'].to_s)
       end
       payload = {role: role_payload}
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update(account_id, role['id'], payload)
         return
@@ -481,6 +483,7 @@ class Morpheus::Cli::Roles
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the role #{role['authority']}?")
         exit
       end
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.destroy(account_id, role['id'])
         return
@@ -528,6 +531,7 @@ class Morpheus::Cli::Roles
       exit 1 if role.nil?
 
       params = {permissionCode: permission_code, access: access_value}
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_permission(account_id, role['id'], params)
         return
@@ -574,6 +578,7 @@ class Morpheus::Cli::Roles
       exit 1 if role.nil?
 
       params = {permissionCode: 'ComputeSite', access: access_value}
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_permission(account_id, role['id'], params)
         return
@@ -669,7 +674,7 @@ class Morpheus::Cli::Roles
         params['groupId'] = group_id
       end
       params['access'] = access_value
-      
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_group(account_id, role['id'], params)
         return
@@ -721,6 +726,7 @@ class Morpheus::Cli::Roles
       exit 1 if role.nil?
 
       params = {permissionCode: 'ComputeZone', access: access_value}
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_permission(account_id, role['id'], params)
         return
@@ -831,6 +837,7 @@ class Morpheus::Cli::Roles
         params['cloudId'] = cloud_id
       end
       params['access'] = access_value
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_cloud(account_id, role['id'], params)
         return
@@ -883,6 +890,7 @@ class Morpheus::Cli::Roles
       exit 1 if role.nil?
 
       params = {permissionCode: 'InstanceType', access: access_value}
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_permission(account_id, role['id'], params)
         return
@@ -974,7 +982,7 @@ class Morpheus::Cli::Roles
         params['instanceTypeId'] = instance_type['id']
       end
       params['access'] = access_value
-
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_instance_type(account_id, role['id'], params)
         return
@@ -1027,6 +1035,7 @@ class Morpheus::Cli::Roles
       exit 1 if role.nil?
 
       params = {permissionCode: 'AppTemplate', access: access_value}
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_permission(account_id, role['id'], params)
         return
@@ -1130,7 +1139,7 @@ class Morpheus::Cli::Roles
         # params['blueprintId'] = blueprint['id']
       end
       params['access'] = access_value
-
+      @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update_blueprint(account_id, role['id'], params)
         return

data/lib/morpheus/cli/security_group_rules.rb

@@ -36,7 +36,7 @@ EOT
       opts.on( '-s', '--secgroup SECGROUP', "Security Group ID (Use will use security as set with 'security-groups use id'" ) do |id|
         security_group_id = id
       end
-      build_common_options(opts, options, [:json, :dry_run])
+      build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -64,6 +64,7 @@ EOT
     }
     connect(options)
     begin
+      @security_group_rules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @security_group_rules_interface.dry.create(security_group_id, params)
         return
@@ -95,7 +96,7 @@ EOT
       opts.on( '-s', '--secgroup secgroup', "Security Group ID (Use will use security as set with 'security-groups use id'" ) do |id|
         security_group_id = id
       end
-      build_common_options(opts, options, [:json, :dry_run])
+      build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 2
@@ -119,6 +120,7 @@ EOT
     }
     connect(options)
     begin
+      @security_group_rules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @security_group_rules_interface.dry.create(security_group_id, params)
         return
@@ -141,7 +143,7 @@ EOT
     security_group_id = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
-      build_common_options(opts, options, [:json, :dry_run])
+      build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
     security_group_id = args[0]
@@ -156,6 +158,7 @@ EOT
     connect(options)
     begin
       params = {}
+      @security_group_rules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @security_group_rules_interface.dry.get(security_group_id, params)
         return
@@ -191,7 +194,7 @@ EOT
       opts.on( '-s', '--secgroup secgroup', "Security Group ID (Use will use security as set with 'security-groups use id'" ) do |id|
         security_group_id = id
       end
-      build_common_options(opts, options, [:json, :dry_run])
+      build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -208,6 +211,7 @@ EOT
     end
     connect(options)
     begin
+      @security_group_rules_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @security_group_rules_interface.dry.delete(security_group_id, args[0])
         return

data/lib/morpheus/cli/security_groups.rb

@@ -34,6 +34,7 @@ class Morpheus::Cli::SecurityGroups
     begin
       params = {}
       params.merge!(parse_list_options(options))
+      @security_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @security_groups_interface.dry.list(params)
         return
@@ -110,6 +111,7 @@ class Morpheus::Cli::SecurityGroups
     end
     connect(options)
     begin
+      @security_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @security_groups_interface.dry.get({id: args[0]})
         return
@@ -155,6 +157,7 @@ class Morpheus::Cli::SecurityGroups
     params[:securityGroup][:name] = args[0]
     connect(options)
     begin
+      @security_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @security_groups_interface.dry.create(params)
         return
@@ -191,6 +194,7 @@ class Morpheus::Cli::SecurityGroups
         puts "Security Group not found by id #{args[0]}"
         return
       end
+      @security_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @security_groups_interface.dry.delete(security_group['id'])
         return

data/lib/morpheus/cli/shell.rb

@@ -90,7 +90,7 @@ class Morpheus::Cli::Shell
 
   def recalculate_auto_complete_commands
     @morpheus_commands = Morpheus::Cli::CliRegistry.all.keys.reject {|k| [:shell].include?(k) }
-    @shell_commands = [:clear, :history, :reload!, :help, :exit]
+    @shell_commands = [:clear, :history, :reload, :help, :exit]
     @alias_commands = Morpheus::Cli::CliRegistry.all_aliases.keys
     @exploded_commands = []
     Morpheus::Cli::CliRegistry.all.each do |cmd, klass|
@@ -247,7 +247,7 @@ class Morpheus::Cli::Shell
   # logging is skipped for certain commands: exit, !,  !!
   def execute(input)
     result = execute_commands_as_expression(input)
-    unless input.strip.empty? || (["exit", "history"].include?(input.strip)) || input.strip[0].to_s.chr == "!"
+    unless input.strip.empty? || (["exit"].include?(input.strip)) || input.strip[0].to_s.chr == "!"
       log_history_command(input.strip)
     end
     return result
@@ -661,31 +661,25 @@ class Morpheus::Cli::Shell
   def log_history_command(cmd)
     @history ||= {}
     @last_command_number ||= 0
+    previous_cmd = @history[@last_command_number]
+    # skip logging consecutive history commands.
+    if previous_cmd && previous_cmd =~ /history/ && previous_cmd == cmd
+      return @last_command_number
+    end
     @last_command_number += 1
     @history[@last_command_number] = cmd
     if @history_logger
       @history_logger.info "#{@current_username}@#{@appliance_name} -- : (cmd #{@last_command_number}) #{cmd}"
     end
+    return @last_command_number
   end
 
   def last_command(n=25)
-    return list_history_commands(max:1)[0]
-  end
-
-  # list the N most recent commands, sorted oldest -> newest
-  # todo: support sort and order options..
-  def list_history_commands(options={})
-    history_records = []
-    max = options[:max] ? options[:max].to_i : 25
-    max = 50
-    load_history_from_log_file if !@history
-    cmd_numbers = @history.keys.last(max.to_i)
-    history_records = cmd_numbers.collect { |cmd_number| {command_number: cmd_number, command: @history[cmd_number]} }
-    last_cmd = cmd_numbers.last ? @history[cmd_numbers.last] : nil
-    # if input != last_cmd # no consecutive
-    #   log_history_command(input)
-    # end
-    return history_records
+    if @history && @last_command_number
+      @history[@last_command_number]
+    else
+      nil
+    end
   end
 
   def print_history(n)
@@ -703,10 +697,6 @@ class Morpheus::Cli::Shell
       puts "#{cmd_number.to_s.rjust(3, ' ')}  #{cmd}"
     end
     print reset
-    #last_cmd = cmd_numbers.last ? @history[cmd_numbers.last] : nil
-    # if input != last_cmd # no consecutive
-    #   log_history_command(input)
-    # end
     return 0
   end
 

data/lib/morpheus/cli/storage_providers_command.rb

@@ -57,6 +57,7 @@ class Morpheus::Cli::StorageProvidersCommand
     connect(options)
     begin
       params.merge!(parse_list_options(options))
+      @storage_providers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @storage_providers_interface.dry.list(params)
         return
@@ -126,6 +127,7 @@ class Morpheus::Cli::StorageProvidersCommand
     end
     connect(options)
     begin
+      @storage_providers_interface.setopts(options)
       if options[:dry_run]
         if args[0].to_s =~ /\A\d{1,}\Z/
           print_dry_run @storage_providers_interface.dry.get(args[0].to_i)
@@ -371,7 +373,7 @@ class Morpheus::Cli::StorageProvidersCommand
         end
       end
 
-      
+      @storage_providers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @storage_providers_interface.dry.create(payload)
         return
@@ -482,7 +484,7 @@ class Morpheus::Cli::StorageProvidersCommand
           payload['storageBucket']['createBucket'] = true
         end
       end
-
+      @storage_providers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @storage_providers_interface.dry.update(storage_provider["id"], payload)
         return
@@ -526,6 +528,7 @@ class Morpheus::Cli::StorageProvidersCommand
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the storage bucket: #{storage_provider['name']}?")
         return 9, "aborted command"
       end
+      @storage_providers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @storage_providers_interface.dry.destroy(storage_provider['id'])
         return 0
@@ -571,6 +574,7 @@ class Morpheus::Cli::StorageProvidersCommand
       [:fullTree].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
+      @storage_providers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @storage_providers_interface.dry.list_files(storage_provider['id'], search_file_path, params)
         return
@@ -667,6 +671,7 @@ class Morpheus::Cli::StorageProvidersCommand
       [:fullTree].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
+      @storage_providers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @storage_providers_interface.dry.list_files(storage_provider['id'], search_file_path, params)
         return 0
@@ -911,7 +916,7 @@ class Morpheus::Cli::StorageProvidersCommand
           destination = file.sub(local_file_path, (remote_file_path || "")).squeeze('/')
           upload_file_list << {file: file, destination: destination}
         end
-
+        @storage_providers_interface.setopts(options)
         if options[:dry_run]
           # print_h1 "DRY RUN"
           print "\n",cyan, bold, "Uploading #{upload_file_list.size} Files...", reset, "\n"
@@ -973,7 +978,7 @@ class Morpheus::Cli::StorageProvidersCommand
         unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to upload #{local_file_path} to #{storage_provider['name']}:#{destination}?")
           return 9, "aborted command"
         end
-
+        @storage_providers_interface.setopts(options)
         if options[:dry_run]
           #print cyan,bold, "  - Uploading #{file} to #{storage_provider_id}:#{destination} DRY RUN", reset, "\n"
           # print_h1 "DRY RUN"
@@ -1078,6 +1083,7 @@ class Morpheus::Cli::StorageProvidersCommand
         end
       end
       begin
+        @storage_providers_interface.setopts(options)
         if options[:dry_run]
           print_dry_run @storage_providers_interface.dry.download_file_chunked(storage_provider['id'], file_path, outfile), full_command_string
           return 0
@@ -1150,7 +1156,7 @@ class Morpheus::Cli::StorageProvidersCommand
       return 1 if storage_provider.nil?
 
       file_path = file_path.squeeze('/')
-
+      @storage_providers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @storage_providers_interface.dry.download_file(storage_provider['id'], file_path), full_command_string
         return 1
@@ -1204,7 +1210,7 @@ class Morpheus::Cli::StorageProvidersCommand
           return 9, "aborted command"
         end
       end
-      
+      @storage_providers_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @storage_files_interface.dry.destroy(storage_file['id'], query_params)
         return 0