morpheus-cli 3.6.12 → 3.6.13

data/lib/morpheus/cli/preseed_scripts_command.rb

@@ -1,7 +1,6 @@
 require 'rest_client'
 require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::PreseedScriptsCommand
@@ -369,12 +368,10 @@ class Morpheus::Cli::PreseedScriptsCommand
     elsif preseed_scripts.size > 1
       print_red_alert "#{preseed_scripts.size} preseed scripts found by name #{name}"
       # print_preseed_scripts_table(preseed_scripts, {color: red})
-      rows = preseed_scripts.collect do |preseed_script|
+      rows = preseed_scripts.collect do |it|
         {id: it['id'], name: it['fileName']}
       end
-      print red
-      tp rows, [:id, :name]
-      print reset,"\n"
+      puts as_pretty_table(rows, [:id, :name], {color:red})
       return nil
     else
       return preseed_scripts[0]

data/lib/morpheus/cli/remote.rb

@@ -71,10 +71,9 @@ EOT
       print reset, "\n"
     else
       print cyan
-      #tp rows, {:active => {:display_name => ""}}, {:name => {:width => 16}}, {:host => {:width => 40}}
       columns = [
-        {:active => {:display_name => "", :display_method => lambda {|it| it[:active] ? "=>" : "" } } },
-        {:name => {:width => 16} }, 
+        #{:active => {:display_name => "", :display_method => lambda {|it| it[:active] ? "=>" : "" } } },
+        {:name => {display_method: lambda {|it| it[:active] ? "#{green}#{it[:name]}#{reset}#{cyan}" : it[:name] }, :width => 16 } },
         {:url => {display_method: lambda {|it| it[:host] || it[:url] }, :width => 40 } },
         {:version => lambda {|it| it[:build_version] } },
         {:status => lambda {|it| format_appliance_status(it, cyan) } },
@@ -86,7 +85,7 @@ EOT
       print reset
       if @appliance_name
         #unless appliances.keys.size == 1
-          print cyan, "\n# => Currently using #{@appliance_name}\n", reset
+          print cyan, "\n# => Currently using remote #{green}#{@appliance_name}#{reset}\n", reset
         #end
       else
         print "\n# => No current remote appliance, see `remote use`\n", reset

data/lib/morpheus/cli/roles.rb

@@ -200,7 +200,7 @@ class Morpheus::Cli::Roles
             access: get_access_string(it['access']),
           }
         end
-        tp rows, [:code, :name, :access]
+        print as_pretty_table(rows, [:code, :name, :access], options)
       else
         puts "Use --feature-access to list feature access"
       end
@@ -216,7 +216,7 @@ class Morpheus::Cli::Roles
               access: get_access_string(it['access']),
             }
           end
-          tp rows, [:name, :access]
+          print as_pretty_table(rows, [:name, :access], options)
         else
           puts "Use --group-access to list custom access"
         end
@@ -233,7 +233,7 @@ class Morpheus::Cli::Roles
               access: get_access_string(it['access']),
             }
           end
-          tp rows, [:name, :access]
+          print as_pretty_table(rows, [:name, :access], options)
         else
           puts "Use --cloud-access to list custom access"
         end
@@ -250,7 +250,7 @@ class Morpheus::Cli::Roles
               access: get_access_string(it['access']),
             }
           end
-          tp rows, [:name, :access]
+          print as_pretty_table(rows, [:name, :access], options)
         else
           puts "Use --instance-type-access to list custom access"
         end
@@ -269,7 +269,7 @@ class Morpheus::Cli::Roles
               access: get_access_string(it['access']),
             }
           end
-          tp rows, [:name, :access]
+          print as_pretty_table(rows, [:name, :access], options)
         else
           puts "Use --blueprint-access to list custom access"
         end

data/lib/morpheus/cli/security_group_rules.rb

@@ -3,7 +3,6 @@ require 'io/console'
 require 'rest_client'
 require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::SecurityGroupRules

data/lib/morpheus/cli/security_groups.rb

@@ -3,7 +3,6 @@ require 'io/console'
 require 'rest_client'
 require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::SecurityGroups

data/lib/morpheus/cli/shell.rb

@@ -246,10 +246,10 @@ class Morpheus::Cli::Shell
   # logs entire input as one command in shell history
   # logging is skipped for certain commands: exit, !,  !!
   def execute(input)
-    result = execute_commands_as_expression(input)
-    unless input.strip.empty? || (["exit"].include?(input.strip)) || input.strip[0].to_s.chr == "!"
+    unless input.strip.empty? || input.strip[0] == "!"
       log_history_command(input.strip)
     end
