morpheus-cli 4.1.6 → 4.1.7

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.1.6"
+    VERSION = "4.1.7"
   end
 end

data/lib/morpheus/cli/whitelabel_settings_command.rb

@@ -3,7 +3,7 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::WhitelabelSettingsCommand
   include Morpheus::Cli::CliCommand
  # include Morpheus::Cli::AccountsHelper
-  set_command_hidden # hide until 4.2.0
+  set_command_hidden
   set_command_name :'whitelabel-settings'
 
   register_subcommands :get, :update
@@ -210,10 +210,22 @@ class Morpheus::Cli::WhitelabelSettingsCommand
       opts.on("--privacy-policy-file FILE", String, "Privacy policy content from local file") do |val|
         options[:privacyPolicyFile] = val
       end
-      opts.on('--support-menu-links LIST', Array, "Support menu links. Comma delimited list of menu links. Each menu link is pipe delimited url1|label1|code1,url2|label2|code2") do |val|
-        options[:supportMenuLinks] = val
+      opts.on('--support-menu-links JSON', String, "Support menu links JSON") do |val|
+        begin
+          support_menu_links = JSON.parse(val.to_s)
+          params['supportMenuLinks'] = support_menu_links.kind_of?(Array) ? support_menu_links : [support_menu_links]
+        rescue JSON::ParserError => e
+          print_red_alert "Unable to parse forwarding rules JSON"
+          exit 1
+        end
       end
-      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+      opts.on('--support-menu-links-list LIST', Array, "Support menu links list. Comma delimited list of menu links. Each menu link is pipe delimited url1|label1|code1,url2|label2|code2") do |val|
+        params['supportMenuLinks'] = val.collect { |link|
+          parts = link.split('|')
+          {'url' => parts[0].strip, 'label' => (parts.count > 1 ? parts[1].strip : ''), 'labelCode' => (parts.count > 2 ? parts[2].strip : '')}
+        }
+      end
+      build_common_options(opts, options, [:json, :payload, :dry_run, :quiet, :remote])
     end
 
     optparse.parse!(args)
@@ -241,12 +253,6 @@ class Morpheus::Cli::WhitelabelSettingsCommand
             end
           end
         end
-        if options[:supportMenuLinks]
-          params['supportMenuLinks'] = options[:supportMenuLinks].collect { |link|
-            parts = link.split('|')
-            {'url' => parts[0].strip, 'label' => (parts.count > 1 ? parts[1].strip : ''), 'labelCode' => (parts.count > 2 ? parts[2].strip : '')}
-          }
-        end
         payload = {'whitelabelSettings' => params}
       end
 
@@ -303,7 +309,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
       opts.on("--reset-favicon", String, "Resets favicon default favicon") do |val|
         params['resetFavicon'] = true
       end
-      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+      build_common_options(opts, options, [:json, :payload, :dry_run, :quiet, :remote])
       opts.footer = "Update your whitelabel images."
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.1.7
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,6 +166,7 @@ files:
 - lib/morpheus/api/archive_buckets_interface.rb
 - lib/morpheus/api/archive_files_interface.rb
 - lib/morpheus/api/auth_interface.rb
+- lib/morpheus/api/backup_settings_interface.rb
 - lib/morpheus/api/blueprints_interface.rb
 - lib/morpheus/api/cloud_datastores_interface.rb
 - lib/morpheus/api/cloud_folders_interface.rb
@@ -201,6 +202,7 @@ files:
 - lib/morpheus/api/library_layouts_interface.rb
 - lib/morpheus/api/license_interface.rb
 - lib/morpheus/api/load_balancers_interface.rb
+- lib/morpheus/api/log_settings_interface.rb
 - lib/morpheus/api/logs_interface.rb
 - lib/morpheus/api/monitoring_alerts_interface.rb
 - lib/morpheus/api/monitoring_apps_interface.rb
@@ -259,6 +261,7 @@ files:
 - lib/morpheus/cli/apps.rb
 - lib/morpheus/cli/archives_command.rb
 - lib/morpheus/cli/auth_command.rb
+- lib/morpheus/cli/backup_settings_command.rb
 - lib/morpheus/cli/blueprints_command.rb
 - lib/morpheus/cli/boot_scripts_command.rb
 - lib/morpheus/cli/change_password_command.rb
@@ -321,6 +324,7 @@ files:
 - lib/morpheus/cli/library_upgrades_command.rb
 - lib/morpheus/cli/license.rb
 - lib/morpheus/cli/load_balancers.rb
+- lib/morpheus/cli/log_settings_command.rb
 - lib/morpheus/cli/login.rb
 - lib/morpheus/cli/logout.rb
 - lib/morpheus/cli/logs_command.rb