morpheus-cli 4.1.7 → 4.1.8

data/lib/morpheus/cli/log_settings_command.rb

@@ -3,9 +3,9 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::LogSettingsCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
-  set_command_hidden
-  set_command_name :'log-settings'
 
+  set_command_name :'log-settings'
+  set_command_hidden
   register_subcommands :get, :update
   register_subcommands :enable_integration, :disable_integration
   register_subcommands :add_syslog_rule, :remove_syslog_rule
@@ -147,8 +147,8 @@ class Morpheus::Cli::LogSettingsCommand
         end
 
         if !options[:integrations].nil?
-          if options[:integrations].reject { |rule| rule['name'] && rule['host'] && rule['port'] }.count > 0
-            print_red_alert "Invalid integration: name, host and port are required"
+          if options[:integrations].reject { |rule| rule['name'] }.count > 0
+            print_red_alert "Invalid integration: name is required"
             return 1
           end
           payload['logSettings']['integrations'] = options[:integrations]

data/lib/morpheus/cli/monitoring_apps_command.rb

@@ -486,8 +486,8 @@ class Morpheus::Cli::MonitoringAppsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on(nil, "--disable", "Unmute instead, the same as the unmute command") do
-        params['enabled'] = false
         params['muted'] = false
+        params['enabled'] = false
       end
       opts.footer = "Mute a monitoring app. This prevents it from creating new incidents." + "\n" +
                     "[name] is required. This is the name or id of a monitoring app."
@@ -517,7 +517,7 @@ class Morpheus::Cli::MonitoringAppsCommand
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
-        if params['enabled']
+        if params['muted'] != false
           print_green_success "Muted app #{monitor_app['name']}"
         else
           print_green_success "Unmuted app #{monitor_app['name']}"
@@ -611,7 +611,7 @@ class Morpheus::Cli::MonitoringAppsCommand
         puts as_json(json_response, options)
       elsif !options[:quiet]
         num_updated = json_response['updated']
-        if params['enabled']
+        if params['muted'] != false
           print_green_success "Muted #{num_updated} apps"
         else
           print_green_success "Unmuted #{num_updated} apps"

data/lib/morpheus/cli/monitoring_checks_command.rb

@@ -505,7 +505,7 @@ class Morpheus::Cli::MonitoringChecksCommand
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
-        if params['enabled']
+        if params['muted'] != false
           print_green_success "Muted check #{check['name']}"
         else
           print_green_success "Unmuted check #{check['name']}"
@@ -599,7 +599,7 @@ class Morpheus::Cli::MonitoringChecksCommand
         puts as_json(json_response, options)
       elsif !options[:quiet]
         num_updated = json_response['updated']
-        if params['enabled']
+        if params['muted'] != false
           print_green_success "Muted #{num_updated} checks"
         else
           print_green_success "Unmuted #{num_updated} checks"

data/lib/morpheus/cli/monitoring_groups_command.rb

@@ -445,6 +445,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
       opts.banner = subcommand_usage("[name]")
       opts.on(nil, "--disable", "Disable mute, the same as unmute") do
         params['enabled'] = false
+        params['muted'] = false
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
       opts.footer = "Mute a check group. This prevents it from creating new incidents." + "\n" +
@@ -474,7 +475,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
-        if params['enabled']
+        if params['muted'] != false
           print_green_success "Muted group #{check_group['name']}"
         else
           print_green_success "Unmuted group #{check_group['name']}"
@@ -568,7 +569,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
         puts as_json(json_response, options)
       elsif !options[:quiet]
         num_updated = json_response['updated']
-        if params['enabled']
+        if params['muted'] != false
           print_green_success "Muted #{num_updated} check groups"
         else
           print_green_success "Unmuted #{num_updated} check groups"

data/lib/morpheus/cli/monitoring_incidents_command.rb

@@ -587,7 +587,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
-        if params['enabled']
+        if params['muted'] != false
           print_green_success "Muted incident #{incident['id']}"
         else
           print_green_success "Unmuted incident #{incident['id']}"
@@ -651,6 +651,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on(nil, "--disable", "Disable mute state instead, the same as unmute-all") do
+        params['muted'] = false
         params['enabled'] = false
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
@@ -680,7 +681,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
         puts as_json(json_response, options)
       elsif !options[:quiet]
         num_updated = json_response['updated']
