morpheus-cli 4.2.12 → 4.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e122acdb8c77d80c4d352581e33ee8e8a7d7caf6e631fda4645e8f5854f8c6e
-  data.tar.gz: 67d82f25c0fd463098d96183f0301ee22f3538bd6d6043c77132ae12fa5c3324
+  metadata.gz: 2788d4682a38deca42b716fa364b76fa58b81bc4dd0d9e0d61088029462684f9
+  data.tar.gz: 68fa32a490908ba747a7ea4ce63e34a6894e7e0398592a7a53e01fa688f237de
 SHA512:
-  metadata.gz: 84efcd68bc06c45125654bc2279894cb5e1d7ef484f63015185fdedbdcdef57c48179cababa63128fd978416109229e08dc267ee0094c74fb16824f4450a4306
-  data.tar.gz: 8326f9f6dc94b22cb3e0df8ce18155bbadf67e5256301d9ad0df07803c99e4eaccfe36eabcde0b8ec9461f226dd3beea5c0584c30bb5146937dbf70c59e7b75b
+  metadata.gz: 25a714b9505f60ad3c71da4b1af361f32112efe774ec08f1fb85c162f59e62150410127ed3b34f37de23a71ebc2857b112cf68b9d0501478bf401d348553473c
+  data.tar.gz: 6ec182c42b61ebf359e3ea9158c63e109b3a5369bc4242e5cad80355dd6093b82e6593d26c7968683e55903ee184791187b0db5f470ff0b100b16fdaeb5ba2b3

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 4.2.12
+RUN gem install morpheus-cli -v 4.2.13
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/cli/apps.rb

@@ -1303,7 +1303,7 @@ EOT
       #   options[:interval] = parse_time(val).utc.iso8601
       # end
       opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
-        params['level'] = params['level'] ? [params['level'], val].flatten : val
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
       end
       opts.on('--table', '--table', "Format ouput as a table.") do
         options[:table] = true
@@ -1346,6 +1346,7 @@ EOT
         end
       end
       params = {}
+      params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
       params.merge!(parse_list_options(options))
       params['query'] = params.delete('phrase') if params['phrase']
       params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction

data/lib/morpheus/cli/cli_registry.rb

@@ -128,6 +128,11 @@ module Morpheus
               previous_command_result = nil
               current_operator = nil
               still_executing = true
+              # need to error before executing anything, could be dangerous otherwise!
+              # also maybe only pass flow commands if they have a space on either side..
+              if flow.include?("|")
+                raise Morpheus::Cli::ExpressionParser::InvalidExpression.new "The PIPE (|) operator is not yet supported. You can wrap your arguments in quotations."
+              end
               flow.each do |flow_cmd|
                 if still_executing
                   if flow_cmd == '&&'
@@ -144,7 +149,8 @@ module Morpheus
                       still_executing = false
                     end
                   elsif flow_cmd == '|' # or with previous command
-                    raise Morpheus::Cli::ExpressionParser::InvalidExpression.new "The PIPE (|) operator is not yet supported =["
+                    # todo, handle pipe!
+                    raise Morpheus::Cli::ExpressionParser::InvalidExpression.new "The PIPE (|) operator is not yet supported. You can wrap your arguments in quotations."
                     previous_command_result = nil
                     still_executing = false
                     # or just continue?

data/lib/morpheus/cli/clusters.rb

@@ -836,7 +836,7 @@ class Morpheus::Cli::Clusters
         options[:end] = parse_time(val) #.utc.iso8601
       end
       opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
-        params['level'] = params['level'] ? [params['level'], val].flatten : val
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
       end
       opts.on('--table', '--table', "Format ouput as a table.") do
         options[:table] = true
@@ -854,6 +854,7 @@ class Morpheus::Cli::Clusters
     begin
       cluster = find_cluster_by_name_or_id(args[0])
       params = {}
+      params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
       params.merge!(parse_list_options(options))
       params['query'] = params.delete('phrase') if params['phrase']
       params['startMs'] = (options[:start].to_i * 1000) if options[:start]

data/lib/morpheus/cli/containers_command.rb

@@ -519,7 +519,7 @@ class Morpheus::Cli::ContainersCommand
         options[:end] = parse_time(val) #.utc.iso8601
       end
       opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
