morpheus-cli 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55a52bf8952a3690771d35f8914b7d0d6e38df15722637675195d5cf11aefa28
-  data.tar.gz: f20e90f2a385cc4d1bb3e8dec5d6237e8849d0e8aee1dfe0a55dbb30a895b15a
+  metadata.gz: 9cb4101fbb710060028dcbfcda3ad4caeb117950e68506f804a6d0fa604c8c08
+  data.tar.gz: 5d12f8d57d4d4ad8b83a8f9fc731e893b6f29ae6a8b36faa0bb5cb4b904d4eb8
 SHA512:
-  metadata.gz: '099de15a241b8b7fa06d637a44416fe2d485c986aa203bc5b937206f7901f5459e767b5395c7c5f6987e3e4885902af4de480f85973f69fa1f292ced4cbb9415'
-  data.tar.gz: c11981e1aba213f0447379a4f30ace695b51af37a7626360acac64954e2bef8199839393953f27252f7ba92b8d04310789917509e182952c7906d9c246908572
+  metadata.gz: c1673ab1af718c3570d502ba4323102e58999b2c2a8c883df79c6043a84ba92c9a49fe831160cd273f5912d1624965be0dbc854a78b23105d8e2a6768cd5ec17
+  data.tar.gz: 644dc0ded92efb77ca3c3007c7dc0d84c3e147c6f42acb49b5635024a4ea268ba9a5887af4733589a8b6794e0f6a67432252fe9f66ff50d88e9a5b05981d96b5

data/Dockerfile

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

data/lib/morpheus/cli/invoices_command.rb

