morpheus-cli 4.2.8 → 4.2.10

data/lib/morpheus/api/setup_interface.rb

@@ -1,59 +1,42 @@
 require 'morpheus/api/api_client'
 # There is no authentication required for this API.
 class Morpheus::SetupInterface < Morpheus::APIClient
-  # def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-  #   @access_token = access_token
-  #   @refresh_token = refresh_token
-  #   @base_url = base_url
-  #   @expires_at = expires_at
-  # end
-
-  # def initialize(base_url)
-  #   @base_url = base_url
-  # end
-
-  # no JSON here, just a 200 OK 'NOTHING TO SEE HERE'
-  def ping(params={}, timeout=5)
-    url = "#{@base_url}/ping"
-    headers = {:params => params }
-    opts = {method: :get, url: url, headers: headers, timeout: timeout}
-    execute(opts, {parse_json: false})
+
+  # no Authorization header is required
+  def authorization_required?
+    false
   end
 
-  def check(params={}, timeout=5)
-    url = "#{@base_url}/api/setup/check"
-    headers = {:params => params, 'Content-Type' => 'application/json' }
-    execute(method: :get, url: url, headers: headers, timeout: timeout)
+  # health checks use a relatively small timeout by default
+  def default_timeout
+    5
   end
 
   def get(params={})
-    url = "#{@base_url}/api/setup"
-    headers = {:params => params, 'Content-Type' => 'application/json' }
-    execute(method: :get, url: url, headers: headers)
+    headers = {params: params}
+    execute(method: :get, url: "/api/setup", headers: headers)
   end
 
+  #this should go away and just use 
+  def check(params={}, timeout=5)
+    headers = {params: params}
+    execute(method: :get, url: "/api/setup/check", headers: headers, timeout: timeout)
+  end
+
+  # you can only use this successfully one time on a fresh install.
   def init(payload={})
-    url = "#{@base_url}/api/setup/init"
     headers = { 'Content-Type' => 'application/json' }
-    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+    execute(method: :post, url: "/api/setup/init", headers: headers, payload: payload.to_json)
   end
 
   def hub_register(payload={})
-    url = "#{@base_url}/api/setup/hub-register"
     headers = { 'Content-Type' => 'application/json' }
-    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+    execute(method: :post, url: "/api/setup/hub-register", headers: headers, payload: payload.to_json)
   end
 
   def hub_login(payload={})
-    url = "#{@base_url}/api/setup/hub-login"
     headers = { 'Content-Type' => 'application/json' }
-    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+    execute(method: :post, url: "/api/setup/hub-login", headers: headers, payload: payload.to_json)
   end  
 
-  def teardown(params={})
-    url = "#{@base_url}/api/setup/teardown"
-    headers = { :params => params, :authorization => "Bearer #{@access_token}" }
-    execute(method: :delete, url: url, headers: headers)
-  end
-
 end

data/lib/morpheus/api/user_settings_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::UserSettingsInterface < Morpheus::APIClient
-    def initialize(access_token, refresh_token, expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
 
   def get(params={})
     url = "#{@base_url}/api/user-settings"

data/lib/morpheus/api/whoami_interface.rb

@@ -1,17 +1,13 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::WhoamiInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
+
+  def default_timeout
+    5
   end
 
   def get(params={})
-    url = "#{@base_url}/api/whoami"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers, timeout: 5)
+    execute(method: :get, url: "/api/whoami", params: params)
   end
 
 end

data/lib/morpheus/benchmarking.rb

@@ -229,34 +229,24 @@ module Morpheus::Benchmarking
       error_str = "#{@error}" # should inspect and format this
       out = ""
       
+      # show exit only if non 0
+      # so it looks like:
+      # command  time   [exit: 1]  [error:]
+      # instances list foo         0.049 seconds
+      # foo         0.001 seconds   exit: 1
+      out << "#{command_str.ljust(45, ' ')}"
+      out << "\t"
+      out << "#{time_str.ljust(15, ' ')}" # maybe use the format time: 0.021s
+      out << "\t"
       if @end_time
