morpheus-cli 4.2.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44226a558c2f02d9ca3aea75025930a2adb9c8b63e41fa6437d14ad55f34211b
-  data.tar.gz: debee18e47a2930a5da5cf2085d6463ce23171a70e875bbe81dc33d68ec1b640
+  metadata.gz: 55a52bf8952a3690771d35f8914b7d0d6e38df15722637675195d5cf11aefa28
+  data.tar.gz: f20e90f2a385cc4d1bb3e8dec5d6237e8849d0e8aee1dfe0a55dbb30a895b15a
 SHA512:
-  metadata.gz: b3d6087cb623b08e6adabe1bf9e8f214b38c9eef2a627a47442b30c3f9523c7a5487fdff61c63f4fef885176695fc595cd0d751287a3e42b8edbebbf984b06f8
-  data.tar.gz: ab8829f3d013e6ef4345447f90cd2defb13e2d91491f5b860ad44fe06ac022b3e2bf8baa3c12e525ab7e33f527e7b51b35043538ab82a52e79c5d628fff3dd0f
+  metadata.gz: '099de15a241b8b7fa06d637a44416fe2d485c986aa203bc5b937206f7901f5459e767b5395c7c5f6987e3e4885902af4de480f85973f69fa1f292ced4cbb9415'
+  data.tar.gz: c11981e1aba213f0447379a4f30ace695b51af37a7626360acac64954e2bef8199839393953f27252f7ba92b8d04310789917509e182952c7906d9c246908572

data/Dockerfile

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

data/lib/morpheus/api/invoices_interface.rb

@@ -8,10 +8,10 @@ class Morpheus::InvoicesInterface < Morpheus::APIClient
     @expires_at = expires_at
   end
 
-  def get(id)
+  def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
     url = "#{@base_url}/api/invoices/#{id}"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 

data/lib/morpheus/cli/cli_command.rb

@@ -183,11 +183,21 @@ module Morpheus
             value_label = 'on|off' # or.. true|false
           elsif option_type['type'] == 'number'
             value_label = 'NUMBER'
+          elsif option_type['type'] == 'multiSelect'
+            value_label = 'LIST'
           # elsif option_type['type'] == 'select'
           #   value_label = 'SELECT'
           # elsif option['type'] == 'select'
           end
           opts.on("--#{full_field_name} #{value_label}", String, description) do |val|
+            # attempt to parse JSON, this allows blank arrays for multiSelect like --tenants []
+            if (val.to_s[0] == '{' && val.to_s[-1] == '}') || (val.to_s[0] == '[' && val.to_s[-1] == ']')
+              begin
+                val = JSON.parse(val)
+              rescue
+                Morpheus::Logging::DarkPrinter.puts "Failed to parse option value '#{val}' as JSON" if Morpheus::Logging.debug?
+              end
+            end
             cur_namespace = custom_options
             field_namespace.each do |ns|
               next if ns.empty?

data/lib/morpheus/cli/clouds.rb

@@ -4,11 +4,13 @@ require 'rest_client'
 require 'optparse'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/infrastructure_helper'
+require 'morpheus/cli/mixins/provisioning_helper'
 require 'morpheus/cli/option_types'
 
 class Morpheus::Cli::Clouds
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::InfrastructureHelper
+  include Morpheus::Cli::ProvisioningHelper
 
   register_subcommands :list, :count, :get, :add, :update, :remove, :security_groups, :apply_security_groups, :types => :list_cloud_types
   register_subcommands :wiki, :update_wiki
@@ -267,14 +269,14 @@ class Morpheus::Cli::Clouds
 
         # Group
         group_id = nil
-        group = params[:group] ? find_group_by_name_or_id(params[:group]) : nil
+        group = params[:group] ? find_group_by_name_or_id_for_provisioning(params[:group]) : nil
         if group
           group_id = group["id"]
         else
           # print_red_alert "Group not found or specified!"
           # exit 1
-          groups_dropdown = @groups_interface.list({})['groups'].collect {|it| {'name' => it["name"], 'value' => it["id"]} }
-          group_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'selectOptions' => groups_dropdown, 'required' => true, 'description' => 'Select Group.'}],options[:options],@api_client,{})
+          #groups_dropdown = @groups_interface.list({})['groups'].collect {|it| {'name' => it["name"], 'value' => it["id"]} }
+          group_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'optionSource' => 'groups', 'required' => true, 'description' => 'Select Group.'}],options[:options],@api_client,{})
           group_id = group_prompt['group']
         end
         cloud_payload['groupId'] = group_id