-        if params['enabled']
+        if params['muted'] != false
           print_green_success "Muted #{num_updated} open incidents"
         else
           print_green_success "Unmuted #{num_updated} open incidents"

data/lib/morpheus/cli/option_types.rb

@@ -35,7 +35,7 @@ module Morpheus
         prompt(option_types, options, api_client, api_params, true)
       end
 
-      def self.prompt(option_types, options={}, api_client=nil,api_params={}, no_prompt=false)
+      def self.prompt(option_types, options={}, api_client=nil, api_params={}, no_prompt=false, paging_enabled=false)
         results = {}
         options = options || {}
         # puts "Options Prompt #{options}"
@@ -153,7 +153,7 @@ module Morpheus
               # I suppose the entered value should take precedence
               # api_params = api_params.merge(options) # this might be good enough
               # dup it
-              value = select_prompt(option_type,api_client, (api_params || {}).merge(results))
+              value = select_prompt(option_type, api_client, (api_params || {}).merge(results), options[:no_prompt], nil, paging_enabled)
           elsif option_type['type'] == 'hidden'
             value = option_type['defaultValue']
             input = value
@@ -245,7 +245,7 @@ module Morpheus
         Thread.current[:_last_select]
       end
 
-      def self.select_prompt(option_type,api_client, api_params={}, no_prompt=false, use_value=nil)
+      def self.select_prompt(option_type,api_client, api_params={}, no_prompt=false, use_value=nil, paging_enabled=false)
         value_found = false
         value = nil
         default_value = option_type['defaultValue']
@@ -320,6 +320,12 @@ module Morpheus
             end
           end
         end
+
+        page_size = Readline.get_screen_size[0] - 6
+        if paging_enabled && page_size < select_options.count
+          paging = {:cur_page => 0, :page_size => page_size, :total => select_options.count}
+        end
+
         while !value_found do
           Readline.completion_append_character = ""
           Readline.basic_word_break_characters = ''
@@ -336,7 +342,9 @@ module Morpheus
             }
             matches
           }
-          input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!default_value.to_s.empty? ? ' ['+default_value.to_s+']' : ''} ['?' for options]: ", false).to_s
+
+          has_more_pages = paging && (paging[:cur_page] * paging[:page_size]) < paging[:total]
+          input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!default_value.to_s.empty? ? ' ['+default_value.to_s+']' : ''} ['?' for#{has_more_pages && paging[:cur_page] > 0 ? ' more ' : ' '}options]: ", false).to_s
           input = input.chomp.strip
           if input.empty? && default_value
             input = default_value.to_s
@@ -351,7 +359,8 @@ module Morpheus
           
           if input == '?'
             help_prompt(option_type)
-            display_select_options(option_type, select_options)
+            display_select_options(option_type, select_options, paging)
+            paging[:cur_page] = (paging[:cur_page] + 1) * paging[:page_size] < paging[:total] ? paging[:cur_page] + 1 : 0 if paging
           elsif !value.nil? || option_type['required'] != true
             value_found = true
           end
@@ -505,8 +514,14 @@ module Morpheus
         api_client.options.options_for_source(source,params)['data']
       end
 
-      def self.display_select_options(opt, select_options = [])
+      def self.display_select_options(opt, select_options = [], paging = nil)
         header = opt['fieldLabel'] ? "#{opt['fieldLabel']} Options" : "Options"
+        if paging
+          offset = paging[:cur_page] * paging[:page_size]
+          limit = [offset + paging[:page_size], select_options.count].min - 1
+          header = "#{header} (#{offset+1}-#{limit+1} of #{paging[:total]})"
+          select_options = select_options[(offset)..(limit)]
+        end
         puts "\n#{header}"
         puts "==============="
         select_options.each do |option|

data/lib/morpheus/cli/tenants_command.rb

@@ -43,7 +43,7 @@ class Morpheus::Cli::TenantsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "List tenants (accounts)."
+      opts.footer = "List tenants."
     end
     optparse.parse!(args)
     connect(options)
@@ -53,7 +53,7 @@ class Morpheus::Cli::TenantsCommand
       @accounts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @accounts_interface.dry.list(params)
-        return
+        return 0
       end
       json_response = @accounts_interface.list(params)
       render_result = render_with_format(json_response, options, 'accounts')
@@ -64,7 +64,7 @@ class Morpheus::Cli::TenantsCommand
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if accounts.empty?
-        puts yellow,"No tenants found.",reset
+        print cyan,"No tenants found.",reset,"\n"
       else
         print_accounts_table(accounts)
         print_results_pagination(json_response)

data/lib/morpheus/cli/users.rb

@@ -53,32 +53,26 @@ class Morpheus::Cli::Users
         return
       end
       json_response = @users_interface.list(account_id, params)
+      render_result = render_with_format(json_response, options, 'users')
+      return 0 if render_result
       users = json_response['users']
-      if options[:json]
-        puts as_json(json_response, options, "users")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "users")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(users, options)
-        return 0
+
+      title = "Morpheus Users"
+      subtitles = []
+      if account
+        subtitles << "Account: #{account['name']}".strip
+      end
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles, options
+      if users.empty?
+        print cyan,"No users found.",reset,"\n"
       else
