morpheus-cli 5.3.2.3 → 5.4.1

data/lib/morpheus/cli/{roles.rb → commands/roles.rb}

@@ -1,26 +1,26 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/option_types'
-require 'morpheus/cli/mixins/accounts_helper'
-require 'morpheus/cli/mixins/provisioning_helper'
-require 'json'
 
 class Morpheus::Cli::Roles
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::WhoamiHelper
-  register_subcommands :list, :get, :add, :update, :remove, :'list-permissions', :'update-feature-access', :'update-global-group-access', :'update-group-access', :'update-global-cloud-access', :'update-cloud-access', :'update-global-instance-type-access', :'update-instance-type-access', :'update-global-blueprint-access', :'update-blueprint-access', :'update-global-catalog-item-type-access', :'update-catalog-item-type-access', :'update-persona-access', :'update-global-vdi-pool-access', :'update-vdi-pool-access'
+  register_subcommands :list, :get, :add, :update, :remove, 
+    :'list-permissions', :'update-feature-access', :'update-global-group-access', 
+    :'update-group-access', :'update-global-cloud-access', :'update-cloud-access', 
+    :'update-global-instance-type-access', :'update-instance-type-access', 
+    :'update-global-blueprint-access', :'update-blueprint-access', 
+    :'update-global-catalog-item-type-access', :'update-catalog-item-type-access', 
+    :'update-persona-access', 
+    :'update-global-vdi-pool-access', :'update-vdi-pool-access',
+    :'update-global-report-type-access', :'update-report-type-access'
   alias_subcommand :details, :get
   set_default_subcommand :list
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @whoami_interface = @api_client.whoami
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @accounts_interface = @api_client.accounts
     @roles_interface = @api_client.roles
     @groups_interface = @api_client.groups
@@ -110,6 +110,9 @@ class Morpheus::Cli::Roles
       opts.on(nil,'--vdi-pool-access', "Display VDI Pool Access") do
         options[:include_vdi_pool_access] = true
       end
+      opts.on(nil,'--report-type-access', "Display Report Type Access") do
+        options[:include_report_type_access] = true
+      end
       opts.on('-a','--all', "Display All Access Lists") do
         options[:include_feature_access] = true
         options[:include_group_access] = true
@@ -119,6 +122,7 @@ class Morpheus::Cli::Roles
         options[:include_catalog_item_type_access] = true
         options[:include_personas_access] = true
         options[:include_vdi_pool_access] = true
+        options[:include_report_type_access] = true
       end
       build_standard_get_options(opts, options)
       opts.footer = <<-EOT
@@ -225,6 +229,7 @@ EOT
         "Blueprints" => lambda {|it| get_access_string(it['globalAppTemplateAccess'] || it['globalBlueprintAccess']) },
         "Catalog Item Types" => lambda {|it| get_access_string(it['globalCatalogItemTypeAccess']) },
         "VDI Pools" => lambda {|it| get_access_string(it['globalVdiPoolAccess']) },
+        "Report Types" => lambda {|it| get_access_string(it['globalReportTypeAccess']) },
       }
       if role['roleType'].to_s.downcase == 'account'
         global_access_columns.delete("Groups")
@@ -378,7 +383,7 @@ EOT
           rows = vdi_pool_permissions.collect do |it|
             {
               name: it['name'],
-              access: format_access_string(it['access'], ["none","read","full"]),
+              access: format_access_string(it['access'], ["none","full"]),
             }
           end
           print as_pretty_table(rows, [:name, :access], options)
@@ -390,6 +395,27 @@ EOT
         # print cyan,bold,"VDI Pool Access: #{get_access_string(json_response['globalVdiPoolAccess'])}",reset,"\n"
       end
 
