morpheus-cli 4.2.16 → 4.2.21

data/lib/morpheus/cli/jobs_command.rb

@@ -768,7 +768,7 @@ class Morpheus::Cli::JobsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
-      opts.on('-D', '--details [on|off]', String, "Can be used to enable / disable execution details. Default if on") do |val|
+      opts.on('-D', '--details [on|off]', String, "Can be used to enable / disable execution details. Default is on") do |val|
         options[:details] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
       build_common_options(opts, options, [:json, :dry_run, :remote])
@@ -970,7 +970,7 @@ class Morpheus::Cli::JobsCommand
   def format_status(status_string, return_color=cyan)
     out = ""
     if status_string
-      if ['success', 'successful', 'ok'].include?(status_string)
+      if ['complete','success', 'successful', 'ok'].include?(status_string)
         out << "#{green}#{status_string.upcase}"
       elsif ['error', 'offline', 'failed', 'failure'].include?(status_string)
         out << "#{red}#{status_string.upcase}"

data/lib/morpheus/cli/library_instance_types_command.rb

@@ -244,15 +244,14 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
     options = {}
     params = {}
     logo_file = nil
-    option_type_ids = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
       build_option_type_options(opts, options, add_instance_type_option_types())
       opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
         if list.nil?
-          option_type_ids = []
+          params['optionTypes'] = []
         else
