morpheus-cli 5.5.0 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca02ec5cffb310afe4458568f745332e8f81f1d03a525ad1a9d9d1a3ecd08313
-  data.tar.gz: 323d4e3627c67fbd676bb34eb0b6f62b0eecff6180285af93599aba21f0a9781
+  metadata.gz: 0f9a8ef29c8d96c51593c8c762e94e34409426fb787ce3944396af9fc1e71279
+  data.tar.gz: 9a89c3ce4161499a9cf9df9ec30d48f0f8e9f4faf04746a19f966c1dc6cda7fd
 SHA512:
-  metadata.gz: bc72cdba318abc74aef8dec7ab8602ad7ec7196101950dfc0b29b8fe8c4298c2de5b41265a386457c38fa0ac9e46082cb86d04d7cfbc75652a1824d5a036cec1
-  data.tar.gz: f546fe9ed24fcc380d8aa1f2fc6d05a1cfb7186dcee48e66c340c51951b69e3b04408db5400ddcb23c9c596ccb14867571f1e21b6ceeb3e253c720d0525c21b0
+  metadata.gz: 2d4ef36713c80b4ce6c9037b5ac971f8abdcd65ad4ff732a7e1c9ab89e46ca7199fa4ce7f4bcb5cbe67e79236f9b90ee7b894d1d62ea5809c6da4c7b54e7ca7b
+  data.tar.gz: fc6fca36a81248ad7f44c8dd7aabb03fe60d7b9aaafd03311385a7b86a101a1cfb180dacf1a33d7306a5e5cf204d70ffb7e61ca02cef3c5180ff52df89d8fe65

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 5.5.0
+RUN gem install morpheus-cli -v 5.5.1
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -590,6 +590,10 @@ class Morpheus::APIClient
     Morpheus::OptionTypeListsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def scale_thresholds
+    Morpheus::ScaleThresholdsInterface.new(common_interface_options).setopts(@options)
+  end
+
   def power_schedules
     Morpheus::PowerSchedulesInterface.new(common_interface_options).setopts(@options)
   end

data/lib/morpheus/api/clusters_interface.rb

@@ -103,6 +103,18 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers)
   end
 
+  def get_upgrade_versions(id, params={})
+    url = "#{base_path}/#{id}/upgrade-cluster"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def do_cluster_upgrade(id, params={})
+    url = "#{base_path}/#{id}/upgrade-cluster"
+    headers = { params: params, authorization: "Bearer #{@access_token}", 'Content-Type' => 'application/json'  }
+    execute(method: :post, url: url, headers: headers)
+    end
+
   def list_services(id, params={})
     url = "#{base_path}/#{id}/services"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/network_pool_servers_interface.rb