@@ -23,7 +23,18 @@ class Morpheus::Cli::InvoicesCommand
     ref_ids = []
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      opts.on('--type TYPE', String, "Find invoices for a Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
+      opts.on('-a', '--all', "Display all costs, prices and raw data" ) do
+        options[:show_costs] = true
+        options[:show_prices] = true
+        options[:show_raw_data] = true
+      end
+      opts.on('--costs', '--costs', "Display all costs: Compute, Memory, Storage, etc." ) do
+        options[:show_costs] = true
+      end
+      opts.on('--prices', '--prices', "Display all costs: Compute, Memory, Storage, etc." ) 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'
@@ -40,43 +51,40 @@ class Morpheus::Cli::InvoicesCommand
           params['refType'] = val
         end
       end
-      opts.on('--ref-id ID', String, "Find invoices for a Ref ID") do |val|
+      opts.on('--id ID', String, "Filter by Ref ID") do |val|
         ref_ids << val
       end
-      opts.on('--group ID', String, "Find invoices for a Group") do |val|
-        # params['siteId'] = val
-        params['refType'] = 'ComputeSite'
+      opts.on('--ref-id ID', String, "Filter by Ref ID") do |val|
         ref_ids << val
       end
-      opts.on('--cloud ID', String, "Find invoices for a Cloud") do |val|
-        # params['zoneId'] = val
-        params['refType'] = 'ComputeZone'
-        ref_ids << val
+      opts.add_hidden_option('--ref-id')
+      opts.on('--group ID', String, "Filter by Group") do |val|
+        params['siteId'] ||= []
+        params['siteId'] << val
       end
-      opts.on('--instance ID', String, "Find invoices for an Instance") do |val|
-        # params['instanceId'] = val
-        params['refType'] = 'Instance'
-        ref_ids << val
+      opts.on('--cloud ID', String, "Filter by Cloud") do |val|
+        params['zoneId'] ||= []
+        params['zoneId'] << val
       end
-      opts.on('--container ID', String, "Find invoices for a Container") do |val|
-        # params['instanceId'] = val
-        params['refType'] = 'Container'
-        ref_ids << val
+      opts.on('--instance ID', String, "Filter by Instance") do |val|
+        params['instanceId'] ||= []
+        params['instanceId'] << val
       end
-      opts.on('--server ID', String, "Find invoices for a Server (Host)") do |val|
-        # params['serverId'] = val
-        params['refType'] = 'ComputeServer'
-        ref_ids << val
+      opts.on('--container ID', String, "Filter by Container") do |val|
+        params['containerId'] ||= []
+        params['containerId'] << val
       end
-      opts.on('--user ID', String, "Find invoices for a User") do |val|
-        # params['userId'] = val
-        params['refType'] = 'User'
-        ref_ids << val
+      opts.on('--server ID', String, "Filter by Server (Host)") do |val|
+        params['serverId'] ||= []
+        params['serverId'] << val
+      end
+      opts.on('--user ID', String, "Filter by User") do |val|
+        params['userId'] ||= []
+        params['userId'] << val
       end
       # opts.on('--cluster ID', String, "Filter by Cluster") do |val|
-      #   # params['clusterId'] = val
-      #   params['refType'] = 'ComputeServerGroup'
-      #   params['refId'] = val.to_i
+      #   params['clusterId'] ||= []
+      #   params['clusterId'] << val
       # end
       opts.on('--start DATE', String, "Start date in the format YYYY-MM-DD.") do |val|
         params['startDate'] = val #parse_time(val).utc.iso8601
@@ -90,12 +98,14 @@ class Morpheus::Cli::InvoicesCommand
       opts.on('--active [true|false]',String, "Filter by active.") do |val|
         params['active'] = (val.to_s != 'false' && val.to_s != 'off')
       end
+      opts.on('--estimate [true|false]',String, "Filter by estimate.") do |val|
+        params['estimate'] = (val.to_s != 'false' && val.to_s != 'off')
+      end
       opts.on('--tenant ID', String, "View invoices for a tenant. Default is your own account.") do |val|
         params['accountId'] = val
       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
-        params['rawData'] = true
       end
       build_standard_list_options(opts, options)
       opts.footer = "List invoices."
@@ -108,6 +118,7 @@ class Morpheus::Cli::InvoicesCommand
       return 1
     end
     begin
+      params['rawData'] = true if options[:show_raw_data]
       params['refId'] = ref_ids unless ref_ids.empty?
       params.merge!(parse_list_options(options))
       @invoices_interface.setopts(options)
@@ -116,7 +127,7 @@ class Morpheus::Cli::InvoicesCommand
         return
       end
       json_response = @invoices_interface.list(params)
-      render_result = render_with_format(json_response, options, 'invoice')
+      render_result = render_with_format(json_response, options, 'invoices')
       return 0 if render_result
       invoices = json_response['invoices']
       title = "Morpheus Invoices"
@@ -138,22 +149,62 @@ class Morpheus::Cli::InvoicesCommand
       if invoices.empty?
         print cyan,"No invoices found.",reset,"\n"
       else
+        current_date = Time.now
+        current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
         columns = [
           {"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'] } },
           #{"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']) } },
           {"PERIOD" => lambda {|it| format_invoice_period(it) } },
           {"START" => lambda {|it| format_date(it['startDate']) } },
           {"END" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' } },
-          {"PRICE" => lambda {|it| format_money(it['totalPrice']) } },
-          {"COST" => lambda {|it| format_money(it['totalCost']) } },
+          
         ]
+        if options[:show_costs]
+          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']) } },
+          ]
+        end
+        columns += [
+          {"MTD" => lambda {|it| format_money(it['runningCost']) } },
+          {"TOTAL" => lambda {|it| 
+            if it['period'] == current_period && it['totalCost'].to_f > 0
+              format_money(it['totalCost']) + " (Projected)"
+            else
+              format_money(it['totalCost'])
+            end
+          } }
+        ]
+        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']) } },
+            {"TOTAL PRICE" => lambda {|it| 
+              if it['period'] == current_period && it['totalPrice'].to_f > 0
+                format_money(it['totalPrice']) + " (Projected)"
+              else
+                format_money(it['totalPrice'])
+              end
+            } }
+          ]
+        end
+
         if options[:show_raw_data]
-          columns << {"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }
+          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"})
@@ -220,26 +271,75 @@ class Morpheus::Cli::InvoicesCommand
         "Start" => lambda {|it| format_date(it['startDate']) },
         "End" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' },
         "Estimate" => lambda {|it| format_boolean(it['estimate']) },
-        "Compute Price" => lambda {|it| format_money(it['computePrice']) },
-        "Compute Cost" => lambda {|it| format_money(it['computeCost']) },
-        "Memory Price" => lambda {|it| format_money(it['memoryPrice']) },
-        "Memory Cost" => lambda {|it| format_money(it['memoryCost']) },
-        "Storage Price" => lambda {|it| format_money(it['storagePrice']) },
-        "Storage Cost" => lambda {|it| format_money(it['storageCost']) },
-        "Network Price" => lambda {|it| format_money(it['networkPrice']) },
-        "Network Cost" => lambda {|it| format_money(it['networkCost']) },
-        "License Price" => lambda {|it| format_money(it['licensePrice']) },
-        "License Cost" => lambda {|it| format_money(it['licenseCost']) },
-        "Extra Price" => lambda {|it| format_money(it['extraPrice']) },
-        "Extra Cost" => lambda {|it| format_money(it['extraCost']) },
-        "Running Price" => lambda {|it| format_money(it['runningPrice']) },
-        "Running Cost" => lambda {|it| format_money(it['runningCost']) },
-        "Total Price" => lambda {|it| format_money(it['totalPrice']) },
-        "Total Cost" => lambda {|it| format_money(it['totalCost']) },
-        # "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
-        # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+        "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+        "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
       }
       print_description_list(description_cols, invoice)
+=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']) },
+      }
+      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']) },
+      }
+      print as_pretty_table([invoice], price_columns, options)
+=end
+      
+      current_date = Time.now
+      current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
+
+      print "\n"
+      # print_h2 "Costs"
+      cost_rows = [
+        {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']},
+        {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']},
+      ]
+      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]) },
+        "Total".upcase => lambda {|it| 
+          if invoice['period'] == current_period && it[:total].to_f > 0
+            format_money(it[:total]) + " (Projected)"
+          else
+            format_money(it[:total])
+          end
+        },
+      }
+      # 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)
 
       if options[:show_raw_data]
         print_h2 "Raw Data"

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.3"
+    VERSION = "4.2.4"
   end
 end

data/lib/morpheus/formatters.rb

@@ -346,6 +346,9 @@ end
 def format_money(amount, currency='usd')
   if amount.to_f == 0
     return currency_sym(currency).to_s + "0"
+  # elsif amount.to_f < 0.01
+  #   # return exponent notation like 3.4e-09
+  #   return currency_sym(currency).to_s + "#{amount}"
   else
     rtn = amount.to_f.round(2).to_s
     if rtn.index('.').nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler