morpheus-cli 4.2.22 → 5.0.0

data/lib/morpheus/cli/cli_command.rb

@@ -194,7 +194,7 @@ module Morpheus
           if option_type['placeHolder']
             value_label = option_type['placeHolder']
           elsif option_type['type'] == 'checkbox'
-            value_label = 'on|off' # or.. true|false
+            value_label = '[on|off]' # or.. true|false
           elsif option_type['type'] == 'number'
             value_label = 'NUMBER'
           elsif option_type['type'] == 'multiSelect'
@@ -204,12 +204,16 @@ module Morpheus
           # elsif option['type'] == 'select'
           end
           opts.on("--#{full_field_name} #{value_label}", String, description) do |val|
-            # attempt to parse JSON, this allows blank arrays for multiSelect like --tenants []
-            if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
-              begin
-                val = JSON.parse(val)
-              rescue
-                Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+            if option_type['type'] == 'checkbox'
+              val = (val.to_s != 'false' && val.to_s != 'off')
+            else
+              # attempt to parse JSON, this allows blank arrays for multiSelect like --tenants []
+              if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
+                begin
+                  val = JSON.parse(val)
+                rescue
+                  Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+                end
               end
             end
             cur_namespace = custom_options
@@ -489,13 +493,17 @@ module Morpheus
 
           when :query, :query_filters
             # arbitrary query parameters in the format -Q "category=web&phrase=nginx"
+            # or pass it many times like -Q foo=bar -Q hello=world
             opts.on( '-Q', '--query PARAMS', "Query parameters. PARAMS format is 'foo=bar&category=web'" ) do |val|
-              options[:query_filters_raw] = val
-              options[:query_filters] = {}
-              # todo: smarter parsing
+              if options[:query_filters_raw] && !options[:query_filters_raw].empty?
+                options[:query_filters_raw] += ("&" + val)
+              else
+                options[:query_filters_raw] = val
+              end
+              options[:query_filters] ||= {}
               val.split('&').each do |filter| 
                 k, v = filter.split('=')
-                # allow "woot:true instead of woot=true"
+                # allow woot:true instead of woot=true
                 if (k.include?(":") && v == nil)
                   k, v = k.split(":")
                 end

data/lib/morpheus/cli/commands/standard/source_command.rb

@@ -14,7 +14,7 @@ class Morpheus::Cli::SourceCommand
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus #{command_name} [file] [file2]"
       build_common_options(opts, options, [])
-      opts.footer = "This will execute a file, treatin it as a script of morpheus commands"
+      opts.footer = "This will execute a file as a script where each line is a morpheus command or expression."
     end
     optparse.parse!(args)
     if args.count < 1

data/lib/morpheus/cli/commands/standard/update_command.rb

@@ -0,0 +1,76 @@
+require 'morpheus/cli/cli_command'
+require 'json'
+
+# This is for use in dotfile scripts and the shell..
+class Morpheus::Cli::UpdateCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :update
+
+  def handle(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name}"
+      opts.on( '-f', '--force', "Force Update, executes update even if latest version is already installed." ) do
+        options[:force] = true
+      end
+      build_common_options(opts, options, [:dry_run, :quiet])
+      opts.footer = "This will update the morpheus command line interface to the latest version.\nThis is done by executing the system command: `gem update #{morpheus_gem_name}`"
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:0)
+
+    current_version = Morpheus::Cli::VERSION
+    latest_version = get_latest_version()
+    latest_version = latest_version
+    
+    if current_version == latest_version && !options[:force]
+      unless options[:quiet]
+        print cyan, "The latest version is already installed. (#{latest_version})", "\n", reset
+      end
+      return 0, nil
+    end
+
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to update the #{morpheus_gem_name} gem from version #{current_version} to version #{latest_version}?")
+      return 9, "aborted command"
+    end
+
+    gem_update_command = "gem update #{morpheus_gem_name}"
+
+    if options[:dry_run]
+      unless options[:quiet]
+        print "\n"
+        print "#{cyan}#{bold}#{dark}COMMAND#{reset}\n"
+        puts gem_update_command
+        print "\n", reset
+      end
+      return 0, nil
+    end
+    
+    # ok, update it
+    if options[:quiet]
+      system(gem_update_command)
+    else
+      `#{gem_update_command}`
+    end
+
+    if $?.success?
+      return 0, nil
+    else
+      return $?.exitstatus, "update failed"
+    end
+
+  end
+
+  protected
+
+  def morpheus_gem_name
+    'morpheus-cli'
+  end
+
+  def get_latest_version
+    result = HTTP.get("https://rubygems.org/api/v1/gems/#{morpheus_gem_name}.json")
+    json_response = JSON.parse(result.body)
+    json_response["version"]
+  end
+
+end