@@ -38,4 +38,11 @@ class Morpheus::NetworkPoolServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def get_type(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/networks/pool-server-types/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
 end

data/lib/morpheus/api/scale_thresholds_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::ScaleThresholdsInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/scale-thresholds"
+  end
+
+end

data/lib/morpheus/cli/cli_command.rb

@@ -479,8 +479,10 @@ module Morpheus
               options[:offset] = offset
             end
 
-            opts.on( '-s', '--search PHRASE', "Search Phrase" ) do |phrase|
-              options[:phrase] = phrase
+            if excludes.include?("search") == false
+              opts.on( '-s', '--search PHRASE', "Search Phrase" ) do |phrase|
+                options[:phrase] = phrase
+              end
             end
 
             opts.on( '-S', '--sort ORDER', "Sort Order. DIRECTION may be included as \"ORDER [asc|desc]\"." ) do |v|
@@ -741,7 +743,15 @@ module Morpheus
                 options[:include_fields] = val
               end
             end
-            opts.add_hidden_option('-F,') if opts.is_a?(Morpheus::Cli::OptionParser)
+            opts.on('--raw-fields [x,y,z]', String, "Raw fields filters output like --fields except the properties [x,y,z] must be specified from the root of the response instead of relative to the the list or object context for this particular resource.") do |val|
+              if val.size == 1 && val[0].downcase == 'all'
+                options[:all_fields] = true
+              else
+                options[:include_fields] = val.split(',').collect {|r| r.strip}.compact
+              end
+              options[:raw_fields] = true
+            end
+            opts.add_hidden_option('--raw-fields') if opts.is_a?(Morpheus::Cli::OptionParser)
             opts.on(nil, '--all-fields', "Show all fields present in the data.") do
               options[:all_fields] = true
             end
@@ -753,6 +763,11 @@ module Morpheus
             opts.on('--select x,y,z', String, "Filter Output to just print the value(s) of specific fields.") do |val|
               options[:select_fields] = val.split(',').collect {|r| r.strip}
             end
+            opts.on('--raw-select x,y,z', String, "Raw select works like --select except the properties [x,y,z] must be specified from the root of the response instead of relative to the the list or object context for this particular resource.") do |val|
+              options[:select_fields] = val.split(',').collect {|r| r.strip}
+              options[:raw_fields] = true
+            end
+            opts.add_hidden_option('--raw-select') if opts.is_a?(Morpheus::Cli::OptionParser)
 
           when :delim
             opts.on('--delimiter [CHAR]', String, "Delimiter for output values. Default: ',', use with --select and --csv") do |val|
@@ -1397,29 +1412,33 @@ module Morpheus
       def render_response(json_response, options, object_key=nil, &block)
         output = nil
         if options[:select_fields]
-          row = object_key ? json_response[object_key] : json_response
-          row = [row].flatten()
-          if row.is_a?(Array)
-            output = [row].flatten.collect { |record| 
-              options[:select_fields].collect { |field| 
-                value = get_object_value(record, field)
-                value.is_a?(String) ? value : JSON.fast_generate(value)
-              }.join(options[:delim] || ",")
-            }.join(options[:newline] || "\n")
-          else
-            output = records_as_csv([row], options)
+          # support foos get --raw-select foo.x,foo.y,foo.z
+          # and foos list --raw-select foos.x,foos.y,foos.z
+          row = (object_key && !options[:raw_fields]) ? json_response[object_key] : json_response
+          records = [row].flatten()
+          # look for an array in the first field only now...
+          field_parts = options[:select_fields][0].to_s.split(".")
+          field_context = field_parts[0]
+          context_data = json_response[field_context]
+          if field_parts.size > 1 && context_data.is_a?(Array)
+            # inject all the root level properties to be selectable too..
+            context_data = json_response.delete(field_context)
+            # records = context_data
+            records = context_data.collect {|it| it.is_a?(Hash) ? json_response.merge(it) : json_response }
+            options[:select_fields] = options[:select_fields].collect {|it| it.sub(field_context+'.', '')}
           end
+          output = records.collect { |record| 
+            options[:select_fields].collect { |field| 
+              value = get_object_value(record, field)
+              value.is_a?(String) ? value : JSON.fast_generate(value)
+            }.join(options[:delim] || ",")
+          }.join(options[:newline] || "\n")
         elsif options[:json]
           output = as_json(json_response, options, object_key)
         elsif options[:yaml]
           output = as_yaml(json_response, options, object_key)
         elsif options[:csv]
-          row = object_key ? json_response[object_key] : json_response
-          if row.is_a?(Array)
-            output = records_as_csv(row, options)
-          else
-            output = records_as_csv([row], options)
-          end
+          output = as_csv(json_response, nil, options, object_key)
         end
         if options[:outfile]
           full_outfile = File.expand_path(options[:outfile])

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

@@ -996,7 +996,7 @@ EOT
   end
 
   def apply(args)
-    default_refresh_interval = 15
+    default_refresh_interval = 10
     params, payload, options = {}, {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[app] [options]")

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

@@ -35,7 +35,10 @@ class Morpheus::Cli::CloudResourcePoolsCommand
         cloud_id = val
       end
       opts.add_hidden_option('-c') # prefer args[0] for [cloud]
-      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.on( '-s', '--search PHRASE', "Search by Name and/or Display Name" ) do |phrase|
+        options[:phrase] = phrase
+      end
+      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote], ['search'])
       opts.footer = "List resource pools for a cloud." + "\n" +
                     "[cloud] is required. This is the name or id of the cloud."
     end
@@ -91,6 +94,7 @@ class Morpheus::Cli::CloudResourcePoolsCommand
             type: resource_pool['type'].to_s.capitalize,
             description: resource_pool['description'],
             active: format_boolean(resource_pool['active']),
+            inventory: format_boolean(resource_pool['inventory']),
             status: resource_pool['status'].to_s.upcase,
             visibility: resource_pool['visibility'].to_s.capitalize,
             default: format_boolean(resource_pool['defaultPool']),
@@ -99,7 +103,7 @@ class Morpheus::Cli::CloudResourcePoolsCommand
           }
           row
         }
-        columns = [:id, :name, :description, :active, :default, :visibility, :tenants]
+        columns = [:id, :name, :description, :active,:inventory, :default, :visibility, :tenants]
         if options[:include_fields]
           columns = options[:include_fields]
         end