+    result = execute_commands_as_expression(input)
     return result
   end
 
@@ -331,7 +331,7 @@ class Morpheus::Cli::Shell
 
       if input == 'exit'
         #print cyan,"Goodbye\n",reset
-        @history_logger.info "exit" if @history_logger
+        #@history_logger.info "exit" if @history_logger
         @exit_now_please = true
         return 0
         #exit 0
@@ -620,7 +620,41 @@ class Morpheus::Cli::Shell
     return logger
   end
 
-  def load_history_from_log_file(n_commands=1000)
+  def load_history_from_log_file
+    
+    # @history ||= {}
+    # @last_command_number ||= 0
+    @history = {}
+    @last_command_number = 0
+
+    begin
+      file_path = history_file_path
+      FileUtils.mkdir_p(File.dirname(file_path))
+
+      File.open(file_path).each_line do |line|
+        # this is pretty goofy, but this looks for the format: (cmd $command_number) $command_string
+        matches = line.match(/\(cmd (\d+)\) (.+)/)
+        if matches && matches.size == 3
+          cmd_number = matches[1].to_i
+          cmd = matches[2]
+
+          @last_command_number = cmd_number
+          @history[@last_command_number] = cmd
+
+          # for Ctrl+R history searching
+          Readline::HISTORY << cmd
+        end
+      end
+    rescue => e
+      # raise e
+      puts_error "failed to load history from log: #{e}"
+      @history ||= {}
+    end
+    return @history
+  end
+
+  # remove this..
+  def _old_load_history_from_log_file(n_commands=1000)
     @history ||= {}
     @last_command_number ||= 0
 
@@ -659,8 +693,10 @@ class Morpheus::Cli::Shell
   end
 
   def log_history_command(cmd)
-    @history ||= {}
-    @last_command_number ||= 0
+    load_history_from_log_file if !@history
+    #todo: a fast log_history_command, that doesnt need to load the file..
+    #@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
@@ -674,7 +710,7 @@ class Morpheus::Cli::Shell
     return @last_command_number
   end
 
-  def last_command(n=25)
+  def last_command
     if @history && @last_command_number
       @history[@last_command_number]
     else
@@ -686,49 +722,54 @@ class Morpheus::Cli::Shell
   # the most recent 25 are returned by default.
   # @return Hash like {:commands => [], :command_count => total}
   def load_history_commands(options={})
-    options[:phrase] ||= nil
-    options[:sort] = options[:sort] ? options[:sort].to_sym : :number
-    options[:direction] ||= 'asc'
-    options[:offset] = options[:offset].to_i > 0 ? options[:offset].to_i : 0
-    options[:max] = options[:max].to_i > 0 ? options[:max].to_i : 25
+    phrase = options[:phrase]
+    sort = options[:sort] ? options[:sort].to_sym : :number
+    direction = options[:direction] == 'desc' ? 'desc' : 'asc'
+    offset = options[:offset].to_i > 0 ? options[:offset].to_i : 0
+    max = options[:max].to_i > 0 ? options[:max].to_i : 25
+    
+    if !@history
+      load_history_from_log_file
+    end
     
-    load_history_from_log_file if !@history
     
     # collect records as [{:number => 1, :command => "instances list"}, etc]
     history_records = []
     history_count = 0
-    if options[:sort].to_sym == :command
+    
+    # sort is a bit different for this command, the default sort is by number
+    # it sorts oldest -> newest, but shows the very last page by default.
+    sort_key = :number
+    if sort.to_sym == :command
       sort_key = :command
-    else
-      sort_key = :number
     end
-    if options[:phrase] || sort_key != :number
+    
+    if phrase || sort_key != :number
       # this could be a large object...need to index our shell_history file lol
       history_records = @history.keys.collect { |k| {number: k, command: @history[k]} }
-      history_records = history_records.sort {|x,y| x[sort_key] <=> y[sort_key] }
-      if options[:phrase]
-        history_records = history_records.select {|it| it[:command].include?(options[:phrase]) || it[:number].to_s == options[:phrase] }
+      if direction == 'desc'
+        history_records = history_records.sort {|x,y| y[sort_key] <=> x[sort_key] }
+      else
+        history_records = history_records.sort {|x,y| x[sort_key] <=> y[sort_key] }
+      end
+      if phrase
+        history_records = history_records.select {|it| it[:command].include?(phrase) || it[:number].to_s == phrase }
       end
-      # get count and then slice it
       command_count = history_records.size
-      history_records = history_records[options[:offset]..options[:max]-1]
+      history_records = history_records[offset..max-1]
     else
       # default should try to be as fast as possible..
       # no searching or sorting, default order by :number works
       # desc here means show oldest commands