+      report_type_global_access = json_response['globalReportTypeAccess']
+      report_type_permissions = json_response['reportTypePermissions'] || []
+      print cyan
+      if report_type_global_access == 'custom'
+        print_h2 "Report Type Access", options
+        if options[:include_report_type_access]
+          rows = report_type_permissions.collect do |it|
+            {
+              name: it['name'],
+              access: format_access_string(it['access'], ["none","full"]),
+            }
+          end
+          print as_pretty_table(rows, [:name, :access], options)
+        else
+          print cyan,"Use --report-type-access to list custom access","\n"
+        end
+      else
+        # print "\n"
+        # print cyan,bold,"Report Type Access: #{get_access_string(json_response['globalReportTypeAccess'])}",reset,"\n"
+      end
+
     end
     print reset,"\n"
 
@@ -765,6 +791,11 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [full|read|custom|none]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
+            opts.footer = <<-EOT
+Update global group access for a role.
+[role] is required. This is the name (authority) or id of a role.
+[access] is required. This is the access level to assign: full, read, custom or none.
+EOT
     end
     optparse.parse!(args)
 
@@ -844,16 +875,14 @@ EOT
       access_value = args[2] if args[2]
     end
     if !group_id && !do_all
-      raise_command_error("missing required argument: [group] or --all", optparse)
+      raise_command_error("missing required argument: [group] or --all", args, optparse)
     end
     if !access_value
-      raise_command_error("missing required argument: [access]", optparse)
+      raise_command_error("missing required argument: [access]", args, optparse)
     end
     access_value = access_value.to_s.downcase
     if !allowed_access_values.include?(access_value)
-      raise_command_error("invalid access value: #{access_value}", optparse)
-      puts optparse
-      return 1
+      raise_command_error("invalid access value: #{access_value}", args, optparse)
     end
 
     connect(options)
@@ -915,6 +944,11 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [full|custom|none]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
+            opts.footer = <<-EOT
+Update global cloud access for a role.
+[role] is required. This is the name (authority) or id of a role.
+[access] is required. This is the access level to assign: full, custom or none.
+EOT
     end
     optparse.parse!(args)
 
@@ -993,16 +1027,14 @@ EOT
       access_value = args[2] if args[2]
     end
     if !cloud_id && !do_all
-      raise_command_error("missing required argument: [cloud] or --all", optparse)
+      raise_command_error("missing required argument: [cloud] or --all", args, optparse)
     end
     if !access_value
-      raise_command_error("missing required argument: [access]", optparse)
+      raise_command_error("missing required argument: [access]", args, optparse)
     end
     access_value = access_value.to_s.downcase
     if !allowed_access_values.include?(access_value)
-      raise_command_error("invalid access value: #{access_value}", optparse)
-      puts optparse
-      return 1
+      raise_command_error("invalid access value: #{access_value}", args, optparse)
     end
 
     connect(options)
@@ -1063,6 +1095,11 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[role] [full|custom|none]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
+            opts.footer = <<-EOT
+Update global instance type access for a role.
+[role] is required. This is the name (authority) or id of a role.
+[access] is required. This is the access level to assign: full, custom or none.
+EOT
     end
     optparse.parse!(args)
 
@@ -1209,6 +1246,11 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[role] [full|custom|none]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
+            opts.footer = <<-EOT
+Update global blueprint access for a role.
+[role] is required. This is the name (authority) or id of a role.
+[access] is required. This is the access level to assign: full, custom or none.
+EOT
     end
     optparse.parse!(args)
 
@@ -1288,16 +1330,14 @@ EOT
       access_value = args[2] if args[2]
     end
     if !blueprint_id && !do_all
-      raise_command_error("missing required argument: [blueprint] or --all", optparse)
+      raise_command_error("missing required argument: [blueprint] or --all", args, optparse)
     end
     if !access_value
-      raise_command_error("missing required argument: [access]", optparse)
+      raise_command_error("missing required argument: [access]", args, optparse)
     end
     access_value = access_value.to_s.downcase
     if !allowed_access_values.include?(access_value)
-      raise_command_error("invalid access value: #{access_value}", optparse)
-      puts optparse
-      return 1
+      raise_command_error("invalid access value: #{access_value}", args, optparse)
     end
 
     connect(options)
