morpheus-cli 4.2.8 → 4.2.10

data/lib/morpheus/cli/users.rb

@@ -16,6 +16,9 @@ class Morpheus::Cli::Users
   alias_subcommand :details, :get
   set_default_subcommand :list
 
+  #todo: TOO_SIMPL_REGEX = //i
+  # TOO_SIMPLE_ERROR = "Password too simple. Password must contain at least one uppercase letter, one lowercase letter, a number, and a symbol."
+
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
   end
@@ -116,10 +119,15 @@ class Morpheus::Cli::Users
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[username]")
-      opts.on(nil,'--feature-access', "Display Feature Access") do |val|
+      opts.on('-p','--permissions', "Display Permissions") do |val|
         options[:include_features_access] = true
         params['includeAccess'] = true
       end
+      opts.on(nil,'--feature-access', "Display Permissions") do |val|
+        options[:include_features_access] = true
+        params['includeAccess'] = true
+      end
+      opts.add_hidden_option('--feature-access')
       opts.on(nil,'--group-access', "Display Group Access") do
         options[:include_sites_access] = true
         params['includeAccess'] = true
@@ -211,12 +219,13 @@ class Morpheus::Cli::Users
       description_cols = {
           "ID" => 'id',
           "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
-          # "First" => 'firstName',
-          # "Last" => 'lastName',
+          "First Name" => 'firstName',
+          "Last Name" => 'lastName',
           # "Name" => 'displayName',
-          "Name" => lambda {|it| it['firstName'] ? it['displayName'] : '' },
+          #"Name" => lambda {|it| it['firstName'] ? it['displayName'] : '' },
           "Username" => 'username',
           "Email" => 'email',
+          "Notifications" => lambda {|it| it['receiveNotifications'].nil? ? '' : format_boolean(it['receiveNotifications']) },
           "Role" => lambda {|it| format_user_role_names(it) },
           "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
           "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
@@ -233,12 +242,12 @@ class Morpheus::Cli::Users
           print cyan
           if user_feature_permissions.is_a?(Array)
             rows = user_feature_permissions.collect do |it|
-              {name: it['name'], code: it['code'], access: get_access_string(it['access']) }
+              {name: it['name'], code: it['code'], access: format_access_string(it['access']) }
             end
             print as_pretty_table(rows, [:name, :code, :access], options)
           else
             rows = user_feature_permissions.collect do |code, access|
-              {code: code, access: get_access_string(access) }
+              {code: code, access: format_access_string(access) }
             end
             print as_pretty_table(rows, [:code, :access], options)
           end
@@ -252,11 +261,21 @@ class Morpheus::Cli::Users
             access = user['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]
             access = access.reject {|it| it['access'] == 'none'} if !options[:display_none_access]
 
-            print_h2 "#{label} Access", options
+            if field == "features"
+              # print_h2 "Permissions", options
+              print_h2 "#{label} Access", options
+            else
+              print_h2 "#{label} Access", options
+            end
             print cyan
 
+            # access levels vary, default is none,read,user,full
+            available_access_levels = ["none","read","user","full"]
+            if field == 'sites' || field == 'zones' || field == 'instance_types' || field == 'app_templates'
+              available_access_levels = ["none","read","full"]
+            end
             if access.count > 0
-              access.each {|it| it['access'] = get_access_string(it['access'])}
+              access.each {|it| it['access'] = format_access_string(it['access'], available_access_levels)}
 
               if ['features', 'instance_types'].include?(field)
                 print as_pretty_table(access, [:name, :code, :access], options)
@@ -289,11 +308,7 @@ class Morpheus::Cli::Users
                     "[username] is required. This is the username or id of a user."
     end
     optparse.parse!(args)
-
-    if args.count < 1
-      puts optparse
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
 
     connect(options)
     begin
@@ -331,12 +346,12 @@ class Morpheus::Cli::Users
             print cyan
             if user_feature_permissions.is_a?(Array)
               rows = user_feature_permissions.collect do |it|
-                {name: it['name'], code: it['code'], access: get_access_string(it['access']) }
+                {name: it['name'], code: it['code'], access: format_access_string(it['access']) }
               end
               print as_pretty_table(rows, [:name, :code, :access], options)
             else
               rows = user_feature_permissions.collect do |code, access|
-                {code: code, access: get_access_string(access) }
+                {code: code, access: format_access_string(access) }
               end
               print as_pretty_table(rows, [:code, :access], options)
             end
@@ -367,9 +382,12 @@ class Morpheus::Cli::Users
 
             print_h2 "#{label} Access", options
             print cyan
-
+            available_access_levels = ["full","user","read","none"]
+            if field == 'sites' || field == 'zones' || field == 'instance_types' || field == 'app_templates'
+              available_access_levels = ["full","custom","none"]
+            end
             if access.count > 0
-              access.each {|it| it['access'] = get_access_string(it['access'])}
+              access.each {|it| it['access'] = format_access_string(it['access'], available_access_levels)}
 
               if ['features', 'instance_types'].include?(field)
                 print as_pretty_table(access, [:name, :code, :access], options)
@@ -377,7 +395,7 @@ class Morpheus::Cli::Users
                 print as_pretty_table(access, [:name, :access], options)
               end
             else
-              println yellow,"No #{label} Access Found.",reset
+              println cyan,"No #{label} Access Found.",reset
             end
           end
         end
@@ -394,24 +412,36 @@ class Morpheus::Cli::Users
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[options]")
+      opts.banner = subcommand_usage("[username] [email] [first] [last] [options]")
       build_option_type_options(opts, options, add_user_option_types)
       build_common_options(opts, options, [:account, :options, :payload, :json, :dry_run])
+      opts.footer = <<-EOT
+Create a new user.
+[username] is required. Username of the new user
+[email] is required. Email address
+[first] is optional. First Name
+[last] is optional. Last Name
+EOT
     end
     optparse.parse!(args)
-
+    verify_args!(args:args, optparse:optparse, min:0, max:4)
+    options[:options]['username'] = args[0] if args[0]
+    options[:options]['email'] = args[1] if args[1]
+    options[:options]['firstName'] = args[2] if args[2]
+    options[:options]['lastName'] = args[3] if args[3]
     connect(options)
     begin
 
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
 
-      payload = nil
+      payload = {}
       if options[:payload]
         payload = options[:payload]
+        payload.deep_merge!(parse_passed_options(options))
       else
         # merge -O options into normally parsed options
-        params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        payload.deep_merge!(parse_passed_options(options))
         # remove role option_type, it is just for help display, the role prompt is separate down below
         prompt_option_types = add_user_option_types().reject {|it| 'role' == it['fieldName'] }
         v_prompt = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, options[:options], @api_client, options[:params])
@@ -452,7 +482,7 @@ class Morpheus::Cli::Users
       if account
         details_options.push "--account-id", account['id'].to_s
       end
-      get(details_options)
+      get(details_options + (options[:remote] ? ["-r",options[:remote]] : []))
     end
       
 
@@ -465,18 +495,14 @@ class Morpheus::Cli::Users
   def update(args)
     options = {}
     params = {}
+    payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[username] [options]")
       build_option_type_options(opts, options, update_user_option_types)
       build_common_options(opts, options, [:account, :options, :payload, :json, :dry_run])
     end
     optparse.parse!(args)
-
-    if args.count < 1
-      puts optparse
-      return 1
-    end
-
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
     begin
 
@@ -486,36 +512,29 @@ class Morpheus::Cli::Users
       user = find_user_by_username_or_id(account_id, args[0])
       return 1 if user.nil?
 
-      payload = nil
+      # use --payload
       if options[:payload]
         payload = options[:payload]
+        payload.deep_merge!(parse_passed_options(options))
       else
-        #params = Morpheus::Cli::OptionTypes.prompt(update_user_option_types, options[:options], @api_client, options[:params])
-        # merge -O options into normally parsed options
-        params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
-        # if params.empty?
-        #   print_red_alert "Specify at least one option to update"
-        #   puts optparse
-        #   return 1
-        # end
-        # prompt_option_types = update_user_option_types().reject {|it| 'role' == it['fieldName'] }
-        # params = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, params, @api_client)
+        # inject -O key=value options
+        # payload.deep_merge!(parse_passed_options(options))
+        params.deep_merge!(parse_passed_options(options))
+        # user_prompt_output = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, payload['user'], @api_client)
         selected_roles = []
         selected_roles += params.delete('role').split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if params['role']
         selected_roles += params.delete('roles').split(',').collect {|r| r.strip.empty? ? nil : r.strip}.uniq if params['roles']
         roles = prompt_user_roles(account_id, user['id'], selected_roles, options.merge(no_prompt: true))
+        # should it allow [] (no roles) ?
         if !roles.empty?
           params['roles'] = roles.collect {|r| {id: r['id']} }
         end
-        if params.empty?
-          puts optparse.banner
-          puts Morpheus::Cli::OptionTypes.display_option_types_help(update_user_option_types)
-          return 1
+        payload.deep_merge!({'user' => params})
+        if payload['user'].empty? # || options[:no_prompt]
+          raise_command_error "Specify at least one option to update.\n#{optparse}"
         end
-
-        
-        payload = {'user' => params}
       end
+
       @users_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @users_interface.dry.update(account_id, user['id'], payload)
@@ -528,13 +547,15 @@ class Morpheus::Cli::Users
         print "\n"
       else
         username = user['username'] # json_response['user']['username']
-        username = payload['user']['username'] if payload['user'] && payload['user']['username']
+        if payload['user'] && payload['user']['username']
+          username = payload['user']['username']
+        end
         print_green_success "Updated user #{username}"
         details_options = [username]
         if account
           details_options.push "--account-id", account['id'].to_s
         end
-        get(details_options)
+        get(details_options + (options[:remote] ? ["-r",options[:remote]] : []))
       end
 
     rescue RestClient::Exception => e
@@ -547,75 +568,79 @@ class Morpheus::Cli::Users
     options = {}
     new_password = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[username] [options]")
-      opts.on('--password VALUE', String, "New password") do |val|
-        new_password = val
-      end
-      build_common_options(opts, options, [:account, :options, :json, :dry_run, :remote, :quiet])
+      opts.banner = subcommand_usage("[username] [password] [options]")
+      # opts.on('--password VALUE', String, "New password") do |val|
+      #   new_password = val
+      # end
+      build_standard_update_options(opts, options, [:account])
     end
     optparse.parse!(args)
-
-    if args.count < 1
-      # print_error Morpheus::Terminal.angry_prompt
-      # puts_error  "wrong number of arguments, expected 1 and got #{args.count}\n#{optparse}"
-      puts optparse
-      return 1
-    end
-
+    verify_args!(args:args, optparse:optparse, min:1,max:2) # [username] [password]
     connect(options)
-    begin
+    exit_code, err = 0, nil
 
-      account = find_account_from_options(options)
-      account_id = account ? account['id'] : nil
+    # user can be scoped to account (tenant)
+    account = find_account_from_options(options)
+    account_id = account ? account['id'] : nil
 
-      user = find_user_by_username_or_id(account_id, args[0])
-      return 1 if user.nil?
-
-      if !options[:quiet]
-        print cyan, "Changing password for #{user['username']}", reset, "\n"
-      end
+    # fetch the user to update
+    user = find_user_by_username_or_id(account_id, args[0])
+    return 1 if user.nil?
+    
+    new_password = args[1] if args[1]
 
-      if new_password.nil?
-        
+    # print a warning or important info
+    if !options[:quiet]
+      print cyan, "Changing password for #{user['username']}", reset, "\n"
+    end
+    # construct change_password payload
+    
+    # use --payload
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
+    else
+      # inject -O key=value options
+      payload.deep_merge!(parse_passed_options(options))
+
+      # prompt for password input
+      current_input_attempt = 1
+      still_prompting = new_password ? false : true
+      while still_prompting do
+        # New Password
         password_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'password', 'fieldLabel' => 'New Password', 'type' => 'password', 'required' => true}], options[:options], @api_client)
         new_password = password_prompt['password']
