morpheus-cli 4.2.15 → 4.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6215b2bb521606b6de3580787cca558fa2925f2c037f5c6bfbf2f1d952e0f81
-  data.tar.gz: 64f921b6c079eabda7fdad9bf70f55af423c0cc1a42f6f5ccead6442737a684b
+  metadata.gz: 3481d47679761310fbffd07ad968588ace4b92d9f428f68983f90a3ef4e13799
+  data.tar.gz: 5c900c15f68c14d5ab10d89b148e2bee5216653c123004b528f3d8bf1c1740cb
 SHA512:
-  metadata.gz: ba237f9f75cb4f64d04699ae8feaf3840c87b2cb62c1f0ec224a70aece0a23c76105de608f493f019e44f43ebd72590df226cf61654aee6fa34881754695a82b
-  data.tar.gz: 92f3c614362d4dfe3385aecdb8f52847a336d47aa41afc3a9ee6909f221a672454bc98a2e3bfdbe94a48208cebbb9f0293abc7bd9d9c177e7f11ec8b0989a9b6
+  metadata.gz: 384148f22d822c664456d5de65813d8ff6e4ea07b9a26a68ab8803131aa43247e093f4cae9304cb591d58f6f075bebccdbbdd2ca614f615b33ebc46b242a8cf2
+  data.tar.gz: 8ae2af56264a5bb3163ae5b8bb04747f58ef4e96f3ecdfed5b3a66e14ebce5147ef73623624fc22ab16536d4834a21b7de8a7b57952b86a9ad128abb712cf37f

data/Dockerfile

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

data/lib/morpheus/cli/cli_command.rb

@@ -169,14 +169,18 @@ module Morpheus
             full_field_name = "#{field_namespace.join('.')}.#{field_name}"
           end
 
-          description = "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{option_type['defaultValue'] ? ' Default: '+option_type['defaultValue'].to_s : ''}"
+          description = "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}"
           if option_type['description']
             # description << "\n                                     #{option_type['description']}"
             description << " - #{option_type['description']}"
           end
+          if option_type['defaultValue']
+            description << ". Default: #{option_type['defaultValue']}"
+          end
           if option_type['helpBlock']
             description << "\n                                     #{option_type['helpBlock']}"
           end
+
           # description = option_type['description'].to_s
           # if option_type['defaultValue']
           #   description = "#{description} Default: #{option_type['defaultValue']}"
@@ -804,6 +808,20 @@ module Morpheus
         self.class.subcommand_aliases
       end
 