@@ -1370,6 +1410,11 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[role] [full|custom|none]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
+            opts.footer = <<-EOT
+Update global catalog item type access for a role.
+[role] is required. This is the name (authority) or id of a role.
+[access] is required. This is the access level to assign: full, custom or none.
+EOT
     end
     optparse.parse!(args)
 
@@ -1449,16 +1494,14 @@ EOT
       access_value = args[2] if args[2]
     end
     if !catalog_item_type_id && !do_all
-      raise_command_error("missing required argument: [catalog-item-type] or --all", optparse)
+      raise_command_error("missing required argument: [catalog-item-type] or --all", args, optparse)
     end
     if !access_value
-      raise_command_error("missing required argument: [access]", optparse)
+      raise_command_error("missing required argument: [access]", args, optparse)
     end
     access_value = access_value.to_s.downcase
     if !allowed_access_values.include?(access_value)
-      raise_command_error("invalid access value: #{access_value}", optparse)
-      puts optparse
-      return 1
+      raise_command_error("invalid access value: #{access_value}", args, optparse)
     end
 
     connect(options)
@@ -1561,16 +1604,14 @@ EOT
       access_value = args[2] if args[2]
     end
     if !persona_id && !do_all
-      raise_command_error("missing required argument: [persona] or --all", optparse)
+      raise_command_error("missing required argument: [persona] or --all", args, optparse)
     end
     if !access_value
-      raise_command_error("missing required argument: [access]", optparse)
+      raise_command_error("missing required argument: [access]", args, optparse)
     end
     access_value = access_value.to_s.downcase
     if !allowed_access_values.include?(access_value)
-      raise_command_error("invalid access value: #{access_value}", optparse)
-      puts optparse
-      return 1
+      raise_command_error("invalid access value: #{access_value}", args, optparse)
     end
 
     connect(options)
@@ -1622,13 +1663,18 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[role] [full|custom|none]")
       build_common_options(opts, options, [:json, :dry_run, :remote])
+            opts.footer = <<-EOT
+Update global VDI pool access for a role.
+[role] is required. This is the name (authority) or id of a role.
+[access] is required. This is the access level to assign: full, custom or none.
+EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count: 2)
     name = args[0]
     access_value = args[1].to_s.downcase
     if !['full', 'custom', 'none'].include?(access_value)
-      raise_command_error("invalid access value: #{args[1]}", optparse)
+      raise_command_error("invalid access value: #{args[1]}", args, optparse)
     end
 
 
@@ -1696,14 +1742,14 @@ EOT
       access_value = args[2] if args[2]
     end
     if !vdi_pool_id && !do_all
-      raise_command_error("missing required argument: [vdi-pool] or --all", optparse)
+      raise_command_error("missing required argument: [vdi-pool] or --all", args, optparse)
     end
     if !access_value
-      raise_command_error("missing required argument: [access]", optparse)
+      raise_command_error("missing required argument: [access]", args, optparse)
     end
     access_value = access_value.to_s.downcase
     if !allowed_access_values.include?(access_value)
-      raise_command_error("invalid access value: #{access_value}", optparse)
+      raise_command_error("invalid access value: #{access_value}", args, optparse)
       puts optparse
       return 1
     end
@@ -1770,6 +1816,165 @@ EOT
     end
   end
 
