morpheus-cli 4.2.14 → 4.2.19

data/lib/morpheus/cli/error_handler.rb

@@ -31,18 +31,31 @@ class Morpheus::Cli::ErrorHandler
       # raise err
       # @stderr.puts "#{red}#{err.message}#{reset}"
       puts_angry_error err.message
-      @stderr.puts "Use -h to get help with this command."
+      @stderr.puts err.optparse.banner if err.optparse && err.optparse.banner
+      @stderr.puts "Try --help for more usage information"
       do_print_stacktrace = false
       # exit_code = 127
-    # when Morpheus::Cli::CommandArgumentsError
+    when Morpheus::Cli::CommandArgumentsError
+      puts_angry_error err.message
+      @stderr.puts err.optparse.banner if err.optparse && err.optparse.banner
+      @stderr.puts "Try --help for more usage information"
+      do_print_stacktrace = false
+      if err.exit_code
+        exit_code = err.exit_code
+      end
+
     when Morpheus::Cli::CommandError
-      # @stderr.puts "#{red}#{err.message}#{reset}"
-      # this should probably print the whole thing as red, but just does the first line for now.
+      # this should probably always print the whole thing as red, but just does the first line for now.
+      # until verify_args! replaces raise_command_error where the full parser help is in the error message..
       message_lines = err.message.split(/\r?\n/)
       first_line = message_lines.shift
       puts_angry_error first_line
-      @stderr.puts message_lines.join("\n") unless message_lines.empty?
-      @stderr.puts "Use -h to get help with this command."
+      if !message_lines.empty?
+        @stderr.puts message_lines.join("\n") unless message_lines.empty?
+      else
+        @stderr.puts err.optparse.banner if err.optparse && err.optparse.banner && message_lines.empty?
+        @stderr.puts "Try --help for more usage information"
+      end
       do_print_stacktrace = false
       if err.exit_code
         exit_code = err.exit_code
@@ -82,7 +95,7 @@ class Morpheus::Cli::ErrorHandler
           @stderr.puts err.to_s
         end
       else
-        @stderr.puts "Use --debug for more information."
+        @stderr.puts "Use -V or --debug for more verbose debugging information."
       end
     end
 
@@ -127,6 +140,8 @@ class Morpheus::Cli::ErrorHandler
         begin
           print_rest_errors(JSON.parse(err.response.to_s), options)
         rescue TypeError, JSON::ParserError => ex
+          # not json, just 404
+          @stderr.print red, "Error Communicating with the remote appliance. #{e}", reset, "\n"  
         end
       else
         @stderr.print red, "Error Communicating with the remote appliance. #{e}", reset, "\n"
@@ -145,7 +160,7 @@ class Morpheus::Cli::ErrorHandler
             @stderr.print reset
           end
         else
-          @stderr.puts "Use --debug for more information."
+          @stderr.puts "Use -V or --debug for more verbose debugging information."
         end
       end
     else

data/lib/morpheus/cli/errors.rb

@@ -3,7 +3,7 @@ module Morpheus::Cli
   # A standard error to raise in your CliCommand classes.
   class CommandError < StandardError
     
-    attr_reader :args, :exit_code
+    attr_reader :args, :optparse, :exit_code
       
     def initialize(msg, args=[], optparse=nil, exit_code=nil)
       @args = args
@@ -11,6 +11,7 @@ module Morpheus::Cli
       @exit_code = exit_code # || 1
       super(msg)
     end
+
   end
 
   # An error indicating the command was not recoginzed
@@ -24,7 +25,7 @@ module Morpheus::Cli
 
   # An error for wrong number of arguments
   # could use ::OptionParser::MissingArgument, ::OptionParser::NeedlessArgument
-  # maybe return an error code niftier than 1?
+  # maybe return an error code other than 1?
   class CommandArgumentsError < CommandError
 
     def initialize(msg, args=[], optparse=nil, exit_code=nil)

data/lib/morpheus/cli/image_builder_command.rb

@@ -518,7 +518,7 @@ class Morpheus::Cli::ImageBuilderCommand
       opts.on( '-K', '--keep-virtual-images', "Preserve associated virtual images" ) do
         query_params['keepVirtualImages'] = 'on'
       end
-      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -565,7 +565,7 @@ class Morpheus::Cli::ImageBuilderCommand
     query_params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[image-build]")
-      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
 

data/lib/morpheus/cli/instances.rb

@@ -9,14 +9,22 @@ class Morpheus::Cli::Instances
   include Morpheus::Cli::AccountsHelper # needed? replace with OptionSourceHelper
   include Morpheus::Cli::OptionSourceHelper
   include Morpheus::Cli::ProvisioningHelper
+  include Morpheus::Cli::DeploymentsHelper
   include Morpheus::Cli::ProcessesHelper
   include Morpheus::Cli::LogsHelper
 
   set_command_name :instances
   set_command_description "View and manage instances."
-  register_subcommands :list, :count, :get, :view, :add, :update, :remove, :cancel_removal, :logs, :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}, :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :backup, :backups, :stop_service, :start_service, :restart_service, :resize, :clone, :envs, :setenv, :delenv, :security_groups, :apply_security_groups, :run_workflow, :import_snapshot, :console, :status_check, {:containers => :list_containers}, :scaling, {:'scaling-update' => :scaling_update}
-  register_subcommands :wiki, :update_wiki
-  register_subcommands :exec => :execution_request
+  register_subcommands :list, :count, :get, :view, :add, :update, :remove, :cancel_removal, :logs, 
+                       :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}, 
+                       :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :stop_service, :start_service, :restart_service, 
+                       :backup, :backups, :resize, :clone, :envs, :setenv, :delenv, 
+                       :security_groups, :apply_security_groups, :run_workflow, :import_snapshot, 
+                       :console, :status_check, {:containers => :list_containers}, 
+                       :scaling, {:'scaling-update' => :scaling_update},
+                       :wiki, :update_wiki,
+                       {:exec => :execution_request},
+                       :deploys
   #register_subcommands :firewall_disable, :firewall_enable
   # register_subcommands {:'lb-update' => :load_balancer_update}
   alias_subcommand :details, :get
@@ -43,6 +51,8 @@ class Morpheus::Cli::Instances
     @options_interface = @api_client.options
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
     @execution_request_interface = @api_client.execution_request
+    @deploy_interface = @api_client.deploy
+    @deployments_interface = @api_client.deployments
   end
   
   def handle(args)
@@ -546,18 +556,12 @@ class Morpheus::Cli::Instances
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
 
     begin
       instance = find_instance_by_name_or_id(args[0])
       return 1 if instance.nil?
-      new_group = nil
-      
-      
       if options[:payload]
         payload = options[:payload]
       end
@@ -579,10 +583,40 @@ class Morpheus::Cli::Instances
         params['ownerId'] = owner_id
         #payload['createdById'] = options[:owner].to_i # pre 4.2.1 api
       end
