morpheus-cli 5.3.3 → 5.4.2

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

@@ -75,7 +75,7 @@ class Morpheus::Cli::AccessTokenCommand
       "Refresh Token" => lambda {|wallet| wallet['refresh_token'] },
       "Login Date" => lambda {|wallet| format_local_dt(wallet['login_date']) },
       "Expire Date" => lambda {|wallet| wallet['expire_date'] ? format_local_dt(wallet['expire_date']) : "" },
-      # "Remote" => lambda {|wallet| display_appliance(@appliance_name, @appliance_url) },
+      "Remote" => lambda {|wallet| display_appliance(@appliance_name, @appliance_url) },
     }
     print cyan
     puts as_description_list(@wallet, description_cols)

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

@@ -1,12 +1,4 @@
-require 'fileutils'
-require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/accounts_helper'
-require 'morpheus/cli/mixins/infrastructure_helper'
-require 'morpheus/logging'
 
 class Morpheus::Cli::AccountGroupsCommand
   include Morpheus::Cli::CliCommand

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

@@ -1,7 +1,4 @@
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/shell'
-require 'json'
 
 # This command allows the creation of an alias
 # these aliases are stored in the $MORPHEUS_CLI_HOME/.morpheusrc
@@ -273,7 +270,7 @@ EOT
       out << "\n"
       out << cyan
       out << as_pretty_table(my_aliases, alias_columns, {:border_style => :thin}.merge(options))
-      out << format_results_pagination({size:my_aliases.size,total:my_aliases.size.to_i})
+      out << format_results_pagination({'size' => my_aliases.size, 'total' => my_aliases.size.to_i})
       out << reset
       out << "\n"
     end

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

@@ -1,13 +1,4 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/accounts_helper'
-require 'morpheus/cli/mixins/provisioning_helper'
-require 'morpheus/cli/mixins/processes_helper'
-require 'morpheus/cli/mixins/logs_helper'
 
 class Morpheus::Cli::Apps
   include Morpheus::Cli::CliCommand
@@ -19,9 +10,7 @@ class Morpheus::Cli::Apps
   set_command_name :apps
   set_command_description "View and manage apps."
   register_subcommands :list, :count, :get, :view, :add, :update, :remove, :cancel_removal, :add_instance, :remove_instance, :logs, :security_groups, :apply_security_groups, :history
-  register_subcommands :'prepare-apply' => :prepare_apply
-  register_subcommands :apply
-  register_subcommands :refresh
+  register_subcommands :refresh, :apply
   register_subcommands :stop, :start, :restart
   register_subcommands :wiki, :update_wiki
   #register_subcommands :firewall_disable, :firewall_enable
@@ -36,7 +25,7 @@ class Morpheus::Cli::Apps
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @accounts_interface = @api_client.accounts
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @apps_interface = @api_client.apps
     @blueprints_interface = @api_client.blueprints
     @instance_types_interface = @api_client.instance_types
@@ -901,9 +890,7 @@ This is only supported by certain types of apps.
 EOT
     end
     optparse.parse!(args)
-    if args.count != 1
-      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
 
     begin
@@ -928,65 +915,11 @@ EOT
         return
       end
       json_response = @apps_interface.refresh(app["id"], params, payload)