data/lib/morpheus/cli/invoices_command.rb

@@ -93,6 +93,10 @@ 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('--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."
     end
@@ -134,7 +138,24 @@ class Morpheus::Cli::InvoicesCommand
       if invoices.empty?
         print cyan,"No invoices found.",reset,"\n"
       else
-        print_invoices_table(invoices, options)
+        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'] } },
+          {"ACCOUNT" => lambda {|it| it['account'] ? it['account']['name'] : '' } },
+          {"ACTIVE" => lambda {|it| format_boolean(it['active']) } },
+          {"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_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"})
       end
       print reset,"\n"
@@ -148,6 +169,9 @@ class Morpheus::Cli::InvoicesCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
+      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
       build_standard_get_options(opts, options)
       opts.footer = "Get details about a specific invoice."
     end
@@ -164,14 +188,17 @@ class Morpheus::Cli::InvoicesCommand
   end
 
   def _get(id, options)
-
+    params = {}
+    if options[:show_raw_data]
+      params['rawData'] = true
+    end
     begin
       @invoices_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @invoices_interface.dry.get(id)
+        print_dry_run @invoices_interface.dry.get(id, params)
         return
       end
-      json_response = @invoices_interface.get(id)
+      json_response = @invoices_interface.get(id, params)
       invoice = json_response['invoice']
       render_result = render_with_format(json_response, options, 'invoice')
       return 0 if render_result
@@ -190,17 +217,31 @@ class Morpheus::Cli::InvoicesCommand
         "Active" => lambda {|it| format_boolean(it['active']) },
         "Period" => lambda {|it| format_invoice_period(it) },
         #"Interval" => lambda {|it| it['interval'] },
-        "Start" => lambda {|it| format_local_dt(it['startDate']) },
-        "End" => lambda {|it| it['endDate'] ? format_local_dt(it['endDate']) : '' },
+        "Start" => lambda {|it| format_date(it['startDate']) },
+        "End" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' },
         "Estimate" => lambda {|it| format_boolean(it['estimate']) },
-        "Price" => lambda {|it| format_money(it['totalPrice']) },
-        "Cost" => lambda {|it| format_money(it['totalCost']) },
+        "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']) }
       }
       print_description_list(description_cols, invoice)
 
-      if invoice['rawData'] && !invoice['rawData'].empty?
+      if options[:show_raw_data]
         print_h2 "Raw Data"
         puts invoice['rawData']
       end
@@ -253,27 +294,6 @@ class Morpheus::Cli::InvoicesCommand
   #   end
   # end
 
-  def print_invoices_table(invoices, opts={})
-    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'] } },
-      {"ACCOUNT" => lambda {|it| it['account'] ? it['account']['name'] : '' } },
-      {"ACTIVE" => lambda {|it| format_boolean(it['active']) } },
-      {"PERIOD" => lambda {|it| format_invoice_period(it) } },
-      {"START" => lambda {|it| format_local_dt(it['startDate']) } },
-      {"END" => lambda {|it| it['endDate'] ? format_local_dt(it['endDate']) : '' } },
-      {"PRICE" => lambda {|it| format_money(it['totalPrice']) } },
-      {"COST" => lambda {|it| format_money(it['totalCost']) } },
-    ]
-    if opts[:include_fields]
-      columns = opts[:include_fields]
-    end
-    print as_pretty_table(invoices, columns, opts)
-  end
-
   def format_invoice_ref_type(it)
     if it['refType'] == 'ComputeZone'
       "Cloud"

data/lib/morpheus/cli/option_types.rb

@@ -111,17 +111,15 @@ module Morpheus
             elsif option_type['type'] == 'select'
               value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, (api_params || {}).merge(results), true)
             elsif option_type['type'] == 'multiSelect'