-        out << "#{command_str.ljust(30, ' ')}"
-      else
-        out << "#{command_str.ljust(30, ' ')}"
-      end
-
-      # if @end_time
-      #   out << "finished: #{command_str.ljust(30, ' ')}"
-      # else
-      #   out << "running: #{command_str.ljust(30, ' ')}"
-      # end
-      
-      #out = "benchmark: #{command_str.ljust(22, ' ')}   time: #{time_str.ljust(9, ' ')}   exit: #{exit_str.ljust(2, ' ')}"
-      # out = "benchmark: #{command_str.ljust(27, ' ')}   time: #{time_str.ljust(9, ' ')}   exit: #{exit_str.ljust(2, ' ')}"
-      #out = "time: #{time_str.ljust(9, ' ')}   exit: #{exit_str.ljust(2, ' ')}   exec: #{command_str}"
-      # how about a command you can copy and paste?
-      # out = "time: #{time_str.ljust(9, ' ')}   exit: #{exit_str.ljust(2, ' ')}   #{command_str}"
-      # out = "time: #{time_str.ljust(9, ' ')}   exit: #{exit_str.ljust(4, ' ')}   benchmark exec '#{command_str}'"
-      if @end_time || @exit_code
-        out << "\texit: #{exit_str.ljust(2, ' ')}"
-      end
-      if @end_time && @exit_code != 0 && @error
-        out << "\terror: #{error_str.ljust(12, ' ')}"
+        if @exit_code && @exit_code != 0
+          out << "\texit: #{exit_str.ljust(2, ' ')}"
+        end
+        if @error && @error != ""
+          out << "\terror: #{error_str.ljust(12, ' ')}"
+        end
       end
-
-      out << "\t#{time_str.ljust(9, ' ')}"
-      
-
+      #out << reset
       return out
     end
 

data/lib/morpheus/cli.rb

@@ -1,8 +1,9 @@
 require 'morpheus/cli/version'
-require 'morpheus/cli/command_error'
+require 'morpheus/cli/errors'
 require 'morpheus/rest_client'
 require 'morpheus/formatters'
 require 'morpheus/logging'
+require 'morpheus/util'
 require 'term/ansicolor'
 
 Dir[File.dirname(__FILE__)  + "/ext/*.rb"].each {|file| require file }
@@ -56,7 +57,7 @@ module Morpheus
       require 'morpheus/cli/cli_registry.rb'
       require 'morpheus/cli/expression_parser.rb'
       require 'morpheus/cli/dot_file.rb'
-      require 'morpheus/cli/command_error'
+      require 'morpheus/cli/errors'
 
       load 'morpheus/cli/cli_command.rb'
       load 'morpheus/cli/option_types.rb'
@@ -69,17 +70,20 @@ module Morpheus
 
       # all the known commands
       load 'morpheus/cli/remote.rb'
+      load 'morpheus/cli/ping.rb'
+      load 'morpheus/cli/setup.rb'
       load 'morpheus/cli/login.rb'
       load 'morpheus/cli/logout.rb'
       load 'morpheus/cli/whoami.rb'
-      # load 'morpheus/cli/auth_command.rb'
-      load 'morpheus/cli/appliance_settings_command.rb'
       load 'morpheus/cli/access_token_command.rb'
       load 'morpheus/cli/user_settings_command.rb'
+      # load 'morpheus/cli/auth_command.rb'
       load 'morpheus/cli/dashboard_command.rb'
+      load 'morpheus/cli/recent_activity_command.rb' # deprecated, removing soon
+      load 'morpheus/cli/activity_command.rb'
+      load 'morpheus/cli/appliance_settings_command.rb'
       load 'morpheus/cli/power_schedules_command.rb'
       load 'morpheus/cli/execute_schedules_command.rb'
-      load 'morpheus/cli/recent_activity_command.rb'
       load 'morpheus/cli/groups.rb'
       load 'morpheus/cli/clouds.rb'
       load 'morpheus/cli/cloud_datastores_command.rb'