-      if options[:direction] == 'desc'
-        if options[:offset]
-          cmd_numbers = @history.keys.first(options[:max] + options[:offset]).first(options[:max])
-        else
-          cmd_numbers = @history.keys.first(options[:max])
-        end
-        cmd_count = @history.keys.size
+      cmd_count = @history.keys.size
+      cmd_numbers = []
+      if direction == 'desc'
+        cmd_numbers = @history.keys[offset..(offset + max-1)]
       else
-        cmd_numbers = []
-        if options[:offset]
-          cmd_numbers = @history.keys.last(options[:max] + options[:offset]).first(options[:max])
+        if offset != 0
+          cmd_numbers = @history.keys.last(max + offset).first(max)
         else
-          cmd_numbers = @history.keys.last(options[:max])
+          cmd_numbers = @history.keys.last(max)
         end
         history_records = cmd_numbers.collect { |k| {number: k, command: @history[k]} }
         command_count = @history.size
@@ -741,12 +782,22 @@ class Morpheus::Cli::Shell
     history_result = load_history_commands(options)
     history_records = history_result[:commands]
     command_count = history_result[:command_count]
-    print cyan
-    history_records.each do |history_record|
-      puts "#{history_record[:number].to_s.rjust(3, ' ')}  #{history_record[:command]}"
+    if history_records.size == 0
+      if options[:phrase]
+        print cyan,"0 commands found matching '#{options[:phrase]}'.",reset,"\n"
+      else
+        print cyan,"0 commands found.",reset,"\n"
+      end
+    else
+      print cyan
+      history_records.each do |history_record|
+        puts "#{history_record[:number].to_s.rjust(3, ' ')}  #{history_record[:command]}"
+      end
+      if options[:show_pagination]
+        print_results_pagination({size:history_records.size,total:command_count.to_i})
+        print reset, "\n"
+      end
     end
-    #print_results_pagination({size:history_records.size,total:command_count.to_i}, {:label => "command", :n_label => "commands"})
-    print reset
     #print "\n"
     return 0
   end

data/lib/morpheus/cli/storage_providers_command.rb

@@ -1,7 +1,6 @@
 require 'rest_client'
 require 'optparse'
 require 'filesize'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/infrastructure_helper'
 
@@ -1277,12 +1276,10 @@ class Morpheus::Cli::StorageProvidersCommand
       return nil
     elsif storage_providers.size > 1
       print_red_alert "#{storage_providers.size} storage buckets found by name #{name}"
-      rows = storage_providers.collect do |storage_provider|
+      rows = storage_providers.collect do |it|
         {id: it['id'], name: it['name']}
       end
-      print red
-      tp rows, [:id, :name]
-      print reset,"\n"
+      puts as_pretty_table(rows, [:id, :name], {color:red})
       return nil
     else
       return storage_providers[0]

data/lib/morpheus/cli/tasks.rb

@@ -2,7 +2,6 @@
 require 'io/console'
 require 'rest_client'
 require 'optparse'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Tasks
@@ -244,10 +243,10 @@ class Morpheus::Cli::Tasks
           print yellow,"No task types currently exist on this appliance. This could be a seed issue.",reset,"\n"
         else
           print cyan
-          tasks_table_data = task_types.collect do |task_type|
+          rows = task_types.collect do |task_type|
             {name: task_type['name'], id: task_type['id'], code: task_type['code'], description: task_type['description']}
           end
-          tp tasks_table_data, :id, :name, :code
+          puts as_pretty_table(rows, [:id, :name, :code], {color:red})
         end
 
         print reset,"\n"

data/lib/morpheus/cli/users.rb

@@ -223,7 +223,7 @@ class Morpheus::Cli::Users
             rows = user_feature_permissions.collect do |code, access|
               {code: code, access: get_access_string(access) }
             end
-            tp rows, [:code, :access]
+            print as_pretty_table(rows, [:name, :access], options)
           else
             puts yellow,"No permissions found.",reset
           end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.12"
+    VERSION = "3.6.13"
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -2,7 +2,6 @@
 require 'io/console'
 require 'rest_client'
 require 'optparse'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 # JD: I don't think a lot of this has ever worked, fix it up.
@@ -310,16 +309,14 @@ class Morpheus::Cli::VirtualImages
         if image_types.nil? || image_types.empty?
           print yellow,"No image types currently exist on this appliance. This could be a seed issue.",reset,"\n"
         else
-          print cyan
-          lb_table_data = image_types.collect do |lb_type|
+          rows = image_types.collect do |lb_type|
             {name: lb_type['name'], code: lb_type['code']}
           end
