morpheus-cli 4.2.20 → 5.0.2

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']) } },
@@ -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) } }]
@@ -656,7 +671,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 +758,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 +825,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/jobs_command.rb

@@ -102,15 +102,15 @@ class Morpheus::Cli::JobsCommand
         if stats = json_response['stats']
           label_width = 17
 
-          print_h2 "Executions Stats - Last 7 Days"
+          print_h2 "Execution Stats - Last 7 Days"
           print cyan
 
           print "Jobs".rjust(label_width, ' ') + ": #{stats['jobCount']}\n"
           print "Executions Today".rjust(label_width, ' ') + ": #{stats['todayCount']}\n"
           print "Daily Executions".rjust(label_width, ' ') + ": " + stats['executionsPerDay'].join(' | ') + "\n"
           print "Total Executions".rjust(label_width, ' ') + ": #{stats['execCount']}\n"
-          print "Completed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execSuccessRate'].to_f, 100) + "#{stats['execSuccess']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
-          print "Failed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execFailedRate'].to_f, 100) + "#{stats['execFailed']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
+          print "Completed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execSuccessRate'].to_f, 100, {bar_color:green}) + "#{stats['execSuccess']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
+          print "Failed".rjust(label_width, ' ') + ": " + generate_usage_bar(stats['execFailedRate'].to_f, 100, {bar_color:red}) + "#{stats['execFailed']}".rjust(15, ' ') + " of " + "#{stats['execCount']}".ljust(15, ' ') + "\n#{cyan}"
         end
         print reset,"\n"
       end
@@ -304,7 +304,7 @@ class Morpheus::Cli::JobsCommand
           job_options = @jobs_interface.options(job_type_id)
 
           # prompt task / workflow
-          if job_type['code'] == 'morpheus.task'
+          if ['morpheus.task.jobType', 'morpheus.task'].include?(job_type['code'])
             params['task'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'task.id', 'fieldLabel' => 'Task', 'type' => 'select', 'required' => true, 'optionSource' => 'tasks'}], options[:options], @api_client, {})['task']
           else
             params['workflow'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'workflow.id', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => true, 'optionSource' => 'operationTaskSets'}], options[:options], @api_client, {})['workflow']
@@ -320,10 +320,11 @@ class Morpheus::Cli::JobsCommand
             exit 1
           end
           params['task'] = {'id' => task['id']}
-          job_type_id = load_job_type_id_by_code('morpheus.task')
+          job_type_id = load_job_type_id_by_code('morpheus.task.jobType') || load_job_type_id_by_code('morpheus.task')
         end
 
         # workflow
+        task_set = nil
         if !options[:workflow].nil?
           task_set = find_by_name_or_id('task_set', options[:workflow])
 
@@ -332,8 +333,29 @@ class Morpheus::Cli::JobsCommand
             exit 1
           end
           params['workflow'] = {'id' => task_set['id']}
-          job_type_id = load_job_type_id_by_code('morpheus.workflow')
+          job_type_id = load_job_type_id_by_code('morpheus.workflow.jobType') || load_job_type_id_by_code('morpheus.workflow')
         end
+        # load workflow if we havent yet
+        if (params['workflow'] && params['workflow']['id']) && task_set.nil?
+          task_set = find_by_name_or_id('task_set', params['workflow']['id'])
+          if task_set.nil?
+            print_red_alert "Workflow #{params['workflow']['id']} not found"
+            exit 1
+          end
+        end
+        # prompt for custom options for workflow
+        custom_option_types = task_set ? task_set['optionTypes'] : nil
+        if custom_option_types && custom_option_types.size() > 0
+          # they are all returned in a single array right now, so skip prompting for the jobType optionTypes
+          custom_option_types.reject! { |it| it['code'] && it['code'].include?('job.type') }
+          custom_option_types = custom_option_types.collect {|it|
+            it['fieldContext'] = 'customOptions'
+            it
+          }
+          custom_options = Morpheus::Cli::OptionTypes.prompt(custom_option_types, options[:options], @api_client, {})
+          params['customOptions'] = custom_options['customOptions']
+        end
+
 
         # load options based upon job type + task / taskset
         job_options = @jobs_interface.options(job_type_id, {'taskId' => params['task'] ? params['task']['id'] : nil, 'workflowId' => params['workflow'] ? params['workflow']['id'] : nil})

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/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

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

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