-
+          
+        # could validate password is "strong"
+        # Confirm New Password
         confirm_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true}], options[:options], @api_client)
         confirm_password = confirm_prompt['passwordConfirmation']
         if confirm_password != new_password
           print_red_alert "Confirm password did not match."
-          return 1
+          new_password = nil
+          unless ::Morpheus::Cli::OptionTypes::confirm("Would you like to try again?", options.merge({default: true}))
+            return 9, "aborted login"
+          end
         end
+        still_prompting = !!new_password
       end
-
-      if new_password.nil? || new_password.empty?
-        print_red_alert "A new password is required"
-        return 1
-      end
-
       payload = {
         'user' => {
           'password' => new_password
         } 
       }
-      @users_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @users_interface.dry.update(account_id, user['id'], payload)
-        return
-      end
 
-      json_response = @users_interface.update(account_id, user['id'], payload)
-
-      if options[:json]
-        puts JSON.pretty_generate(json_response)
-      elsif !options[:quiet]
-        print_green_success "Updated password for user #{user['username']}"
-      end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
+    @users_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @users_interface.dry.update(account_id, user['id'], payload)
+      return
+    end
+    json_response = @users_interface.update(account_id, user['id'], payload)
+    render_response(json_response, optparse, "user") do
+      print_green_success "Updated password for user #{user['username']}"
+    end
+    return exit_code, err
   end
 
   def remove(args)