@@ -166,6 +170,7 @@ module Morpheus
       load 'morpheus/cli/health_command.rb'
       load 'morpheus/cli/invoices_command.rb'
       load 'morpheus/cli/guidance_command.rb'
+      load 'morpheus/cli/projects_command.rb'
       # add new commands here...
 
     end

data/lib/morpheus/cli/access_token_command.rb

@@ -17,13 +17,10 @@ class Morpheus::Cli::AccessTokenCommand
 
   # connect overridden to skip login and return an exit_code
   def connect(options)
-    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true}))
+    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
     # automatically get @appliance_name, @appliance_url, @wallet
     if !@appliance_name
-      unless options[:quiet]
-        print yellow,"Please specify a Morpheus Appliance with -r or see the command `remote use`#{reset}\n"
-      end
-      return 1
+      raise_command_error "#{command_name} requires a remote to be specified, use -r [remote] or set the active remote with `remote use`"
     end
     if !@appliance_url
       unless options[:quiet]
@@ -35,7 +32,7 @@ class Morpheus::Cli::AccessTokenCommand
     if @wallet.nil? || @wallet['access_token'].nil?
       unless options[:quiet]
         print_error yellow,"You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}",reset,"\n"
-        print_error yellow,"Use the 'login' command.",reset,"\n"
+        print_error yellow,"Use `login` to authenticate or try passing the --username option.",reset,"\n"
       end
       return 1
     end
@@ -74,11 +71,11 @@ class Morpheus::Cli::AccessTokenCommand
     print_h1 "Morpheus Credentials", options
     description_cols = {
       "Username" => lambda {|wallet| wallet['username'] },
-      "Remote" => lambda {|wallet| "#{display_appliance(@appliance_name, @appliance_url)}" },
       "Access Token" => lambda {|wallet| wallet['access_token'] },
       "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) },
     }
     print cyan
     puts as_description_list(@wallet, description_cols)
@@ -130,7 +127,7 @@ class Morpheus::Cli::AccessTokenCommand
     # if @wallet.nil? || @wallet['access_token'].nil?
     #   unless options[:quiet]
     #     print_error yellow,"You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}",reset,"\n"
-    #     print_error yellow,"Use the 'login' command.",reset,"\n"
+    #     print_error yellow,"Use `login` to authenticate or try passing the --username option.",reset,"\n"
     #   end
     #   return 1
     # end

data/lib/morpheus/cli/activity_command.rb

