morpheus-cli 4.2.20 → 5.0.2

data/lib/morpheus/cli/search_command.rb

@@ -0,0 +1,182 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::SearchCommand
+  include Morpheus::Cli::CliCommand
+  
+  set_command_name :search
+  set_command_description "Global search for finding all types of objects"
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @search_interface = @api_client.search
+  end
+
+  def handle(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = "Usage: #{prog_name} #{command_name} [phrase]"
+      opts.on("-g", "--go", "Go get details for the top search result instead of printing the list.") do
+        options[:go] = true
+      end
+      build_standard_list_options(opts, options)
+      opts.footer = <<-EOT
+Global search for finding all types of objects
+[phrase] is required. This is the phrase to search for.
+Prints the list of search results with the most relevant first.
+or use the --go option to get details about the top result instead.
+EOT
+    end
+    optparse.parse!(args)
+    connect(options)
+    # verify_args!(args:args, optparse:optparse, min:1)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    if options[:phrase].to_s.empty?
+      raise_command_error "[phrase] is required.", args, optparse
+    end
+    params.merge!(parse_list_options(options))
+    @search_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @search_interface.dry.list(params)
+      return
+    end
+    json_response = @search_interface.list(params)
+    search_results = json_response["hits"] || json_response["results"] || []
+    top_result = search_results[0]
+    if options[:go]
+      if top_result
+        print cyan,"Loading top search result: #{format_morpheus_type(top_result['type'])} #{top_result['name'] || top_result['id']} (score: #{top_result['score']})",reset,"\n"
+        return go_to_search_result(top_result, options)
+      else
+        # print cyan,"No results found.",reset,"\n"
+        raise_command_error "No search results for phrase '#{options[:phrase]}'"
+      end
+    end
+    render_response(json_response, options, "hits") do
+      print_h1 "Morpheus Search", parse_list_subtitles(options), options
+      if search_results.empty?
+        print cyan,"No results found.",reset,"\n"
+      else
+        columns = {
+          "Type" => lambda {|it| format_morpheus_type(it['type']) },
+          "ID" => 'id',
+          # "UUID" => 'uuid',
+          "Name" => 'name',
+          "Decription" => 'description',
+          #"Score" => 'score',
+          "Date Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+        }
+        print as_pretty_table(search_results, columns.upcase_keys!, options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+    end
+    if search_results.empty?
+      return 1, "no results found"
+    else
+      return 0, nil
+    end
+  end
+
+  protected
+
+  def format_morpheus_type(val)
+    if val == "ComputeSite"
+      "Group"
+    elsif val == "ComputeZone"
+      "Cloud"
+    elsif val == "ComputeServer"
+      "Host"
+    elsif val == "ComputeServerGroup"
+      "Cluster"
+    elsif val == "ComputeZonePool"
+      "Pool"
+    else
+      val
+    end
+  end
+  
+  def go_to_search_result(result, options)
+    result_type = result['type']
+    cmd_class = lookup_morpheus_command(result['type'])
+    if cmd_class
+      get_options = []
+      get_options += (options[:remote] ? ["-r",options[:remote]] : [])
+      get_options += (options[:json] ? ["--json"] : [])
+      get_options += (options[:yaml] ? ["--yaml"] : [])
+      return cmd_class.new.handle(["get", result['id']] + get_options)
+    else
+      raise_command_error "Sorry, result cannot be loaded. type: #{result_type}, id: #{result['id']}, name: #{result['name']}"
+    end
+  end
+
+
+  def lookup_morpheus_command(result_type)
+    case result_type.to_s.downcase
+    when "computezone","cloud","zone"
+      Morpheus::Cli::Clouds
+    when "computesite","group"
+      Morpheus::Cli::Groups
+    when "computeserver","server","host"
+      Morpheus::Cli::Hosts
+    when "computeservergroup","serverGroup","cluster"
+      Morpheus::Cli::Clusters
+    when "instance"
+      Morpheus::Cli::Instances
+    when "app"
+      Morpheus::Cli::Apps
+    when "container"
+      Morpheus::Cli::Containers
+    when "computezonefolder","zonefolder","resourcefolder"
+      # crap, need result.zoneId, or resource-folders should not require cloud actually, get by id
+      # Morpheus::Cli::CloudFoldersCommand
+      nil
+    when "computezonepool","zonepool","resourcepool"
+      # crap, need result.zoneId, or resource-pools should not require cloud actually, get by id
+      # Morpheus::Cli::CloudResourcePoolsCommand
+      nil
+    # when "chassis"
+    #   Morpheus::Cli::ChassisCommand
+    when "network"
+      Morpheus::Cli::NetworksCommand
+    when "networkgroup"
+      Morpheus::Cli::NetworkGroupsCommand
+    when "networkpool"
+      Morpheus::Cli::NetworkPoolsCommand
+    when "networkdomain"
+      Morpheus::Cli::NetworkDomainsCommand
+    when "virtualimage"
+      Morpheus::Cli::VirtualImages
+    when "loadbalancer"
+      Morpheus::Cli::LoadBalancers
+    # when "virtualserver","loadbalancerinstance"
+    #   Morpheus::Cli::LoadBalancerInstances
+    when "instancetype"
+      # Morpheus::Cli::LibraryInstanceTypesCommand
+      Morpheus::Cli::LibraryInstanceTypes
+    when "instancetypelayout","layout"
+      Morpheus::Cli::LibraryLayoutsCommand
+    when "certificate"
+      # todo: WHAT! didnt I write certs already!?
+      Morpheus::Cli::CertificatesCommand
+    when "keypair"
+      Morpheus::Cli::KeyPairs
+    when "integration"
+      Morpheus::Cli::IntegrationsCommand
+    when "account","tenant"
+      Morpheus::Cli::TenantsCommand
+    when "user"
+      Morpheus::Cli::Users
+    when "role"
+      Morpheus::Cli::Roles
+    when "wikipage","wiki"
+      Morpheus::Cli::WikiCommand
+    else
+      nil
+    end
+  end
+
+end
+

data/lib/morpheus/cli/service_plans_command.rb

@@ -409,9 +409,9 @@ class Morpheus::Cli::ServicePlanCommand
           while Morpheus::Cli::OptionTypes.confirm("Add #{price_sets.empty? ? '' : 'another '}price set?", {:default => false}) do
             price_unit = prompt_price_unit(options)
 
-            avail_price_sets ||= @price_sets_interface.list['priceSets'].collect {|it| {'name' => it['name'], 'value' => it['id'], 'priceUnit' => it['priceUnit']}}
+            avail_price_sets ||= @price_sets_interface.list({'priceUnit' => price_unit, 'max' => 10000})['priceSets'].collect {|it| {'name' => it['name'], 'value' => it['id'], 'priceUnit' => it['priceUnit']}}
 
-            if price_set_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'priceSet', 'type' => 'select', 'fieldLabel' => 'Price Set', 'selectOptions' => avail_price_sets.reject {|it| it['priceUnit'] != price_unit}, 'required' => false, 'description' => 'Select Price.'}],options[:options],@api_client,{}, options[:no_prompt], true)['priceSet']
+            if price_set_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'priceSet', 'type' => 'select', 'fieldLabel' => 'Price Set', 'selectOptions' => avail_price_sets, 'required' => false, 'description' => 'Select Price.'}],options[:options],@api_client,{}, options[:no_prompt], true)['priceSet']
               price_set = avail_price_sets.find {|it| it['value'] == price_set_id}
               price_sets << {'id' => price_set['value'], 'priceUnit' => price_set['priceUnit']}
               avail_price_sets.reject! {|it| it['value'] == price_set_id}

