morpheus-cli 3.1.2.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd692a97b1bbed2d5e8ea4bbd23cdcd9a978fdcd
-  data.tar.gz: 31761018c7d726c6f72dcf0a104eab21d441be08
+  metadata.gz: f32e58bc8431581ac6d29c7c8b2ff37b2f5084c2
+  data.tar.gz: 4f40c2a106aba9b340d3900c51bfa201b95d1ed4
 SHA512:
-  metadata.gz: cd4f34da720c642384ddc9514d8c8175ba3a68188a8dc3b4b0b99968d3df524f7469f0be0a855a25977e51ddada333011dfb0385a4f810ff5d670e87361cdd76
-  data.tar.gz: 9a754c3209288fac407ab5a86824415ddc31487232631a496436d946fa5061961579653837c93cd29240dc35cad33b0cd006c3f0267d8eb0965ea7cbf1a13e81
+  metadata.gz: 58d1640fdc65dba08ca947cdcb5969899ce652073291b44801549e266be28ba203367112cabcfbc89ae0ee91933c1e1dcd684b025dc4d6246d9857291a2848f1
+  data.tar.gz: c5a073c80d735dee9a2a68631d8663aa9824b4fcf534ad619a8a0385935362f1f960746ba1a8d492e5a0c5ecfe005415c5117eb184d9822e7e7c2e7b7f5eba26

data/lib/morpheus/api/api_client.rb

@@ -141,6 +141,10 @@ class Morpheus::APIClient
     Morpheus::UsersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   end
 
+  def user_groups
+    Morpheus::UserGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
   def logs
     Morpheus::LogsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   end
@@ -182,12 +186,12 @@ class Morpheus::APIClient
   end
 
   # def checks
-  #   # Morpheus::ChecksInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  #   # Morpheus::MonitoringChecksInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   #   monitoring.checks
   # end
 
   # def incidents
-  #   # Morpheus::IncidentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  #   # Morpheus::MonitoringIncidentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   #   monitoring.incidents
   # end
 

data/lib/morpheus/api/license_interface.rb

@@ -21,4 +21,11 @@ class Morpheus::LicenseInterface < Morpheus::APIClient
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def decode(key)
+    url = "#{@base_url}/api/license/decode"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = {license: key}
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
+
 end

data/lib/morpheus/api/monitoring_apps_interface.rb

@@ -37,11 +37,24 @@ class Morpheus::MonitoringAppsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def destroy(id)
+  def destroy(id, payload={})
     url = "#{@base_url}/api/monitoring/apps/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, headers: headers}
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
+  def quarantine(id, payload={})
+    url = "#{@base_url}/api/monitoring/apps/#{id}/quarantine"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def statistics(id, params={})
+    url = "#{@base_url}/api/monitoring/apps/#{id}/statistics"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
 end

data/lib/morpheus/api/{checks_interface.rb → monitoring_checks_interface.rb}

@@ -1,6 +1,6 @@
 require 'morpheus/api/api_client'
 
-class Morpheus::ChecksInterface < Morpheus::APIClient
+class Morpheus::MonitoringChecksInterface < Morpheus::APIClient
   def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
     @access_token = access_token
     @refresh_token = refresh_token
@@ -23,14 +23,12 @@ class Morpheus::ChecksInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  # eh? maye use for rendering form
-  # def create(options)
-  #   url = "#{@base_url}/api/monitoring/checks/create"
-  #   headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-  #   payload = options
-  #   opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
-  #   execute(opts)
-  # end
+  def create(payload)
+    url = "#{@base_url}/api/monitoring/checks"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
 
   def update(id, options)
     url = "#{@base_url}/api/monitoring/checks/#{id}"
@@ -55,10 +53,6 @@ class Morpheus::ChecksInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def mute(id, payload={})
-    quarantine(id, payload)
-  end
-
   def history(id, params={})
     url = "#{@base_url}/api/monitoring/checks/#{id}/history"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
@@ -66,13 +60,6 @@ class Morpheus::ChecksInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  # def notifications(id)
-  #   url = "#{@base_url}/api/monitoring/checks/#{id}/notifications"
-  #   headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-  #   opts = {method: :get, url: url, headers: headers}
-  #   execute(opts)
-  # end
-
   def statistics(id)
     url = "#{@base_url}/api/monitoring/checks/#{id}/statistics"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -93,7 +80,7 @@ class Morpheus::ChecksInterface < Morpheus::APIClient
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
-  
+
   # def events(id, params={})
   #   # JD: maybe switch to this instead /api/monitoring/checks/#{id}/events instead?
   #   # url = "#{@base_url}/api/monitoring/checks/#{id}/events"

data/lib/morpheus/api/monitoring_groups_interface.rb

@@ -37,10 +37,31 @@ class Morpheus::MonitoringGroupsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def destroy(id)
+  def destroy(id, payload={})
     url = "#{@base_url}/api/monitoring/groups/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, headers: headers}
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def quarantine(id, payload={})
+    url = "#{@base_url}/api/monitoring/groups/#{id}/quarantine"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def history(id, params={})
+    url = "#{@base_url}/api/monitoring/groups/#{id}/history"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def statistics(id)
+    url = "#{@base_url}/api/monitoring/groups/#{id}/statistics"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/{incidents_interface.rb → monitoring_incidents_interface.rb}

@@ -1,6 +1,6 @@
 require 'morpheus/api/api_client'
 
-class Morpheus::IncidentsInterface < Morpheus::APIClient
+class Morpheus::MonitoringIncidentsInterface < Morpheus::APIClient
   def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
     @access_token = access_token
     @refresh_token = refresh_token
@@ -46,10 +46,10 @@ class Morpheus::IncidentsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def destroy(id)
+  def destroy(id, payload={})
     url = "#{@base_url}/api/monitoring/incidents/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, headers: headers}
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
@@ -90,11 +90,11 @@ class Morpheus::IncidentsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def events(id)
+  def events(id, params={})
     # JD: maybe switch to this instead /api/monitoring/incidents/#{id}/events instead?
     # url = "#{@base_url}/api/monitoring/incidents/#{id}/events"
     url = "#{@base_url}/api/monitoring/incident-events/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end

data/lib/morpheus/api/monitoring_interface.rb

@@ -1,6 +1,6 @@
 require 'morpheus/api/api_client'
-require 'morpheus/api/checks_interface'
-require 'morpheus/api/incidents_interface'
+require 'morpheus/api/monitoring_checks_interface'
+require 'morpheus/api/monitoring_incidents_interface'
 require 'morpheus/api/monitoring_contacts_interface'
 require 'morpheus/api/monitoring_groups_interface'
 require 'morpheus/api/monitoring_apps_interface'
@@ -14,11 +14,11 @@ class Morpheus::MonitoringInterface < Morpheus::APIClient
   end
 
   def checks
-    Morpheus::ChecksInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::MonitoringChecksInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   end
 
   def incidents
-    Morpheus::IncidentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::MonitoringIncidentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   end
 
   def contacts

data/lib/morpheus/api/user_groups_interface.rb