data/lib/morpheus/cli/containers_command.rb

@@ -35,6 +35,9 @@ class Morpheus::Cli::ContainersCommand
       opts.on( nil, '--actions', "Display Available Actions" ) do
         options[:include_available_actions] = true
       end
+      opts.on( nil, '--costs', "Display Cost and Price" ) do
+        options[:include_costs] = true
+      end
       opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_status] ||= "running,failed"
         if !val.to_s.empty?
@@ -99,6 +102,8 @@ class Morpheus::Cli::ContainersCommand
         "Name" => lambda {|it| it['server'] ? it['server']['name'] : '(no server)' }, # there is a server.displayName too?
         "Type" => lambda {|it| it['containerType'] ? it['containerType']['name'] : '' },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        # "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        # "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Instance" => lambda {|it| it['instance'] ? it['instance']['name'] : '' },
         "Host" => lambda {|it| it['server'] ? it['server']['name'] : '' },
         "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
@@ -133,6 +138,15 @@ class Morpheus::Cli::ContainersCommand
         end
       end
 
+      if options[:include_costs]
+        print_h2 "Container Cost"
+        cost_columns = {
+          "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+          "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        }
+        print_description_list(cost_columns, container)
+      end
+
       print reset, "\n"
 
       # refresh until a status is reached

data/lib/morpheus/cli/hosts.rb

@@ -119,6 +119,10 @@ class Morpheus::Cli::Hosts
     end
     optparse.parse!(args)
     connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     begin
       params.merge!(parse_list_options(options))
       account = nil
@@ -392,6 +396,9 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
+      opts.on( nil, '--costs', "Display Cost and Price" ) do
+        options[:include_costs] = true
+      end
       opts.on('--refresh [SECONDS]', String, "Refresh until status is provisioned,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_status] ||= "provisioned,failed"
         if !val.to_s.empty?
@@ -453,7 +460,7 @@ class Morpheus::Cli::Hosts
       title = "Host Details"
       print_h1 title, [], options
       print cyan
-      print_description_list({
+      server_columns = {
         "ID" => 'id',
         "Name" => 'name',
         "Description" => 'description',
@@ -463,12 +470,23 @@ class Morpheus::Cli::Hosts
         "Type" => lambda {|it| it['computeServerType'] ? it['computeServerType']['name'] : 'unmanaged' },
         "Platform" => lambda {|it| it['serverOs'] ? it['serverOs']['name'].upcase : 'N/A' },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Agent" => lambda {|it| it['agentInstalled'] ? "#{server['agentVersion'] || ''} updated at #{format_local_dt(server['lastAgentUpdate'])}" : '(not installed)' },
         "Status" => lambda {|it| format_server_status(it) },
         "Nodes" => lambda {|it| it['containers'] ? it['containers'].size : 0 },
         "Power" => lambda {|it| format_server_power_state(it) },
-      }, server)
+      }
       
+      if server['hourlyCost'].to_f == 0
+        server_columns.delete("Cost")
+      end
+      if server['hourlyPrice'].to_f == 0 || server['hourlyPrice'] == server['hourlyCost']
+        server_columns.delete("Price")
+      end
+
+      print_description_list(server_columns, server)
+
       if server['statusMessage']
         print_h2 "Status Message", options
         if server['status'] == 'failed'
@@ -485,6 +503,16 @@ class Morpheus::Cli::Hosts
 
       print_h2 "Host Usage", options
       print_stats_usage(stats)
+
+      if options[:include_costs]
+        print_h2 "Host Cost"
+        cost_columns = {
+          "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+          "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        }
+        print_description_list(cost_columns, server)
+      end
+
       print reset, "\n"
 
 

data/lib/morpheus/cli/instances.rb

@@ -96,7 +96,10 @@ class Morpheus::Cli::Instances
       opts.footer = "List instances."
     end
     optparse.parse!(args)
-    verify_args!(args:args, count:0, optparse:optparse)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     connect(options)
     begin
       params.merge!(parse_list_options(options))
@@ -1148,6 +1151,9 @@ class Morpheus::Cli::Instances
       opts.on( nil, '--scaling', "Display Instance Scaling Settings" ) do
         options[:include_scaling] = true
       end
+      opts.on( nil, '--costs', "Display Cost and Price" ) do
+        options[:include_costs] = true
+      end
       opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_status] ||= "running,failed"
         if !val.to_s.empty?
