morpheus-cli 5.5.2.1 → 5.5.3

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

@@ -760,7 +760,7 @@ EOT
         options[:config_file] = val.to_s
         file_content = nil
         full_filename = File.expand_path(options[:config_file])
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_content = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -770,7 +770,7 @@ EOT
         config_map = parse_result[:data]
         if config_map.nil?
           # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
           #raise_command_error "Failed to parse config as valid YAML or JSON."
         else
           params['config'] = config_map
@@ -813,7 +813,7 @@ EOT
       #   config_map = parse_result[:data]
       #   if config_map.nil?
       #     # todo: bubble up JSON.parse error message
-      #     raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:err]}"
+      #     raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
       #     #raise_command_error "Failed to parse config as valid YAML or JSON."
       #   else
       #     params['config'] = config_map
@@ -1065,26 +1065,28 @@ EOT
     return 1, "integration inventory not found for #{args[1]}" if integration_inventory.nil?
     # construct payload
     object_key = integration_inventory_object_key
-    payload = build_payload(options, object_key)
-    if options[:tenants]
-      #params['tenants'] = options[:tenants]
-      params['tenants'] = options[:tenants].collect do |val|
-        if val.to_s =~ /\A\d{1,}\Z/
-          val.to_i
-        else
-          # todo: use /api/options/allTenants to avoid permission errors here..
-          record = find_by_name_or_id(:account, val)
-          if record.nil?
-            exit 1 #return 1, "Tenant not found by '#{val}'"
-          else 
-            record['id']
+    payload = parse_payload(options, object_key)
+    if payload.nil?
+      if options[:tenants]
+        #params['tenants'] = options[:tenants]
+        params['tenants'] = options[:tenants].collect do |val|
+          if val.to_s =~ /\A\d{1,}\Z/
+            val.to_i
+          else
+            # todo: use /api/options/allTenants to avoid permission errors here..
+            record = find_by_name_or_id(:account, val)
+            if record.nil?
+              exit 1 #return 1, "Tenant not found by '#{val}'"
+            else 
+              record['id']
+            end
           end
         end
       end
-    end
-    payload.deep_merge!({object_key => params})
-    if payload.empty? || payload[object_key].empty?
-      raise_command_error "Specify at least one option to update.\n#{optparse}"
+      payload.deep_merge!({object_key => params})
+      if payload.empty? || payload[object_key].empty?
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
+      end
     end
     # make request
     @integrations_interface.setopts(options)

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

@@ -146,7 +146,7 @@ class Morpheus::Cli::KeyPairs
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       opts.on('', '--public-key-file FILENAME', "Public Key File" ) do |filename|
-        if File.exists?(File.expand_path(filename))
+        if File.exist?(File.expand_path(filename))
           options['publicKey'] = File.read(File.expand_path(filename))
           options[:options] ||= {}
           options[:options]['publicKey'] = options['publicKey']
@@ -163,7 +163,7 @@ class Morpheus::Cli::KeyPairs
       end
 
       opts.on('', '--private-key-file FILENAME', "Private Key File" ) do |filename|
-        if File.exists?(File.expand_path(filename))
+        if File.exist?(File.expand_path(filename))
           options['privateKey'] = File.read(File.expand_path(filename))
           options[:options] ||= {}
           options[:options]['privateKey'] = options['privateKey']

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

@@ -172,7 +172,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       end
       opts.on('--file FILE', "File containing the script. This can be used instead of --script" ) do |filename|
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           params['script'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -266,7 +266,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       end
       opts.on('--file FILE', "File containing the script. This can be used instead of --script" ) do |filename|
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           params['script'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"

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

@@ -195,7 +195,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       end
       opts.on('--file FILE', "File containing the template. This can be used instead of --template" ) do |filename|
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           params['template'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -312,7 +312,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       end
       opts.on('--file FILE', "File containing the template. This can be used instead of --template" ) do |filename|
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           params['template'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"

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

@@ -306,7 +306,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         params.deep_merge!(v_prompt)
         if params['logo']
           filename = File.expand_path(params['logo'])
-          if !File.exists?(filename)
+          if !File.exist?(filename)
             print_red_alert "File not found: #{filename}"
             exit 1
           end
@@ -523,7 +523,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         logo_file = 'null' # clear it
       else
         filename = File.expand_path(filename)
-        if !File.exists?(filename)
+        if !File.exist?(filename)
           print_red_alert "File not found: #{filename}"
           exit 1
         end
@@ -571,7 +571,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         dark_logo_file = 'null' # clear it
       else
         filename = File.expand_path(filename)
-        if !File.exists?(filename)
+        if !File.exist?(filename)
           print_red_alert "File not found: #{filename}"
           exit 1
         end

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

@@ -207,7 +207,7 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
       opts.on('--file FILE', "File containing the template. This can be used instead of --content" ) do |filename|
         file_params['sourceType'] = 'local' if file_params['sourceType'].nil?
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_params['content'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"
@@ -363,7 +363,7 @@ class Morpheus::Cli::LibrarySpecTemplatesCommand
       opts.on('--file FILE', "File containing the template. This can be used instead of --content" ) do |filename|
         file_params['sourceType'] = 'local' if file_params['sourceType'].nil?
         full_filename = File.expand_path(filename)
-        if File.exists?(full_filename)
+        if File.exist?(full_filename)
           file_params['content'] = File.read(full_filename)
         else
           print_red_alert "File not found: #{full_filename}"

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

@@ -33,7 +33,7 @@ class Morpheus::Cli::Login
       end
       opts.on( '--password-file FILE', String, "Password File, read a file containing the password." ) do |val|
         password_file = File.expand_path(val)
-        if !File.exists?(password_file) || !File.file?(password_file) # check readable too
+        if !File.exist?(password_file) || !File.file?(password_file) # check readable too
           raise ::OptionParser::InvalidOption.new("File not found: #{password_file}")
         end
         password = File.read(password_file) #.to_s.split("\n").first.strip

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

@@ -8,12 +8,24 @@ class Morpheus::Cli::ManCommand
   # this should be read only anyway...
   @@default_editor = "less" # ENV['EDITOR']
 
+  def self.man_file_path
+    File.join(Morpheus::Cli.home_directory, "CLI-Manual-#{Morpheus::Cli::VERSION}.md")
+  end
+
   def handle(args)
     options = {}
     regenerate = false
-    editor = @@default_editor
     open_as_link = false # true please
     goto_wiki = false
+    editor = @@default_editor
+    #todo: windows
+    if !$stdin.tty?
+      editor = "cat"
+    end
+    # no editor for windows atm
+    if Morpheus::Cli.windows?
+      open_as_link = true
+    end
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus man"
       opts.on('-w','--wiki', "Open the morpheus-cli wiki instead of the local man page") do
@@ -81,16 +93,16 @@ EOT
         print_error "#{red}It is the name of an existing directory.#{reset}\n"
         return 1
       end
-      if File.exists?(fn) && options[:overwrite] != true
+      if File.exist?(fn) && options[:overwrite] != true
         print_error "#{red}Output file '#{fn}' already exists.#{reset}\n"
         print_error "#{red}Use --overwrite to overwrite the existing file.#{reset}\n"
         return 1
       end
     end
     exit_code, err = 0, nil
-    if regenerate || !File.exists?(fn)
+    if regenerate || !File.exist?(fn)
       #Morpheus::Logging::DarkPrinter.puts "generating manual #{fn} ..." if Morpheus::Logging.debug? && !options[:quiet]
-      exit_code, err = Morpheus::Cli::ManCommand.generate_manual(options)
+      exit_code, err = generate_manual(options)
     end
     
     if options[:quiet]
@@ -99,7 +111,7 @@ EOT
     
     Morpheus::Logging::DarkPrinter.puts "opening manual file #{fn}" if Morpheus::Logging.debug? && !options[:quiet]
     
-    if open_as_link # not used atm
+    if open_as_link # windows only atm
       link = "file://#{fn}"
       if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
         system "start #{link}"
@@ -142,13 +154,9 @@ EOT
     return has_it
   end
 
-  def self.man_file_path
-    File.join(Morpheus::Cli.home_directory, "CLI-Manual-#{Morpheus::Cli::VERSION}.md")
-  end
-
   # def self.save_manual(fn, content)
-  #   # fn = man_file_path()
-  #   if !Dir.exists?(File.dirname(fn))
+  #   # fn = Morpheus::Cli::ManCommand.man_file_path
+  #   if !Dir.exist?(File.dirname(fn))
   #     FileUtils.mkdir_p(File.dirname(fn))
   #   end
   #   Morpheus::Logging::DarkPrinter.puts "saving manual to #{fn}" if Morpheus::Logging.debug?
@@ -156,19 +164,19 @@ EOT
   #   FileUtils.chmod(0600, fn)
   # end
 
-  def self.generate_manual(options={})
+  def generate_manual(options={})
     # todo: use pandoc or something else to convert the CLI-Manual.md to a man page
     # and install it, so the os command `man morpheus` will work too.
-    fn = man_file_path()
+    fn = Morpheus::Cli::ManCommand.man_file_path
     if options[:outfile]
       fn = File.expand_path(options[:outfile])
-      if File.exists?(fn) && options[:overwrite] != true
+      if File.exist?(fn) && options[:overwrite] != true
         print_error "#{red}Output file '#{options[:outfile]}' already exists.#{reset}\n"
         print_error "#{red}Use --overwrite to overwrite the existing file.#{reset}\n"
         return 1, "output file already exists"
       end
     end
-    if !Dir.exists?(File.dirname(fn))
+    if !Dir.exist?(File.dirname(fn))
       FileUtils.mkdir_p(File.dirname(fn))
     end
     Morpheus::Logging::DarkPrinter.puts "generating manual #{fn}" if Morpheus::Logging.debug? && !options[:quiet]
@@ -202,7 +210,7 @@ EOT
 
     Use the command `#{prog_name} remote add` to connect to your Morpheus appliance.
 
-    To learn more, visit https://github.com/gomorpheus/morpheus-cli/wiki/Getting-Started
+    To learn more, visit https://clidocs.morpheusdata.com
 
     To learn more about the Morpheus Appliance, visit https://www.morpheusdata.com
 
@@ -254,7 +262,11 @@ EOT
     The available commands and their options are documented below.
 ENDTEXT
       
-      terminal = Morpheus::Terminal.new($stdin, manpage)
+      
+      #terminal = Morpheus::Terminal.new($stdin, manpage)
+      terminal = my_terminal
+      terminal.with_stdout(manpage) do
+
       Morpheus::Logging::DarkPrinter.puts "appending command help `#{prog_name} --help`" if Morpheus::Logging.debug? && !options[:quiet]
 
       manpage.print "\n"
@@ -406,12 +418,14 @@ echo
 ```
 
 ENDTEXT
+    
+    end # end with_stdout(manpage)
 
     ensure
       manpage.close if manpage
       # $stdout = previous_stdout if previous_stdout
       # this is needed to re-establish instance with STDOUT, STDIN
-      terminal = Morpheus::Terminal.new()
+      #terminal = Morpheus::Terminal.new()
     end
 
     return 0, nil

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

@@ -386,7 +386,7 @@ class Morpheus::Cli::PackagesCommand
       puts_error  "bad argument: [morpkg-file]\nFile '#{local_file_path}' is invalid.\n#{optparse}"
       return 1
     end
-    if !File.exists?(local_file_path)
+    if !File.exist?(local_file_path)
       print_error Morpheus::Terminal.angry_prompt
       puts_error  "bad argument: [morpkg-file]\nFile '#{local_file_path}' was not found.\n"
       return 1
@@ -545,7 +545,7 @@ class Morpheus::Cli::PackagesCommand
         end
       end
       outfile = File.expand_path(outfile)
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         puts_error "#{Morpheus::Terminal.angry_prompt}--file is invalid. It is the name of an existing directory: #{outfile}"
         return 1
       end
@@ -554,7 +554,7 @@ class Morpheus::Cli::PackagesCommand
         outfile << ".morpkg"
       end
       destination_dir = File.dirname(outfile)
-      if !Dir.exists?(destination_dir)
+      if !Dir.exist?(destination_dir)
         if do_mkdir
           print cyan,"Creating local directory #{destination_dir}",reset,"\n"
           FileUtils.mkdir_p(destination_dir)
@@ -563,7 +563,7 @@ class Morpheus::Cli::PackagesCommand
           return 1
         end
       end
-      if File.exists?(outfile)
+      if File.exist?(outfile)
         if do_overwrite
           # uhh need to be careful wih the passed filepath here..
           # don't delete, just overwrite.
@@ -598,7 +598,7 @@ class Morpheus::Cli::PackagesCommand
 
         if do_unzip
           package_dir = File.join(File.dirname(outfile), File.basename(outfile).sub(/\.morpkg\Z/, ''))
-          if File.exists?(package_dir)
+          if File.exist?(package_dir)
             print cyan,"Deleting existing directory #{package_dir}",reset,"\n"
             FileUtils.rm_rf(package_dir)
           end
@@ -619,7 +619,7 @@ class Morpheus::Cli::PackagesCommand
           #response_body = (http_response.body.kind_of?(Net::ReadAdapter) ? "" : http_response.body)
         end
         # F it, just remove a bad result
-        if File.exists?(outfile) && File.file?(outfile)
+        if File.exist?(outfile) && File.file?(outfile)
           Morpheus::Logging::DarkPrinter.puts "Deleting bad file download: #{outfile}" if Morpheus::Logging.debug?
           File.delete(outfile)
         end
@@ -687,7 +687,7 @@ class Morpheus::Cli::PackagesCommand
     begin  
       # validate source
       source_directory = File.expand_path(source_directory)
-      if !File.exists?(source_directory)
+      if !File.exist?(source_directory)
         puts_error "#{Morpheus::Terminal.angry_prompt}[source] is invalid. Directory not found: #{source_directory}"
         return 1
       end
@@ -718,7 +718,7 @@ class Morpheus::Cli::PackagesCommand
       else
         outfile = File.expand_path(outfile)
       end
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         puts_error "#{Morpheus::Terminal.angry_prompt}[target] is invalid. It is the name of an existing directory: #{outfile}"
         return 1
       end
@@ -727,7 +727,7 @@ class Morpheus::Cli::PackagesCommand
         outfile << ".morpkg"
       end
       destination_dir = File.dirname(outfile)
-      if !Dir.exists?(destination_dir)
+      if !Dir.exist?(destination_dir)
         if do_mkdir
           print cyan,"Creating local directory #{destination_dir}",reset,"\n"
           FileUtils.mkdir_p(destination_dir)
@@ -736,7 +736,7 @@ class Morpheus::Cli::PackagesCommand
           return 1
         end
       end
-      if File.exists?(outfile)
+      if File.exist?(outfile)
         if do_overwrite
           # uhh need to be careful wih the passed filepath here..
           # don't delete, just overwrite.
@@ -783,7 +783,7 @@ class Morpheus::Cli::PackagesCommand
           end
         end
         # F it, just remove a bad result
-        # if File.exists?(outfile) && File.file?(outfile)
+        # if File.exist?(outfile) && File.file?(outfile)
         #   Morpheus::Logging::DarkPrinter.puts "Deleting bad build file: #{outfile}" if Morpheus::Logging.debug?
         #   File.delete(outfile)
         # end

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

@@ -30,7 +30,7 @@ EOT
     connect(options)
     filename = args[0]
     filename = File.expand_path(filename)
-    if !File.exists?(filename)
+    if !File.exist?(filename)
       raise_command_error "File not found: #{filename}"
     elsif !File.file?(filename)
       raise_command_error "File is a directory: #{filename}"

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

@@ -334,7 +334,7 @@ class Morpheus::Cli::PoliciesCommand
         options['eachUser'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s.empty?
       end
       
-      opts.on('-t', '--type ID', "Policy Type Name or ID") do |val|
+      opts.on('-t', '--type ID', "Policy Type Name, Code or ID") do |val|
         options['type'] = val
       end
       opts.on('--name VALUE', String, "Name for this policy") do |val|
@@ -417,7 +417,7 @@ class Morpheus::Cli::PoliciesCommand
           print_red_alert "No available policy types found!"
           return 1
         end
-        policy_types_dropdown = available_policy_types.collect {|it| {'name' => it['name'], 'value' => it['id']} }
+        policy_types_dropdown = available_policy_types.collect {|it| {'name' => it['name'], 'value' => it['code'], 'id' => it['id']} }
         policy_type_id = nil
         policy_type = nil
         if options['type']
@@ -497,7 +497,7 @@ class Morpheus::Cli::PoliciesCommand
           payload['policy']['config'] = options['config']
         elsif options['configFile']
           config_file = File.expand_path(options['configFile'])
-          if !File.exists?(config_file) || !File.file?(config_file)
+          if !File.exist?(config_file) || !File.file?(config_file)
             print_red_alert "File not found: #{config_file}"
             return false
           end
@@ -637,7 +637,7 @@ class Morpheus::Cli::PoliciesCommand
         payload['policy']['config'] = options['config']
       elsif options['configFile']
         config_file = File.expand_path(options['configFile'])
-        if !File.exists?(config_file) || !File.file?(config_file)
+        if !File.exist?(config_file) || !File.file?(config_file)
           print_red_alert "File not found: #{config_file}"
           return false
         end

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

@@ -172,7 +172,7 @@ class Morpheus::Cli::PreseedScriptsCommand
       params = Morpheus::Cli::OptionTypes.prompt(my_options, options[:options], @api_client, options[:params])
       script_file = params.delete('file')
       if script_file
-        if !File.exists?(script_file)
+        if !File.exist?(script_file)
           print_red_alert "File not found: #{script_file}"
           return 1
         end
@@ -243,7 +243,7 @@ class Morpheus::Cli::PreseedScriptsCommand
       # params = Morpheus::Cli::OptionTypes.prompt(my_options, options[:options], @api_client, options[:params])
       script_file = params.delete('file')
       if script_file
-        if !File.exists?(script_file)
+        if !File.exist?(script_file)
           print_red_alert "File not found: #{script_file}"
           return 1
         end

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

@@ -1512,7 +1512,7 @@ EOT
 
     def save_appliances(new_config)
       fn = appliances_file_path
-      if !Dir.exists?(File.dirname(fn))
+      if !Dir.exist?(File.dirname(fn))
         FileUtils.mkdir_p(File.dirname(fn))
       end
       File.open(fn, 'w') {|f| f.write new_config.to_yaml } #Store

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

@@ -396,12 +396,12 @@ class Morpheus::Cli::ReportsCommand
         report_format = "csv"
       end
       
-      if Dir.exists?(outfile)
+      if Dir.exist?(outfile)
         print_red_alert "[file] is invalid. It is the name of an existing directory: #{outfile}"
         return 1
       end
       destination_dir = File.dirname(outfile)
-      if !Dir.exists?(destination_dir)
+      if !Dir.exist?(destination_dir)
         if do_mkdir
           print cyan,"Creating local directory #{destination_dir}",reset,"\n"
           FileUtils.mkdir_p(destination_dir)
@@ -410,7 +410,7 @@ class Morpheus::Cli::ReportsCommand
           return 1
         end
       end
-      if File.exists?(outfile)
+      if File.exist?(outfile)
         if do_overwrite
           # uhh need to be careful wih the passed filepath here..
           # don't delete, just overwrite.

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

@@ -500,7 +500,9 @@ EOT
     permission_label = -> (s) {s.split('-').collect{|s| s.capitalize}.join(' ') + ' Permissions'}
 
     if category.nil?
-      permissions = available_categories.collect{|category| role[permission_name.call(category)].map{|perm| perm.merge({'category' => permission_label.call(category)})}}.flatten
+      permissions = available_categories.reject{|category| role[permission_name.call(category)].nil?}.collect{|category|
+        role[permission_name.call(category)].map{|perm| perm.merge({'category' => permission_label.call(category)})}
+      }.flatten
     else
       permissions = role[permission_name.call(category)]
     end
@@ -517,11 +519,12 @@ EOT
     end
 
     print cyan
-    print_h1 "Role: [#{role['role']['id']},#{role['role']['owner']['name']}] #{role['role']['authority']}", options
+    print_h1 "Role: [#{role['role']['id']}#{(role['role']['owner'].nil? ? ']' : ", #{role['role']['owner']['name']}]")} #{role['role']['authority']}", options
 
     (category.nil? ? available_categories : [category]).each do |category|
-      print_h2 "#{permission_label.call(category)}", options
       permissions = role[permission_name.call(category)]
+      next if permissions.nil?
+      print_h2 "#{permission_label.call(category)}", options
       if permissions.size > 0
         rows = permissions.collect do |it|
           {

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

@@ -1156,7 +1156,7 @@ class Morpheus::Cli::SecurityGroups
 
   def self.save_security_group(new_config)
     fn = security_group_file_path
-    if !Dir.exists?(File.dirname(fn))
+    if !Dir.exist?(File.dirname(fn))
       FileUtils.mkdir_p(File.dirname(fn))
     end
     File.open(fn, 'w') {|f| f.write new_config.to_yaml } #Store