-      if params.empty? && options[:owner].nil?
-        print_red_alert "Specify at least one option to update"
-        puts optparse
-        exit 1
+      if options[:group]
+        group = find_group_by_name_or_id_for_provisioning(options[:group])
+        if group.nil?
+          return 1, "group not found"
+        end
+        payload['instance']['site'] = {'id' => group['id']}
+      end
+      # metadata tags
+      # if options[:options]['metadata'].is_a?(Array) && !options[:metadata]
+      #   options[:metadata] = options[:options]['metadata']
+      # end
+      if options[:metadata]
+        metadata = []
+        if options[:metadata] == "[]" || options[:metadata] == "null"
+          payload['instance']['metadata'] = []
+        elsif options[:metadata].is_a?(Array)
+          payload['instance']['metadata'] = options[:metadata]
+        else
+          # parse string into format name:value, name:value
+          # merge IDs from current metadata
+          # todo: should allow quoted semicolons..
+          metadata_list = options[:metadata].split(",").select {|it| !it.to_s.empty? }
+          metadata_list = metadata_list.collect do |it|
+            metadata_pair = it.split(":")
+            row = {}
+            row['name'] = metadata_pair[0].to_s.strip
+            row['value'] = metadata_pair[1].to_s.strip
+            row
+          end
+          payload['instance']['metadata'] = metadata_list
+        end
+      end
+      if payload['instance'].empty? && params.empty? && options[:owner].nil?
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
       end
       if !params.empty?
         payload['instance'].deep_merge!(params)
@@ -1218,7 +1252,6 @@ class Morpheus::Cli::Instances
         "Environment" => 'instanceContext',
         "Labels" => lambda {|it| it['tags'] ? it['tags'].join(',') : '' },
         "Metadata" => lambda {|it| it['metadata'] ? it['metadata'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
-        "Power Schedule" => lambda {|it| (it['powerSchedule'] && it['powerSchedule']['type']) ? it['powerSchedule']['type']['name'] : '' },
         "Owner" => lambda {|it| 
           if it['owner']
             (it['owner']['username'] || it['owner']['id'])
@@ -1228,13 +1261,20 @@ class Morpheus::Cli::Instances
         },
         #"Tenant" => lambda {|it| it['tenant'] ? it['tenant']['name'] : '' },
         "Date Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+        # "Last Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+        "Power Schedule" => lambda {|it| (it['powerSchedule'] && it['powerSchedule']['type']) ? it['powerSchedule']['type']['name'] : '' },
+        "Last Deployment" => lambda {|it| (it['lastDeploy'] ? "#{it['lastDeploy']['deployment']['name']} #{it['lastDeploy']['deploymentVersion']['userVersion']} at #{format_local_dt it['lastDeploy']['deployDate']}" : nil) rescue "" },
+        "Expire Date" => lambda {|it| it['expireDate'] ? format_local_dt(it['expireDate']) : '' },
+        "Shutdown Date" => lambda {|it| it['shutdownDate'] ? format_local_dt(it['shutdownDate']) : '' },
         "Nodes" => lambda {|it| it['containers'] ? it['containers'].count : 0 },
         "Connection" => lambda {|it| format_instance_connection_string(it) },
         "Status" => lambda {|it| format_instance_status(it) }
       }
-
+      description_cols.delete("Power Schedule") if instance['powerSchedule'].nil?
+      description_cols.delete("Expire Date") if instance['expireDate'].nil?
+      description_cols.delete("Shutdown Date") if instance['shutdownDate'].nil?
       description_cols["Removal Date"] = lambda {|it| format_local_dt(it['removalDate'])} if instance['status'] == 'pendingRemoval'
-
+      description_cols.delete("Last Deployment") if instance['lastDeploy'].nil?
       print_description_list(description_cols, instance)
 
       if instance['statusMessage']
@@ -3606,6 +3646,60 @@ class Morpheus::Cli::Instances
     end
   end
 
+  def deploys(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance] [search]")
+      build_standard_list_options(opts, options)
+      opts.footer = <<-EOT
+List deployments for an instance.
+[instance] is required. This is the name or id of an instance
+[search] is optional. Filters on deployment version identifier
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:1)
+    connect(options)
+    if args.count > 1
+      options[:phrase] = args.join(" ")
+    end
+    params.merge!(parse_list_options(options))
+    instance = find_instance_by_name_or_id(args[0])
+    return 1 if instance.nil?
+    # @deploy_interface.setopts(options)
+    # if options[:dry_run]
+    #   print_dry_run @deploy_interface.dry.list(instance['id'], params)
+    #   return
+    # end
+    # json_response = @deploy_interface.list(instance['id'], params)
+
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.deploys(instance['id'], params)
+      return
+    end
+    json_response = @instances_interface.deploys(instance['id'], params)
+
+    app_deploys = json_response['appDeploys']
+    render_response(json_response, options, 'appDeploys') do
+      print_h1 "Instance Deploys", ["#{instance['name']}"] + parse_list_subtitles(options), options
+      if app_deploys.empty?
+        print cyan,"No deployments found.",reset,"\n"
+      else
+        print as_pretty_table(app_deploys, app_deploy_column_definitions.upcase_keys!, options)
+        if json_response['meta']
+          print_results_pagination(json_response)
+        else
+          print_results_pagination({size:app_deploys.size,total:app_deploys.size.to_i})
+        end
+
+      end
+      print reset,"\n"
+    end
+    return 0
+  end
+
 private
 
   def find_zone_by_name_or_id(group_id, val)
@@ -3902,4 +3996,29 @@ private
     ]
   end
 
+  def app_deploy_column_definitions
+    {
+      "ID" => 'id',
+      "Deployment" => lambda {|it| it['deployment']['name'] rescue '' },
+      "Version" => lambda {|it| (it['deploymentVersion']['userVersion'] || it['deploymentVersion']['version']) rescue '' },
+      "Deploy Date" => lambda {|it| format_local_dt(it['deployDate']) },
+      "Status" => lambda {|it| format_app_deploy_status(it['status']) },
+    }
+  end
+
+  def format_app_deploy_status(status, return_color=cyan)
+    out = ""
+    s = status.to_s.downcase
+    if s == 'deployed'
+      out << "#{green}#{s.upcase}#{return_color}"
+    elsif s == 'open' || s == 'archived' || s == 'committed'
+      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
+
 end

data/lib/morpheus/cli/invoices_command.rb

@@ -25,39 +25,29 @@ 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 costs, prices and raw data" ) do
+      opts.on('-a', '--all', "Display all details, costs and prices." ) do
+        options[:show_all] = true
         options[:show_estimates] = true
         # options[:show_costs] = true
         options[:show_prices] = true
-        options[:show_raw_data] = true
+        # options[:show_raw_data] = true
       end
-      opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Memory, Storage, etc." ) do
+      opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Storage, Network, Extra" ) do
         options[:show_estimates] = true
       end
-      # opts.on('--costs', '--costs', "Display all costs: Compute, Memory, Storage, etc." ) do
+      # opts.on('--costs', '--costs', "Display all costs: Compute, Storage, Network, Extra" ) do
       #   options[:show_costs] = true
       # end
-      opts.on('--prices', '--prices', "Display prices: Total, Compute, Memory, Storage, etc." ) do
+      opts.on('--prices', '--prices', "Display prices: Total, Compute, Storage, Network, Extra" ) do
         options[:show_prices] = true
       end