@@ -179,10 +183,12 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       description_cols = {
         "ID" => 'id',
         "Name" => 'name',
+        "Display Name" => 'displayName',
         "Description" => 'description',
         #"Type" => lambda {|it| it['type'].to_s.capitalize },
         "Cloud" => lambda {|it| it['zone'] ? it['zone']['name'] : '' },
         "Active" => lambda {|it| format_boolean(it['active']) },
+        "Inventory" => lambda {|it| format_boolean(it['inventory']) },
         "Default" => lambda {|it| format_boolean(it['defaultPool']) },
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
         "Status" => lambda {|it| it['status'].to_s.capitalize },
@@ -329,6 +335,9 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a resource pool") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--inventory [on|off]', String, "Enable or disable inventory sync for resource pool during cloud refresh") do |val|
+        options['inventory'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       opts.on('--default-pool [on|off]', String, "Set resource pool as the default") do |val|
         options['defaultPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
@@ -447,6 +456,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       else
         payload['resourcePool']['active'] = true
       end
+      
+      #inventory
+      if options['inventory'] != nil
+        payload['resourcePool']['inventory'] = options['inventory']
+      end
 
       # Default
       if options['defaultPool'] != nil
@@ -574,12 +588,18 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a resource pool") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--inventory [on|off]', String, "Enable or disable inventory sync for resource pool during cloud refresh") do |val|
+        options['inventory'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       opts.on('--default-pool [on|off]', String, "Set resource pool as the default") do |val|
         options['defaultPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
       opts.on("--description [TEXT]", String, "Description") do |val|
         options['description'] = val.to_s
       end
+      opts.on("--display-name [TEXT]", String, "Display Name") do |val|
+        options['displayName'] = val.to_s
+      end
       opts.on( '--role ROLE', String, "Role Name or ID (applicable to select resource pools)" ) do |val|
         options['role'] = val
       end
@@ -599,6 +619,7 @@ class Morpheus::Cli::CloudResourcePoolsCommand
     end
 
     connect(options)
+    puts "options #{options}"
 
     begin
       # load cloud
@@ -672,6 +693,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
         if options['active'] != nil
           payload['resourcePool']['active'] = options['active']
         end
+        
+        #inventory
+        if options['inventory'] != nil
+          payload['resourcePool']['inventory'] = options['inventory']
+        end
 
         # Default
         if options['defaultPool'] != nil
@@ -688,6 +714,11 @@ class Morpheus::Cli::CloudResourcePoolsCommand
           payload['resourcePool']['description'] = options['description']
         end
 
+        # Display Name
+        if options['displayName'] != nil
+          payload['resourcePool']['displayName'] = options['displayName']
+        end
+
         # Role
         if options['role'] != nil
           role_options = load_option_source_data('openstackRoles', {zoneId: cloud['id']})

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

@@ -260,7 +260,6 @@ class Morpheus::Cli::Clouds
         # todo: pass groups as an array instead
 
         # Cloud Name
-
         if args[0]
           cloud_payload[:name] = args[0]
           options[:options]['name'] = args[0] # to skip prompt
@@ -270,7 +269,6 @@ class Morpheus::Cli::Clouds
         end
 
         # Cloud Type
-
         cloud_type = nil
         if params[:zone_type]
           cloud_type = cloud_type_for_name(params[:zone_type])
@@ -459,7 +457,16 @@ class Morpheus::Cli::Clouds
     query_params = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [options]")
+      opts.banner = subcommand_usage("[cloud] [options]")
+      opts.on( '-m', '--mode [daily|costing]', "Refresh Mode. Use this to run the daily or costing jobs instead of the default hourly refresh." ) do |val|
+        query_params[:mode] = val
+      end
+      opts.on( '--rebuild [on|off]', "Rebuild invoices for period. Only applies to mode=costing." ) do |val|
+        query_params[:rebuild] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.on( '--period PERIOD', "Period in the format YYYYMM to process invoices for. Default is the current period. Only applies to mode=costing." ) do |val|
+        query_params[:period] = val.to_s
+      end
       opts.on( '-f', '--force', "Force refresh. Useful if the cloud is disabled." ) do
         query_params[:force] = 'true'
       end
@@ -970,8 +977,7 @@ class Morpheus::Cli::Clouds
       {'fieldName' => 'location', 'fieldLabel' => 'Location', 'type' => 'text', 'required' => false, 'displayOrder' => 3},
       {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}], 'required' => false, 'description' => 'Visibility', 'category' => 'permissions', 'defaultValue' => 'private', 'displayOrder' => 4},
       {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 5},
-      {'fieldName' => 'autoRecoverPowerState', 'fieldLabel' => 'Automatically Power On VMs', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'displayOrder' => 6},
-      {'fieldName' => 'credential', 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Credential ID or use "local" to specify username and password', 'displayOrder' => 9, 'defaultValue' => "local", 'required' => true, :for_help_only => true}, # hacky way to render this but not prompt for it
+      {'fieldName' => 'autoRecoverPowerState', 'fieldLabel' => 'Automatically Power On VMs', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'displayOrder' => 6}
     ]
 
     # TODO: Account
@@ -1004,7 +1010,7 @@ class Morpheus::Cli::Clouds
   end
 
   def cloud_types_for_dropdown
-    get_available_cloud_types().select {|it| it['enabled'] }.collect {|it| {'name' => it['name'], 'value' => it['code']} }
+    @clouds_interface.cloud_types({max:1000, shallow:true})['zoneTypes'].select {|it| it['enabled'] }.collect {|it| {'name' => it['name'], 'value' => it['code']} }
   end
 
   def format_cloud_status(cloud, return_color=cyan)

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

@@ -10,6 +10,7 @@ class Morpheus::Cli::Clusters
   register_subcommands :list, :count, :get, :view, :add, :update, :remove, :logs, :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}
   register_subcommands :list_workers, :add_worker, :remove_worker, :update_worker_count
   register_subcommands :list_masters
+  register_subcommands :upgrade_cluster
   register_subcommands :list_volumes, :remove_volume
   register_subcommands :list_namespaces, :get_namespace, :add_namespace, :update_namespace, :remove_namespace
   register_subcommands :list_containers, :remove_container, :restart_container
@@ -69,7 +70,6 @@ class Morpheus::Cli::Clusters
         return
       end
       json_response = @clusters_interface.list(params)
-      
       render_result = render_with_format(json_response, options, 'clusters')
       return 0 if render_result
 
@@ -859,7 +859,11 @@ class Morpheus::Cli::Clusters
         print JSON.pretty_generate(json_response)
         print "\n"
       elsif !options[:quiet]
-        print_green_success "Cluster #{cluster['name']} is being removed..."
+        msg = "Cluster #{cluster['name']} is being removed..."
+        if json_response['msg'] != nil && json_response['msg'] != ''
+          msg = json_response['msg']
+        end
+        print_green_success msg
         #list([])
       end
     rescue RestClient::Exception => e
@@ -1324,7 +1328,11 @@ class Morpheus::Cli::Clusters
       if options[:json]
         puts as_json(json_response)
       elsif json_response['success']
-        print_green_success "Added worker to cluster #{cluster['name']}"
+        if json_response['msg'] == nil
+          print_green_success "Added worker to cluster #{cluster['name']}"
+        else
+          print_green_success json_response['msg']
+        end
         #get_args = [json_response["cluster"]["id"]] + (options[:remote] ? ["-r",options[:remote]] : [])
         #get(get_args)
       end
@@ -1377,7 +1385,11 @@ class Morpheus::Cli::Clusters
     end
     json_response = @clusters_interface.destroy_worker(cluster['id'], worker['id'], params)
     render_response(json_response, options) do
-      print_green_success "Worker #{worker['name']} is being removed from cluster #{cluster['name']}..." 
+      msg = "Worker #{worker['name']} is being removed from cluster #{cluster['name']}..." 
+      if json_response['msg']
+        msg = json_response['msg']
+      end
+      print_green_success msg
     end
     return 0, nil
   end
@@ -1518,6 +1530,45 @@ class Morpheus::Cli::Clusters
     end
   end
 
+  def upgrade_cluster(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[cluster]")
+      build_standard_update_options(opts, options)
+      opts.footer = "Updates kubernetes version (kubectl and kubeadm) of the specified cluster.\n" +
+                    "[cluster] is required. This is the name or id of an existing cluster.\n"
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+
+    cluster = find_cluster_by_name_or_id(args[0])
+    return 1 if cluster.nil?
+
+    version_options = get_valid_upgrade_versions(cluster['id'])
+    version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'targetVersion', 'type' => 'select', 'fieldLabel' => 'To Version', 'selectOptions' => version_options, 'required' => true, 'description' => 'Select target version.' }],options[:options],api_client,{})
+    target_version = version_options.detect{ |element| element['value']  == version_prompt['targetVersion'] }['name']
+
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'targetVersion' => target_version})
+    else
+      payload.deep_merge!({'targetVersion' => target_version})
+    end
+    @clusters_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clusters_interface.dry.do_cluster_upgrade(cluster['id'], payload)
+      return
+    end
+    json_response = @clusters_interface.do_cluster_upgrade(cluster['id'], payload)
+    render_response(json_response, options) do
+      print_green_success "Cluster #{cluster['name']} is being upgraded to #{target_version}..."
+    end
+    return 0, nil
+  end
+
   def list_volumes(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -3573,6 +3624,7 @@ class Morpheus::Cli::Clusters
     rows = clusters.collect do |cluster|
       {
           id: cluster['id'],
+          display_name: cluster['displayName'],
           name: cluster['name'],
           type: (cluster['type']['name'] rescue ''),
           layout: (cluster['layout']['name'] rescue ''),
@@ -3582,7 +3634,7 @@ class Morpheus::Cli::Clusters
       }
     end
     columns = [
-        :id, :name, :type, :layout, :workers, :cloud, :status
+        :id, :name, :display_name, :type, :layout, :workers, :cloud, :status
     ]
     print as_pretty_table(rows, columns, opts)
   end
@@ -4107,6 +4159,15 @@ class Morpheus::Cli::Clusters
     rtn
   end
 
+  def get_valid_upgrade_versions(cluster_id)
+    result = @clusters_interface.get_upgrade_versions(cluster_id, {})
+    rtn = []
+    if result['versions']
+      rtn = result['versions'].map.with_index {|value, idx| {'name' => value,'value' => idx}}
+    end
+    rtn
+  end
+
   def update_wiki_page_option_types
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => false, 'displayOrder' => 1, 'description' => 'The name of the wiki page for this instance. Default is the instance name.'},

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