-          tp lb_table_data, :name, :code
+          puts as_pretty_table(rows, [:name, :code], options)
         end
-
-        print reset,"\n"
+        return 0
       end
-                rescue RestClient::Exception => e
+    rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
     end

data/lib/morpheus/cli/whoami.rb

@@ -191,7 +191,7 @@ class Morpheus::Cli::Whoami
             rows = @user_permissions.collect do |code, access|
               {code: code, access: get_access_string(access) }
             end
-            tp rows, [:code, :access]
+            print as_pretty_table(rows, [:code, :access], options)
           else
             puts yellow,"No permissions found.",reset
           end

data/lib/morpheus/cli/workflows.rb

@@ -1,8 +1,6 @@
 # require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'optparse'
-require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Workflows

data/lib/morpheus/formatters.rb

@@ -309,3 +309,20 @@ end
 def no_colors(str)
   str.to_s.gsub /\e\[\d+m/, ""
 end
+
+def format_number(n, opts={})
+  delim = opts[:delimiter] || ','
+  out = ""
+  parts = n.to_s.split(".")
+  whole_number = parts[0]
+  decimal = parts[1] ? parts[1..-1].join('.') : nil
+  i = 0
+  whole_number.reverse.each_char do |c|
+    out = (i > 0 && i % 3 == 0) ? "#{c}#{delim}#{out}" : "#{c}#{out}"
+    i+= 1
+  end
+  if decimal
+    out << "." + decimal
+  end
+  return out
+end

data/lib/morpheus/logging.rb

@@ -8,6 +8,9 @@ module Morpheus::Logging
 
   DEFAULT_LOG_LEVEL = ENV['DEBUG'] ? Logger::DEBUG : Logger::INFO
 
+  AUTHORIZATION_HEADER = 'Authorization'
+  SECRET_TOKEN_HEADERS = ['X-Morpheus-Token', 'X-Cypher-Token', 'X-Vault-Token', 'X-Morpheus-Lease']
+
   @@log_level = DEFAULT_LOG_LEVEL
   @@logger = nil
 
@@ -80,13 +83,20 @@ module Morpheus::Logging
   def self.scrub_message(msg)
     if msg.is_a?(String)
       msg = msg.clone
-      msg.gsub!(/Authorization\"\s?\=\>\s?\"Bearer [^"]+/, 'Authorization"=>"Bearer ************')
-      msg.gsub!(/Authorization\:\s?Bearer [^"'']+/, 'Authorization: Bearer ************')
-      msg.gsub!(/password\"\s?\=\>\s?\"[^"]+/, 'password"=>"************')
-      msg.gsub!(/password\=\"[^"]+/, 'password="************')
-      msg.gsub!(/password\=[^"'&\Z]+/, 'password=************') # buggy, wont work with ampersand or quotes in passwords! heh
-      msg.gsub!(/passwordConfirmation\=[^" ]+/, 'passwordConfirmation="************')
-      msg.gsub!(/passwordConfirmation\=[^" ]+/, 'passwordConfirmation=************')
+      # looks for RestClient format (hash.inspect) and request/curl output name: value
+      msg.gsub!(/Authorization\"\s?\=\>\s?\"Bearer [^"]+/i, 'Authorization"=>"Bearer ************')
+      msg.gsub!(/Authorization\:\s?Bearer [^"'']+/i, 'Authorization: Bearer ************')
+      # msg.gsub!(/#{AUTHORIZATION_HEADER}\"\s?\=\>\s?\"Bearer [^"]+/, "#{AUTHORIZATION_HEADER}"=>"Bearer ************")
+      # msg.gsub!(/#{AUTHORIZATION_HEADER}\:\s?Bearer [^"'']+/, "#{AUTHORIZATION_HEADER}: Bearer ************")
+      SECRET_TOKEN_HEADERS.each do |header|
+        msg.gsub!(/#{header}\"\s?\=\>\s?\"[^"]+/, "#{header}\"=>\"************")
+        msg.gsub!(/#{header}\:\s?[^"'']+/, "#{header}: ************")
+      end
+      msg.gsub!(/password\"\s?\=\>\s?\"[^"]+/i, 'password"=>"************')
+      msg.gsub!(/password\=\"[^"]+/i, 'password="************')
+      msg.gsub!(/password\=[^"'&\Z]+/i, 'password=************') # buggy, wont work with ampersand or quotes in passwords! heh
+      msg.gsub!(/passwordConfirmation\=[^" ]+/i, 'passwordConfirmation="************')
+      msg.gsub!(/passwordConfirmation\=[^" ]+/i, 'passwordConfirmation=************')
     end
     msg
   end