data/lib/morpheus/cli/setup.rb

@@ -9,7 +9,7 @@ class Morpheus::Cli::Setup
   
   set_command_name :setup
   
-  register_subcommands :init
+  # register_subcommands :init
 
   # no authorization needed
   def connect(options={})

data/lib/morpheus/cli/shell.rb

@@ -92,6 +92,13 @@ class Morpheus::Cli::Shell
   def recalculate_auto_complete_commands
     @morpheus_commands = Morpheus::Cli::CliRegistry.all.keys.reject {|k| [:shell].include?(k) }
     @shell_commands = [:clear, :history, :reload, :help, :exit]
+    @shell_command_descriptions = {
+      :clear => "Clear terminal output and move cursor to the top", 
+      :history => "View morpheus shell command history", 
+      :reload => "Reload the shell, can be useful when developing", 
+      :help => "Print this help", 
+      :exit => "Exit the morpheus shell"
+    }
     @alias_commands = Morpheus::Cli::CliRegistry.all_aliases.keys
     @exploded_commands = []
     Morpheus::Cli::CliRegistry.all.each do |cmd, klass|
@@ -336,6 +343,11 @@ class Morpheus::Cli::Shell
     #Morpheus::Logging::DarkPrinter.puts "Shell command: #{input}"
     input = input.to_s.strip
 