-        title = "Morpheus Users"
-        subtitles = []
-        if account
-          subtitles << "Account: #{account['name']}".strip
-        end
-        subtitles += parse_list_subtitles(options)
-        print_h1 title, subtitles, options
-        if users.empty?
-          puts yellow,"No users found.",reset
-        else
-          print_users_table(users, options)
-          print_results_pagination(json_response)
-        end
-        print reset,"\n"
+        print_users_table(users, options)
+        print_results_pagination(json_response)
       end
+      print reset,"\n"
+      return 0
+      
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       return 1

data/lib/morpheus/cli/version.rb

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

data/lib/morpheus/cli/whitelabel_settings_command.rb

@@ -3,9 +3,9 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::WhitelabelSettingsCommand
   include Morpheus::Cli::CliCommand
  # include Morpheus::Cli::AccountsHelper
-  set_command_hidden
-  set_command_name :'whitelabel-settings'
 
+  set_command_name :'whitelabel-settings'
+  set_command_hidden
   register_subcommands :get, :update
   register_subcommands :update_images, :reset_image, :download_image, :view_image
   set_default_subcommand :get

data/morpheus-cli.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.3' # according to http.rb doc
+  spec.required_ruby_version = '>= 2.5.1' # according to http.rb doc
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_dependency 'term-ansicolor', '~> 1.3.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.7
+  version: 4.1.8
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,6 +162,7 @@ files:
 - lib/morpheus/api/accounts_interface.rb
 - lib/morpheus/api/api_client.rb
 - lib/morpheus/api/appliance_settings_interface.rb
+- lib/morpheus/api/approvals_interface.rb
 - lib/morpheus/api/apps_interface.rb
 - lib/morpheus/api/archive_buckets_interface.rb
 - lib/morpheus/api/archive_files_interface.rb
@@ -192,6 +193,8 @@ files:
 - lib/morpheus/api/image_builder_preseed_scripts_interface.rb
 - lib/morpheus/api/instance_types_interface.rb
 - lib/morpheus/api/instances_interface.rb
+- lib/morpheus/api/integrations_interface.rb
+- lib/morpheus/api/jobs_interface.rb
 - lib/morpheus/api/key_pairs_interface.rb
 - lib/morpheus/api/library_compute_type_layouts_interface.rb
 - lib/morpheus/api/library_container_scripts_interface.rb
@@ -258,6 +261,7 @@ files:
 - lib/morpheus/cli/account_groups_command.rb
 - lib/morpheus/cli/accounts.rb
 - lib/morpheus/cli/appliance_settings_command.rb
+- lib/morpheus/cli/approvals_command.rb
 - lib/morpheus/cli/apps.rb
 - lib/morpheus/cli/archives_command.rb
 - lib/morpheus/cli/auth_command.rb
@@ -312,6 +316,8 @@ files:
 - lib/morpheus/cli/image_builder_command.rb
 - lib/morpheus/cli/instance_types.rb
 - lib/morpheus/cli/instances.rb
+- lib/morpheus/cli/integrations_command.rb
+- lib/morpheus/cli/jobs_command.rb
 - lib/morpheus/cli/key_pairs.rb
 - lib/morpheus/cli/library.rb
 - lib/morpheus/cli/library_container_scripts_command.rb
@@ -399,7 +405,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 2.5.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="