morpheus-cli 4.2.6 → 4.2.7

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.6"
+    VERSION = "4.2.7"
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -89,7 +89,7 @@ class Morpheus::Cli::VirtualImages
       end
       print_h1 title, subtitles
       if images.empty?
-        print yellow,"No virtual images found.",reset,"\n"
+        print cyan,"No virtual images found.",reset,"\n"
       else
         rows = images.collect do |image|
           image_type = virtual_image_type_for_name_or_code(image['imageType'])
@@ -307,7 +307,7 @@ class Morpheus::Cli::VirtualImages
         image_types = json_response['virtualImageTypes']
         print_h1 "Morpheus Virtual Image Types"
         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"
+          print cyan,"No image types found.",reset,"\n"
         else
           rows = image_types.collect do |lb_type|
             {name: lb_type['name'], code: lb_type['code']}

data/lib/morpheus/cli/whitelabel_settings_command.rb

@@ -1,8 +1,9 @@
 require 'morpheus/cli/cli_command'
+require 'morpheus/cli/mixins/accounts_helper'
 
 class Morpheus::Cli::WhitelabelSettingsCommand
   include Morpheus::Cli::CliCommand
- # include Morpheus::Cli::AccountsHelper
+  include Morpheus::Cli::AccountsHelper
 
   set_command_name :'whitelabel-settings'
 
@@ -17,6 +18,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @whitelabel_settings_interface = @api_client.whitelabel_settings
+    @accounts_interface = @api_client.accounts
   end
 
   def handle(args)
@@ -27,6 +29,9 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+        options[:account] = val
+      end
       opts.on('--details', "Show full (not truncated) contents of Terms of Use, Privacy Policy, Override CSS" ) do
         options[:details] = true
       end
@@ -44,12 +49,21 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     
     begin
       params = parse_list_options(options)
+      account = nil
+      if options[:account]
+        account = find_account_by_name_or_id(options[:account])
+        if account.nil?
+          return 1
+        else
+          params['accountId'] = account['id']
+        end
+      end
       @whitelabel_settings_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @whitelabel_settings_interface.dry.get()
+        print_dry_run @whitelabel_settings_interface.dry.get(params)
         return
       end
-      json_response = @whitelabel_settings_interface.get()
+      json_response = @whitelabel_settings_interface.get(params)
       if options[:json]
         puts as_json(json_response, options, "whitelabelSettings")
         return 0