@@ -0,0 +1,65 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::UserGroupsInterface < Morpheus::APIClient
+    def initialize(access_token, refresh_token, expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def get(account_id, id)
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = build_url(account_id, id)
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
+
+  def list(account_id, options={})
+    url = build_url(account_id)
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    opts = {method: :get, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
+
+  def create(account_id, options)
+    url = build_url(account_id)
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :post, url: url, timeout: 10, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(account_id, id, options)
+    url = build_url(account_id, id)
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :put, url: url, timeout: 10, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy(account_id, id)
+    url = build_url(account_id, id)
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
+
+  private
+
+  def build_url(account_id=nil, user_id=nil)
+    url = "#{@base_url}/api"
+    if account_id
+      url += "/accounts/#{account_id}/user-groups"
+    else
+      url += "/user-groups"
+    end
+    if user_id
+      url += "/#{user_id}"
+    end
+    url
+  end
+
+end

data/lib/morpheus/cli.rb

@@ -79,6 +79,7 @@ module Morpheus
       load 'morpheus/cli/security_group_rules.rb'
       load 'morpheus/cli/accounts.rb'
       load 'morpheus/cli/users.rb'
+      load 'morpheus/cli/user_groups_command.rb'
       load 'morpheus/cli/roles.rb'
       load 'morpheus/cli/key_pairs.rb'
       load 'morpheus/cli/virtual_images.rb'

data/lib/morpheus/cli/curl_command.rb

@@ -49,12 +49,12 @@ EOT
       curl_args.unshift "--inescure"
     end
 
-    creds = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
-    if !creds
-      print yellow,"You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}",reset,"\n"
-      print yellow,"Use the 'login' command.",reset,"\n"
-      return 0
-    end
+    # @access_token = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
+    # if !@access_token
+    #   print yellow,"You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}",reset,"\n"
+    #   print yellow,"Use the 'login' command.",reset,"\n"
+    #   return 0
+    # end
 
     if !@appliance_url
       raise "Unable to determine remote appliance url"
@@ -67,7 +67,9 @@ EOT
     api_path = args[0].sub(/^\//, "")
     url = "#{base_url}/#{api_path}"
     curl_cmd = "curl \"#{url}\""
-    curl_cmd << " -H \"Authorization: Bearer #{@access_token}\""
+    if @access_token
+      curl_cmd << " -H \"Authorization: Bearer #{@access_token}\""
+    end
     if !curl_args.empty?
       curl_cmd << " " + curl_args.join(' ')
     end

data/lib/morpheus/cli/dot_file.rb

@@ -55,16 +55,22 @@ class Morpheus::Cli::DotFile
       
       # print "#{dark} #=> executing source file line #{line_num}: #{line}#{reset}\n" if Morpheus::Logging.debug?
 
-      # todo: allow semicolons inside arguments too..
-      command_list = line.strip.split(';').compact
+      # allow semicolons inside arguments too..
+      #command_list = line.strip.split(';').compact
+      command_list = line.split(/(;)(?=(?:[^"']|["|'][^"']*")*$)/).reject {|it| it.to_s.strip.empty? || it.to_s.strip == ";" }
       command_list.each do |input|
         input = input.strip
         if input.empty?
           next
         end
-        argv = Shellwords.shellsplit(input)
-
-        if Morpheus::Cli::CliRegistry.has_command?(argv[0]) || Morpheus::Cli::CliRegistry.has_alias?(argv[0])
+        argv = nil
+        begin
+          argv = Shellwords.shellsplit(input)
+        rescue => err
+          cmd_result = false
+          puts "#{red} Unparsable source file: #{@filename} line: #{line_num} '#{input}' #{reset} - #{err}"
+        end
+        if argv[0] && Morpheus::Cli::CliRegistry.has_command?(argv[0]) || Morpheus::Cli::CliRegistry.has_alias?(argv[0])
           #log_history_command(input)
           cmd_result = nil
           begin

data/lib/morpheus/cli/echo_command.rb

@@ -1,13 +1,33 @@
-require 'optparse'
 require 'morpheus/cli/cli_command'
+require 'term/ansicolor'
 require 'json'
 
-# This is for use in dotfile scripts
-class Morpheus::Cli::EchoCommand
+# This is for use in dotfile scripts for printing
+# It is also responsible for maintaining a map of variables
+# that are also used in custom shell prompts.
+class Morpheus::Cli::Echo
   include Morpheus::Cli::CliCommand
   set_command_name :echo
   set_command_hidden
 
+  unless defined?(DEFAULT_VARIABLE_MAP)
+    DEFAULT_VARIABLE_MAP = {'%cyan' => Term::ANSIColor.cyan, '%magenta' => Term::ANSIColor.magenta, '%red' => Term::ANSIColor.red, '%green' => Term::ANSIColor.green, '%yellow' => Term::ANSIColor.yellow, '%dark' => Term::ANSIColor.dark, '%reset' => Term::ANSIColor.reset}
+  end
+
+  def self.variable_map
+    @output_variable_map ||= recalculate_variable_map()
+  end
+
+  def self.recalculate_variable_map()
+    var_map = {}
+    var_map.merge!(DEFAULT_VARIABLE_MAP)
+    appliance = ::Morpheus::Cli::Remote.load_active_remote()
+    if appliance
+      var_map.merge!({'%remote' => appliance[:name], '%remote_url' => appliance[:host], '%username' => appliance[:username]})
+    end
+    @output_variable_map = var_map
+  end
+
   def handle(args)
     append_newline = true
     options = {}
@@ -21,6 +41,10 @@ class Morpheus::Cli::EchoCommand
     optparse.parse!(args)
     out = ""
     out << args.join(' ')
+
+    self.class.variable_map.each do |k, v|
+      out.gsub!(k.to_s, v.to_s)
+    end
     if append_newline
       out << "\n"
     end

data/lib/morpheus/cli/license.rb

@@ -7,7 +7,7 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::License
   include Morpheus::Cli::CliCommand
 
-  register_subcommands :get, :apply
+  register_subcommands :get, :apply, :decode
   alias_subcommand :details, :get
 
   def initialize() 
@@ -26,7 +26,7 @@ class Morpheus::Cli::License
 
   def get(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
@@ -37,26 +37,38 @@ class Morpheus::Cli::License
         print_dry_run @license_interface.dry.get()
         return
       end
-      license = @license_interface.get()
+      json_result = @license_interface.get()
+      license = json_result['license']
+      used_memory = json_result['licenseUsedMemory']
       if options[:json]
-        puts JSON.pretty_generate(license)
+        puts JSON.pretty_generate(json_result)
       else
-        if license['license'].nil?
-          puts "No License Currently Applied to the appliance."
-          exit 1
+        if license.nil?
+          puts_error "No license currently applied to the appliance."
+          return 1
         else
           print_h1 "License"
-          max_memory = Filesize.from("#{license['license']['maxMemory']} B").pretty
-          max_storage = Filesize.from("#{license['license']['maxStorage']} B").pretty
-          used_memory = Filesize.from("#{license['usedMemory']} B").pretty
-          puts "Account: #{license['license']['accountName']}"
-          puts "Start Date: #{license['license']['startDate']}"
-          puts "End Date: #{license['license']['endDate']}"
-          puts "Memory: #{used_memory} / #{max_memory}"
-          puts "Max Storage: #{max_storage}"
+          max_memory = "Unlimited"
+          max_storage = "Unlimited"
+          max_memory = Filesize.from("#{license['maxMemory']} B").pretty  if license['maxMemory'].to_i != 0
+          max_storage = Filesize.from("#{license['maxStorage']} B").pretty  if license['maxStorage'].to_i != 0
+          used_memory = Filesize.from("#{used_memory} B").pretty if used_memory.to_i != 0
+          print cyan
+          description_cols = {
+            "Account" => 'accountName',
+            "Product Tier" => lambda {|it| format_product_tier(it) },
+            "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
+            "End Date" => lambda {|it| format_local_dt(it['endDate']) },
+            "Memory" => lambda {|it| "#{used_memory} / #{max_memory}" },
+            "Max Storage" => lambda {|it| "#{max_storage}" },
+            "Max Instances" => lambda {|it| it["maxInstances"].to_i == 0 ? 'Unlimited' : it["maxInstances"] },
+            "Hard Limit" => lambda {|it| it[""] == false ? 'Yes' : 'No' },
+          }
+          print_description_list(description_cols, license)
+          print reset,"\n"
         end
-        print reset,"\n"
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       return false
@@ -66,7 +78,7 @@ class Morpheus::Cli::License
   def apply(args)
     options = {}
     account_name = nil
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[key]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
@@ -81,18 +93,95 @@ class Morpheus::Cli::License
       end
       if options[:dry_run]
         print_dry_run @license_interface.dry.apply(key)
+        return 0
+      end
+      json_result = @license_interface.apply(key)
+      license = json_result['license']
+      if options[:json]
+        puts JSON.pretty_generate(json_result)
+      else
+        print_green_success "License applied successfully!"
+        # get([]) # show it
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return false
+    end
+  end
+
+  def decode(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[key]")
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = "Decode a license key."
+    end
+    optparse.parse!(args)
+    connect(options)
+    key = nil
+    if args[0]
+      key = args[0]
+    else
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'licenseKey', 'fieldLabel' => 'License Key', 'type' => 'text', 'required' => true}], options[:options])
+      key = v_prompt['licenseKey'] || ''
+    end
+    begin
+      if options[:dry_run]
+        print_dry_run @license_interface.dry.decode(key)
         return
       end
-      license_results = @license_interface.apply(key)
+      json_result = @license_interface.decode(key)
+      license = json_result['license']
       if options[:json]
-        puts JSON.pretty_generate(license_results)
+        puts JSON.pretty_generate(json_result)
       else
-        puts "License applied successfully!"
+        if license.nil?
+          puts_error "Unable to decode license."
+          puts_error json_results['msg'] if json_results['msg']
+          return 1
+        else
+          print_h1 "License"
+          max_memory = "Unlimited"
+          max_storage = "Unlimited"
+          max_memory = Filesize.from("#{license['maxMemory']} B").pretty  if license['maxMemory'].to_i != 0
+          max_storage = Filesize.from("#{license['maxStorage']} B").pretty  if license['maxStorage'].to_i != 0
+          print cyan
+          description_cols = {
+            "Account" => 'accountName',
+            "Product Tier" => lambda {|it| format_product_tier(it) }, 
+            "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
+            "End Date" => lambda {|it| format_local_dt(it['endDate']) },
+            "Max Memory" => lambda {|it| max_memory },
+            "Max Storage" => lambda {|it| max_storage },
+            "Max Instances" => lambda {|it| it["maxInstances"].to_i == 0 ? 'Unlimited' : it["maxInstances"] },
+            "Hard Limit" => lambda {|it| it[""] == false ? 'Yes' : 'No' },
+          }
+          print_description_list(description_cols, license)
+          print reset,"\n"
+        end
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       return false
     end
   end
 
+  def format_product_tier(license)
+    product_tier = license['productTier'] || 'capacity'
+    if product_tier == 'capacity'
+      'Capacity'
+    elsif product_tier == 'essentials'
+      'Essentials'
+    elsif product_tier == 'pro'
+      'Pro'
+    elsif product_tier == 'enterprise'
+      'Enterprise'
+    elsif product_tier == 'msp'
+      'Service Provider'
+    else
+      product_tier.to_s.capitalize
+    end
+  end
 end