+      # def subcommand_descriptions
+      #   self.class.subcommand_descriptions
+      # end
+
+      def get_subcommand_description(subcmd)
+        self.class.get_subcommand_description(subcmd)
+      end
+
+      def subcommand_description()
+        calling_method = caller[0][/`([^']*)'/, 1].to_s.sub('block in ', '')
+        subcommand_name = subcommands.key(calling_method)
+        subcommand_name ? get_subcommand_description(subcommand_name) : nil
+      end
+
       def default_subcommand
         self.class.default_subcommand
       end
@@ -845,8 +863,11 @@ module Morpheus
         if !subcommands.empty?
           out << "Commands:"
           out << "\n"
-          subcommands.sort.each {|cmd, method|
-            out << "\t#{cmd.to_s}\n"
+          subcommands.sort.each {|subcmd, method|
+            desc = get_subcommand_description(subcmd)
+            out << "\t#{subcmd.to_s}"
+            out << "\t#{desc}" if desc
+            out << "\n"
           }
         end
         # out << "\n"
@@ -1277,12 +1298,46 @@ module Morpheus
               v = cmd.to_s.gsub('-', '_')
               register_subcommands({(k) => v})
             else
-              raise "Unable to register command of type: #{cmd.class} #{cmd}"
+              raise Morpheus::Cli::CliRegistry::BadCommandDefinition.new("Unable to register command of type: #{cmd.class} #{cmd}")
             end
           }
           return
         end
 
+        # this might be the new hotness
+        # register_subcommand(:show) # do not do this, always define a description!
+        # register_subcommand(:list, "List things")
+        # register_subcommand("update-all", "update_all", "Update all things")
+        # If the command name =~ method, no need to pass both
+        # command names will have "-" swapped in for "_" and vice versa for method names.
+        def register_subcommand(*args)
+          args = args.flatten
+          cmd_name = args[0]
+          cmd_method = nil
+          cmd_desc = nil
+          if args.count == 1
+            cmd_method = cmd_name
+          elsif args.count == 2
+            if args[1].is_a?(Symbol)
+              cmd_method = args[1]
+            else
+              cmd_method = cmd_name
+              cmd_desc = args[1]
+            end
+          elsif args.count == 3
+            cmd_method = args[1]
+            cmd_desc = args[2]
+          else
+            raise Morpheus::Cli::CliRegistry::BadCommandDefinition.new("register_subcommand expects 1-3 arguments, got #{args.size} #{args.inspect}")
+          end
+          cmd_name = cmd_name.to_s.gsub("_", "-").to_sym
+          cmd_method = (cmd_method || cmd_name).to_s.gsub("-", "_").to_sym
+          cmd_definition = {(cmd_name) => cmd_method}
+          register_subcommands(cmd_definition)
+          add_subcommand_description(cmd_name, cmd_desc)
+          return
+        end
+
         def set_default_subcommand(cmd)
           @default_subcommand = cmd
         end
@@ -1341,6 +1396,31 @@ module Morpheus
           @subcommand_aliases.delete(alias_cmd_name.to_s)
         end
 
+        def subcommand_descriptions
+          @subcommand_descriptions ||= {}
+        end
+
+        def add_subcommand_description(cmd_name, description)
+          @subcommand_descriptions ||= {}
+          @subcommand_descriptions[cmd_name.to_s.gsub('_', '-')] = description
+        end
+
+        def get_subcommand_description(cmd_name)
+          desc = subcommand_descriptions[cmd_name.to_s.gsub('_', '-')]
+          if desc
+            return desc
+          else
+            cmd_method = subcommands.key(cmd_name)
+            return cmd_method ? subcommand_descriptions[cmd_method.to_s.gsub('_', '-')] : nil
+          end
+        end
+
+        def set_subcommand_descriptions(cmd_map)
+          cmd_map.each do |cmd_name, description|
+            add_subcommand_description(cmd_name, description)
+          end
+        end
+
       end
     end
   end

data/lib/morpheus/cli/cli_registry.rb

@@ -9,6 +9,9 @@ module Morpheus
   module Cli
     class CliRegistry
 
+      class BadCommandDefinition < StandardError
+      end
+
       class BadAlias < StandardError
       end
 

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

@@ -7,11 +7,14 @@ class Morpheus::Cli::BenchmarkCommand
   include Morpheus::Cli::CliCommand
   set_command_name :'benchmark'
 
-  # control global benchmark toggle
-  register_subcommands :on, :off, :on?, :off?
-  # record your own benchmarks
-  register_subcommands :start, :stop, :status, :exec => :execute
-
+  register_subcommand :on, "Enable global benchmarking."
+  register_subcommand :off, "Disable global benchmarking."
+  register_subcommand :on?, "Print the value of the global benchmark setting. Exit 0 if on."
+  register_subcommand :off?, "Print the value of the global benchmark setting. Exit 0 if off."
+  register_subcommand :start, "Start recording a benchmark."
+  register_subcommand :stop, "Stop recording a benchmark."
+  register_subcommand :status, "Print status of benchmark."
+  register_subcommand :exec, :execute, "Benchmark a specified command or expression."
 
   # this would be cool, we should store all benchmarking results in memory or on disk =o
   # register_subcommands :list, :get, :put, :remove
@@ -35,7 +38,7 @@ class Morpheus::Cli::BenchmarkCommand
       opts.banner = subcommand_usage("")
       build_common_options(opts, options, [:quiet])
       opts.footer = <<-EOT
-Enable global benchmarking. 
+#{subcommand_description}
 This behaves the same as if you were to add the -B switch to every command.
 EOT
     end
@@ -65,7 +68,7 @@ EOT
       opts.banner = subcommand_usage("")
       build_common_options(opts, options, [:quiet])
       opts.footer = <<-EOT
-Disable global benchmarking. 
+#{subcommand_description}
 The default state for this setting is off.
 EOT
     end
@@ -95,7 +98,7 @@ EOT
       opts.banner = subcommand_usage("")
       build_common_options(opts, options, [:quiet])
       opts.footer = <<-EOT
-Print the value of the global benchmark setting. 
+#{subcommand_description}
 Exit 0 if on.
 EOT
     end
@@ -121,7 +124,7 @@ EOT
       opts.banner = subcommand_usage("")
       build_common_options(opts, options, [:quiet])
       opts.footer = <<-EOT
-Print the value of the global benchmark setting. 
+#{subcommand_description}
 Exit 0 if off.
 EOT
     end
@@ -149,7 +152,7 @@ EOT
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:quiet])
       opts.footer = <<-EOT
-Start recording a benchmark.
+#{subcommand_description}
 [name] is required. This is just a name for the routine.
 This allows you to record how long it takes to run a series of commands.
 Just run `benchmark stop` when you are finished.
@@ -194,7 +197,7 @@ EOT
       end
       build_common_options(opts, options, [:quiet])
       opts.footer = <<-EOT
-Stop recording a benchmark.
+#{subcommand_description}
 [name] is optional. This is the name of the benchmark to stop. 
 The last benchmark is used by default.
 EOT
@@ -254,7 +257,7 @@ EOT
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:quiet])
       opts.footer = <<-EOT
-Print status of benchmark.
+#{subcommand_description}
 [name] is optional. This is the name of the benchmark to inspect.
 The last benchmark is used by default.
 EOT
@@ -309,7 +312,7 @@ EOT
       end
       build_common_options(opts, options, [:quiet])
       opts.footer = <<-EOT
-Benchmark a specified command.
+#{subcommand_description}
 [command] is required. This is the command to execute
 EOT
     end

data/lib/morpheus/cli/invoices_command.rb

@@ -27,37 +27,26 @@ class Morpheus::Cli::InvoicesCommand
     ref_ids = []
     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, Other" ) 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, Other" ) 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, Other" ) 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
+        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
@@ -123,6 +112,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
@@ -185,7 +182,9 @@ class Morpheus::Cli::InvoicesCommand
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if invoices.empty?
-        print cyan,"No invoices found.",reset,"\n"
+        unless options[:totals_only]
+          print cyan,"No invoices found.",reset,"\n"
+        end
       else
         # current_date = Time.now
         # current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
@@ -194,98 +193,146 @@ 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]}) } },
+          {"OTHER" => 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]}) } },
+            {"OTHER 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]}) } },
+            {"OTHER 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 '' } },
+        ]
+        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 "Line Item Totals" unless options[:totals_only]
+          invoice_totals_columns = [
+            {"Invoices" => lambda {|it| format_number(json_response['meta']['total']) rescue '' } },
+            {"Compute" => lambda {|it| format_money(it['actualComputeCost'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"Storage" => lambda {|it| format_money(it['actualStorageCost'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"Network" => lambda {|it| format_money(it['actualNetworkCost'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"Extra" => lambda {|it| format_money(it['actualExtraCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          ] + (options[:show_prices] ? [
+            {"Compute Price" => lambda {|it| format_money(it['actualComputePrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"Storage Price" => lambda {|it| format_money(it['actualStoragePrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"Network Price" => lambda {|it| format_money(it['actualNetworkPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"Extra Price" => lambda {|it| format_money(it['actualExtraPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+          ] : [])
+          print_description_list(invoice_totals_columns, line_item_totals)
+        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', 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', 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: 'Estimated 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: 'Estimated 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]}) },
+              "Other".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| 
+                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("Other".upcase)
+            end
+            print as_pretty_table(cost_rows, cost_columns, options)
           else
             print "\n"
             print yellow, "No invoice totals data", reset, "\n"
@@ -301,14 +348,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, Other" ) do
+        options[:show_prices] = true
+      end
+      opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Storage, Network, Other" ) 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 +368,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
@@ -366,19 +416,21 @@ EOT
         "Ref ID" => lambda {|it| it['refId'] },
         "Ref Name" => lambda {|it| it['refName'] },
         "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 '' },
+        "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']) }
       }
@@ -398,27 +450,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]}) },
+        "Other" => 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]}) },
+        "Other" => 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 +478,76 @@ 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'] } },
+          {"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: 'Estimated 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]}) },
+        "Other".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...
@@ -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
@@ -598,41 +658,33 @@ EOT
     ref_ids = []
     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, Other" ) 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, Other" ) 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, Other" ) 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('--external-id ID', String, "Filter by External ID") do |val|
+        params['externalId'] ||= []
+        params['externalId'] << 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
+        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
@@ -698,6 +750,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
@@ -773,15 +833,21 @@ 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'] } },
+          {"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 +855,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 +910,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 +956,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 +1034,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 +1099,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'