@@ -670,22 +695,23 @@ class Morpheus::Cli::Users
       {'fieldName' => 'lastName', 'fieldLabel' => 'Last Name', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
       {'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'required' => true, 'displayOrder' => 3},
       {'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => true, 'displayOrder' => 4},
-      {'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => true, 'displayOrder' => 6},
-      {'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'displayOrder' => 7},
-      {'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'displayOrder' => 11, 'description' => "Role names (comma separated)"},
+      {'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => true, 'displayOrder' => 5},
+      {'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'displayOrder' => 6},
+      {'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'description' => "Role names (comma separated)", 'displayOrder' => 7},
+      {'fieldName' => 'receiveNotifications', 'fieldLabel' => 'receiveNotifications', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 58},
+      {'fieldName' => 'linuxUsername', 'fieldLabel' => 'Linux Username', 'type' => 'text', 'required' => false, 'displayOrder' => 9},
+      # {'fieldName' => 'linuxPassword', 'fieldLabel' => 'Linux Password', 'type' => 'password', 'required' => false, 'displayOrder' => 10},
+      {'fieldName' => 'windowsUsername', 'fieldLabel' => 'Windows Username', 'type' => 'text', 'required' => false, 'displayOrder' => 11},
+      # {'fieldName' => 'windowsPassword', 'fieldLabel' => 'Windows Password', 'type' => 'text', 'required' => false, 'displayOrder' => 12},
+      #  'linuxUsername','windowsUsername','linuxKeyPairId'
     ]
   end
 
   def update_user_option_types
-    [
-      {'fieldName' => 'firstName', 'fieldLabel' => 'First Name', 'type' => 'text', 'required' => false, 'displayOrder' => 1},
-      {'fieldName' => 'lastName', 'fieldLabel' => 'Last Name', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
-      {'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'required' => false, 'displayOrder' => 3},
-      {'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text', 'required' => false, 'displayOrder' => 4},
-      {'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => false, 'displayOrder' => 6},
-      {'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => false, 'displayOrder' => 7},
-      {'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'displayOrder' => 11, 'description' => "Role names (comma separated)"},
-    ]
+    add_user_option_types.collect {|it|
+      it['required'] = false
+      it
+    }
   end
 
   # prompt user to select roles for a new or existing user

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.8"
+    VERSION = "4.2.10"
   end
 end

data/lib/morpheus/cli/whitelabel_settings_command.rb

@@ -29,7 +29,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+      opts.on( '-a', '--tenant TENANT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
       opts.on('--details', "Show full (not truncated) contents of Terms of Use, Privacy Policy, Override CSS" ) do
@@ -80,7 +80,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
       print_h1 "Whitelabel Settings"
       print cyan
       description_cols = {
-        "Account" => lambda {|it| it['account']['name'] rescue '' },
+        "Tenant" => lambda {|it| it['account']['name'] rescue '' },
         "Enabled" => lambda {|it| format_boolean(it['enabled']) },
         "Appliance Name" => lambda {|it| it['applianceName'] },
         "Disable Support Menu" => lambda {|it| format_boolean(it['disableSupportMenu'])},
@@ -148,7 +148,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     query_params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage()
-      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+      opts.on( '-a', '--account ACCOUNT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
       opts.on('--active [on|off]', String, "Can be used to enable / disable whitelabel feature") do |val|
@@ -314,7 +314,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage()
-      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+      opts.on( '-a', '--account ACCOUNT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
       opts.on("--header-logo FILE", String, "Header logo image. Local path of a file to upload (png|jpg|svg)") do |val|
@@ -412,7 +412,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage("[image-type]")
-      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+      opts.on( '-a', '--tenant TENANT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
@@ -468,7 +468,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage("[image-type]")
-      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+      opts.on( '-a', '--tenant TENANT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
@@ -532,7 +532,7 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage("[image-type] [local-file]")
-      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+      opts.on( '-a', '--tenant TENANT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
       opts.on( '-f', '--force', "Overwrite existing [local-file] if it exists." ) do