+  def update_global_report_type_access(args)
+    usage = "Usage: morpheus roles update-global-report-type-access [role] [full|custom|none]"
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[role] [full|custom|none]")
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = <<-EOT
+Update global report type access for a role.
+[role] is required. This is the name (authority) or id of a role.
+[access] is required. This is the access level to assign: full, custom or none.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count: 2)
+    name = args[0]
+    access_value = args[1].to_s.downcase
+    if !['full', 'custom', 'none'].include?(access_value)
+      raise_command_error("invalid access value: #{args[1]}", args, optparse)
+    end
+
+
+    connect(options)
+    begin
+      account = find_account_from_options(options)
+      account_id = account ? account['id'] : nil
+      role = find_role_by_name_or_id(account_id, name)
+      exit 1 if role.nil?
+      # note: ReportTypes being plural is odd, the others are singular
+      params = {permissionCode: 'ReportTypes', access: access_value}
+      @roles_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @roles_interface.dry.update_permission(account_id, role['id'], params)
+        return
+      end
+      json_response = @roles_interface.update_permission(account_id, role['id'], params)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Role #{role['authority']} global report type access updated"
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update_report_type_access(args)
+    options = {}
+    report_type_id = nil
+    access_value = nil
+    do_all = false
+    allowed_access_values = ['full', 'none']
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[role] [report-type] [access]")
+      opts.on( '--report-type ID', String, "Report Type ID or Name" ) do |val|
+        report_type_id = val
+      end
+      opts.on( nil, '--all', "Update all report types at once." ) do
+        do_all = true
+      end
+      opts.on( '--access VALUE', String, "Access value [#{allowed_access_values.join('|')}]" ) do |val|
+        access_value = val
+      end
+      build_common_options(opts, options, [:json, :dry_run, :remote])
+      opts.footer = "Update role access for a report type or all report types.\n" +
+                    "[role] is required. This is the name or id of a role.\n" + 
+                    "--report-type or --all is required. This is the name or id of a report type.\n" + 
+                    "--access is required. This is the new access value. #{anded_list(allowed_access_values)}"
+    end
+    optparse.parse!(args)
+
+    # usage: update-report-type-access [role] [access] --all
+    #        update-report-type-access [role] [report-type] [access]
+    name = args[0]
+    if do_all
+      verify_args!(args:args, optparse:optparse, min:1, max:2)
+      access_value = args[1] if args[1]
+    else
+      verify_args!(args:args, optparse:optparse, min:1, max:3)
+      report_type_id = args[1] if args[1]
+      access_value = args[2] if args[2]
+    end
+    if !report_type_id && !do_all
+      raise_command_error("missing required argument: [report-type] or --all", args, optparse)
+    end
+    if !access_value
+      raise_command_error("missing required argument: [access]", args, optparse)
+    end
+    access_value = access_value.to_s.downcase
+    if !allowed_access_values.include?(access_value)
+      raise_command_error("invalid access value: #{access_value}", args, optparse)
+      puts optparse
+      return 1
+    end
+
+    connect(options)
+    begin
+      account = find_account_from_options(options)
+      account_id = account ? account['id'] : nil
+      role = find_role_by_name_or_id(account_id, name)
+      return 1 if role.nil?
+
+      role_json = @roles_interface.get(account_id, role['id'])
+      report_type_global_access = role_json['globalReportTypeAccess']
+      report_type_permissions = role_json['reportTypePermissions'] || []
+      if report_type_global_access != 'custom'
+        print "\n", red, "Global Report Type Access is currently: #{report_type_global_access.to_s.capitalize}"
+        print "\n", "You must first set it to Custom via `morpheus roles update-global-report-type-access \"#{name}\" custom`"
+        print "\n\n", reset
+        return 1
+      end
+
+      # hacky, but support name or code lookup via the list returned in the show payload
+      report_type = nil
+      if !do_all
+        if report_type_id.to_s =~ /\A\d{1,}\Z/
+          report_type = report_type_permissions.find {|b| b['id'] == report_type_id.to_i }
+        else
+          report_type = report_type_permissions.find {|b| b['name'] == report_type_id }
+        end
+        if report_type.nil?
+          print_red_alert "Report Type not found: '#{report_type_id}'"
+          return 1
+        end
+      end
+
+      params = {}
+      if do_all
+        params['allReportTypes'] = true
+      else
+        params['reportTypeId'] = report_type['id']
+      end
+      params['access'] = access_value
+      @roles_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @roles_interface.dry.update_report_type(account_id, role['id'], params)
+        return
+      end
+      json_response = @roles_interface.update_report_type(account_id, role['id'], params)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        if do_all
+          print_green_success "Role #{role['authority']} access updated for all report types"
+        else
+          print_green_success "Role #{role['authority']} access updated for report type #{report_type['name']}"
+        end
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
   
   def add_role_option_types