@@ -1249,6 +1255,8 @@ class Morpheus::Cli::Instances
         "Layout" => lambda {|it| it['layout'] ? it['layout']['name'] : '' },
         "Version" => lambda {|it| it['instanceVersion'] },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        # "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        # "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Environment" => 'instanceContext',
         "Labels" => lambda {|it| it['tags'] ? it['tags'].join(',') : '' },
         "Metadata" => lambda {|it| it['metadata'] ? it['metadata'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
@@ -1304,6 +1312,16 @@ class Morpheus::Cli::Instances
         print_h2 "Instance Usage", options
         print_stats_usage(stats)
       end
+
+      if options[:include_costs]
+        print_h2 "Instance Cost"
+        cost_columns = {
+          "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+          "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        }
+        print_description_list(cost_columns, instance)
+      end
+
       print reset, "\n"
 
       # if options[:include_lb]

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -90,6 +90,9 @@ class Morpheus::Cli::LibraryOptionListsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_standard_get_options(opts, options)
+      opts.on(nil,'--no-items', "Do not display List Items") do |val|
+        options[:no_list_items] = true
+      end
       opts.footer = "Get details about an option list.\n" + 
                     "[name] is required. This is the name or id of an option list. Supports 1-N [name] arguments."
     end
@@ -166,15 +169,20 @@ class Morpheus::Cli::LibraryOptionListsCommand
           print_h2 "Translation Script"
           print reset,"#{option_type_list['translationScript']}","\n",reset
         end
+        if !option_type_list['requestScript'].empty?
+          print_h2 "Request Script"
+          print reset,"#{option_type_list['requestScript']}","\n",reset
+        end
       end
-      print_h2 "List Items"
-      if option_type_list['listItems']
-        print as_pretty_table(option_type_list['listItems'], ['name', 'value'], options)
-      else
-        puts "No data"
+      if options[:no_list_items] != true
+        list_items = option_type_list['listItems']
+        if list_items && list_items.size > 0
+          print_h2 "List Items"
+          print as_pretty_table(list_items, [:name, :value], options)
+          print_results_pagination({size: list_items.size, total: list_items.size})
+        end
       end
       print reset,"\n"
-
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/mixins/accounts_helper.rb

@@ -136,6 +136,7 @@ module Morpheus::Cli::AccountsHelper
       "Multitenant" => lambda {|it| 
         format_boolean(it['multitenant']).to_s + (it['multitenantLocked'] ? " (LOCKED)" : "")
       },
+      "Default Persona" => lambda {|it| it['defaultPersona'] ? it['defaultPersona']['name'] : '(standard)' },
       "Owner" => lambda {|it| it['owner'] ? it['owner']['name'] : '' },
       #"Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
@@ -196,7 +197,7 @@ module Morpheus::Cli::AccountsHelper
 
   ## Users
 
-  def user_column_definitions()
+  def user_column_definitions(opts={})
     {
       "ID" => 'id',
       "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
@@ -206,15 +207,15 @@ module Morpheus::Cli::AccountsHelper
       "Email" => 'email',
       "Role" => lambda {|it| format_user_role_names(it) },
       "Notifications" => lambda {|it| it['receiveNotifications'].nil? ? '' : format_boolean(it['receiveNotifications']) },
-      "Status" => lambda {|it| format_user_status(it) },
+      "Status" => lambda {|it| format_user_status(it, opts[:color] || cyan) },
       "Last Login" => lambda {|it| format_duration_ago(it['lastLoginDate']) },
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
     }
   end
 
-  def list_user_column_definitions()
-    columns = user_column_definitions
+  def list_user_column_definitions(opts={})
+    columns = user_column_definitions(opts)
     columns.delete("Notifications")
     return columns.upcase_keys!
   end
@@ -261,8 +262,8 @@ module Morpheus::Cli::AccountsHelper
       return nil
     elsif users.size > 1
       print_red_alert "Found #{users.size} users by username '#{username}'. Try using ID instead: #{format_list(users.collect {|it| it['id']}, 'or', 3)}"
-      print "\n"
-      print as_pretty_table(users, list_user_column_definitions, {color: red, thin: true})
+      print_error "\n"
+      print_error as_pretty_table(users, list_user_column_definitions({color: red}), {color: red, thin: true})
       print reset,"\n"
       return nil
     else

data/lib/morpheus/cli/mixins/backups_helper.rb

@@ -1,6 +1,6 @@
 require 'morpheus/cli/mixins/print_helper'
 # Mixin for Morpheus::Cli command classes
-# Provides common methods for infrastructure management
+# Provides common methods for backups management
 module Morpheus::Cli::BackupsHelper
 
   def self.included(klass)
@@ -8,13 +8,11 @@ module Morpheus::Cli::BackupsHelper
   end
 
   def backups_interface
-    # @api_client.groups
     raise "#{self.class} has not defined @backups_interface" if @backups_interface.nil?
     @backups_interface
   end
 
-  def backup_jobs_interface
-    # @api_client.groups
+  def backup_jobs_interfaces
     raise "#{self.class} has not defined @backup_jobs_interface" if @backup_jobs_interface.nil?
     @backup_jobs_interface
   end

data/lib/morpheus/cli/mixins/catalog_helper.rb

@@ -0,0 +1,66 @@
+require 'morpheus/cli/mixins/print_helper'
+# Mixin for Morpheus::Cli command classes
+# Provides common methods for infrastructure management
+module Morpheus::Cli::CatalogHelper
+
+  def self.included(klass)
+    klass.send :include, Morpheus::Cli::PrintHelper
+  end
+
+  def catalog_item_types_interface
+    raise "#{self.class} has not defined @catalog_item_types_interface" if @catalog_item_types_interface.nil?
+    @catalog_item_types_interface
+  end
+
+  # def service_catalog_interface
+  #   raise "#{self.class} has not defined @service_catalog_interface" if @service_catalog_interface.nil?
+  #   @service_catalog_interface
+  # end
+
+  def catalog_item_type_object_key
+    'catalogItemType'
+  end
+
+  def catalog_item_type_list_key
+    'catalogItemTypes'
+  end
+
+  def find_catalog_item_type_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_catalog_item_type_by_id(val)
+    else
+      return find_catalog_item_type_by_name(val)
+    end
+  end
+
+  def find_catalog_item_type_by_id(id)
+    begin
+      json_response = catalog_item_types_interface.get(id.to_i)
+      return json_response[catalog_item_type_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "catalog_item_type not found by id '#{id}'"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_catalog_item_type_by_name(name)
+    json_response = catalog_item_types_interface.list({name: name.to_s})
+    catalog_item_types = json_response[catalog_item_type_list_key]
+    if catalog_item_types.empty?
+      print_red_alert "catalog_item_type not found by name '#{name}'"
+      return nil
+    elsif catalog_item_types.size > 1
+      print_red_alert "#{catalog_item_types.size} catalog_item_types found by name '#{name}'"
+      puts_error as_pretty_table(catalog_item_types, [:id, :name], {color:red})
+      print_red_alert "Try using ID instead"
+      print reset,"\n"
+      return nil
+    else
+      return catalog_item_types[0]
+    end
+  end
+
+end