@@ -1118,7 +1118,11 @@ class Morpheus::Cli::Hosts
         print JSON.pretty_generate(json_response)
         print "\n"
       elsif !options[:quiet]
-        print_green_success "Host #{server['name']} is being removed..."
+        if json_response['deleteApprovalRequired'] == true
+          print_green_success "Delete Request created for Host #{server['name']}"
+        else
+          print_green_success "Host #{server['name']} is being removed..."
+        end
         #list([])
       end
     rescue RestClient::Exception => e

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

@@ -4607,7 +4607,7 @@ EOT
   end
 
   def apply(args)
-    default_refresh_interval = 15
+    default_refresh_interval = 10
     params, payload, options = {}, {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance] [options]")

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

@@ -275,7 +275,7 @@ EOT
             opt['fieldContext'] = nil
           end
         end
-        config_prompt = Morpheus::Cli::OptionTypes.prompt(config_option_types, options[:options], @api_client, options[:params])
+        config_prompt = Morpheus::Cli::OptionTypes.prompt(config_option_types, options[:options], @api_client, options[:params], false, true)
         config_prompt.deep_compact!
         params.deep_merge!(config_prompt)
       end

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

@@ -627,6 +627,12 @@ Update an invoice.
       opts.on( '--date DATE', String, "Date to collect costing for. By default the cost data is collected for the end of the previous job interval (hour or day)." ) do |val|
         payload[:date] = val.to_s
       end