data/lib/morpheus/cli/{security_group_rules.rb → commands/security_group_rules.rb}

@@ -1,8 +1,3 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::SecurityGroupRules

data/lib/morpheus/cli/{security_groups.rb → commands/security_groups.rb}

@@ -1,10 +1,4 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::SecurityGroups
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/commands/{standard/set_prompt_command.rb → set_prompt_command.rb}

@@ -1,6 +1,3 @@
-require 'optparse'
-require 'json'
-require 'morpheus/logging'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::SetPromptCommand

data/lib/morpheus/cli/{shell.rb → commands/shell.rb}

@@ -1,18 +1,6 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require "shellwords"
-require 'readline'
-require 'logger'
-require 'fileutils'
-require 'morpheus/cli/cli_registry'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/error_handler'
-require 'morpheus/cli/expression_parser'
-require 'morpheus/terminal'
-require 'morpheus/logging'
-require 'morpheus/benchmarking'
+require "shellwords"
+require "readline"
 
 #class Morpheus::Cli::Shell < Morpheus::Terminal
 class Morpheus::Cli::Shell
@@ -391,102 +379,14 @@ class Morpheus::Cli::Shell
       elsif input =~ /^\s*#/
         Morpheus::Logging::DarkPrinter.puts "ignored comment: #{input}" if Morpheus::Logging.debug?
         return 0
-      # this is a full blown command now
-      # elsif input =~ /^sleep/
-      #   sleep_sec = input.sub("sleep ", "").to_f
-      #   if (!(sleep_sec > 0))
-      #     # raise_command_error "sleep requires the argument [seconds]. eg. sleep 3.14"
-      #     puts_error  "sleep requires argument [seconds]. eg. sleep 3.14"
-      #     return false
-      #   end
-      #   log_history_command(input)
-      #   Morpheus::Logging::DarkPrinter.puts "sleeping for #{sleep_sec}s ... zzzZzzzZ" if Morpheus::Logging.debug?
-      #   begin
-      #     sleep(sleep_sec)
-      #   rescue Interrupt
-      #     Morpheus::Logging::DarkPrinter.puts "\nInterrupt. waking up from sleep early"
-      #   end
-      #   return 0
-      # elsif input =~ /^history/
-      #   n_commands = input.sub(/^history\s?/, '').sub(/\-n\s?/, '')
-      #   n_commands = n_commands.empty? ? 25 : n_commands.to_i
-      #   cmd_numbers = @history.keys.last(n_commands)
-      #   if cmd_numbers.size == 1
-      #     puts "Last command"
-      #   else
-      #     puts "Last #{cmd_numbers.size} commands"
-      #   end
-      #   cmd_numbers.each do |cmd_number|
-      #     cmd = @history[cmd_number]
-      #     puts "#{cmd_number.to_s.rjust(3, ' ')}  #{cmd}"
-      #   end
-      #   last_cmd = cmd_numbers.last ? @history[cmd_numbers.last] : nil
-      #   if input != last_cmd # no consecutive
-      #     log_history_command(input)
-      #   end
-      #   return 0
       elsif input == 'clear'
         print "\e[H\e[2J"
         return 0