-              value_list = value.is_a?(String) ? value.parse_csv : [value].flatten
-              input_value_list = input_value.is_a?(String) ? input_value.parse_csv : [input_value].flatten
-              if value_list.size > 1
-                select_value_list = []
-                value_list.each_with_index do |v, i|
-                  select_value_list << select_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, (api_params || {}).merge(results), true)
-                end
-                value = select_value_list
-              else
-                value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, (api_params || {}).merge(results), true)
+              # support value as csv like "thing1, thing2"
+              value_list = value.is_a?(String) ? value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [value].flatten
+              input_value_list = input_value.is_a?(String) ? input_value.parse_csv.collect {|v| v ? v.to_s.strip : v } : [input_value].flatten
+              select_value_list = []
+              value_list.each_with_index do |v, i|
+                select_value_list << select_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, (api_params || {}).merge(results), true)
               end
+              value = select_value_list
+              
             end
             if options[:always_prompt] != true
               value_found = true

data/lib/morpheus/cli/provisioning_licenses_command.rb

@@ -4,9 +4,7 @@ class Morpheus::Cli::ProvisioningLicensesCommand
   include Morpheus::Cli::CliCommand
   set_command_name :'provisioning-licenses'
   register_subcommands :list, :get, :add, :update, :remove, :reservations, :'list-types'
-
   set_command_hidden
-  
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @provisioning_licenses_interface = @api_client.provisioning_licenses
@@ -55,11 +53,12 @@ class Morpheus::Cli::ProvisioningLicensesCommand
           {"ID" => lambda {|license| license['id'] } },
           {"NAME" => lambda {|license| license['name'] } },
           {"LICENSE TYPE" => lambda {|license| license['licenseType']['name'] rescue license['licenseType'] } },
+          {"VERSION" => lambda {|license| license['licenseVersion'] } },
           {"COPIES" => lambda {|license| 
             "#{license['reservationCount']}/#{license['copies']}"
           } },
-          {"TENANTS" => lambda {|it| it['tenants'] ? it['tenants'].collect {|acnt| acnt['name']}.join(', ') : '' } },
           {"VIRTUAL IMAGES" => lambda {|it| it['virtualImages'] ? it['virtualImages'].collect {|v| v['name']}.join(', ') : '' } },
+          {"TENANTS" => lambda {|it| it['tenants'] ? it['tenants'].collect {|acnt| acnt['name']}.join(', ') : '' } },
         ]
         if options[:include_fields]
           columns = options[:include_fields]
@@ -121,11 +120,16 @@ class Morpheus::Cli::ProvisioningLicensesCommand
         {"Name" => lambda {|license| license['name'] } },
         {"License Type" => lambda {|license| license['licenseType']['name'] rescue license['licenseType'] } },
         {"License Key" => lambda {|license| license['licenseKey'] } },
+        {"Org Name" => lambda {|license| license['orgName'] } },
+        {"Full Name" => lambda {|license| license['fullName'] } },
+        {"Version" => lambda {|license| license['licenseVersion'] } },
+        {"Description" => lambda {|license| license['description'] } },
         {"Copies" => lambda {|license| 
           "#{license['reservationCount']}/#{license['copies']}"
         } },
-        {"Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|acnt| acnt['name']}.join(', ') : '' } },
+        {"Description" => lambda {|license| license['description'] } },
         {"Virtual Images" => lambda {|it| it['virtualImages'] ? it['virtualImages'].collect {|v| v['name']}.join(', ') : '' } },
+        {"Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|acnt| acnt['name']}.join(', ') : '' } },
       ]
       print_description_list(columns, license, options)
       print reset,"\n"

data/lib/morpheus/cli/version.rb

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

data/lib/morpheus/formatters.rb

@@ -2,6 +2,7 @@ require 'time'
 require 'filesize'
 require 'money'
 
+DEFAULT_DATE_FORMAT = "%x"
 DEFAULT_TIME_FORMAT = "%x %I:%M %p"
 ALTERNATE_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'"
 
@@ -64,11 +65,11 @@ def format_local_dt(dt, options={})
 end
 
 def format_date(dt, options={})
-  format_dt(dt, options.merge({local: true}))
+  format_dt(dt, {format: DEFAULT_DATE_FORMAT}.merge(options))
 end
 
 def format_local_date(dt, options={})
-  format_dt(dt, {local: true, format: "%x"}.merge(options))
+  format_dt(dt, {local: true, format: DEFAULT_DATE_FORMAT}.merge(options))
 end
 
 def format_dt_as_param(dt)

metadata

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