+    # allow pasting in commands that have 'morpheus ' prefix
+    if input[0..(prog_name.size)] == "#{prog_name} "
+      input = input[(prog_name.size + 1)..-1] || ""
+    end
+
     if !input.empty?
 
       if input == 'exit'
@@ -345,26 +357,36 @@ class Morpheus::Cli::Shell
         return 0
         #exit 0
       elsif input == 'help'
+        out = ""
         if @temporary_shell_mode
-          puts "You are in a (temporary) morpheus shell"
+          out << "You are in a (temporary) morpheus shell\n"
         else
-          puts "You are in a morpheus shell."
+          out << "You are in a morpheus shell.\n"
         end
-        puts "See the available commands below."
+        out <<  "See the available commands below.\n"
 
-        puts "\nCommands:"
+        out << "\nCommands:"
         # commands = @morpheus_commands + @shell_commands
-        @morpheus_commands.sort.each {|cmd|
-          puts "\t#{cmd.to_s}"
+        # @morpheus_commands.sort.each {|cmd|
+        #   out <<  "\t#{cmd.to_s}\n"
+        # }
+        sorted_commands = Morpheus::Cli::CliRegistry.all.values.sort { |x,y| x.command_name.to_s <=> y.command_name.to_s }
+        sorted_commands.each {|cmd|
+          # JD: not ready to show description yet, gotta finish filling in every command first
+          # maybe change 'View and manage' to something more concise like 'Manage'
+          # out << "\t#{cmd.command_name.to_s.ljust(28, ' ')} #{cmd.command_description}\n"
+          out << "\t#{cmd.command_name.to_s}\n"
         }
         #puts "\n"
-        puts "\nShell Commands:"
+        out <<  "\nShell Commands:\n"
         @shell_commands.each {|cmd|
-          puts "\t#{cmd.to_s}"
+          # out << "\t#{cmd.to_s.ljust(28, ' ')} #{@shell_command_descriptions ? @shell_command_descriptions[cmd] : ''}\n"
+          out <<  "\t#{cmd.to_s}\n"
         }
-        puts "\n"
-        puts "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki"
-        #print "\n"
+        out << "\n"
+        out << "For more information, see https://github.com/gomorpheus/morpheus-cli/wiki"
+        out << "\n"
+        print out
         return 0
       elsif input =~ /^\s*#/
         Morpheus::Logging::DarkPrinter.puts "ignored comment: #{input}" if Morpheus::Logging.debug?

data/lib/morpheus/cli/storage_providers_command.rb

@@ -42,71 +42,39 @@ class Morpheus::Cli::StorageProvidersCommand
   def list(args)
     options = {}
     params = {}
+    ref_ids = []
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
+      opts.banner = subcommand_usage("[search]")
+      build_standard_list_options(opts, options)
       opts.footer = "List storage buckets."
     end
     optparse.parse!(args)
-    if args.count != 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got #{args.count}\n#{optparse}"
-      return 1
-    end
     connect(options)
-    begin
-      params.merge!(parse_list_options(options))
-      @storage_providers_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @storage_providers_interface.dry.list(params)
-        return
-      end
-      json_response = @storage_providers_interface.list(params)
-      storage_providers = json_response["storageBuckets"]
-      if options[:json]
-        puts as_json(json_response, options, "storageBuckets")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "storageBuckets")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(storage_providers, options)
-        return 0
-      end
-      title = "Morpheus Storage Buckets"
-      subtitles = []
-      subtitles += parse_list_subtitles(options)
-      print_h1 title, subtitles
-      if storage_providers.empty?
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    params.merge!(parse_list_options(options))
+    @storage_providers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @storage_providers_interface.dry.list(params)
+      return
+    end
+    json_response = @storage_providers_interface.list(params)
+    storage_buckets = json_response['storageBuckets']
+    render_response(json_response, options, 'storageBuckets') do
+      print_h1 "Morpheus Storage Buckets", parse_list_subtitles(options), options
+      if storage_buckets.empty?
         print cyan,"No storage buckets found.",reset,"\n"
       else