-      render_result = render_with_format(json_response, options)
-      return 0 if render_result
-      print_green_success "Refreshed app #{app['name']}"
-      return get([app['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
-  end
-
-  def prepare_apply(args)
-    params, payload, options = {}, {}, {}
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[app] [options]")
-      build_standard_update_options(opts, options, [:auto_confirm])
-      opts.footer = <<-EOT
-Prepare to apply an app.
-[app] is required. This is the name or id of an app.
-Template parameter values can be applied with -O templateParameter.foo=bar
-This only prints the app configuration that would be applied.
-It does not make any updates.
-This is only supported by certain types of apps.
-EOT
-    end
-    optparse.parse!(args)
-    if args.count != 1
-      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
-    end
-    connect(options)
-
-    begin
-      app = find_app_by_name_or_id(args[0])
-      return 1 if app.nil?
-      # construct request
-      params.merge!(parse_query_options(options))
-      payload = {}
-      if options[:payload]
-        payload = options[:payload]
-        payload.deep_merge!(parse_passed_options(options))
-      else
-        payload.deep_merge!(parse_passed_options(options))
-        # raise_command_error "Specify at least one option to update.\n#{optparse}" if payload.empty?
+      render_response(json_response, options) do
+        print_green_success "Refreshing app #{app['name']}"
+        # return _get(app['id'], options)
       end
-      @apps_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @apps_interface.dry.prepare_apply(app["id"], params, payload)
-        return
-      end
-      json_response = @apps_interface.prepare_apply(app["id"], params, payload)
-      render_result = render_with_format(json_response, options)
-      return 0 if render_result
-      # print_green_success "Prepared to apply app: #{app['name']}"
-      print_h1 "Prepared App: #{app['name']}"
-      app_config = json_response['data'] 
-      # app_config = json_response if app_config.nil?
-      puts as_yaml(app_config, options)
-      #return get([app['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
-      print "\n", reset
-      return 0
+      return 0, nil
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -1001,17 +934,11 @@ EOT
       opts.footer = <<-EOT
 Apply an app.
 [app] is required. This is the name or id of an app.
-Template parameter values can be applied with -O templateParameter.foo=bar
-This is a way to apply an app with new configuration parameters to an app. 
-This prints the app configuration that would be applied.
-It does not make any updates.
-This is only supported by certain types of apps.
+This is only supported by certain types of apps such as terraform.
 EOT
     end
     optparse.parse!(args)
-    if args.count != 1
-      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
 
     begin
@@ -1036,11 +963,11 @@ EOT
         return
       end
       json_response = @apps_interface.apply(app["id"], params, payload)
-      render_result = render_with_format(json_response, options)
-      return 0 if render_result
-      print_green_success "Applied app #{app['name']}"
-      #return get([app['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
-      return 0
+      render_response(json_response, options) do
+        print_green_success "Applying app #{app['name']}"
+        # return _get(app['id'], options)
+      end
+      return 0, nil
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

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

@@ -1,9 +1,3 @@
-require 'fileutils'
-require 'json'
-require 'yaml'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::ArchivesCommand

data/lib/morpheus/cli/commands/audit.rb

@@ -0,0 +1,188 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::Audit
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::LogsHelper
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::OptionSourceHelper
+
+  set_command_description "View audit log records."
+  set_command_name :'audit'
+  register_subcommands :list, :get
+  
+  # audit is not published yet
+  set_command_hidden
+
+  # RestCommand settings
+
+  # interfaces
+  register_interfaces :audit
+  set_rest_interface_name :audit
+
+  # resource name is "Audit Log"
+  set_rest_name :audit_log
+
+  # display argument as [id] instead of [audit log]
+  set_rest_has_name false
+  set_rest_arg "id"
+
+  # def connect(opts)
+  #   @api_client = establish_remote_appliance_connection(opts)
+  #   @audit_interface = @api_client.audit # @api_client.rest("audit")
+  # end
+  
+  # def handle(args)
+  #   handle_subcommand(args)
+  # end
+
+  def list(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[search]")
+      opts.on('--user USER', String, "Filter by User Username or ID") do |val|
+        params['user'] = params['user'] ? [params['user'], val].flatten : [val]
+      end
+      opts.on('--level VALUE', String, "Log Level. DEBUG|INFO|WARN|ERROR") do |val|
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
+      end
+      opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start date timestamp in standard iso8601 format.") do |val|
+        params['startDate'] = val # parse_time(val).utc.iso8601
+      end
+      opts.on('--end TIMESTAMP','--end TIMESTAMP', "End date timestamp in standard iso8601 format.") do |val|
+        params['endDate'] = val # parse_time(val).utc.iso8601
+      end
+      build_standard_list_options(opts, options)
+      opts.footer = "List audit logs records."
+    end
+    optparse.parse!(args)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    connect(options)
+    params.merge!(parse_list_options(options))
+    # parse --user id,name
+    if params['user']
+      user_ids = parse_user_id_list(params['user'])
+      return 1 if user_ids.nil?
+      params['user'] = user_ids
+    end
+    # api works with level=INFO|WARN
+    if params['level']
+      params['level'] = [params['level']].flatten.collect {|it| it.to_s.upcase }.join('|')
+    end
+    # could find_by_name_or_id for params['servers'] and params['containers']
+    @audit_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @audit_interface.dry.list(params)
+      return
+    end
+    json_response = @audit_interface.list(params)
+
+    render_response(json_response, options, rest_list_key) do
+      records = json_response[rest_list_key]
+      print_h1 "Morpheus Audit Log", parse_list_subtitles(options), options
+      if records.nil? || records.empty?
+        print cyan,"No #{rest_label_plural.downcase} found.",reset,"\n"
+      else
+        print as_pretty_table(records, rest_list_column_definitions(options).upcase_keys!, options)
+        print_results_pagination(json_response) if json_response['meta']
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  protected
+
+  # custom rendering to print Message below description list
+  def render_response_for_get(json_response, options)
+    render_response(json_response, options, rest_object_key) do
+      record = json_response[rest_object_key]
+      print_h1 rest_label, [], options
+      print cyan
+      print_description_list(rest_column_definitions(options), record, options)
+      # show log message settings...
+      print_h2 "Message", options
+      print cyan
+      puts record['message']
+      print reset,"\n"
+    end
+  end
+
+  def audit_log_object_key
+    "auditLog"
+  end
+
+  def audit_log_list_key
+    "auditLogs"
+  end
+
+  def audit_log_list_column_definitions(options={})
+    {
+      "ID" => 'id',
+      "Level" => lambda {|it| format_log_level(it['level']) },
+      "Message" => {display_method:'message', max_width: (options[:wrap] ? nil : 75)}, 
+      "Event Type" => 'eventType',
+      "Object" => lambda {|it| "#{it['objectClass']} #{it['objectId']}".strip },
+      # "Object Type" => 'objectClass',
+      # "Object ID" => 'objectId',
+      "User" => lambda {|it| 
+        if it['actualUser'] && it['user'] && it['actualUser']['username'] != it['user']['username']
+          it['user']['username'] + '(' + it['actualUser']['username'].to_s + ')'
+        elsif it['user']
+          it['user']['username']
+        else
+          # system or deleted user maybe?
+        end
+      },
+      # "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+    }
+  end
+
+  def audit_log_column_definitions(options={})
+    {
+      "ID" => 'id',
+      "Level" => lambda {|it| format_log_level(it['level']) },
+      #"Message" => 'message', 
+      "Event Type" => 'eventType',
+      "Object Type" => 'objectClass',
+      "Object ID" => 'objectId',
+      "User" => lambda {|it| 
+        if it['actualUser'] && it['user'] && it['actualUser']['username'] != it['user']['username']
+          it['user']['username'] + '(' + it['actualUser']['username'].to_s + ')'
+        elsif it['user']
+          it['user']['username']
+        else
+          # system or deleted user maybe?
+        end
+      },
+      # "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+    }
+  end
+
+  def find_audit_log_by_name_or_id(val)
+    return find_audit_log_by_id(val)
+  end
+
+  def find_audit_log_by_id(id)
+    begin
+      json_response = @audit_interface.get(id)
+      return json_response[audit_log_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Audit Log not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_audit_log_by_name(name)
+    raise_command_error "finding audit log by name not supported"
+  end
+
+end

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

@@ -1,7 +1,4 @@
-require 'morpheus/logging'
-require 'morpheus/benchmarking'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/cli_registry'
 
 class Morpheus::Cli::BenchmarkCommand
   include Morpheus::Cli::CliCommand

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

@@ -36,7 +36,7 @@ class Morpheus::Cli::BlueprintsCommand
     @options_interface = @api_client.options
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
     @clouds_interface = @api_client.clouds
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @library_layouts_interface = @api_client.library_layouts
   end
 

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

@@ -1,6 +1,3 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::BootScriptsCommand

data/lib/morpheus/cli/commands/change_password_command.rb

@@ -0,0 +1,132 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::ChangePasswordCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::AccountsHelper
+
+  set_command_name :passwd
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @whoami_interface = @api_client.whoami
+    @account_users_interface = @api_client.account_users
+    @accounts_interface = @api_client.accounts
+    @roles_interface = @api_client.roles
+  end
+
+  def handle(args)
+    change_password(args)
+  end
+
+  def change_password(args)
+    options = {}
+    username = nil
+    new_password = nil
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[username] [options]")
+      opts.on('--username USERNAME', String, "Username. Default is your own.") do |val|
+        username = val
+      end
+      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, :auto_confirm], [:username,:password])
+      opts.footer = "Change your password or the password of another user.\n" +
+                    "[username] is optional. This is the username of the user to update. Default is your own.\n" +
+                    "Be careful with this command, the default behavior is to update your own password."
+    end
+    optparse.parse!(args)
+
+    if args.count > 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 0-1 and got #{args.count} #{args}\n#{optparse}"
+      return 1
+    end
+
+    connect(options)
+    @current_remote = @appliance_name ? ::Morpheus::Cli::Remote.load_remote(@appliance_name) : ::Morpheus::Cli::Remote.load_active_remote()
+
+    if args[0]
+      username = args[0]
+    end
+    if username.nil?
+      if !@current_remote
+        raise_command_error "No current appliance, see `remote use`."
+      end
+      if !@current_remote[:username]
+        raise_command_error "You are not currently logged in to #{display_appliance(@current_remote[:name], @current_remote[:url])}"
+      end
+      username = @current_remote[:username]
+    end
+
+    account = find_account_from_options(options)
+    account_id = account ? account['id'] : nil
+
+    user = find_user_by_username_or_id(account_id, username)
+    return 1 if user.nil?
+
+    if @current_remote && @current_remote[:username] == username
+      if !options[:quiet]
+        if options[:dry_run]
+          print cyan,bold,  "DRY RUN. This is just a dry run, the password is not being updated.",reset,"\n"
+        else
+          print cyan,bold,  "WARNING! You are about to update your own password!",reset,"\n"
+          print yellow,bold,"WARNING! You are about to update your own password!",reset,"\n"
+          print reset,bold, "WARNING! You are about to update your own password!",reset,"\n"
+        end
+      end
+    end
+
+    if !options[:quiet]
+      print cyan, "Changing password for #{user['username']}", reset, "\n"
+    end
+
+    if new_password.nil? && options[:options]['password']
+      new_password = options[:options]['password']
+    end
+    if new_password.nil?
+      password_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'password', 'fieldLabel' => 'New Password', 'type' => 'password', 'required' => true}], options[:options], @api_client)
+      new_password = password_prompt['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
+      end
+    end
+
+    if new_password.nil? || new_password.empty?
+      print_red_alert "A new password is required"
+      return 1
+    end
+
+    payload = {
+      'user' => {
+        'password' => new_password
+      } 
+    }
+    @account_users_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @account_users_interface.dry.update(account_id, user['id'], payload)
+      return 0
+    end
+
+    unless options[:yes]
+      unless ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to update the password for user #{user['username']}?", options)
+        return 9, "aborted command"
+      end
+    end
+
+    json_response = @account_users_interface.update(account_id, user['id'], payload)
+    if options[:json]
+      puts as_json(json_response)
+    elsif !options[:quiet]
+      print_green_success "Updated password for user #{user['username']}"
+    end
+    return 0
+  end
+
+  private
+
+
+end

data/lib/morpheus/cli/{cloud_datastores_command.rb → commands/cloud_datastores_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::CloudDatastoresCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{cloud_folders_command.rb → commands/cloud_folders_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::CloudFoldersCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{cloud_resource_pools_command.rb → commands/cloud_resource_pools_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::CloudResourcePoolsCommand
   include Morpheus::Cli::CliCommand
@@ -819,7 +815,7 @@ class Morpheus::Cli::CloudResourcePoolsCommand
       print_red_alert "Resource Pool not found by name #{name}"
       return nil
     elsif resource_pools.size > 1
-      matching_resource_pools = folders.select { |it| name && (it['name'] == name || it['externalId'] == name) }
+      matching_resource_pools = resource_pools.select { |it| name && (it['name'] == name || it['externalId'] == name) }
       if matching_resource_pools.size == 1
         return matching_resource_pools[0]
       end