+      opts.on( '--period PERIOD', "Period in the format YYYYMM to process invoices for. Default is the current period. This is an alias for the --date option." ) do |val|
+        payload[:date] = val.to_s
+      end
+      opts.on( '--rebuild', "Rebuild invoices for period. Only applies to mode=costing." ) do |val|
+        query_params[:rebuild] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
       build_standard_update_options(opts, options, [:query, :auto_confirm])
       opts.footer = <<-EOT
 Refresh invoice costing data for the specified clouds.
@@ -674,6 +680,7 @@ EOT
       opts.on('-a', '--all', "Display all details, costs and prices." ) do
         options[:show_actual_costs] = true
         options[:show_costs] = true
+        options[:details] = true
       end
       # opts.on('--actuals', '--actuals', "Display all actual costs: Compute, Memory, Storage, Network, Extra" ) do
       #   options[:show_actual_costs] = true
@@ -861,7 +868,7 @@ EOT
           {"COST" => lambda {|it| format_money(it['itemCost'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
           {"TAX" => lambda {|it| format_money(it['itemTax'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
         ] : []) + [
-          {"ITEM ID" => lambda {|it| truncate_string_right(it['itemId'], 65) } },
+          {"ITEM ID" => lambda {|it| options[:details] ? it['itemId'] : truncate_string_right(it['itemId'], 65) } },
           {"ITEM NAME" => lambda {|it| it['itemName'] } },
           {"ITEM TYPE" => lambda {|it| it['itemType'] } },
           {"ITEM DESCRIPTION" => lambda {|it| it['itemDescription'] } },