-        rows = storage_providers.collect {|storage_provider| 
-          row = {
-            id: storage_provider['id'],
-            name: storage_provider['name'],
-            provider: format_storage_provider_type(storage_provider), 
-            bucket: format_bucket_name(storage_provider), 
-            backups: storage_provider['defaultBackupTarget'] ? 'Yes' : 'No', 
-            deployments: storage_provider['defaultDeploymentTarget'] ? 'Yes' : 'No', 
-            virtualImages: storage_provider['defaultVirtualImageTarget'] ? 'Yes' : 'No', 
-          }
-          row
-        }
-        columns = [:id, :name, {:provider => {:display_name => "Provider Type".upcase} }, {:bucket => {:display_name => "Bucket Name".upcase} }, :backups, :deployments]
-        if options[:include_fields]
-          columns = options[:include_fields]
-          rows = storage_providers
-        end
-        print cyan
-        print as_pretty_table(rows, columns, options)
-        print reset
-        print_results_pagination(json_response, {:label => "storage bucket", :n_label => "storage buckets"})
+        print as_pretty_table(storage_buckets, storage_bucket_column_definitions.upcase_keys!, options)
+        print_results_pagination(json_response)
       end
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    end
+    if storage_buckets.empty?
+      return 1, "no storage buckets found"
+    else
+      return 0, nil
     end
   end
 
@@ -1232,6 +1200,22 @@ class Morpheus::Cli::StorageProvidersCommand
 
   private
 
+  def storage_bucket_column_definitions()
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      # "Description" => 'description',
+      "Provider Type" => lambda {|it| format_storage_provider_type(it) },
+      "Bucket Name" => lambda {|it| format_bucket_name(it) },
+      # "Source" => lambda {|it| it['source'] },
+      "Backups" => lambda {|it| format_boolean(it['defaultBackupTarget']) },
+      "Deployments" => lambda {|it| format_boolean(it['defaultDeploymentTarget']) },
+      "Virtual Images" => lambda {|it| format_boolean(it['defaultVirtualImageTarget']) },
+      # "Archive Snapshots" => lambda {|it| format_boolean(it['copyToStore']) },
+      # "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
 
   def get_storage_provider_types()
     [

data/lib/morpheus/cli/tasks.rb

@@ -27,34 +27,31 @@ class Morpheus::Cli::Tasks
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
+      opts.banner = subcommand_usage("[search]")
       opts.on('-t', '--type x,y,z', Array, "Filter by task type code(s)") do |val|
         params['taskTypeCodes'] = val
       end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
+      opts.footer = "List tasks."
     end
     optparse.parse!(args)
+    connect(options)
     if args.count > 0
-      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+      options[:phrase] = args.join(" ")
     end
-    connect(options)
-    begin
-      params.merge!(parse_list_options(options))
-      @tasks_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @tasks_interface.dry.list(params)
-        return
-      end
-      json_response = @tasks_interface.list(params)
-
-      render_result = render_with_format(json_response, options, 'tasks')
-      return 0 if render_result
-      
+    params.merge!(parse_list_options(options))
+    @tasks_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @tasks_interface.dry.list(params)
+      return
+    end
+    json_response = @tasks_interface.list(params)
+    tasks = json_response['tasks']
+    render_response(json_response, options, 'tasks') do
       title = "Morpheus Tasks"
       subtitles = []
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
-      tasks = json_response['tasks']
       if tasks.empty?
         print cyan,"No tasks found.",reset,"\n"
       else
@@ -63,11 +60,13 @@ class Morpheus::Cli::Tasks
         print_results_pagination(json_response)
       end
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    if tasks.empty?
+      return 1, "no tasks found"
+    else
+      return 0, nil
+    end
+    
   end
 
   def get(args)