-      # elsif input == 'flush-history' || input == 'flush_history'
-      #   file_path = history_file_path
-      #   if File.exists?(file_path)
-      #     File.truncate(file_path, 0)
-      #   end
-      #   @history = {}
-      #   @last_command_number = 0
-      #   @history_logger = load_history_logger
-      #   puts "history cleared!"
-      #   return 0
-      # elsif input == "edit rc"
-      #   fn = Morpheus::Cli::DotFile.morpheusrc_filename
-      #   editor = ENV['EDITOR'] # || 'nano'
-      #   if !editor
-      #     puts "You have no EDITOR defined. Use 'export EDITOR=emacs'"
-      #     #puts "Trying nano..."
-      #     #editor = "nano"
-      #   end
-      #   system("which #{editor} > /dev/null 2>&1")
-      #   has_editor = $?.success?
-      #   if has_editor
-      #     puts "opening #{fn} for editing with #{editor} ..."
-      #     system("#{editor} #{fn}")
-      #     puts "Use 'reload' to re-execute your startup script #{File.basename(fn)}"
-      #   else
-      #     puts_error2 Morpheus::Terminal.angry_prompt
-      #     puts_error "The defined EDITOR '#{editor}' was not found on your system."
-      #   end
-      #   return 0 # $?
-      # elsif input == "edit profile"
-      #   fn = Morpheus::Cli::DotFile.morpheus_profile_filename
-      #   editor = ENV['EDITOR'] # || 'nano'
-      #   if !editor
-      #     puts "You have no EDITOR defined. Use 'export EDITOR=emacs'."
-      #     #puts "Trying nano..."
-      #     #editor = "nano"
-      #   end
-      #   system("which #{editor} > /dev/null 2>&1")
-      #   has_editor = $?.success?
-      #   if has_editor
-      #     puts "opening #{fn} for editing with #{editor} ..."
-      #     `#{editor} #{fn}`
-      #     puts "Use 'reload' to re-execute your startup script #{File.basename(fn)}"
-      #   else
-      #     puts_error Morpheus::Terminal.angry_prompt
-      #     puts_error "The defined EDITOR '#{editor}' was not found on your system."
-      #   end
-      #   return 0 # $?
       elsif input == 'reload' || input == 'reload!'
-        # raise RestartShellPlease
-        #log_history_command(input)
-        # could just fork instead?
         # clear registry
         Morpheus::Cli::CliRegistry.instance.flush
         # reload code
         Morpheus::Cli.load!
-
-        # raise RestartShellPlease
-
         # execute startup scripts
         if File.exists?(Morpheus::Cli::DotFile.morpheus_profile_filename)
           Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheus_profile_filename).execute()
@@ -494,7 +394,6 @@ class Morpheus::Cli::Shell
         if File.exists?(Morpheus::Cli::DotFile.morpheusrc_filename)
           Morpheus::Cli::DotFile.new(Morpheus::Cli::DotFile.morpheusrc_filename).execute()
         end
-        
         # recalculate shell environment
         reinitialize()
 
@@ -824,10 +723,10 @@ class Morpheus::Cli::Shell
       end
       if options[:show_pagination]
         if options[:phrase] || options[:sort] || options[:direction] || options[:offset]
-          print_results_pagination({:meta => history_result[:meta]})
+          print_results_pagination(history_result[:meta])
         else
           # default order is weird, it's the last page of results, 1-25 is misleading and showing the indexes is stranger
-          print_results_pagination({:meta => history_result[:meta]}, {:message =>"Viewing most recent %{size} of %{total} %{label}"})
+          print_results_pagination(history_result[:meta], {:message =>"Viewing most recent %{size} of %{total} %{label}"})
         end
         print reset, "\n"
       else

data/lib/morpheus/cli/commands/{standard/sleep_command.rb → sleep_command.rb}

@@ -1,6 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'term/ansicolor'
-require 'json'
 
 # This is for use in dotfile scripts
 class Morpheus::Cli::Sleep

data/lib/morpheus/cli/commands/{standard/source_command.rb → source_command.rb}

@@ -1,6 +1,4 @@
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'json'
 
 # This is for use in dotfile scripts and the shell..
 class Morpheus::Cli::SourceCommand

data/lib/morpheus/cli/commands/{standard/ssl_verification_command.rb → ssl_verification_command.rb}

@@ -1,7 +1,4 @@
-require 'optparse'
-require 'morpheus/rest_client'
 require 'morpheus/cli/cli_command'
-require 'json'
 
 # This is for use in dotfile scripts
 class Morpheus::Cli::SslVerificationCommand

data/lib/morpheus/cli/{storage_providers_command.rb → commands/storage_providers_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::StorageProvidersCommand
   include Morpheus::Cli::CliCommand