@@ -0,0 +1,146 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::ActivityCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::OperationsHelper
+  include Morpheus::Cli::OptionSourceHelper
+
+  set_command_name :'activity'
+  register_subcommands :list
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @activity_interface = @api_client.activity
+  end
+
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def list(args)
+    exit_code, err = 0, nil
+    params, options = {}, {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      opts.on('-t','--type TYPE', "Activity Type eg. Provisioning, Admin") do |val|
+        options[:type] ||= []
+        options[:type] << val
+      end
+      opts.on('--timeframe TIMEFRAME', String, "Timeframe, eg. hour,day,today,yesterday,week,month,3months. Default is month") do |val|
+        options[:timeframe] = val
+      end
+      opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start date to search for activity, can be used instead of --timeframe. Default is a month ago.") do |val|
+        options[:start] = parse_time(val) #.utc.iso8601
+      end
+      opts.on('--end TIMESTAMP','--end TIMESTAMP', "Start date to search for activity. Default is the current time.") do |val|
+        options[:end] = parse_time(val) #.utc.iso8601
+      end
+      opts.on('-u', '--user USER', "User Name or ID" ) do |val|
+        options[:user] = val
+      end
+      opts.on( '--tenant TENANT', String, "Tenant Name or ID" ) do |val|
+        options[:tenant] = val
+      end
+      build_standard_list_options(opts, options)
+      opts.footer = <<-EOT
+List activity.
+The default timeframe a month ago up until now, with the most recent activity seen first.
+The option --timeframe or --start and --end can be used to customized the date period
+EOT
+    end
+    # parse options
+    optparse.parse!(args)
+    # parse arguments
+    verify_args!(args:args, count:0, optparse:optparse)
+    # establish connection to @remote_appliance
+    connect(options)
+    # construct request
+    # inject -Q PARAMS and standard list options phrase,max,sort,search
+    params.merge!(parse_list_options(options))
+    # --type
+    if options[:type]
+      params['type'] = [options[:type]].flatten.collect {|it| it.to_s.strip.split(",") }.flatten.collect {|it| it.to_s.strip }
+    end
+    # --timeframe
+    if options[:timeframe]
+      params['timeframe'] = options[:timeframe]
+    end
+    # --start
+    if options[:start]
+      params['start'] = options[:start]
+    end
+    # --end
+    if options[:end]
+      params['end'] = options[:end]
+    end
+    # --user
+    if options[:user]
+      user_ids = parse_user_id_list(options[:user])
+      return 1 if user_ids.nil?
+      params['userId'] = user_ids
+    end
+    # --tenant
+    if options[:tenant]
+      tenant_ids = parse_tenant_id_list(options[:tenant])
+      return 1 if tenant_ids.nil?
+      params['tenantId'] = tenant_ids[0]
+    end
+    
+    # execute the api request
+    @activity_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @activity_interface.dry.list(params)
+      return 0, nil
+    end
+    json_response = @activity_interface.list(params)
+    activity = json_response["activity"]    
+    render_response(json_response, options, "activity") do
+      title = "Morpheus Activity"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      if json_response["meta"] && json_response["meta"]["startDate"]
+        subtitles << "#{format_local_dt(json_response["meta"]["startDate"])} - #{format_local_dt(json_response["meta"]["endDate"])}"
+      end
+      if options[:start]
+        subtitles << "Start: #{options[:start]}"
+      end
+      if options[:end]
+        subtitles << "End: #{options[:end]}"
+      end
+      print_h1 title, subtitles, options
+      if activity.empty?
+        print yellow, "No activity found.",reset,"\n"
+      else
+        columns = [
+          # {"SEVERITY" => lambda {|record| format_activity_severity(record['severity']) } },
+          {"TYPE" => lambda {|record| record['activityType'] } },
+          {"NAME" => lambda {|record| record['name'] } },
+          {"RESOURCE" => lambda {|record| "#{record['objectType']} #{record['objectId']}" } },
+          {"MESSAGE" => lambda {|record| record['message'] || '' } },
+          {"USER" => lambda {|record| record['user'] ? record['user']['username'] : record['userName'] } },
+          #{"DATE" => lambda {|record| "#{format_duration_ago(record['ts'] || record['timestamp'])}" } },
+          {"DATE" => lambda {|record| 
+            # show full time if searching for custom timerange, otherwise the default is to show relative time
+            if params['start'] || params['end'] || params['timeframe']
+              "#{format_local_dt(record['ts'] || record['timestamp'])}"
+            else
+              "#{format_duration_ago(record['ts'] || record['timestamp'])}"
+            end
+
+          } },
+        ]
+        print as_pretty_table(activity, columns, options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+    end
+    if activity.empty?
+      return 1,  "0 activity found"
+    else
+      return 0, nil
+    end
+  end
+
+  protected
+
+end

data/lib/morpheus/cli/apps.rb

@@ -11,13 +11,17 @@ require 'morpheus/cli/mixins/logs_helper'
 
 class Morpheus::Cli::Apps
   include Morpheus::Cli::CliCommand
-  include Morpheus::Cli::AccountsHelper
+  include Morpheus::Cli::AccountsHelper # needed? replace with OptionSourceHelper
+  include Morpheus::Cli::OptionSourceHelper
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::ProcessesHelper
   include Morpheus::Cli::LogsHelper
   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 :stop, :start, :restart
   register_subcommands :wiki, :update_wiki
   #register_subcommands :firewall_disable, :firewall_enable
@@ -51,17 +55,38 @@ class Morpheus::Cli::Apps
   end
 
   def list(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
-        options[:created_by] = val
+      opts.on( '-t', '--type TYPE', "Filter by type" ) do |val|
+        options[:type] = val
+      end
+      opts.on( '--blueprint BLUEPRINT', "Blueprint Name or ID" ) do |val|
+        options[:blueprint] = val
       end
+      opts.on( '--owner USER', "Owner Username or ID" ) do |val|
+        options[:owner] = val
+      end
+      opts.on( '--created-by USER', "[DEPRECATED] Alias for --owner" ) do |val|
+        options[:owner] = val
+      end
+      opts.add_hidden_option('--created-by')
       opts.on('--details', "Display more details: memory and storage usage used / max values." ) do
         options[:details] = true
       end
       opts.on('--pending-removal', "Include apps pending removal.") do
-        options[:pendingRemoval] = true
+        options[:showDeleted] = true
+      end
+      opts.on('--pending-removal-only', "Only apps pending removal.") do
+        options[:deleted] = true
+      end
+      opts.on('--environment ENV', "Filter by environment code (appContext)") do |val|
+        # environment means appContext
+        params['environment'] = (params['environment'] || []) + val.to_s.split(',').collect {|s| s.strip }.select {|s| s != "" }
+      end
+      opts.on('--status STATUS', "Filter by status.") do |val|
+        params['status'] = (params['status'] || []) + val.to_s.split(',').collect {|s| s.strip }.select {|s| s != "" }
       end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List apps."
@@ -74,16 +99,44 @@ class Morpheus::Cli::Apps
     end
     connect(options)
     begin
-      params = {}
+      if options[:type]
+        params['type'] = [options[:type]].flatten.collect {|it| it.to_s.strip.split(",") }.flatten.collect {|it| it.to_s.strip }
+      end
+      if options[:blueprint]
+        blueprint_ids = [options[:blueprint]].flatten.collect {|it| it.to_s.strip.split(",") }.flatten.collect {|it| it.to_s.strip }
+        params['blueprintId'] = blueprint_ids.collect do |blueprint_id|
+          if blueprint_id.to_s =~ /\A\d{1,}\Z/
+            return blueprint_id
+          else
+            blueprint = find_blueprint_by_name_or_id(blueprint_id)
+            return 1 if blueprint.nil?
+            blueprint['id']
+          end
+        end
+      end
+      if options[:owner]
+        owner_ids = [options[:owner]].flatten.collect {|it| it.to_s.strip.split(",") }.flatten.collect {|it| it.to_s.strip }
+        params['ownerId'] = owner_ids.collect do |owner_id|
+          if owner_id.to_s =~ /\A\d{1,}\Z/
+            return owner_id
+          else
+            user = find_available_user_option(owner_id)
+            return 1 if user.nil?
+            user['id']
+          end
+        end
+      end
       params.merge!(parse_list_options(options))
       account = nil
-      if options[:created_by]
-        created_by_ids = find_all_user_ids(account ? account['id'] : nil, options[:created_by])
+      if options[:owner]
+        created_by_ids = find_all_user_ids(account ? account['id'] : nil, options[:owner])
         return if created_by_ids.nil?
         params['createdBy'] = created_by_ids
+        # params['ownerId'] = created_by_ids # 4.2.1+
       end
 
-      params['showDeleted'] = true if options[:pendingRemoval]
+      params['showDeleted'] = options[:showDeleted] if options.key?(:showDeleted)
+      params['deleted'] = options[:deleted] if options.key?(:deleted)
 
       @apps_interface.setopts(options)
       if options[:dry_run]
@@ -125,9 +178,13 @@ class Morpheus::Cli::Apps
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
-      opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
-        options[:created_by] = val
+      opts.on( '--owner USER', "Owner Username or ID" ) do |val|
+        options[:owner] = val
+      end
+      opts.on( '--created-by USER', "Alias for --owner" ) do |val|
+        options[:owner] = val
       end
+      opts.add_hidden_option('--created-by')
       opts.on( '-s', '--search PHRASE', "Search Phrase" ) do |phrase|
         options[:phrase] = phrase
       end
@@ -140,10 +197,11 @@ class Morpheus::Cli::Apps
       params = {}
       params.merge!(parse_list_options(options))
       account = nil
-      if options[:created_by]
-        created_by_ids = find_all_user_ids(account ? account['id'] : nil, options[:created_by])
+      if options[:owner]
+        created_by_ids = find_all_user_ids(account ? account['id'] : nil, options[:owner])
         return if created_by_ids.nil?
         params['createdBy'] = created_by_ids
+        # params['ownerId'] = created_by_ids # 4.2.1+
       end
       @apps_interface.setopts(options)
       if options[:dry_run]
@@ -414,6 +472,7 @@ class Morpheus::Cli::Apps
                       instance_prompt_options[:help_field_prefix] = help_field_prefix
                       instance_prompt_options[:options][:help_field_prefix] = help_field_prefix
                       instance_prompt_options[:locked_fields] = scoped_instance_config['lockedFields']
+                      instance_prompt_options[:for_app] = true
                       # this provisioning helper method handles all (most) of the parsing and prompting
                       instance_config_payload = prompt_new_instance(instance_prompt_options)
                       
@@ -622,10 +681,18 @@ class Morpheus::Cli::Apps
         "ID" => 'id',
         "Name" => 'name',
         "Description" => 'description',
+        "Type" => lambda {|it| 
+          if it['type']
+            format_blueprint_type(it['type']) 
+          else
+            format_blueprint_type(it['blueprint'] ? it['blueprint']['type'] : nil) 
+          end
+        },
         "Blueprint" => lambda {|it| it['blueprint'] ? it['blueprint']['name'] : '' },
         "Group" => lambda {|it| it['group'] ? it['group']['name'] : it['siteId'] },
         "Environment" => lambda {|it| it['appContext'] },
-        "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+        "Owner" => lambda {|it| it['owner'] ? it['owner']['username'] : '' },
+        #"Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
         "Tiers" => lambda {|it| 
           # it['instanceCount']
           tiers = []
@@ -633,7 +700,7 @@ class Morpheus::Cli::Apps
           app_tiers.each do |app_tier|
             tiers << app_tier['tier']
           end
-          "#{tiers.collect {|it| it.is_a?(Hash) ? it['name'] : it }.join(',')}"
+          "(#{(tiers || []).size()}) #{tiers.collect {|it| it.is_a?(Hash) ? it['name'] : it }.join(',')}"
         },
         "Instances" => lambda {|it| 
           # it['instanceCount']
@@ -660,9 +727,9 @@ class Morpheus::Cli::Apps
 
       description_cols["Removal Date"] = lambda {|it| format_local_dt(it['removalDate'])} if app['status'] == 'pendingRemoval'
 
-      if app['blueprint'].nil?
-        description_cols.delete("Blueprint")
-      end
+      # if app['blueprint'].nil?
+      #   description_cols.delete("Blueprint")
+      # end
       # if app['description'].nil?
       #   description_cols.delete("Description")
       # end
@@ -675,7 +742,8 @@ class Morpheus::Cli::Apps
       end
 
       if app_tiers.empty?
-        puts yellow, "This app is empty", reset
+        #puts yellow, "This app is empty", reset
+        print reset,"\n"
       else
         app_tiers.each do |app_tier|
           # print_h2 "Tier: #{app_tier['tier']['name']}", options
@@ -737,7 +805,7 @@ class Morpheus::Cli::Apps
   end
 
   def update(args)
-    options = {}
+    params, payload, options = {}, {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[app] [options]")
       #build_option_type_options(opts, options, update_app_option_types(false))
@@ -753,6 +821,9 @@ class Morpheus::Cli::Apps
       opts.on( '--environment VALUE', String, "Environment" ) do |val|
         options[:environment] = val
       end
+      opts.on( '--owner USER', "Owner Username or ID" ) do |val|
+        options[:owner] = val == 'null' ? nil : val
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run])
       opts.footer = "Update an app.\n" +
                     "[app] is required. This is the name or id of an app."
@@ -768,64 +839,223 @@ class Morpheus::Cli::Apps
     begin
       app = find_app_by_name_or_id(args[0])
       return 1 if app.nil?
-
-      payload = {}
       if options[:payload]
         payload = options[:payload]
-      else
-        payload = {
-          'app' => {id: app["id"]}
-        }
-        params = options[:options] || {}
-        if options[:name]
-          params['name'] = options[:name]
-        end
-        if options[:description]
-          params['description'] = options[:description]
-        end
-        if options[:environment]
-          # params['environment'] = options[:environment]
-          params['appContext'] = options[:environment]
-        end
-        if options[:group]
-          group = find_group_by_name_or_id_for_provisioning(options[:group])
-          return 1 if group.nil?
-          params['group'] = {'id' => group['id'], 'name' => group['name']}
-        end
-        if params.empty?
-          print_red_alert "Specify at least one option to update"
-          puts optparse
-          return 1
-        end
-        payload['app'].merge!(params)
-        # api bug requires this to be at the root level as well right now
-        if payload['app'] && payload['app']['group']
-          payload['group'] = payload['app']['group']
+      end
+      payload['app'] ||= {}
+      payload.deep_merge!({'app' => parse_passed_options(options)})
+      if options[:name]
+        payload['app']['name'] = options[:name]
+      end
+      if options[:description]
+        payload['app']['description'] = options[:description]
+      end
+      if options[:environment]
+        # payload['app']['environment'] = options[:environment]
+        payload['app']['appContext'] = options[:environment]
+      end
+      if options[:group]
+        group = find_group_by_name_or_id_for_provisioning(options[:group])
+        return 1 if group.nil?
+        payload['app']['group'] = {'id' => group['id'], 'name' => group['name']}
+      end
+      if options.key?(:owner)
+        owner_id = options[:owner]
+        if owner_id.to_s.empty?
+          # allow clearing
+          owner_id = nil
+        elsif options[:owner]
+          if owner_id.to_s =~ /\A\d{1,}\Z/
+            # allow id without lookup
+          else
+            user = find_available_user_option(owner_id)
+            return 1 if user.nil?
+            owner_id = user['id']
+          end
         end
+        payload['app']['ownerId'] = owner_id
+      end
+      if payload['app'] && payload['app'].empty?
+        payload.delete('app')
       end
+      if payload.empty?
+        raise_command_error "Specify at least one option to update.\n#{optparse}" if payload.empty?
+      end
+      
       @apps_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @apps_interface.dry.update(app["id"], payload)
         return
       end
-
       json_response = @apps_interface.update(app["id"], payload)
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+      render_result = render_with_format(json_response, options)
+      return 0 if render_result
+      print_green_success "Updated app #{app['name']}"
+      get([app['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def refresh(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
+Refresh an app.
+[app] is required. This is the name or id of an app.
+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
-        print_green_success "Updated app #{app['name']}"
-        # print details
-        get_args = [app['id']] + (options[:remote] ? ["-r",options[:remote]] : [])
-        get(get_args)
+        payload.deep_merge!(parse_passed_options(options))
+        # raise_command_error "Specify at least one option to update.\n#{optparse}" if payload.empty?
+      end
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to refresh this app: #{app['name']}?")
+        return 9, "aborted command"
+      end
+      @apps_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @apps_interface.dry.refresh(app["id"], params, payload)
+        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?
+      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
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
     end
   end
 
+  def 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
+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.
+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?
+      end
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to apply this app: #{app['name']}?")
+        return 9, "aborted command"
+      end
+      @apps_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @apps_interface.dry.apply(app["id"], params, payload)
+        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
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
 
   def add_instance(args)
     options = {}
@@ -1170,6 +1400,7 @@ class Morpheus::Cli::Apps
     end
   end
 
+
   def stop(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -1640,23 +1871,11 @@ class Morpheus::Cli::Apps
         link << "#!#{options[:link_tab]}"
       end
 
-      open_command = nil
-      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
-        open_command = "start #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /darwin/
-        open_command = "open #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
-        open_command = "xdg-open #{link}"
-      end
-
       if options[:dry_run]
-        puts "system: #{open_command}"
+        puts Morpheus::Util.open_url_command(link)
         return 0
       end
-
-      system(open_command)
-      
-      return 0
+      return Morpheus::Util.open_url(link)
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -1761,23 +1980,11 @@ class Morpheus::Cli::Apps
 
       link = "#{@appliance_url}/login/oauth-redirect?access_token=#{@access_token}\\&redirectUri=/provisioning/apps/#{app['id']}#!wiki"
 
-      open_command = nil
-      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
-        open_command = "start #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /darwin/
-        open_command = "open #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
-        open_command = "xdg-open #{link}"
-      end
-
       if options[:dry_run]
-        puts "system: #{open_command}"
+      puts Morpheus::Util.open_url_command(link)
         return 0
       end
-
-      system(open_command)
-      
-      return 0
+      return Morpheus::Util.open_url(link)
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -1900,39 +2107,13 @@ class Morpheus::Cli::Apps
   #   list
   # end
 
-  def find_app_by_id(id)
-    app_results = @apps_interface.get(id.to_i)
-    if app_results['app'].empty?
-      print_red_alert "App not found by id #{id}"
-      exit 1
-    end
-    return app_results['app']
-  end
-
-  def find_app_by_name(name)
-    app_results = @apps_interface.list({name: name})
-    if app_results['apps'].empty?
-      print_red_alert "App not found by name #{name}"
-      exit 1
-    end
-    return app_results['apps'][0]
-  end
-
-  def find_app_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_app_by_id(val)
-    else
-      return find_app_by_name(val)
-    end
-  end
-
   def print_apps_table(apps, options={})
     
     table_color = options[:color] || cyan
     rows = apps.collect do |app|
       tiers_str = format_app_tiers(app)
-      instances_str = (app['instanceCount'].to_i == 1) ? "1 Instance" : "#{app['instanceCount']} Instances"
-      containers_str = (app['containerCount'].to_i == 1) ? "1 Container" : "#{app['containerCount']} Containers"
+      instances_str = (app['instanceCount'].to_i == 1) ? "1" : "#{app['instanceCount']}"
+      containers_str = (app['containerCount'].to_i == 1) ? "1" : "#{app['containerCount']}"
       stats = app['stats']
       # app_stats = app['appStats']
       cpu_usage_str = !stats ? "" : generate_usage_bar((stats['cpuUsage'] || stats['cpuUsagePeak']).to_f, 100, {max_bars: 10})
@@ -1949,34 +2130,44 @@ class Morpheus::Cli::Apps
       {
         id: app['id'],
         name: app['name'],
+        description: app['description'],
+        blueprint: app['blueprint'] ? app['blueprint']['name'] : '',
+        type: app['type'] ? format_blueprint_type(app['type']) : (format_blueprint_type(app['blueprint'] ? app['blueprint']['type'] : nil)),
         group: app['group'] ? app['group']['name'] : app['siteId'],
         environment: app['appContext'],
         tiers: tiers_str,
         instances: instances_str,
         containers: containers_str,
-        account: app['account'] ? app['account']['name'] : nil,
+        owner: app['owner'] ? app['owner']['username'] : '',
+        tenant: app['account'] ? app['account']['name'] : nil,
         status: format_app_status(app, table_color),
         cpu: cpu_usage_str + cyan,
         memory: memory_usage_str + table_color,
-        storage: storage_usage_str + table_color
-        #dateCreated: format_local_dt(app['dateCreated'])
+        storage: storage_usage_str + table_color,
+        created: format_local_dt(app['dateCreated']),
+        updated: format_local_dt(app['lastUpdated'])
       }
     end
 
     columns = [
       :id,
       :name,
+      # :description,
+      :type,
+      :blueprint,
       :group,
       :environment,
+      :status,
       :tiers,
       :instances,
       :containers,
-      #:account,
-      :status,
-      #{:dateCreated => {:display_name => "Date Created"} },
       {:cpu => {:display_name => "MAX CPU"} },
       :memory,
-      :storage
+      :storage,
+      :owner,
+      #:tenant,
+      :created,
+      :updated
     ]
     
     # custom pretty table columns ...