-          option_type_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+          params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
@@ -348,6 +347,13 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_instance_type_option_types())
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      opts.on('--option-types [x,y,z]', Array, "List of Option Type IDs") do |list|
+        if list.nil?
+          params['optionTypes'] = []
+        else
+          params['optionTypes'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
       opts.footer = "Update an instance type." + "\n" +
                     "[name] is required. This is the name or id of a instance type."
     end
@@ -375,6 +381,14 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         params['hasSettings'] = ['on','true','1'].include?(params['hasSettings'].to_s) if params.key?('hasSettings')
         params['hasAutoScale'] = ['on','true','1'].include?(params['hasAutoScale'].to_s) if params.key?('hasAutoScale')
         params['hasDeployment'] = ['on','true','1'].include?(params['hasDeployment'].to_s) if params.key?('hasDeployment')
+        if params['optionTypes']
+          prompt_results = prompt_for_option_types(params, options, @api_client)
+          if prompt_results[:success]
+            params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+          else
+            return 1
+          end
+        end
         if params.empty?
           puts optparse
           #option_lines = update_instance_type_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")

data/lib/morpheus/cli/library_layouts_command.rb

@@ -652,7 +652,7 @@ EOT
     connect(options)
     exit_code, err = 0, nil
     # if !is_master_account
-    #   print_red_alert "Permissions only available for master account"
+    #   print_red_alert "Permissions only available for master tenant"
     #   return 1
     # end
     layout = find_layout_by_name_or_id(nil, args[0])

data/lib/morpheus/cli/login.rb

@@ -30,7 +30,7 @@ class Morpheus::Cli::Login
     username, password = nil, nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
-      opts.on( '-u', '--username USERNAME', "Username" ) do |val|
+      opts.on( '-u', '--username USERNAME', "Username. Sub-tenant users must format their username with a prefix like {subdomain}\\{username}" ) do |val|
         username = val
       end
       opts.on( '-p', '--password PASSWORD', "Password" ) do |val|
@@ -50,11 +50,15 @@ class Morpheus::Cli::Login
       opts.footer = <<-EOT
 Login to a remote appliance with a username and password or using an access token.
 Logging in with username and password will make an authentication api request to obtain an access token.
+[username] is required, this is the username of the Morpheus User
+[password] is required, this is the password of the Morpheus User
+Sub-tenant users will need to pass their tenant subdomain prefix. ie. {subdomain}\\{username}
+By default, the subdomain is the tenant account ID. Example: 2\\neo
 The --token option can be used to login with a valid access token instead of username and password.
 The specified token will be verified by making a whoami api request
 If successful, the access token will be saved with the active session for the remote appliance.
-This command will first logout any active session before attempting authorization.
-The --test option is available for testing credentials without updating your active session, neithing logging you out or in.
+This command will first logout any active session before attempting authentication.
+The --test option can be used to test credentials without updating the stored credentials for the appliance, neither logging you in or out.
 EOT
                     
     end
@@ -106,6 +110,8 @@ EOT
           if options[:test_only]
             print green,"Success! Test Credentials verified for #{wallet['username']}", reset, "\n"
           else
+            # clear whoami cache, it will be lazily load_saved_credentials
+            ::Morpheus::Cli::Whoami.clear_whoami(@appliance_name, wallet['username'])
             print green,"Success! Logged in as #{wallet['username']}", reset, "\n"
           end
         end

data/lib/morpheus/cli/mixins/accounts_helper.rb

@@ -33,6 +33,43 @@ module Morpheus::Cli::AccountsHelper
     @roles_interface
   end
 
+  ## Tenants (Accounts)
+
+  def account_column_definitions()
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      # "Name" => lambda {|it| it['name'].to_s + (it['master'] ? " (Master Tenant)" : '') },
+      "Description" => 'description',
+      "Subdomain" => 'subdomain',
+      "# Instances" => 'stats.instanceCount',
+      "# Users" => 'stats.userCount',
+      "Role" => lambda {|it| it['role']['authority'] rescue nil },
+      "Master" => lambda {|it| format_boolean(it['master']) },
+      "Currency" => 'currency',
+      "Status" => lambda {|it| 
+        status_state = nil
+        if it['active']
+          status_state = "#{green}ACTIVE#{cyan}"
+        else
+          status_state = "#{red}INACTIVE#{cyan}"
+        end
+        status_state
+      },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
+  def list_account_column_definitions()
+    columns = account_column_definitions
+    columns.delete("Subdomain")
+    columns.delete("Master")
+    columns.delete("Currency")
+    return columns.upcase_keys!
+  end
+
+
   def find_account_by_name_or_id(val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_account_by_id(val)
@@ -47,7 +84,7 @@ module Morpheus::Cli::AccountsHelper
       return json_response['account']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
-        print_red_alert "Account not found by id #{id}"
+        print_red_alert "Tenant not found by id #{id}"
       else
         raise e
       end
@@ -57,12 +94,12 @@ module Morpheus::Cli::AccountsHelper
   def find_account_by_name(name)
     accounts = accounts_interface.list({name: name.to_s})['accounts']
     if accounts.empty?
-      print_red_alert "Account not found by name #{name}"
+      print_red_alert "Tenant not found by name #{name}"
       return nil
     elsif accounts.size > 1
-      print_red_alert "#{accounts.size} accounts found by name #{name}"
-      print_accounts_table(accounts, {color: red})
-      print_red_alert "Try using -A ID instead"
+      print_red_alert "Found #{accounts.size} tenants by name '#{name}'. Try using ID instead: #{format_list(accounts.collect {|it| it['id']}, 'or', 3)}"
+      print "\n"
+      print as_pretty_table(accounts, [:id, :name, :description], {color: red, thin: true})
       print reset,"\n"
       return nil
     else
@@ -87,6 +124,35 @@ module Morpheus::Cli::AccountsHelper
     return account
   end
 
+  ## Roles
+
+  def role_column_definitions(options={})
+    {
+      "ID" => 'id',
+      "Name" => 'authority',
+      "Description" => 'description',
+      #"Scope" => lambda {|it| it['scope'] },
+      "Type" => lambda {|it| format_role_type(it) },
+      "Multitenant" => lambda {|it| 
+        format_boolean(it['multitenant']).to_s + (it['multitenantLocked'] ? " (LOCKED)" : "")
+      },
+      "Owner" => lambda {|it| it['owner'] ? it['owner']['name'] : '' },
+      #"Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+    }
+  end
+
+  def subtenant_role_column_definitions(options={})
+    {
+      "ID" => 'id',
+      "Name" => 'authority',
+      "Description" => 'description',
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+    }
+  end
+
   def find_role_by_name_or_id(account_id, val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_role_by_id(account_id, val)
@@ -114,9 +180,11 @@ module Morpheus::Cli::AccountsHelper
       print_red_alert "Role not found by name #{name}"
       return nil
     elsif roles.size > 1
-      print_red_alert "#{roles.size} roles by name #{name}"
-      print_roles_table(roles, {color: red, thin: true})
-      print reset,"\n\n"
+      print_red_alert "Found #{roles.size} roles by name '#{name}'. Try using ID instead: #{format_list(roles.collect {|it| it['id']}, 'or', 3)}"
+      print "\n"
+      # print as_pretty_table(accounts, [:id, :name, :description], {color: red, thin: true})
+      print as_pretty_table(roles, {"ID" => 'id', "Name" => 'authority',"Description" => 'description'}.upcase_keys!, {color: red, thin: true})
+      print reset,"\n"
       return nil
     else
       return roles[0]
@@ -125,17 +193,57 @@ module Morpheus::Cli::AccountsHelper
 
   alias_method :find_role_by_authority, :find_role_by_name
 
-  def find_user_by_username_or_id(account_id, val)
+
+  ## Users
+
+  def user_column_definitions()
+    {
+      "ID" => 'id',
+      "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+      "First Name" => 'firstName',
+      "Last Name" => 'lastName',
+      "Username" => 'username',
+      "Email" => 'email',
+      "Role" => lambda {|it| format_user_role_names(it) },
+      "Notifications" => lambda {|it| it['receiveNotifications'].nil? ? '' : format_boolean(it['receiveNotifications']) },
+      "Status" => lambda {|it| format_user_status(it) },
+      "Last Login" => lambda {|it| format_duration_ago(it['lastLoginDate']) },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
+  def list_user_column_definitions()
+    columns = user_column_definitions
+    columns.delete("Notifications")
+    return columns.upcase_keys!
+  end
+
+  def format_user_status(user, return_color=cyan)
+    if user["enabled"] != true
+      red + "DISABLED" + return_color
+    elsif user["accountLocked"]
+      red + "ACCOUNT LOCKED" + return_color
+    elsif user["accountExpired"]
+      yellow + "ACCOUNT EXPIRED" + return_color
+    elsif user["passwordExpired"]
+      yellow + "PASSWORD EXPIRED" + return_color
+    else
+      green + "ACTIVE" + return_color
+    end
+  end
+
+  def find_user_by_username_or_id(account_id, val, params={})
     if val.to_s =~ /\A\d{1,}\Z/
-      return find_user_by_id(account_id, val)
+      return find_user_by_id(account_id, val, params)
     else
-      return find_user_by_username(account_id, val)
+      return find_user_by_username(account_id, val, params)
     end
   end
 
-  def find_user_by_id(account_id, id)
+  def find_user_by_id(account_id, id, params={})
     begin
-      json_response = users_interface.get(account_id, id.to_i, {includePermissions:true})
+      json_response = users_interface.get(account_id, id.to_i, params)
       return json_response['user']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
@@ -146,22 +254,23 @@ module Morpheus::Cli::AccountsHelper
     end
   end
 
-  def find_user_by_username(account_id, username)
-    users = users_interface.list(account_id, {username: username.to_s})['users']
+  def find_user_by_username(account_id, username, params={})
+    users = users_interface.list(account_id, params.merge({username: username.to_s}))['users']
     if users.empty?
       print_red_alert "User not found by username #{username}"
       return nil
     elsif users.size > 1
-      print_red_alert "#{users.size} users by username #{username}"
-      print_users_table(users, {color: red, thin: true})
-      print reset,"\n\n"
+      print_red_alert "Found #{users.size} users by username '#{username}'. Try using ID instead: #{format_list(users.collect {|it| it['id']}, 'or', 3)}"
+      print "\n"
+      print as_pretty_table(users, list_user_column_definitions, {color: red, thin: true})
+      print reset,"\n"
       return nil
     else
       return users[0]
     end
   end
 
-  def find_all_user_ids(account_id, usernames)
+  def find_all_user_ids(account_id, usernames, params={})
     user_ids = []
     if usernames.is_a?(String)
       usernames = usernames.split(",").collect {|it| it.to_s.strip }.select {|it| it }.uniq
@@ -170,11 +279,11 @@ module Morpheus::Cli::AccountsHelper
     end
     usernames.each do |username|
       # save a query
-      #user = find_user_by_username_or_id(nil, username)
+      #user = find_user_by_username_or_id(nil, username, params)
       if username.to_s =~ /\A\d{1,}\Z/
         user_ids << username.to_i
       else
-        user = find_user_by_username(account_id, username)
+        user = find_user_by_username(account_id, username, params)
         if user.nil?
           return nil
         else
@@ -185,6 +294,32 @@ module Morpheus::Cli::AccountsHelper
     user_ids
   end
 
+
+  ## User Groups
+
+  def user_group_column_definitions()
+    {
+      "ID" => lambda {|it| it['id'] },
+      #"Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+      "Name" => lambda {|it| it['name'] },
+      "Description" => lambda {|it| it['description'] },
+      "Server Group" => lambda {|it| it['serverGroup'] },
+      "Sudo Access" => lambda {|it| format_boolean it['sudoAccess'] },
+      # "Shared User" => lambda {|it| format_boolean it['sharedUser'] },
+      "# Users" => lambda {|it| it['users'].size rescue nil },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+    }
+  end
+
+  def list_user_group_column_definitions()
+    columns = user_group_column_definitions
+    columns.delete("Sudo Access")
+    columns.delete("Server Group")
+    columns.delete("Updated")
+    return columns.upcase_keys!
+  end
+
   def find_user_group_by_name_or_id(account_id, val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_user_group_by_id(account_id, val)
@@ -212,9 +347,8 @@ module Morpheus::Cli::AccountsHelper
       print_red_alert "User Group not found by name #{name}"
       return nil
     elsif user_groups.size > 1
-      print_red_alert "#{user_groups.size} user groups found by name #{name}"
-      print_user_groups_table(user_groups, {color: red})
-      print_red_alert "Try using ID instead"
+      print_red_alert "Found #{user_groups.size} user groups by name '#{name}'. Try using ID instead: #{format_list(user_groups.collect {|it| it['id']}, 'or', 3)}"
+      print as_pretty_table(user_groups, [:id, :name, :description], {color: red, thin: true})
       print reset,"\n"
       return nil
     else
@@ -222,36 +356,6 @@ module Morpheus::Cli::AccountsHelper
     end
   end
 
-  def print_accounts_table(accounts, options={})
-    table_color = options.key?(:color) ? options[:color] : cyan
-    rows = accounts.collect do |account|
-      status_state = nil
-      if account['active']
-        status_state = "#{green}ACTIVE#{table_color}"
-      else
-        status_state = "#{red}INACTIVE#{table_color}"
-      end
-      {
-        id: account['id'],
-        name: account['name'],
-        description: account['description'],
-        role: account['role'] ? account['role']['authority'] : nil,
-        status: status_state,
-        dateCreated: format_local_dt(account['dateCreated'])
-      }
-    end
-    print table_color if table_color
-    print as_pretty_table(rows, [
-      :id,
-      :name,
-      :description,
-      :role,
-      {:dateCreated => {:display_name => "Date Created"} },
-      :status
-    ], options.merge({color:table_color}))
-    print reset if table_color
-  end
-
   def format_role_type(role)
     str = ""
     if role['roleType'] == "account"
@@ -271,52 +375,6 @@ module Morpheus::Cli::AccountsHelper
     return str
   end
 
-  def print_roles_table(roles, options={})
-    table_color = options.key?(:color) ? options[:color] : cyan
-    rows = roles.collect do |role|
-      {
-        id: role['id'],
-        name: role['authority'],
-        description: role['description'],
-        scope: role['scope'],
-        multitenant: role['multitenant'] ? 'Yes' : 'No',
-        type: format_role_type(role),
-        owner: role['owner'] ? role['owner']['name'] : "System",
-        dateCreated: format_local_dt(role['dateCreated'])
-      }
-    end
-    columns = [
-      :id,
-      :name,
-      :description,
-      # options[:is_master_account] ? :scope : nil,
-      options[:is_master_account] ? :type : nil,
-      options[:is_master_account] ? :multitenant : nil,
-      options[:is_master_account] ? :owner : nil,
-      {:dateCreated => {:display_name => "Date Created"} }
-    ].compact
-    if options[:include_fields]
-      columns = options[:include_fields]
-    end
-    # print table_color if table_color
-    print as_pretty_table(rows, columns, options)
-    # print reset if table_color
-  end
-
-  def print_users_table(users, options={})
-    table_color = options[:color] || cyan
-    rows = users.collect do |user|
-      {id: user['id'], username: user['username'], name: user['displayName'], first: user['firstName'], last: user['lastName'], email: user['email'], role: format_user_role_names(user), account: user['account'] ? user['account']['name'] : nil}
-    end
-    columns = [:id, :account, :first, :last, :username, :email, :role]
-    if options[:include_fields]
-      columns = options[:include_fields] 
-    end
-    #print table_color if table_color
-    print as_pretty_table(rows, columns, options)
-    #print reset if table_color
-  end
-
   ## These user access formatted methods should probably move up to PrintHelper to be more ubiquitous.
 
   def format_user_role_names(user)