morpheus-cli 4.2.22 → 5.2.1

data/lib/morpheus/cli/invoices_command.rb

@@ -25,16 +25,19 @@ class Morpheus::Cli::InvoicesCommand
     options = {}
     params = {}
     ref_ids = []
-    query_tags = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on('-a', '--all', "Display all details, costs and prices." ) do
         options[:show_all] = true
+        options[:show_dates] = true
         options[:show_estimates] = true
         # options[:show_costs] = true
         options[:show_prices] = true
         # options[:show_raw_data] = true
       end
+      opts.on('--dates', "Display Ref Start, Ref End, etc.") do |val|
+        options[:show_dates] = true
+      end
       opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Storage, Network, Extra" ) do
         options[:show_estimates] = true
       end
@@ -107,9 +110,12 @@ class Morpheus::Cli::InvoicesCommand
         params['accountId'] = val
       end
       opts.on('--tags Name=Value',String, "Filter by tags.") do |val|
-        k,v = val.split("=")
-        query_tags[k] ||= []
-        query_tags[k] << v
+        val.split(",").each do |value_pair|
+          k,v = value_pair.strip.split("=")
+          options[:tags] ||= {}
+          options[:tags][k] ||= []
+          options[:tags][k] << (v || '')
+        end
       end
       opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
         options[:show_raw_data] = true
@@ -169,8 +175,8 @@ class Morpheus::Cli::InvoicesCommand
     end
     params['rawData'] = true if options[:show_raw_data]
     params['refId'] = ref_ids unless ref_ids.empty?
-    if query_tags && !query_tags.empty?
-      query_tags.each do |k,v|
+    if options[:tags] && !options[:tags].empty?
+      options[:tags].each do |k,v|
         params['tags.' + k] = v
       end
     end
@@ -203,6 +209,7 @@ class Morpheus::Cli::InvoicesCommand
           {"INVOICE ID" => lambda {|it| it['id'] } },
           {"TYPE" => lambda {|it| format_invoice_ref_type(it) } },
           {"REF ID" => lambda {|it| it['refId'] } },
+          {"REF UUID" => lambda {|it| it['refUuid'] } },
           {"REF NAME" => lambda {|it| 
             if options[:show_all]
               it['refName']
@@ -218,9 +225,11 @@ class Morpheus::Cli::InvoicesCommand
           {"PERIOD" => lambda {|it| format_invoice_period(it) } },
           {"START" => lambda {|it| format_date(it['startDate']) } },
           {"END" => lambda {|it| format_date(it['endDate']) } },
-        ] + (options[:show_all] ? [
+        ] + ((options[:show_dates] || options[:show_all]) ? [
           {"REF START" => lambda {|it| format_dt(it['refStart']) } },
           {"REF END" => lambda {|it| format_dt(it['refEnd']) } },
+          # {"LAST COST DATE" => lambda {|it| format_local_dt(it['lastCostDate']) } },
+          # {"LAST ACTUAL DATE" => lambda {|it| format_local_dt(it['lastActualDate']) } },
         ] : []) + [
           {"COMPUTE" => lambda {|it| format_money(it['computeCost'], 'usd', {sigdig:options[:sigdig]}) } },
           # {"MEMORY" => lambda {|it| format_money(it['memoryCost']) } },
@@ -263,7 +272,7 @@ class Morpheus::Cli::InvoicesCommand
           {"ESTIMATE" => lambda {|it| format_boolean(it['estimate']) } },
           {"ACTIVE" => lambda {|it| format_boolean(it['active']) } },
           {"ITEMS" => lambda {|it| it['lineItems'].size rescue '' } },
-          {"TAGS" => lambda {|it| it['metadata'] ? it['metadata'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' } },
+          {"TAGS" => lambda {|it| (it['metadata'] || it['tags']) ? (it['metadata'] || it['tags']).collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' } },
         ]
         if show_projects
           columns += [
@@ -272,9 +281,15 @@ class Morpheus::Cli::InvoicesCommand
           {"PROJECT TAGS" => lambda {|it| it['project'] ? truncate_string(format_metadata(it['project']['tags']), 50) : '' } },
         ]
         end
+        if options[:show_dates]
+          columns += [
+            {"LAST COST DATE" => lambda {|it| format_local_dt(it['lastCostDate']) } },
+            {"LAST ACTUAL DATE" => lambda {|it| format_local_dt(it['lastActualDate']) } },
+          ]
+        end
         columns += [
           {"CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } },
-          {"UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } }
+          {"UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } },
         ]
         if options[:show_raw_data]
           columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
@@ -423,7 +438,7 @@ EOT
         "Ref Start" => lambda {|it| format_dt(it['refStart']) },
         "Ref End" => lambda {|it| format_dt(it['refEnd']) },
         "Items" => lambda {|it| it['lineItems'].size rescue '' },
-        "Tags" => lambda {|it| it['metadata'] ? it['metadata'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
+        "Tags" => lambda {|it| (it['metadata'] || it['tags']) ? (it['metadata'] || it['tags']).collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
         "Project ID" => lambda {|it| it['project'] ? it['project']['id'] : '' },
         "Project Name" => lambda {|it| it['project'] ? it['project']['name'] : '' },
         "Project Tags" => lambda {|it| it['project'] ? format_metadata(it['project']['tags']) : '' },
@@ -439,7 +454,8 @@ EOT
         description_cols.delete("Project Name")
         description_cols.delete("Project Tags")
       end
-      if invoice['metadata'].nil? || invoice['metadata'].empty?
+      tags = (invoice['metadata'] || invoice['tags'])
+      if tags.nil? || tags.empty?
         description_cols.delete("Tags")
       end
       if !['ComputeServer','Instance','Container'].include?(invoice['refType'])
@@ -656,7 +672,6 @@ EOT
     options = {}
     params = {}
     ref_ids = []
-    query_tags = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on('-a', '--all', "Display all details, costs and prices." ) do
@@ -744,11 +759,14 @@ EOT
       opts.on('--tenant ID', String, "View invoice line items for a tenant. Default is your own account.") do |val|
         params['accountId'] = val
       end
-      # opts.on('--tags Name=Value',String, "Filter by tags.") do |val|
-      #   k,v = val.split("=")
-      #   query_tags[k] ||= []
-      #   query_tags[k] << v
-      # end
+      opts.on('--tags Name=Value',String, "Filter by tags.") do |val|
+        val.split(",").each do |value_pair|
+          k,v = value_pair.strip.split("=")
+          options[:tags] ||= {}
+          options[:tags][k] ||= []
+          options[:tags][k] << (v || '')
+        end
+      end
       opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
         options[:show_raw_data] = true
       end
@@ -808,8 +826,8 @@ EOT
     end
     params['rawData'] = true if options[:show_raw_data]
     params['refId'] = ref_ids unless ref_ids.empty?
-    if query_tags && !query_tags.empty?
-      query_tags.each do |k,v|
+    if options[:tags] && !options[:tags].empty?
+      options[:tags].each do |k,v|
         params['tags.' + k] = v
       end
     end

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
@@ -262,7 +270,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
       else
         payload = {}
         payload.deep_merge!({'optionTypeList' => parse_passed_options(options)})
-        list_payload = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_option_types(), options[:options], @api_client)
+        list_payload = Morpheus::Cli::OptionTypes.no_prompt(update_option_type_list_option_types(), options[:options], @api_client)
         if list_payload['type'] == 'rest'
           # parse Source Headers
           if !(payload['optionTypeList']['config'] && payload['optionTypeList']['config']['sourceHeaders'])

data/lib/morpheus/cli/library_option_types_command.rb

@@ -129,7 +129,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
 
       print_h1 "Option Type Details"
       print cyan
-      print_description_list({
+      columns = {
         "ID" => 'id',
         "Name" => 'name',
         "Description" => 'description',
@@ -138,11 +138,14 @@ class Morpheus::Cli::LibraryOptionTypesCommand
         # "Field Name" => 'fieldName',
         "Full Field Name" => lambda {|it| [it['fieldContext'], it['fieldName']].select {|it| !it.to_s.empty? }.join('.') },
         "Type" => lambda {|it| it['type'].to_s.capitalize },
+        "Option List" => lambda {|it| it['optionList'] ? it['optionList']['name'] : nil },
         "Placeholder" => 'placeHolder',
         "Default Value" => 'defaultValue',
         "Required" => lambda {|it| format_boolean(it['required']) },
         "Export As Tag" => lambda {|it| it['exportMeta'].nil? ? '' : format_boolean(it['exportMeta']) },
-      }, option_type)
+      }
+      columns.delete("Option List") if option_type['optionList'].nil?
+      print as_description_list(option_type, columns, options)
       print reset,"\n"
       return 0
     rescue RestClient::Exception => e

data/lib/morpheus/cli/logs_command.rb

@@ -34,7 +34,7 @@ class Morpheus::Cli::LogsCommand
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id]")
+      opts.banner = subcommand_usage("[search]")
       opts.on('--hosts HOSTS', String, "Filter logs to specific Host ID(s)") do |val|
         params['servers'] = val.to_s.split(",").collect {|it| it.to_s.strip }.select {|it| it }.compact
       end
@@ -72,18 +72,21 @@ class Morpheus::Cli::LogsCommand
         options[:details] = true
       end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "List logs for a container.\n" +
-                    "[id] is required. This is the id of a container."
+      opts.footer = "List logs for all hosts and containers."
     end
     optparse.parse!(args)
-    if args.count != 0
-      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    if args.count > 0
+      options[:phrase] = args.join(" ")
     end
     connect(options)
     begin
       params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
       params.merge!(parse_list_options(options))
-      params['query'] = params.delete('phrase') if params['phrase']
+      if params['phrase']
+        options.delete(:phrase)
+        search_phrase = params.delete('phrase')
+        params['query'] = search_phrase
+      end
       params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction
       params['startMs'] = (options[:start].to_i * 1000) if options[:start]
       params['endMs'] = (options[:end].to_i * 1000) if options[:end]

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
@@ -400,7 +401,7 @@ module Morpheus::Cli::AccountsHelper
   end
 
   def get_access_string(access, return_color=cyan)
-    get_access_color(access) + access + return_color
+    get_access_color(access) + access.to_s + return_color.to_s
     # access ||= 'none'
     # if access == 'none'
     #   "#{white}#{access.to_s}#{return_color}"
@@ -425,10 +426,14 @@ module Morpheus::Cli::AccountsHelper
   # Examples: format_permission_access("read")
   #           format_permission_access("custom", "full,custom,none")
   def format_access_string(access, access_levels=nil, return_color=cyan)
+    # nevermind all this, just colorized access level
+    return get_access_string(access, return_color)
+    
     access = access.to_s.downcase.strip
     if access.empty?
       access = "none"
     end
+
     if access_levels.nil?
       access_levels = ["none","read","user","full"]
     elsif access_levels.is_a?(Array)

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/deployments_helper.rb

@@ -10,7 +10,6 @@ module Morpheus::Cli::DeploymentsHelper
   ## Deployments
 
   def deployments_interface
-    # @api_client.groups
     raise "#{self.class} has not defined @deployments_interface" if @deployments_interface.nil?
     @deployments_interface
   end
@@ -52,9 +51,10 @@ module Morpheus::Cli::DeploymentsHelper
       return nil
     elsif deployments.size > 1
       print_red_alert "#{deployments.size} deployments found by name '#{name}'"
+      print_error "\n"
       puts_error as_pretty_table(deployments, [:id, :name], {color:red})
       print_red_alert "Try using ID instead"
-      print reset,"\n"
+      print_error reset,"\n"
       return nil
     else
       return deployments[0]
@@ -123,13 +123,41 @@ module Morpheus::Cli::DeploymentsHelper
       return nil
     elsif deployment_versions.size > 1
       print_red_alert "#{deployment_versions.size} deployment versions found by version '#{name}'"
+      print_error "\n"
       puts_error as_pretty_table(deployment_versions, {"ID" => 'id', "VERSION" => 'userVersion'}, {color:red})
       print_red_alert "Try using ID instead"
-      print reset,"\n"
+      print_error reset,"\n"
       return nil
     else
       return deployment_versions[0]
     end
   end
 
+  def format_deployment_version_number(deployment_version)
+    if deployment_version
+      deployment_version['userVersion'] || deployment_version['version'] || ''
+    else
+      ''
+    end
+  end
+
+  def format_app_deploy_status(status, return_color=cyan)
+    out = ""
+    s = status.to_s.downcase
+    if s == 'deployed' || s == 'committed'
+      out << "#{green}#{s.upcase}#{return_color}"
+    elsif s == 'open' || s == 'archived'
+      out << "#{cyan}#{s.upcase}#{return_color}"
+    elsif s == 'failed'
+      out << "#{red}#{s.upcase}#{return_color}"
+    else
+      out << "#{yellow}#{s.upcase}#{return_color}"
+    end
+    out
+  end
+
+  def format_deploy_type(val)
+    return val
+  end
+
 end

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

@@ -75,7 +75,7 @@ module Morpheus::Cli::OptionSourceHelper
 
   def get_cloud_options(refresh=false, api_params={})
     if !@available_cloud_options || refresh
-      option_results = options_interface.options_for_source('clouds', api_params.mege({'default' => 'false'}))
+      option_results = options_interface.options_for_source('clouds', api_params.merge({'default' => 'false'}))
         @available_cloud_options = option_results['data'].collect {|it|
           {"name" => it["name"], "value" => it["value"], "id" => it["value"]}
         }

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

@@ -1151,27 +1151,6 @@ module Morpheus::Cli::PrintHelper
     out
   end
 
-  def format_list(items, conjunction="and", limit=nil)
-    items = items ? items.clone : []
-    if limit
-      items = items.first(limit)
-    end
-    last_item = items.pop
-    if items.empty?
-      return "#{last_item}"
-    else
-      return items.join(", ") + (conjunction.to_s.empty? ? ", " : " #{conjunction} ") + "#{last_item}" + ((limit && limit < (items.size+1)) ? " ..." : "")
-    end
-  end
-
-  def anded_list(items, limit=nil)
-    format_list(items, "and", limit)
-  end
-
-  def ored_list(items, limit=nil)
-    format_list(items, "or", limit)
-  end
-
   def sleep_with_dots(sleep_seconds, dots=3, dot_chr=".")
     dot_interval = (sleep_seconds.to_f / dots.to_i)
     dots.to_i.times do |dot_index|
@@ -1285,4 +1264,50 @@ module Morpheus::Cli::PrintHelper
     end
   end
 
+  # convert JSON or YAML string to a map
+  def parse_json_or_yaml(config, parsers = [:json, :yaml])
+    rtn = {success: false, data: nil, err: nil}
+    err = nil
+    config = config.strip
+    if config[0..2] == "---"
+      parsers = [:yaml]
+    end
+    # ok only parse json for strings that start with {, consolidated yaml can look like json and cause issues}
+    if config[0] && config[0].chr == "{" && config[-1] && config[-1].chr == "}"
+      parsers = [:json]
+    end
+    parsers.each do |parser|
+      if parser == :yaml
+        begin
+          # todo: one method to parse and return Hash
+          # load does not raise an exception, it just returns the bad string
+          #YAML.parse(config)
+          config_map = YAML.load(config)
+          if !config_map.is_a?(Hash)
+            raise "Failed to parse config as YAML"
+          end
+          rtn[:data] = config_map
+          rtn[:success] = true
+          break
+        rescue => ex
+          rtn[:err] = ex if rtn[:err].nil?
+        end
+      elsif parser == :json
+        begin
+          config_map = JSON.parse(config)
+          rtn[:data] = config_map
+          rtn[:success] = true
+          break
+        rescue => ex
+          rtn[:err] = ex if rtn[:err].nil?
+        end
+      end
+    end
+    return rtn
+  end
+
+  def parse_yaml_or_json(config, parsers = [:yaml, :json])
+    parse_json_or_yaml(config, parsers)
+  end
+
 end