-        params['level'] = params['level'] ? [params['level'], val].flatten : val
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
       end
       opts.on('--table', '--table', "Format ouput as a table.") do
         options[:table] = true
@@ -541,6 +541,7 @@ class Morpheus::Cli::ContainersCommand
     id_list = parse_id_list(args)
     begin
       containers = id_list # heh
+      params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
       params.merge!(parse_list_options(options))
       params['query'] = params.delete('phrase') if params['phrase']
       params[:order] = params[:direction] unless params[:direction].nil? # old api version expects order instead of direction

data/lib/morpheus/cli/health_command.rb

@@ -457,7 +457,7 @@ class Morpheus::Cli::HealthCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
-        params['level'] = params['level'] ? [params['level'], val].flatten : val
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
       end
       opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start timestamp. Default is 30 days ago.") do |val|
         start_date = parse_time(val) #.utc.iso8601
@@ -465,7 +465,7 @@ class Morpheus::Cli::HealthCommand
       opts.on('--end TIMESTAMP','--end TIMESTAMP', "End timestamp. Default is now.") do |val|
         end_date = parse_time(val) #.utc.iso8601
       end
-      opts.on('--table', '--table', "Format output as a table.") do
+      opts.on('-t', '--table', "Format output as a table.") do
         options[:table] = true
       end
       opts.on('-a', '--all', "Display all details: entire message." ) do
@@ -484,6 +484,7 @@ class Morpheus::Cli::HealthCommand
       # params['endDate'] = end_date.utc.iso8601 if end_date
       params['startMs'] = (start_date.to_i * 1000) if start_date
       params['endMs'] = (end_date.to_i * 1000) if end_date
+      params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
       params.merge!(parse_list_options(options))
       @health_interface.setopts(options)
       if options[:dry_run]
@@ -497,7 +498,7 @@ class Morpheus::Cli::HealthCommand
       title = "Morpheus Health Logs"
       subtitles = []
       if params['level']
-        subtitles << "Level: #{params['level']}"
+        subtitles << "Level: #{[params['level']].flatten.join(',')}"
       end
       if start_date
         subtitles << "Start: #{start_date}"

data/lib/morpheus/cli/hosts.rb

@@ -582,7 +582,7 @@ class Morpheus::Cli::Hosts
         options[:end] = parse_time(val) #.utc.iso8601
       end
       opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
-        params['level'] = params['level'] ? [params['level'], val].flatten : val
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
       end
       opts.on('--table', '--table', "Format ouput as a table.") do
         options[:table] = true
@@ -600,6 +600,7 @@ class Morpheus::Cli::Hosts
     connect(options)
     begin
       server = find_host_by_name_or_id(args[0])
+      params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
       params.merge!(parse_list_options(options))
       params['query'] = params.delete('phrase') if params['phrase']
       params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction

data/lib/morpheus/cli/instances.rb

@@ -1009,7 +1009,7 @@ class Morpheus::Cli::Instances
       #   options[:interval] = parse_time(val).utc.iso8601
       # end
       opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
-        params['level'] = params['level'] ? [params['level'], val].flatten : val
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
       end
       opts.on('--table', '--table', "Format ouput as a table.") do
         options[:table] = true
@@ -1036,6 +1036,7 @@ class Morpheus::Cli::Instances
           return 1
         end
       end
+      params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
       params.merge!(parse_list_options(options))
       params['query'] = params.delete('phrase') if params['phrase']
       params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction

data/lib/morpheus/cli/logs_command.rb

@@ -63,9 +63,9 @@ class Morpheus::Cli::LogsCommand
       #   options[:interval] = parse_time(val).utc.iso8601
       # end
       opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
-        params['level'] = params['level'] ? [params['level'], val].flatten : val
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
       end
-      opts.on('--table', '--table', "Format ouput as a table.") do
+      opts.on('-t', '--table', "Format ouput as a table.") do
         options[:table] = true
       end
       opts.on('-a', '--all', "Display all details: entire message." ) do
@@ -81,6 +81,7 @@ class Morpheus::Cli::LogsCommand
     end
     connect(options)
     begin
+      params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
       params.merge!(parse_list_options(options))
       params['query'] = params.delete('phrase') if params['phrase']
       params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction

data/lib/morpheus/cli/mixins/logs_helper.rb

@@ -45,6 +45,8 @@ module Morpheus::Cli::LogsHelper
     end
     out = ""
     table_color = options.key?(:color) ? options[:color] : cyan