-      opts.on('--type TYPE', String, "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
-        if val.to_s.downcase == 'cloud' || val.to_s.downcase == 'zone'
-          params['refType'] = 'ComputeZone'
-        elsif val.to_s.downcase == 'instance'
-          params['refType'] = 'Instance'
-        elsif val.to_s.downcase == 'server' || val.to_s.downcase == 'host'
-          params['refType'] = 'ComputeServer'
-        elsif val.to_s.downcase == 'cluster'
-          params['refType'] = 'ComputeServerGroup'
-        elsif val.to_s.downcase == 'group'
-          params['refType'] = 'ComputeSite'
-        elsif val.to_s.downcase == 'user'
-          params['refType'] = 'User'
-        else
-          params['refType'] = val
-        end
+      opts.on('-t', '--type TYPE', "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
+        params['refType'] ||= []
+        values = val.split(",").collect {|it| it.strip }.select {|it| it != "" }
+        values.each { |it| params['refType'] << parse_invoice_ref_type(it) }
       end
       opts.on('--id ID', String, "Filter by Ref ID") do |val|
         ref_ids << val
@@ -116,6 +106,11 @@ class Morpheus::Cli::InvoicesCommand
       opts.on('--tenant ID', String, "View invoices 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('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
         options[:show_raw_data] = true
       end
@@ -123,6 +118,14 @@ class Morpheus::Cli::InvoicesCommand
         params['includeTotals'] = true
         options[:show_invoice_totals] = true
       end
+      opts.on('--totals-only', "View totals only") do |val|
+        params['includeTotals'] = true
+        options[:show_invoice_totals] = true
+        options[:totals_only] = true
+      end
+      opts.on('--sigdig DIGITS', "Significant digits when rounding cost values for display as currency. Default is 2. eg. $3.50") do |val|
+        options[:sigdig] = val.to_i
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List invoices."
     end
@@ -166,6 +169,11 @@ 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|
+        params['tags.' + k] = v
+      end
+    end
     @invoices_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @invoices_interface.dry.list(params)
@@ -186,6 +194,7 @@ class Morpheus::Cli::InvoicesCommand
       print_h1 title, subtitles
       if invoices.empty?
         print cyan,"No invoices found.",reset,"\n"
+        print reset,"\n"
       else
         # current_date = Time.now
         # current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
@@ -194,105 +203,137 @@ 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 NAME" => lambda {|it| it['refName'] } }
-        ] + (show_projects ? [
-          {"PROJECT ID" => lambda {|it| it['project'] ? it['project']['id'] : '' } },
-          {"PROJECT NAME" => lambda {|it| it['project'] ? it['project']['name'] : '' } },
-          {"PROJECT TAGS" => lambda {|it| it['project'] ? truncate_string(format_metadata(it['project']['tags']), 50) : '' } }
-        ] : []) + [
+          {"REF NAME" => lambda {|it| 
+            if options[:show_all]
+              it['refName']
+            else
+              truncate_string_right(it['refName'], 100)
+            end
+          } },
           #{"INTERVAL" => lambda {|it| it['interval'] } },
           {"CLOUD" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' } },
-          {"ACCOUNT" => lambda {|it| it['account'] ? it['account']['name'] : '' } },
-          {"ACTIVE" => lambda {|it| format_boolean(it['active']) } },
-          #{"ESTIMATE" => lambda {|it| format_boolean(it['estimate']) } },
+          #{"TENANT" => lambda {|it| it['account'] ? it['account']['name'] : '' } },
+          
+          #{"COST TYPE" => lambda {|it| it['costType'].to_s.capitalize } },
           {"PERIOD" => lambda {|it| format_invoice_period(it) } },
           {"START" => lambda {|it| format_date(it['startDate']) } },
-          {"END" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' } },
-          {"MTD" => lambda {|it| format_money(it['runningCost']) } },
+          {"END" => lambda {|it| format_date(it['endDate']) } },
+        ] + (options[:show_all] ? [
+          {"REF START" => lambda {|it| format_dt(it['refStart']) } },
+          {"REF END" => lambda {|it| format_dt(it['refEnd']) } },
+        ] : []) + [
+          {"COMPUTE" => lambda {|it| format_money(it['computeCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          # {"MEMORY" => lambda {|it| format_money(it['memoryCost']) } },
+          {"STORAGE" => lambda {|it| format_money(it['storageCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"NETWORK" => lambda {|it| format_money(it['networkCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"EXTRA" => lambda {|it| format_money(it['extraCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"MTD" => lambda {|it| format_money(it['runningCost'], 'usd', {sigdig:options[:sigdig]}) } },
           {"TOTAL" => lambda {|it| 
-
-            if it['runningMultiplier'] && it['runningMultiplier'].to_i != 1 && it['totalCost'].to_f > 0
-              format_money(it['totalCost']) + " (Projected)"
-            else
-              format_money(it['totalCost'])
-            end
+            format_money(it['totalCost'], 'usd', {sigdig:options[:sigdig]}) + ((it['totalCost'].to_f > 0 && it['totalCost'] != it['runningCost']) ? " (Projected)" : "")
           } }
         ]
         
-        columns += [
-          {"COMPUTE" => lambda {|it| format_money(it['computeCost']) } },
-          # {"MEMORY" => lambda {|it| format_money(it['memoryCost']) } },
-          {"STORAGE" => lambda {|it| format_money(it['storageCost']) } },
-          {"NETWORK" => lambda {|it| format_money(it['networkCost']) } },
-          {"OTHER" => lambda {|it| format_money(it['extraCost']) } },
-        ]
         if options[:show_prices]
           columns += [
-            {"COMPUTE PRICE" => lambda {|it| format_money(it['computePrice']) } },
-            # {"MEMORY PRICE" => lambda {|it| format_money(it['memoryPrice']) } },
-            {"STORAGE PRICE" => lambda {|it| format_money(it['storagePrice']) } },
-            {"NETWORK PRICE" => lambda {|it| format_money(it['networkPrice']) } },
-            {"OTHER PRICE" => lambda {|it| format_money(it['extraPrice']) } },
-            {"MTD PRICE" => lambda {|it| format_money(it['runningPrice']) } },
+            {"COMPUTE PRICE" => lambda {|it| format_money(it['computePrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            # {"MEMORY PRICE" => lambda {|it| format_money(it['memoryPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"STORAGE PRICE" => lambda {|it| format_money(it['storagePrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"NETWORK PRICE" => lambda {|it| format_money(it['networkPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"EXTRA PRICE" => lambda {|it| format_money(it['extraPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"MTD PRICE" => lambda {|it| format_money(it['runningPrice'], 'usd', {sigdig:options[:sigdig]}) } },
             {"TOTAL PRICE" => lambda {|it| 
-              if it['runningMultiplier'] && it['runningMultiplier'].to_i != 1 && it['totalPrice'].to_f > 0
-                format_money(it['totalPrice']) + " (Projected)"
-              else
-                format_money(it['totalPrice'])
-              end
+              format_money(it['totalPrice'], 'usd', {sigdig:options[:sigdig]}) + ((it['totalCost'].to_f > 0 && it['totalCost'] != it['runningCost']) ? " (Projected)" : "")
             } }
           ]
         end
         if options[:show_estimates]
           columns += [
-            {"MTD EST." => lambda {|it| format_money(it['estimatedRunningCost']) } },
+            {"COMPUTE EST." => lambda {|it| format_money(it['estimatedComputeCost'], 'usd', {sigdig:options[:sigdig]}) } },
+            # {"MEMORY  EST." => lambda {|it| format_money(it['estimatedMemoryCost'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"STORAGE EST." => lambda {|it| format_money(it['estimatedStorageCost'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"NETWORK EST." => lambda {|it| format_money(it['estimatedNetworkCost'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"EXTRA EST." => lambda {|it| format_money(it['estimatedExtraCost'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"MTD EST." => lambda {|it| format_money(it['estimatedRunningCost'], 'usd', {sigdig:options[:sigdig]}) } },
             {"TOTAL EST." => lambda {|it| 
-              if it['runningMultiplier'] && it['runningMultiplier'].to_i != 1 && it['estimatedTotalCost'].to_f > 0
-                format_money(it['estimatedTotalCost']) + " (Projected)"
-              else
-                format_money(it['estimatedTotalCost'])
-              end
+              format_money(it['estimatedTotalCost'], 'usd', {sigdig:options[:sigdig]}) + ((it['estimatedTotalCost'].to_f > 0 && it['estimatedTotalCost'] != it['estimatedRunningCost']) ? " (Projected)" : "")
             } },
-            {"COMPUTE EST." => lambda {|it| format_money(it['estimatedComputeCost']) } },
-            # {"MEMORY  EST." => lambda {|it| format_money(it['estimatedMemoryCost']) } },
-            {"STORAGE EST." => lambda {|it| format_money(it['estimatedStorageCost']) } },
-            {"NETWORK EST." => lambda {|it| format_money(it['estimatedNetworkCost']) } },
-            {"OTHER EST." => lambda {|it| format_money(it['estimatedExtraCost']) } },
           ]
         end
+        columns += [
+          {"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(', ') : '' } },
+        ]
+        if show_projects
+          columns += [
+          {"PROJECT ID" => lambda {|it| it['project'] ? it['project']['id'] : '' } },
+          {"PROJECT NAME" => lambda {|it| it['project'] ? it['project']['name'] : '' } },
+          {"PROJECT TAGS" => lambda {|it| it['project'] ? truncate_string(format_metadata(it['project']['tags']), 50) : '' } },
+        ]
+        end
+        columns += [
+          {"CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } },
+          {"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) } }]
         end
-        print as_pretty_table(invoices, columns, options)
-        print_results_pagination(json_response, {:label => "invoice", :n_label => "invoices"})
+        unless options[:totals_only]
+          print as_pretty_table(invoices, columns, options)
+          print_results_pagination(json_response, {:label => "invoice", :n_label => "invoices"})
+        end
 
         if options[:show_invoice_totals]
           invoice_totals = json_response['invoiceTotals']
+          print_h2 "Invoice Totals (#{format_number(json_response['meta']['total']) rescue ''})"
+
           if invoice_totals
-            print_h2 "Invoice Totals"
-            invoice_totals_columns = {
-              "# Invoices" => lambda {|it| format_number(json_response['meta']['total']) rescue '' },
-              "Total Price" => lambda {|it| format_money(it['actualTotalPrice']) },
-              "Total Cost" => lambda {|it| format_money(it['actualTotalCost']) },
-              "Running Price" => lambda {|it| format_money(it['actualRunningPrice']) },
-              "Running Cost" => lambda {|it| format_money(it['actualRunningCost']) },
-              # "Invoice Total Price" => lambda {|it| format_money(it['invoiceTotalPrice']) },
-              # "Invoice Total Cost" => lambda {|it| format_money(it['invoiceTotalCost']) },
-              # "Invoice Running Price" => lambda {|it| format_money(it['invoiceRunningPrice']) },
-              # "Invoice Running Cost" => lambda {|it| format_money(it['invoiceRunningCost']) },
-              # "Estimated Total Price" => lambda {|it| format_money(it['estimatedTotalPrice']) },
-              # "Estimated Total Cost" => lambda {|it| format_money(it['estimatedTotalCost']) },
-              # "Compute Price" => lambda {|it| format_money(it['computePrice']) },
-              # "Compute Cost" => lambda {|it| format_money(it['computeCost']) },
+            cost_rows = [
+              {label: 'Cost'.upcase, compute: invoice_totals['actualComputeCost'], memory: invoice_totals['actualMemoryCost'], storage: invoice_totals['actualStorageCost'], network: invoice_totals['actualNetworkCost'], license: invoice_totals['actualLicenseCost'], extra: invoice_totals['actualExtraCost'], running: invoice_totals['actualRunningCost'], total: invoice_totals['actualTotalCost']},
+            ]
+            if options[:show_prices]
+              cost_rows += [
+                {label: 'Price'.upcase, compute: invoice_totals['actualComputePrice'], memory: invoice_totals['actualMemoryPrice'], storage: invoice_totals['actualStoragePrice'], network: invoice_totals['actualNetworkPrice'], license: invoice_totals['actualLicensePrice'], extra: invoice_totals['actualExtraPrice'], running: invoice_totals['actualRunningPrice'], total: invoice_totals['actualTotalPrice']},
+              ]
+            end
+            if options[:show_estimates]
+              cost_rows += [
+                {label: 'Metered Cost'.upcase, compute: invoice_totals['estimatedComputeCost'], memory: invoice_totals['estimatedMemoryCost'], storage: invoice_totals['estimatedStorageCost'], network: invoice_totals['estimatedNetworkCost'], license: invoice_totals['estimatedLicenseCost'], extra: invoice_totals['estimatedExtraCost'], running: invoice_totals['estimatedRunningCost'], total: invoice_totals['estimatedTotalCost']},
+                {label: 'Metered Price'.upcase, compute: invoice_totals['estimatedComputePrice'], memory: invoice_totals['estimatedMemoryPrice'], storage: invoice_totals['estimatedStoragePrice'], network: invoice_totals['estimatedNetworkPrice'], license: invoice_totals['estimatedLicensePrice'], extra: invoice_totals['estimatedExtraPrice'], running: invoice_totals['estimatedRunningPrice'], total: invoice_totals['estimatedTotalPrice']},
+              ]
+            end
+            cost_columns = {
+              "" => lambda {|it| it[:label] },
+              "Compute".upcase => lambda {|it| format_money(it[:compute], 'usd', {sigdig:options[:sigdig]}) },
+              "Memory".upcase => lambda {|it| format_money(it[:memory], 'usd', {sigdig:options[:sigdig]}) },
+              "Storage".upcase => lambda {|it| format_money(it[:storage], 'usd', {sigdig:options[:sigdig]}) },
+              "Network".upcase => lambda {|it| format_money(it[:network], 'usd', {sigdig:options[:sigdig]}) },
+              "License".upcase => lambda {|it| format_money(it[:license], 'usd', {sigdig:options[:sigdig]}) },
+              "Extra".upcase => lambda {|it| format_money(it[:extra], 'usd', {sigdig:options[:sigdig]}) },
+              "MTD".upcase => lambda {|it| format_money(it[:running], 'usd', {sigdig:options[:sigdig]}) },
+              "Total".upcase => lambda {|it| 
+                format_money(it[:total], 'usd', {sigdig:options[:sigdig]}) + ((it[:total].to_f > 0 && it[:total] != it[:running]) ? " (Projected)" : "")
+              },
             }
-            print_description_list(invoice_totals_columns, invoice_totals)
+            # remove columns that rarely have data...
+            if cost_rows.sum { |it| it[:memory].to_f } == 0
+              cost_columns.delete("Memory".upcase)
+            end
+            if cost_rows.sum { |it| it[:license].to_f } == 0
+              cost_columns.delete("License".upcase)
+            end
+            if cost_rows.sum { |it| it[:extra].to_f } == 0
+              cost_columns.delete("Extra".upcase)
+            end
+            print as_pretty_table(cost_rows, cost_columns, options)
           else
             print "\n"
             print yellow, "No invoice totals data", reset, "\n"
           end
         end
+        print reset,"\n"
       end
-      print reset,"\n"
       return 0, nil
     end
   end
@@ -301,14 +342,17 @@ class Morpheus::Cli::InvoicesCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
-      opts.on('-a', '--all', "Display all costs, prices and raw data" ) do
+      opts.on('-a', '--all', "Display all details, costs and prices." ) do
         options[:show_estimates] = true
         # options[:show_costs] = true
         options[:show_prices] = true
-        options[:show_raw_data] = true
+        # options[:show_raw_data] = true
         options[:max_line_items] = 10000
       end
-      opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Memory, Storage, etc." ) do
+      opts.on('--prices', '--prices', "Display prices: Total, Compute, Storage, Network, Extra" ) do
+        options[:show_prices] = true
+      end
+      opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Storage, Network, Extra" ) do
         options[:show_estimates] = true
       end
       opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
@@ -318,12 +362,12 @@ class Morpheus::Cli::InvoicesCommand
         options[:show_raw_data] = true
         options[:pretty_json] = true
       end
-      opts.on('-m', '--max-line-items NUMBER', "Maximum number of line items to display. Default is 5.") do |val|
-        options[:max_line_items] = val.to_i
-      end
       opts.on('--no-line-items', '--no-line-items', "Do not display line items.") do |val|
         options[:hide_line_items] = true
       end
+      opts.on('--sigdig DIGITS', "Significant digits when rounding cost values for display as currency. Default is 2. eg. $3.50") do |val|
+        options[:sigdig] = val.to_i
+      end
       build_standard_get_options(opts, options)
       opts.footer = "Get details about a specific invoice."
       opts.footer = <<-EOT
@@ -365,20 +409,24 @@ EOT
         "Type" => lambda {|it| format_invoice_ref_type(it) },
         "Ref ID" => lambda {|it| it['refId'] },
         "Ref Name" => lambda {|it| it['refName'] },
+        "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
-        "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']) : '' },
         "Power State" => lambda {|it| format_server_power_state(it) },
-        "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+        "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
         "Active" => lambda {|it| format_boolean(it['active']) },
-        "Period" => lambda {|it| format_invoice_period(it) },
         "Estimate" => lambda {|it| format_boolean(it['estimate']) },
+        #"Cost Type" => lambda {|it| it['costType'].to_s.capitalize },
+        "Period" => lambda {|it| format_invoice_period(it) },
         #"Interval" => lambda {|it| it['interval'] },
         "Start" => lambda {|it| format_date(it['startDate']) },
-        "End" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' },
-        "Ref Start" => lambda {|it| format_local_dt(it['refStart']) },
-        "Ref End" => lambda {|it| it['refEnd'] ? format_local_dt(it['refEnd']) : '' },
+        "End" => lambda {|it| format_date(it['endDate']) },
+        "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(', ') : '' },
+        "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']) : '' },
         "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
         "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
       }
@@ -391,6 +439,9 @@ EOT
         description_cols.delete("Project Name")
         description_cols.delete("Project Tags")
       end
+      if invoice['metadata'].nil? || invoice['metadata'].empty?
+        description_cols.delete("Tags")
+      end
       if !['ComputeServer','Instance','Container'].include?(invoice['refType'])
         description_cols.delete("Power State")
       end
@@ -398,27 +449,27 @@ EOT
 =begin
       print_h2 "Costs"
       cost_columns = {
-        "Compute" => lambda {|it| format_money(it['computeCost']) },
-        "Memory" => lambda {|it| format_money(it['memoryCost']) },
-        "Storage" => lambda {|it| format_money(it['storageCost']) },
-        "Network" => lambda {|it| format_money(it['networkCost']) },
-        "License" => lambda {|it| format_money(it['licenseCost']) },
-        "Other" => lambda {|it| format_money(it['extraCost']) },
-        "Running" => lambda {|it| format_money(it['runningCost']) },
-        "Total Cost" => lambda {|it| format_money(it['totalCost']) },
+        "Compute" => lambda {|it| format_money(it['computeCost'], 'usd', {sigdig:options[:sigdig]}) },
+        "Memory" => lambda {|it| format_money(it['memoryCost'], 'usd', {sigdig:options[:sigdig]}) },
+        "Storage" => lambda {|it| format_money(it['storageCost'], 'usd', {sigdig:options[:sigdig]}) },
+        "Network" => lambda {|it| format_money(it['networkCost'], 'usd', {sigdig:options[:sigdig]}) },
+        "License" => lambda {|it| format_money(it['licenseCost'], 'usd', {sigdig:options[:sigdig]}) },
+        "Extra" => lambda {|it| format_money(it['extraCost'], 'usd', {sigdig:options[:sigdig]}) },
+        "Running" => lambda {|it| format_money(it['runningCost'], 'usd', {sigdig:options[:sigdig]}) },
+        "Total Cost" => lambda {|it| format_money(it['totalCost'], 'usd', {sigdig:options[:sigdig]}) },
       }
       print as_pretty_table([invoice], cost_columns, options)
 
       print_h2 "Prices"
       price_columns = {
-        "Compute" => lambda {|it| format_money(it['computePrice']) },
-        "Memory" => lambda {|it| format_money(it['memoryPrice']) },
-        "Storage" => lambda {|it| format_money(it['storagePrice']) },
-        "Network" => lambda {|it| format_money(it['networkPrice']) },
-        "License" => lambda {|it| format_money(it['licensePrice']) },
-        "Other" => lambda {|it| format_money(it['extraPrice']) },
-        "Running" => lambda {|it| format_money(it['runningPrice']) },
-        "Total Price" => lambda {|it| format_money(it['totalPrice']) },
+        "Compute" => lambda {|it| format_money(it['computePrice'], 'usd', {sigdig:options[:sigdig]}) },
+        "Memory" => lambda {|it| format_money(it['memoryPrice'], 'usd', {sigdig:options[:sigdig]}) },
+        "Storage" => lambda {|it| format_money(it['storagePrice'], 'usd', {sigdig:options[:sigdig]}) },
+        "Network" => lambda {|it| format_money(it['networkPrice'], 'usd', {sigdig:options[:sigdig]}) },
+        "License" => lambda {|it| format_money(it['licensePrice'], 'usd', {sigdig:options[:sigdig]}) },
+        "Extra" => lambda {|it| format_money(it['extraPrice'], 'usd', {sigdig:options[:sigdig]}) },
+        "Running" => lambda {|it| format_money(it['runningPrice'], 'usd', {sigdig:options[:sigdig]}) },
+        "Total Price" => lambda {|it| format_money(it['totalPrice'], 'usd', {sigdig:options[:sigdig]}) },
       }
       print as_pretty_table([invoice], price_columns, options)
 =end
@@ -426,33 +477,77 @@ EOT
       # current_date = Time.now
       # current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
 
-      print "\n"
-      # print_h2 "Costs"
+      
+
+      # Line Items
+      line_items = invoice['lineItems']
+      if line_items && line_items.size > 0 && options[:hide_line_items] != true
+        line_items_columns = [
+          {"ID" => lambda {|it| it['id'] } },
+          #{"REF TYPE" => lambda {|it| format_invoice_ref_type(it) } },
+          #{"REF ID" => lambda {|it| it['refId'] } },
+          #{"REF NAME" => lambda {|it| it['refName'] } },
+          #{"REF CATEGORY" => lambda {|it| it['refCategory'] } },
+          {"START" => lambda {|it| format_dt(it['startDate']) } },
+          {"END" => lambda {|it| format_dt(it['endDate']) } },
+          {"USAGE TYPE" => lambda {|it| it['usageType'] } },
+          {"USAGE CATEGORY" => lambda {|it| it['usageCategory'] } },
+          {"USAGE" => lambda {|it| it['itemUsage'] } },
+          {"RATE" => lambda {|it| it['itemRate'] } },
+          {"UNIT" => lambda {|it| it['rateUnit'] } },
+          {"COST" => lambda {|it| format_money(it['itemCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"PRICE" => lambda {|it| format_money(it['itemPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+          #{"TAX" => lambda {|it| format_money(it['itemTax'], 'usd', {sigdig:options[:sigdig]}) } },
+          # {"TERM" => lambda {|it| it['itemTerm'] } },
+          {"ITEM ID" => lambda {|it| truncate_string_right(it['itemId'], 65) } },
+          {"ITEM NAME" => lambda {|it| it['itemName'] } },
+          {"ITEM TYPE" => lambda {|it| it['itemType'] } },
+          {"ITEM DESCRIPTION" => lambda {|it| it['itemDescription'] } },
+          {"PRODUCT CODE" => lambda {|it| it['productCode'] } },
+          {"CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } },
+          {"UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } }
+        ]
+        if options[:show_raw_data]
+          line_items_columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
+        end
+        print_h2 "Line Items"
+        #max_line_items = options[:max_line_items] ? options[:max_line_items].to_i : 5
+        paged_line_items = line_items #.first(max_line_items)
+        print as_pretty_table(paged_line_items, line_items_columns, options)
+        print_results_pagination({total: line_items.size, size: paged_line_items.size}, {:label => "line item", :n_label => "line items"})
+      end
+
+      # cost_types = ["Costs"]
+      # cost_types << "Prices" if options[:show_prices]
+      # cost_types << "Estimates" if options[:show_estimates]
+      # print_h2 cost_types.size == 1 ? "Totals" : "Total #{anded_list(cost_types)}"
+      print_h2 "Invoice Totals"
+
       cost_rows = [
-        {label: 'Price'.upcase, compute: invoice['computePrice'], memory: invoice['memoryPrice'], storage: invoice['storagePrice'], network: invoice['networkPrice'], license: invoice['licensePrice'], extra: invoice['extraPrice'], running: invoice['runningPrice'], total: invoice['totalPrice']},
         {label: 'Cost'.upcase, compute: invoice['computeCost'], memory: invoice['memoryCost'], storage: invoice['storageCost'], network: invoice['networkCost'], license: invoice['licenseCost'], extra: invoice['extraCost'], running: invoice['runningCost'], total: invoice['totalCost']},
       ]
+      if options[:show_prices]
+        cost_rows += [
+          {label: 'Price'.upcase, compute: invoice['computePrice'], memory: invoice['memoryPrice'], storage: invoice['storagePrice'], network: invoice['networkPrice'], license: invoice['licensePrice'], extra: invoice['extraPrice'], running: invoice['runningPrice'], total: invoice['totalPrice']},
+        ]
+      end
       if options[:show_estimates]
         cost_rows += [
-          {label: 'Estimated Cost'.upcase, compute: invoice['estimatedComputeCost'], memory: invoice['estimatedMemoryCost'], storage: invoice['estimatedStorageCost'], network: invoice['estimatedNetworkCost'], license: invoice['estimatedLicenseCost'], extra: invoice['estimatedExtraCost'], running: invoice['estimatedRunningCost'], total: invoice['estimatedTotalCost']},
-          {label: 'Estimated Price'.upcase, compute: invoice['estimatedComputeCost'], memory: invoice['estimatedMemoryCost'], storage: invoice['estimatedStorageCost'], network: invoice['estimatedNetworkCost'], license: invoice['estimatedLicenseCost'], extra: invoice['estimatedExtraCost'], running: invoice['estimatedRunningCost'], total: invoice['estimatedTotalCost']},
+          {label: 'Metered Cost'.upcase, compute: invoice['estimatedComputeCost'], memory: invoice['estimatedMemoryCost'], storage: invoice['estimatedStorageCost'], network: invoice['estimatedNetworkCost'], license: invoice['estimatedLicenseCost'], extra: invoice['estimatedExtraCost'], running: invoice['estimatedRunningCost'], total: invoice['estimatedTotalCost']},
+          {label: 'Metered Price'.upcase, compute: invoice['estimatedComputePrice'], memory: invoice['estimatedMemoryPrice'], storage: invoice['estimatedStoragePrice'], network: invoice['estimatedNetworkPrice'], license: invoice['estimatedLicensePrice'], extra: invoice['estimatedExtraPrice'], running: invoice['estimatedRunningPrice'], total: invoice['estimatedTotalPrice']},
         ]
       end
       cost_columns = {
         "" => lambda {|it| it[:label] },
-        "Compute".upcase => lambda {|it| format_money(it[:compute]) },
-        "Memory".upcase => lambda {|it| format_money(it[:memory]) },
-        "Storage".upcase => lambda {|it| format_money(it[:storage]) },
-        "Network".upcase => lambda {|it| format_money(it[:network]) },
-        "License".upcase => lambda {|it| format_money(it[:license]) },
-        "Other".upcase => lambda {|it| format_money(it[:extra]) },
-        "MTD" => lambda {|it| format_money(it[:running]) },
+        "Compute".upcase => lambda {|it| format_money(it[:compute], 'usd', {sigdig:options[:sigdig]}) },
+        "Memory".upcase => lambda {|it| format_money(it[:memory], 'usd', {sigdig:options[:sigdig]}) },
+        "Storage".upcase => lambda {|it| format_money(it[:storage], 'usd', {sigdig:options[:sigdig]}) },
+        "Network".upcase => lambda {|it| format_money(it[:network], 'usd', {sigdig:options[:sigdig]}) },
+        "License".upcase => lambda {|it| format_money(it[:license], 'usd', {sigdig:options[:sigdig]}) },
+        "Extra".upcase => lambda {|it| format_money(it[:extra], 'usd', {sigdig:options[:sigdig]}) },
+        "MTD" => lambda {|it| format_money(it[:running], 'usd', {sigdig:options[:sigdig]}) },
         "Total".upcase => lambda {|it| 
-          if invoice['runningMultiplier'] && invoice['runningMultiplier'].to_i != 1 && it[:total].to_f.to_f > 0
-            format_money(it[:total]) + " (Projected)"
-          else
-            format_money(it[:total])
-          end
+          format_money(it[:total], 'usd', {sigdig:options[:sigdig]}) + ((it[:total].to_f > 0 && it[:total] != it[:running]) ? " (Projected)" : "")
         },
       }
       # remove columns that rarely have data...
@@ -463,7 +558,7 @@ EOT
         cost_columns.delete("License".upcase)
       end
       if cost_rows.sum { |it| it[:extra].to_f } == 0
-        cost_columns.delete("Other".upcase)
+        cost_columns.delete("Extra".upcase)
       end
       print as_pretty_table(cost_rows, cost_columns, options)
 
@@ -471,41 +566,6 @@ EOT
         print_h2 "Raw Data"
         puts as_json(invoice['rawData'], {pretty_json:false}.merge(options))
       end
-      
-      # Line Items
-      line_items = invoice['lineItems']
-      if line_items && line_items.size > 0 && options[:hide_line_items] != true
-
-        line_items_columns = [
-          {"ID" => lambda {|it| it['id'] } },
-          {"TYPE" => lambda {|it| format_invoice_ref_type(it) } },
-          {"REF ID" => lambda {|it| it['refId'] } },
-          {"REF NAME" => lambda {|it| it['refName'] } },
-          #{"REF CATEGORY" => lambda {|it| it['refCategory'] } },
-          {"START" => lambda {|it| format_date(it['startDate']) } },
-          {"END" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' } },
-          {"USAGE TYPE" => lambda {|it| it['usageType'] } },
-          {"USAGE CATEGORY" => lambda {|it| it['usageCategory'] } },
-          {"USAGE" => lambda {|it| it['itemUsage'] } },
-          {"RATE" => lambda {|it| it['itemRate'] } },
-          {"COST" => lambda {|it| format_money(it['itemCost']) } },
-          {"PRICE" => lambda {|it| format_money(it['itemPrice']) } },
-          {"TAX" => lambda {|it| format_money(it['itemTax']) } },
-          # {"TERM" => lambda {|it| it['itemTerm'] } },
-          "CREATED" => lambda {|it| format_local_dt(it['dateCreated']) },
-          "UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) }
-        ]
-
-        if options[:show_raw_data]
-          line_items_columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
-        end
-
-        print_h2 "Line Items"
-        max_line_items = options[:max_line_items] ? options[:max_line_items].to_i : 5
-        paged_line_items = line_items.first(max_line_items)
-        print as_pretty_table(paged_line_items, line_items_columns, options)
-        print_results_pagination({total: line_items.size, size: paged_line_items.size}, {:label => "line item", :n_label => "line items"})
-      end
 
       print reset,"\n"
       return 0
@@ -596,43 +656,36 @@ EOT
     options = {}
     params = {}
     ref_ids = []
+    query_tags = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      opts.on('-a', '--all', "Display all costs, prices and raw data" ) do
+      opts.on('-a', '--all', "Display all details, costs and prices." ) do
         options[:show_actual_costs] = true
         options[:show_costs] = true
         options[:show_prices] = true
-        options[:show_raw_data] = true
+        # options[:show_raw_data] = true
       end
-      # opts.on('--actuals', '--actuals', "Display all actual costs: Compute, Memory, Storage, etc." ) do
+      # opts.on('--actuals', '--actuals', "Display all actual costs: Compute, Storage, Network, Extra" ) do
       #   options[:show_actual_costs] = true
       # end
-      # opts.on('--costs', '--costs', "Display all costs: Compute, Memory, Storage, etc." ) do
+      # opts.on('--costs', '--costs', "Display all costs: Compute, Storage, Network, Extra" ) do
       #   options[:show_costs] = true
       # end
-      # opts.on('--prices', '--prices', "Display prices: Total, Compute, Memory, Storage, etc." ) do
-      #   options[:show_prices] = true
-      # end
+      opts.on('--prices', '--prices', "Display prices: Total, Compute, Storage, Network, Extra" ) do
+        options[:show_prices] = true
+      end
       opts.on('--invoice-id ID', String, "Filter by Invoice ID") do |val|
         params['invoiceId'] ||= []
         params['invoiceId'] << val
       end
-      opts.on('--type TYPE', String, "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
-        if val.to_s.downcase == 'cloud' || val.to_s.downcase == 'zone'
-          params['refType'] = 'ComputeZone'
-        elsif val.to_s.downcase == 'instance'
-          params['refType'] = 'Instance'
-        elsif val.to_s.downcase == 'server' || val.to_s.downcase == 'host'
-          params['refType'] = 'ComputeServer'
-        elsif val.to_s.downcase == 'cluster'
-          params['refType'] = 'ComputeServerGroup'
-        elsif val.to_s.downcase == 'group'
-          params['refType'] = 'ComputeSite'
-        elsif val.to_s.downcase == 'user'
-          params['refType'] = 'User'
-        else
-          params['refType'] = val
-        end
+      opts.on('--external-id ID', String, "Filter by External ID") do |val|
+        params['externalId'] ||= []
+        params['externalId'] << val
+      end
+      opts.on('-t', '--type TYPE', "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
+        params['refType'] ||= []
+        values = val.split(",").collect {|it| it.strip }.select {|it| it != "" }
+        values.each { |it| params['refType'] << parse_invoice_ref_type(it) }
       end
       opts.on('--id ID', String, "Filter by Ref ID") do |val|
         ref_ids << val
@@ -691,6 +744,11 @@ 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('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
         options[:show_raw_data] = true
       end
@@ -698,6 +756,14 @@ EOT
         params['includeTotals'] = true
         options[:show_invoice_totals] = true
       end
+      opts.on('--totals-only', "View totals only") do |val|
+        params['includeTotals'] = true
+        options[:show_invoice_totals] = true
+        options[:totals_only] = true
+      end
+      opts.on('--sigdig DIGITS', "Significant digits when rounding cost values for display as currency. Default is 2. eg. $3.50") do |val|
+        options[:sigdig] = val.to_i
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List invoice line items."
     end
@@ -742,6 +808,11 @@ 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|
+        params['tags.' + k] = v
+      end
+    end
     @invoice_line_items_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @invoice_line_items_interface.dry.list(params)
@@ -773,15 +844,22 @@ EOT
           {"REF NAME" => lambda {|it| it['refName'] } },
           #{"REF CATEGORY" => lambda {|it| it['refCategory'] } },
           {"START" => lambda {|it| format_date(it['startDate']) } },
-          {"END" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' } },
+          {"END" => lambda {|it| format_date(it['endDate']) } },
           {"USAGE TYPE" => lambda {|it| it['usageType'] } },
           {"USAGE CATEGORY" => lambda {|it| it['usageCategory'] } },
           {"USAGE" => lambda {|it| it['itemUsage'] } },
           {"RATE" => lambda {|it| it['itemRate'] } },
-          {"COST" => lambda {|it| format_money(it['itemCost']) } },
-          {"PRICE" => lambda {|it| format_money(it['itemPrice']) } },
-          {"TAX" => lambda {|it| format_money(it['itemTax']) } },
-          # {"TERM" => lambda {|it| it['itemTerm'] } },
+          {"UNIT" => lambda {|it| it['rateUnit'] } },
+          {"COST" => lambda {|it| format_money(it['itemCost'], 'usd', {sigdig:options[:sigdig]}) } },
+        ] + (options[:show_prices] ? [
+          {"PRICE" => lambda {|it| format_money(it['itemPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"TAX" => lambda {|it| format_money(it['itemTax'], 'usd', {sigdig:options[:sigdig]}) } },
+        ] : []) + [
+          {"ITEM ID" => lambda {|it| truncate_string_right(it['itemId'], 65) } },
+          {"ITEM NAME" => lambda {|it| it['itemName'] } },
+          {"ITEM TYPE" => lambda {|it| it['itemType'] } },
+          {"ITEM DESCRIPTION" => lambda {|it| it['itemDescription'] } },
+          {"PRODUCT CODE" => lambda {|it| it['productCode'] } },
           "CREATED" => lambda {|it| format_local_dt(it['dateCreated']) },
           "UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) }
         ]
@@ -789,35 +867,39 @@ EOT
         if options[:show_raw_data]
           columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
         end
-        if options[:show_invoice_totals]
-          line_item_totals = json_response['lineItemTotals']
-          if line_item_totals
-            totals_row = line_item_totals.clone
-            totals_row['id'] = 'TOTAL:'
-            #totals_row['usageCategory'] = 'TOTAL:'
-            line_items = line_items + [totals_row]
-          end
-        end
-        print as_pretty_table(line_items, columns, options)
-        print_results_pagination(json_response, {:label => "line item", :n_label => "line items"})
-
         # if options[:show_invoice_totals]
         #   line_item_totals = json_response['lineItemTotals']
         #   if line_item_totals
-        #     print_h2 "Line Items Totals"
-        #     invoice_totals_columns = {
-        #       "# Line Items" => lambda {|it| format_number(json_response['meta']['total']) rescue '' },
-        #       "Cost" => lambda {|it| format_money(it['itemCost']) },
-        #       "Price" => lambda {|it| format_money(it['itemPrice']) },
-        #       "Tax" => lambda {|it| format_money(it['itemTax']) },
-        #       "Usage" => lambda {|it| it['itemUsage'] },
-        #     }
-        #     print_description_list(invoice_totals_columns, line_item_totals)
-        #   else
-        #     print "\n"
-        #     print yellow, "No line item totals data", reset, "\n"
+        #     totals_row = line_item_totals.clone
+        #     totals_row['id'] = 'TOTAL:'
+        #     #totals_row['usageCategory'] = 'TOTAL:'
+        #     line_items = line_items + [totals_row]
         #   end
         # end
+        unless options[:totals_only]
+          print as_pretty_table(line_items, columns, options)
+          print_results_pagination(json_response, {:label => "line item", :n_label => "line items"})
+        end
+
+        if options[:show_invoice_totals]
+          line_item_totals = json_response['lineItemTotals']
+          if line_item_totals
+            print_h2 "Line Item Totals" unless options[:totals_only]
+            invoice_totals_columns = [
+              {"Items" => lambda {|it| format_number(json_response['meta']['total']) rescue '' } },
+              #{"Usage" => lambda {|it| it['itemUsage'] } },
+              {"Cost" => lambda {|it| format_money(it['itemCost'], 'usd', {sigdig:options[:sigdig]}) } },
+            ] + (options[:show_prices] ? [
+              {"Price" => lambda {|it| format_money(it['itemPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+              #{"Tax" => lambda {|it| format_money(it['itemTax'], 'usd', {sigdig:options[:sigdig]}) } },
+          
+            ] : [])
+            print_description_list(invoice_totals_columns, line_item_totals)
+          else
+            print "\n"
+            print yellow, "No line item totals data", reset, "\n"
+          end
+        end
 
       end
       print reset,"\n"
@@ -840,6 +922,9 @@ EOT
         options[:show_raw_data] = true
         options[:pretty_json] = true
       end
+      opts.on('--sigdig DIGITS', "Significant digits when rounding cost values for display as currency. Default is 2. eg. $3.50") do |val|
+        options[:sigdig] = val.to_i
+      end
       build_standard_get_options(opts, options)
       opts.footer = "Get details about a specific invoice line item."
       opts.footer = <<-EOT
@@ -883,11 +968,16 @@ EOT
         "Usage Category" => lambda {|it| it['usageCategory'] },
         "Item Usage" => lambda {|it| it['itemUsage'] },
         "Item Rate" => lambda {|it| it['itemRate'] },
-        "Item Cost" => lambda {|it| format_money(it['itemCost']) },
-        "Item Price" => lambda {|it| format_money(it['itemrPrice']) },
-        "Item Tax" => lambda {|it| format_money(it['itemTax']) },
-        "Item Term" => lambda {|it| it['itemTerm'] },
+        "Item Cost" => lambda {|it| format_money(it['itemCost'], 'usd', {sigdig:options[:sigdig]}) },
+        "Item Price" => lambda {|it| format_money(it['itemPrice'], 'usd', {sigdig:options[:sigdig]}) },
+        #"Item Tax" => lambda {|it| format_money(it['itemTax'], 'usd', {sigdig:options[:sigdig]}) },
         #"Tax Type" => lambda {|it| it['taxType'] },
+        "Item Term" => lambda {|it| it['itemTerm'] },
+        "Item ID" => lambda {|it| it['itemId'] },
+        "Item Name" => lambda {|it| it['itemName'] },
+        "Item Type" => lambda {|it| it['itemType'] },
+        "Item Description" => lambda {|it| it['itemDescription'] },
+        "Product Code" => lambda {|it| it['productCode'] },
         "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
         "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
       }
@@ -956,6 +1046,25 @@ EOT
     end
   end
 
+  def parse_invoice_ref_type(ref_type)
+    val = ref_type.to_s.downcase
+    if val == 'cloud' || val == 'zone'
+      'ComputeZone'
+    elsif val == 'instance'
+      'Instance'
+    elsif val == 'server' || val == 'host'
+      'ComputeServer'
+    elsif val == 'cluster'
+      'ComputeServerGroup'
+    elsif val == 'group' || val == 'site'
+      'ComputeSite'
+    elsif val == 'user'
+      'User'
+    else
+      ref_type
+    end
+  end
+
   # convert "202003" to "March 2020"
   def format_invoice_period(it)
     interval = it['interval']
@@ -1002,6 +1111,11 @@ EOT
     end
   end
   
+  def get_current_period()
+    now = Time.now.utc
+    now.year.to_s + now.month.to_s.rjust(2,'0')
+  end
+
   def format_server_power_state(server, return_color=cyan)
     out = ""
     if server['powerState'] == 'on'