@@ -66,6 +80,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
       print_h1 "Whitelabel Settings"
       print cyan
       description_cols = {
+        "Account" => lambda {|it| it['account']['name'] rescue '' },
         "Enabled" => lambda {|it| format_boolean(it['enabled']) },
         "Appliance Name" => lambda {|it| it['applianceName'] },
         "Disable Support Menu" => lambda {|it| format_boolean(it['disableSupportMenu'])},
@@ -130,8 +145,12 @@ class Morpheus::Cli::WhitelabelSettingsCommand
   def update(args)
     options = {}
     params = {}
+    query_params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage()
+      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+        options[:account] = val
+      end
       opts.on('--active [on|off]', String, "Can be used to enable / disable whitelabel feature") do |val|
         params['enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
@@ -237,6 +256,15 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     end
 
     begin
+      account = nil
+      if options[:account]
+        account = find_account_by_name_or_id(options[:account])
+        if account.nil?
+          return 1
+        else
+          query_params['accountId'] = account['id']
+        end
+      end
       payload = parse_payload(options)
       image_files = {}
 
@@ -258,17 +286,17 @@ class Morpheus::Cli::WhitelabelSettingsCommand
 
       @whitelabel_settings_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @whitelabel_settings_interface.dry.update(payload, image_files)
+        print_dry_run @whitelabel_settings_interface.dry.update(payload, query_params)
         return
       end
-      json_response = @whitelabel_settings_interface.update(payload, image_files)
+      json_response = @whitelabel_settings_interface.update(payload, query_params)
 
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
         if json_response['success']
           print_green_success "Updated whitelabel settings"
-          get([] + (options[:remote] ? ["-r",options[:remote]] : []))
+          get([] + (options[:account] ? ["-a",options[:account]] : []) + (options[:remote] ? ["-r",options[:remote]] : []))
         else
           print_red_alert "Error updating whitelabel settings: #{json_response['msg'] || json_response['errors']}"
         end
@@ -281,10 +309,14 @@ class Morpheus::Cli::WhitelabelSettingsCommand
   end
 
   def update_images(args)
-    options = {}
     params = {}
+    query_params = {}
+    options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage()
+      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+        options[:account] = val
+      end
       opts.on("--header-logo FILE", String, "Header logo image. Local path of a file to upload (png|jpg|svg)") do |val|
         options[:headerLogo] = val
       end
@@ -322,6 +354,15 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     end
 
     begin
+      account = nil
+      if options[:account]
+        account = find_account_by_name_or_id(options[:account])
+        if account.nil?
+          return 1
+        else
+          query_params['accountId'] = account['id']
+        end
+      end
       payload = parse_payload(options)
 
       if !payload
@@ -348,11 +389,11 @@ class Morpheus::Cli::WhitelabelSettingsCommand
 
       @whitelabel_settings_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @whitelabel_settings_interface.dry.update_images(payload)
+        print_dry_run @whitelabel_settings_interface.dry.update_images(payload, query_params)
         return
       end
 
-      json_response = @whitelabel_settings_interface.update_images(payload)
+      json_response = @whitelabel_settings_interface.update_images(payload, query_params)
 
       if options[:json]
         puts as_json(json_response, options)
@@ -367,9 +408,13 @@ class Morpheus::Cli::WhitelabelSettingsCommand
   end
 
   def reset_image(args)
+    query_params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage("[image-type]")
+      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+        options[:account] = val
+      end
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
       opts.footer = "Reset your whitelabel image.\n" +
           "[image-type] is required. This is the whitelabel image type (#{@image_types.collect {|k,v| k}.join('|')})"
@@ -388,14 +433,23 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     end
 
     begin
+      account = nil
+      if options[:account]
+        account = find_account_by_name_or_id(options[:account])
+        if account.nil?
+          return 1
+        else
+          query_params['accountId'] = account['id']
+        end
+      end
       image_type = @image_types[args[0]]
       @whitelabel_settings_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @whitelabel_settings_interface.dry.reset_image(image_type)
+        print_dry_run @whitelabel_settings_interface.dry.reset_image(image_type, query_params)
         return
       end
 
-      json_response = @whitelabel_settings_interface.reset_image(image_type)
+      json_response = @whitelabel_settings_interface.reset_image(image_type, query_params)
 
       if options[:json]
         puts as_json(json_response, options)
@@ -410,9 +464,13 @@ class Morpheus::Cli::WhitelabelSettingsCommand
   end
 
   def view_image(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage("[image-type]")
+      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+        options[:account] = val
+      end
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
       opts.footer = "View your image of specified [image-type].\n" +
           "[image-type] is required. This is the whitelabel image type (#{@image_types.collect {|k,v| k}.join('|')})\n" +
@@ -432,14 +490,23 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     end
 
     begin
+      account = nil
+      if options[:account]
+        account = find_account_by_name_or_id(options[:account])
+        if account.nil?
+          return 1
+        else
+          params['accountId'] = account['id']
+        end
+      end
       image_type = @image_types[args[0]]
       @whitelabel_settings_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @whitelabel_settings_interface.dry.get()
+        print_dry_run @whitelabel_settings_interface.dry.get(params)
         return
       end
 
-      whitelabel_settings = @whitelabel_settings_interface.get()['whitelabelSettings']
+      whitelabel_settings = @whitelabel_settings_interface.get(params)['whitelabelSettings']
 
       if link = whitelabel_settings[image_type]
         if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
@@ -461,9 +528,13 @@ class Morpheus::Cli::WhitelabelSettingsCommand
   end
 
   def download_image(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage("[image-type] [local-file]")
+      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+        options[:account] = val
+      end
       opts.on( '-f', '--force', "Overwrite existing [local-file] if it exists." ) do
         options[:overwrite] = true
       end
@@ -489,6 +560,15 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     end
 
     begin
+      account = nil
+      if options[:account]
+        account = find_account_by_name_or_id(options[:account])
+        if account.nil?
+          return 1
+        else
+          params['accountId'] = account['id']
+        end
+      end
       image_type = @image_types[args[0]]
       outfile = File.expand_path(args[1])
       outdir = File.dirname(outfile)
@@ -513,7 +593,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
 
       @whitelabel_settings_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @whitelabel_settings_interface.dry.download_image(image_type, outfile)
+        print_dry_run @whitelabel_settings_interface.dry.download_image(image_type, outfile, params)
         return
       end
 
@@ -521,7 +601,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
         print cyan + "Downloading #{args[0]} to #{outfile} ... "
       end
 
-      http_response = @whitelabel_settings_interface.download_image(image_type, outfile)
+      http_response = @whitelabel_settings_interface.download_image(image_type, outfile, params)
 
       success = http_response.code.to_i == 200
       if success

data/lib/morpheus/cli/wiki_command.rb

@@ -58,7 +58,7 @@ class Morpheus::Cli::WikiCommand
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
         if pages.empty?
-          print yellow,"No wiki pages found.",reset,"\n"
+          print cyan,"No wiki pages found.",reset,"\n"
         else
           columns = [
             {"ID" => lambda {|page| page['id'] } },
@@ -386,7 +386,7 @@ class Morpheus::Cli::WikiCommand
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
         if categories.empty?
-          print yellow,"No wiki categories found.",reset,"\n"
+          print cyan,"No wiki categories found.",reset,"\n"
         else
           columns = [
             {"CATEGORY" => lambda {|page| page['name'] } },

data/lib/morpheus/cli/workflows.rb

@@ -351,15 +351,14 @@ class Morpheus::Cli::Workflows
         #task_names = tasks.collect {|it| it['name'] }
         print_h2 "Workflow Tasks"
         if tasks.empty?
-          print yellow,"No tasks in this workflow.",reset,"\n"
+          print cyan,"No tasks in this workflow.",reset,"\n"
         else
           print cyan
           # tasks.each_with_index do |taskSetTask, index|
           #   puts "#{(index+1).to_s.rjust(3, ' ')}. #{taskSetTask['task']['name']}"
           # end
           task_set_task_columns = [
-            # this is the ID needed for the config options, by name would be nicer
-            {"ID" => lambda {|it| it['id'] } }, 
+            #{"ID" => lambda {|it| it['id'] } }, 
             {"TASK ID" => lambda {|it| it['task']['id'] } },
             {"NAME" => lambda {|it| it['task']['name'] } },
             {"TYPE" => lambda {|it| it['task']['taskType'] ? it['task']['taskType']['name'] : '' } },

data/lib/morpheus/formatters.rb

@@ -284,16 +284,17 @@ def filter_data(data, include_fields=nil, exclude_fields=nil)
   end
 end
 
-def format_bytes(bytes, units="B")
+def format_bytes(bytes, units="B", round=nil)
   out = ""
   if bytes
     if bytes < 1024 && units == "B"
       out = "#{bytes.to_i} B"
     else
-      out = Filesize.from("#{bytes} #{units}").pretty.strip
+      out = Filesize.from("#{bytes}#{units == 'auto' ? '' : " #{units}"}").pretty.strip
+      out = out.split(' ')[0].to_f.round(round).to_s + ' ' + out.split(' ')[1] if round
     end
   end
-  return out
+  out
 end
 
 # returns bytes in an abbreviated format
@@ -343,7 +344,7 @@ end
 
 # returns currency amount formatted like "$4,5123.00". 0.00 is formatted as "$0"
 # this is not ideal
-def format_money(amount, currency='usd')
+def format_money(amount, currency='usd', opts={})
   if amount.to_f == 0
     return currency_sym(currency).to_s + "0"
   # elsif amount.to_f < 0.01
@@ -357,6 +358,14 @@ def format_money(amount, currency='usd')
       rtn = rtn + (['0'] * (2 - rtn.split('.')[1].length) * '')
     end
     dollars,cents = rtn.split(".")
-    currency_sym(currency).to_s + format_number(dollars.to_i) + "." + cents
+    rtn = currency_sym(currency).to_s + format_number(dollars.to_i.abs) + "." + cents
+
+    if dollars.to_i < 0
+      rtn = "(#{rtn})"
+      if opts[:minus_color]
+        rtn = "#{opts[:minus_color]}#{rtn}#{opts[:return_color] || cyan}"
+      end
+    end
+    rtn
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.6
+  version: 4.2.7
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,6 +203,7 @@ files:
 - lib/morpheus/api/file_copy_request_interface.rb
 - lib/morpheus/api/group_policies_interface.rb
 - lib/morpheus/api/groups_interface.rb
+- lib/morpheus/api/guidance_interface.rb
 - lib/morpheus/api/health_interface.rb
 - lib/morpheus/api/image_builder_boot_scripts_interface.rb
 - lib/morpheus/api/image_builder_image_builds_interface.rb
@@ -338,6 +339,7 @@ files:
 - lib/morpheus/cli/expression_parser.rb
 - lib/morpheus/cli/file_copy_request_command.rb
 - lib/morpheus/cli/groups.rb
+- lib/morpheus/cli/guidance_command.rb
 - lib/morpheus/cli/health_command.rb
 - lib/morpheus/cli/hosts.rb
 - lib/morpheus/cli/image_builder_command.rb