+    term_width = current_terminal_width()
+    message_col_width = current_terminal_width() - (show_object ? 56 : 36)
     log_records.each do |log_entry|
       log_level = format_log_level(log_entry['level'], table_color, 6)
       out << table_color if table_color
@@ -52,15 +54,20 @@ module Morpheus::Cli::LogsHelper
       out << "#{log_level} "
       out << "[#{log_entry['ts']}] "
       if show_object
-        out << "(#{log_entry['typeCode']} #{log_entry['objectId']}) "
+        log_src = "#{log_entry['typeCode']} #{log_entry['objectId']}"
+        if options[:details] || options[:all]
+          # log_src = "#{log_entry['typeCode']} #{log_entry['objectId']}"
+        else
+          log_src = truncate_string(log_src, 20)
+        end
+        out << "(#{log_src}) "
       end
       log_msg = ""
       if options[:details] || options[:all]
-          log_msg = log_entry['message'].to_s.strip
-        else
-          # truncate_string(log_entry['message'].to_s.split.select {|it| it.to_s.strip != "" }.first, 100) 
-          log_msg = truncate_string(log_entry['message'].to_s.gsub("\r\n", " ").gsub("\n", " "), 100) 
-        end
+        log_msg = log_entry['message'].to_s.strip
+      else
+        log_msg = truncate_string(log_entry['message'].to_s.strip.gsub(/\r?\n/, " "), message_col_width)
+      end
       out << "- #{log_msg}"
       out << table_color if table_color
       out << "\n"
@@ -71,15 +78,17 @@ module Morpheus::Cli::LogsHelper
   def format_log_table(logs, options={}, show_object=true)
     out = ""
     table_color = options.key?(:color) ? options[:color] : cyan
+    term_width = current_terminal_width()
+    message_col_width = current_terminal_width() - (show_object ? 56 : 36)
     log_columns = [
       {"LEVEL" => lambda {|log_entry| format_log_level(log_entry['level'], table_color) } },
       {"DATE" => lambda {|log_entry| log_entry['ts'] } },
       {"SOURCE" => lambda {|log_entry| "#{log_entry['typeCode']} #{log_entry['objectId']}" } },
       {"MESSAGE" => lambda {|log_entry| 
         if options[:details] || options[:all]
-          log_entry['message'].to_s
+          log_entry['message'].to_s.strip
         else
-          truncate_string(log_entry['message'].to_s.split.first, 100) 
+          truncate_string(log_entry['message'].to_s.strip.gsub(/\r?\n/, " "), message_col_width)
         end
       } }
     ]
@@ -89,7 +98,7 @@ module Morpheus::Cli::LogsHelper
     # if options[:include_fields]
     #   columns = options[:include_fields]
     # end
-    out << as_pretty_table(logs, log_columns, options.merge(responsive_table:false))
+    out << as_pretty_table(logs, log_columns, options.merge(wrap:true))
     # out << "\n"
     return out
   end

data/lib/morpheus/cli/remote.rb

@@ -302,15 +302,12 @@ EOT
     # secure is the default, 
     # try to only store insecure:false in the appliances config
     if url.to_s =~ /^https\:/ && secure.nil?
-      if secure != nil
-        new_appliance_map[:insecure] = !secure
-      else
-        #v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'secure', 'fieldLabel' => 'Secure', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'description' => 'Prevent insecure HTTPS communication, respect SSL errors.'}], options[:options])
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'insecure', 'fieldLabel' => 'Insecure (Ignore SSL Errors)', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'description' => 'Allow insecure HTTPS communication, ignore SSL errors.'}], options[:options])
-        if v_prompt['insecure'].to_s == 'true' || v_prompt['insecure'].to_s == 'on'
-          new_appliance_map[:insecure] = true
-        end
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'insecure', 'fieldLabel' => 'Insecure (Ignore SSL Errors)', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'description' => 'Allow insecure HTTPS communication, ignore SSL errors.'}], options[:options])
+      if v_prompt['insecure'].to_s == 'true' || v_prompt['insecure'].to_s == 'on'
+        new_appliance_map[:insecure] = true
       end
+    elsif secure != nil
+      new_appliance_map[:insecure] = !secure
     end
     
     # --use

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.12"
+    VERSION = "4.2.13"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.12
+  version: 4.2.13
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler