morpheus-cli 5.5.2.2 → 5.5.3.1

data/lib/morpheus/api/network_server_groups_interface.rb

@@ -0,0 +1,7 @@
+require 'morpheus/api/secondary_rest_interface'
+
+class Morpheus::NetworkServerGroupsInterface < Morpheus::SecondaryRestInterface
+  def base_path(network_server_id)
+    "/api/networks/servers/#{network_server_id}/groups"
+  end
+end

data/lib/morpheus/api/packages_interface.rb

@@ -79,7 +79,7 @@ class Morpheus::PackagesInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :post, url: url, headers: headers}
     # execute(opts, {parse_json: false})
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false

data/lib/morpheus/api/reports_interface.rb

@@ -44,7 +44,7 @@ class Morpheus::ReportsInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
     # execute(opts, {parse_json: false})
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false

data/lib/morpheus/api/servers_interface.rb

@@ -55,6 +55,14 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def restart(serverId,payload = {}, params = {})
+    url = "#{@base_url}/api/servers/#{serverId}/restart"
+
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def make_managed(serverId,payload = {})
     url = "#{@base_url}/api/servers/#{serverId}/install-agent"
     #url = "#{@base_url}/api/servers/#{serverId}/make-managed" # added in 4.1
@@ -176,7 +184,7 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
-    def update_network_label(network_id, server_id, payload)
+  def update_network_label(network_id, server_id, payload)
     url = "#{@base_url}/api/servers/#{server_id}/networkInterfaces/#{network_id}"
     headers = {authorization: "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}

data/lib/morpheus/api/storage_providers_interface.rb

@@ -96,7 +96,7 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, false)
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false
@@ -125,7 +125,7 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, false)
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false

data/lib/morpheus/api/virtual_images_interface.rb

@@ -81,7 +81,7 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
       # opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
     end
     
-    start_time = Time.now
+    # start_time = Time.now
     query_params = headers.delete(:params) || {}
     file_size = image_file.size
     if File.blockdev?(image_file)

data/lib/morpheus/api.rb

@@ -7,4 +7,6 @@ require 'morpheus/formatters'
 
 # load interfaces
 require 'morpheus/api/api_client.rb'
+require 'morpheus/api/rest_interface.rb'
+require 'morpheus/api/read_interface.rb'
 Dir[File.dirname(__FILE__)  + "/api/**/*.rb"].each {|file| require file }

data/lib/morpheus/benchmarking.rb

@@ -145,7 +145,7 @@ module Morpheus::Benchmarking
 
     # finish the current benchmark and optionally print the time taken.
     def stop_benchmark(exit_code=0, err=nil)
-      if @benchmark_record
+      if defined?(@benchmark_record) && @benchmark_record
         @benchmark_record.stop(exit_code, err)
         @last_benchmark_record = @benchmark_record
         @benchmark_record = nil

data/lib/morpheus/cli/cli_command.rb

@@ -133,10 +133,12 @@ module Morpheus
       end
 
       # this returns all the options passed in by -O, parsed all nicely into objects.
-      def parse_passed_options(options)
-        passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      def parse_passed_options(options, parse_opts={})
+        excludes = [parse_opts[:exclude], parse_opts[:excludes]].flatten.compact
+        passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) || excludes.include?(k) } : {}
         return passed_options
       end
+
       # Appends Array of OptionType definitions to an OptionParser instance
       # This adds an option like --fieldContext.fieldName="VALUE"
       # @param opts [OptionParser]
@@ -378,35 +380,53 @@ module Morpheus
               end
               options[:options] = custom_options
             end
-            opts.on('-P','--prompt', "Always prompts. Use passed options as the default value.") do |val|
+            # --always-prompt can be used with for update commands where it normally defaults to --no-prompt
+            opts.on('--prompt', "Always prompt for input on every option, even those not prompted for by default.") do
               options[:always_prompt] = true
-              options[:options] ||= {}
               options[:options][:always_prompt] = true
             end
-            opts.on('-N','--no-prompt', "Skip prompts. Use default values for all optional fields.") do |val|
+            opts.on('-N','--no-prompt', "No prompt, skips all input prompting.") do |val|
               options[:no_prompt] = true
-              options[:options] ||= {}
-              options[:options][:no_prompt] = true
-            end
-
-          when :prompt
-            opts.on('-P','--prompt', "Always prompts. Use passed options as the default value.") do |val|
-              options[:always_prompt] = true
-              options[:options] ||= {}
-              options[:options][:always_prompt] = true
-            end
-            opts.on('-N','--no-prompt', "Skip prompts. Use default values for all optional fields.") do |val|
-              options[:no_prompt] = true
-              options[:options] ||= {}
               options[:options][:no_prompt] = true
             end
+            # opts.on('--skip-prompt x,y,z', String, "Skip prompt, do not prompt for input of the specified options.") do |val|
+            #   options[:skip_prompt] ||= []
+            #   options[:skip_prompt] += parse_array(val)
+            #   options[:options][:skip_prompt] = options[:skip_prompt]
+            # end
+            # opts.on('--only-prompt x,y,z', String, "Only prompt for input on the specified options.") do |val|
+            #   options[:only_prompt] ||= []
+            #   options[:only_prompt] += parse_array(val)
+            #   options[:options][:only_prompt] = options[:only_prompt]
+            # end
+            opts.on('--no-options', String, "No options, skips all option parsing so no options are required and no default values are used.") do
+              options[:no_options] = true
+              options[:options][:no_options] = options[:no_options]
+            end
+            opts.on('--skip-options x,y,z', String, "Skip parsing of the specified options so that they are not required and their default value is not used.") do |val|
+              options[:skip_options] ||= []
+              options[:skip_options] += parse_array(val)
+              options[:options][:skip_options] = options[:skip_options]
+            end
+            # opts.on('--only-options x,y,z', String, "Only parse the specified options and skip all others.") do |val|
+            #   options[:only_options] ||= []
+            #   options[:only_options] += parse_array(val)
+            #   options[:options][:only_options] = options[:only_options]
+            # end
+            
+            # hide these while incubating
+            opts.add_hidden_option('--skip-prompt')
+            opts.add_hidden_option('--only-prompt')
+            opts.add_hidden_option('--no-options')
+            opts.add_hidden_option('--skip-options')
+            opts.add_hidden_option('--only-options')
 
           when :payload
             opts.on('--payload FILE', String, "Payload from a local JSON or YAML file, skip all prompting") do |val|
               options[:payload_file] = val.to_s
               begin
                 payload_file = File.expand_path(options[:payload_file])
-                if !File.exists?(payload_file) || !File.file?(payload_file)
+                if !File.exist?(payload_file) || !File.file?(payload_file)
                   raise ::OptionParser::InvalidOption.new("File not found: #{payload_file}")
                   #return false
                 end
@@ -419,10 +439,10 @@ module Morpheus
                 raise ::OptionParser::InvalidOption.new("Failed to parse payload file: #{payload_file} Error: #{ex.message}")
               end
             end
-            opts.on('--payload-dir DIRECTORY', String, "Payload from a local directory containing 1-N JSON or YAML files, skip all prompting") do |val|
+            opts.on('--payload-dir DIRECTORY', String, "Payload from a local directory containing 1-N JSON or YAML files, skip all prompting.") do |val|
               options[:payload_dir] = val.to_s
               payload_dir = File.expand_path(options[:payload_dir])
-              if !Dir.exists?(payload_dir) || !File.directory?(payload_dir)
+              if !Dir.exist?(payload_dir) || !File.directory?(payload_dir)
                 raise ::OptionParser::InvalidOption.new("Directory not found: #{payload_dir}")
               end
               payload = {}
@@ -592,7 +612,7 @@ module Morpheus
             end unless excludes.include?(:remote_token)
             opts.on( '--token-file FILE', String, "Token File, read a file containing the access token." ) do |val|
               token_file = File.expand_path(val)
-              if !File.exists?(token_file) || !File.file?(token_file)
+              if !File.exist?(token_file) || !File.file?(token_file)
                 raise ::OptionParser::InvalidOption.new("File not found: #{token_file}")
               end
               options[:remote_token] = File.read(token_file).to_s.split("\n").first.strip
@@ -609,7 +629,7 @@ module Morpheus
               end
               opts.on( '--password-file FILE', String, "Password File, read a file containing the password for authentication." ) do |val|
                 password_file = File.expand_path(val)
-                if !File.exists?(password_file) || !File.file?(password_file)
+                if !File.exist?(password_file) || !File.file?(password_file)
                   raise ::OptionParser::InvalidOption.new("File not found: #{password_file}")
                 end
                 file_content = File.read(password_file) #.strip
@@ -914,12 +934,12 @@ module Morpheus
 
         opts.on('--hidden-help', "Print help that includes all the hidden options, like this one." ) do
           puts opts.full_help_message({show_hidden_options:true})
-          exit # return 0 maybe?
+          exit 0 # return 0 maybe?
         end
         opts.add_hidden_option('--hidden-help') if opts.is_a?(Morpheus::Cli::OptionParser)
         opts.on('-h', '--help', "Print this help" ) do
           puts opts
-          exit # return 0 maybe?
+          exit 0 # return 0 maybe?
         end
 
         opts
@@ -1012,9 +1032,9 @@ module Morpheus
             out << "\n"
           }
         end
-        if command_description
+        if command_description && !command_description.to_s.strip.empty?
           out << "\n"
-          out << "#{command_description}\n"
+          out << "#{command_description.strip}\n"
         end
         # out << "\n"
         out
@@ -1248,6 +1268,14 @@ module Morpheus
         true
       end
 
+      def confirm(msg, options)
+        options[:yes] or ::Morpheus::Cli::OptionTypes::confirm(msg, options)
+      end
+
+      def confirm!(msg, options)
+        confirm(msg, options) or raise CommandAborted.new("confirmation declined: #{msg}")
+      end
+
       # The default way to build options for the list command
       # @param [OptionParser] opts
       # @param [Hash] options
@@ -1449,11 +1477,11 @@ module Morpheus
       def validate_outfile(outfile, options)
         full_filename = File.expand_path(outfile)
         outdir = File.dirname(full_filename)
-        if Dir.exists?(full_filename)
+        if Dir.exist?(full_filename)
           print_red_alert "[local-file] is invalid. It is the name of an existing directory: #{outfile}"
           return false
         end
-        if !Dir.exists?(outdir)
+        if !Dir.exist?(outdir)
           if options[:mkdir]
             print cyan,"Creating local directory #{outdir}",reset,"\n"
             FileUtils.mkdir_p(outdir)
@@ -1462,7 +1490,7 @@ module Morpheus
             return false
           end
         end
-        if File.exists?(full_filename) && !options[:overwrite]
+        if File.exist?(full_filename) && !options[:overwrite]
           print_red_alert "[local-file] is invalid. File already exists: #{outfile}\nUse -f to overwrite the existing file."
           return false
         end
@@ -1586,7 +1614,16 @@ module Morpheus
         interface_name = "@#{type.pluralize}_interface"
         interface = instance_variable_get(interface_name)
         if interface.nil?
-          raise "#{self.class} has not defined interface #{interface_name}"
+          api_client = instance_variable_get("@api_client")
+          if api_client
+            if api_client.respond_to?(type.pluralize)
+              interface = api_client.send(type.pluralize)
+            else
+              raise "@api_client.#{type.pluralize} is not a recognized interface"
+            end
+          else
+            raise "#{self.class} has not defined interface #{interface_name} or @api_client"
+          end
         end
         begin
           json_response = interface.get(*ids)
@@ -1753,6 +1790,9 @@ module Morpheus
 
       module ClassMethods
 
+        # attr_writer :command_name, :command_description, :hidden_command, :default_refresh_interval,
+        #             :subcommands, :hidden_subcommands, :default_subcommand, :subcommand_aliases, :subcommand_descriptions
+
         def prog_name
           "morpheus"
         end
@@ -1779,7 +1819,11 @@ module Morpheus
         # alias :command_name= :set_command_name
 
         def hidden_command
-          !!@hidden_command
+          defined?(@hidden_command) && @hidden_command == true
+        end
+
+        def hidden_subcommands
+          @hidden_subcommands ||= []
         end
 
         def set_subcommands_hidden(*cmds)
@@ -1791,7 +1835,7 @@ module Morpheus
         end
 
         def command_description
-          @command_description
+          @command_description ||= ""
         end
 
         def set_command_description(val)
@@ -1880,10 +1924,8 @@ module Morpheus
 
         def visible_subcommands
           cmds = subcommands.clone
-          if @hidden_subcommands && !@hidden_subcommands.empty?
-            @hidden_subcommands.each do |hidden_cmd|
-              cmds.delete(hidden_cmd.to_s.gsub('_', '-'))
-            end
+          hidden_subcommands.each do |hidden_cmd|
+            cmds.delete(hidden_cmd.to_s.gsub('_', '-'))
           end
           cmds
         end

data/lib/morpheus/cli/cli_registry.rb

@@ -78,10 +78,17 @@ module Morpheus
 
         def exec_command(command_name, args)
           #puts "exec_command(#{command_name}, #{args})"
+          result = nil
           if has_alias?(command_name)
-            exec_alias(command_name, args)
+            result = exec_alias(command_name, args)
           elsif has_command?(command_name)
-            instance.get(command_name).new.handle(args)
+            begin
+              result = instance.get(command_name).new.handle(args)
+            rescue SystemExit => e
+              result = Morpheus::Cli::ErrorHandler.new(Morpheus::Terminal.instance.stderr).handle_error(e) # lol
+            rescue => e
+              result = Morpheus::Cli::ErrorHandler.new(Morpheus::Terminal.instance.stderr).handle_error(e) # lol
+            end
           else
             # todo: need to just return error instead of raise
             msg = "'#{command_name}' is not a morpheus command."
@@ -97,8 +104,10 @@ module Morpheus
                 msg += "\t" + suggestion + "\n"
               end
             end
-            raise CommandNotFoundError.new(msg)
+            #raise CommandNotFoundError.new(msg)
+            result = Morpheus::Cli::ErrorHandler.new(Morpheus::Terminal.instance.stderr).handle_error(CommandNotFoundError.new(msg)) # lol
           end
+          return result
         end
 
         def exec_alias(alias_name, args)
@@ -248,17 +257,17 @@ module Morpheus
 
         # parse any object into a command result [exit_code, error]
         # 0 means success.
-        # This treats nil, true, or an object success.
-        # 0 or
-        # @return [Array] exit_code, error. Success returns [0, nil].
+        # This treats nil, true, or an object as success ie. [0, nil]
+        # and false is treated as an error [1, error]
+        # @return [Array] [exit_code, error]. Success returns [0, nil].
         def parse_command_result(cmd_result)
-          exit_code, err = nil, nil
+          exit_code, error = nil, nil
           if cmd_result.is_a?(Array)
             exit_code = cmd_result[0] || 0
-            err = cmd_result[1]
+            error = cmd_result[1]
           elsif cmd_result.is_a?(Hash)
             exit_code = cmd_result[:exit_code] || 0
-            err = cmd_result[:error] || cmd_result[:err]
+            error = cmd_result[:error] || cmd_result[:err]
           elsif cmd_result == nil || cmd_result == true
             exit_code = 0
           elsif cmd_result == false
@@ -279,7 +288,7 @@ module Morpheus
               exit_code = 0
             end
           end
-          return exit_code, err
+          return exit_code, error
         end
 
         def cached_command_list

data/lib/morpheus/cli/commands/access_token_command.rb

@@ -116,7 +116,7 @@ class Morpheus::Cli::AccessTokenCommand
       end
       opts.on( '--token-file FILE', String, "Refresh Token File, read a file containing the refresh token." ) do |val|
         token_file = File.expand_path(val)
-        if !File.exists?(token_file) || !File.file?(token_file)
+        if !File.exist?(token_file) || !File.file?(token_file)
           raise ::OptionParser::InvalidOption.new("File not found: #{token_file}")
         end
         options[:refresh_token] = File.read(token_file).to_s.split("\n").first.strip

data/lib/morpheus/cli/commands/appliance_settings_command.rb

@@ -6,7 +6,7 @@ class Morpheus::Cli::ApplianceSettingsCommand
 
   set_command_name :'appliance-settings'
 
-  register_subcommands :get, :update
+  register_subcommands :get, :update, :toggle_maintenance, :'reindex'
   
   set_default_subcommand :get
 
@@ -103,7 +103,7 @@ class Morpheus::Cli::ApplianceSettingsCommand
         print cyan
         print enabled_zone_types.collect {|it| it['name']}.join(', ')
       end
-      print reset "\n"
+      print reset, "\n"
       return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -307,6 +307,61 @@ class Morpheus::Cli::ApplianceSettingsCommand
     end
   end
 
+  def toggle_maintenance(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = opts.banner = subcommand_usage()
+      opts.on("--enabled [on|off]", String, "Enabled (on) or Disabled (off)") do |val|
+        params['enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      build_standard_update_options(opts, options, [:auto_confirm], [:payload, :options])
+      opts.footer = "Toggle maintenance mode."
+    end
+    optparse.parse!(args)
+    connect(options)
+    verify_args!(args:args, optparse:optparse, count:0)
+    if params['enabled'].nil?
+      confirm!("Are you sure you would like to toggle maintenance mode?", options)
+    else
+      confirm!("Are you sure you would like to toggle maintenance mode: #{params['enabled'] ? 'on' : 'off'}?", options)
+    end
+    @appliance_settings_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @appliance_settings_interface.dry.maintenance(params)
+      return
+    end
+    json_response = @appliance_settings_interface.maintenance(params)
+    render_response(json_response, options) do
+      print_green_success "Toggled maintenance mode: '#{params['enabled'] ? 'on' : 'off'}'"
+    end
+    return 0, nil
+  end
+
+  def reindex(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = opts.banner = subcommand_usage()
+      build_standard_update_options(opts, options, [:auto_confirm], [:payload, :options])
+      opts.footer = "Reindex all search data."
+    end
+    optparse.parse!(args)
+    connect(options)
+    verify_args!(args:args, optparse:optparse, count:0)
+    confirm!("Are you sure you would like reindex all search data?", options)
+    @appliance_settings_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @appliance_settings_interface.dry.reindex(params)
+      return
+    end
+    json_response = @appliance_settings_interface.reindex(params)
+    render_response(json_response, options) do
+      print_green_success "Reindexing all search data..."
+    end
+    return 0, nil
+  end
+
   private
 
   def format_days(days)

data/lib/morpheus/cli/commands/apps.rb

@@ -2260,7 +2260,7 @@ EOT
       build_option_type_options(opts, options, update_wiki_page_option_types)
       opts.on('--file FILE', "File containing the wiki content. This can be used instead of --content") do |filename|
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           params['content'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"