morpheus-cli 2.11.1 → 2.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a9c598b82ebbf8eea995f58a454bf8a52defef0
-  data.tar.gz: 6a81fff1ddc710ca3d56488670586caf7844ab93
+  metadata.gz: 6d561294737f605bb14714d84f21984797f012b2
+  data.tar.gz: 857aa6f016e8f4db4cfaea280703a7f71adac83a
 SHA512:
-  metadata.gz: 5821cf3be29b11830eab7cf6e87f15ebb3f0e783d3d49664c5dbd6b824e775e6546b2da09a52983edf1dfd60058c51f40c9ae3cd591ea61fb5fb730b2766da6a
-  data.tar.gz: 356f77e67812b6f8b63e85f3c1a95c0206e5a5f456c912a65aae311f0040ad1eea4fae2d77d840a85be1a03bbc342db0b1097dfa07eb623ef1bb71e699b21786
+  metadata.gz: 941e2fd2a2478c7af97e604f3bbea977874a585b5a4dcd0d526bce39434b4461b9859556f509054239b0fd957919f36b5606304e314f2befda86667d888aec15
+  data.tar.gz: 1fe0c7f8d07df32dd4ea2b771ef2b21106831115d3d3c0a51358e8b9c640be215a3057b12f8f3608524fb46aee02b8f6fa5eef2f60599b6653e1553df6e3cb16

data/lib/morpheus/api/api_client.rb

@@ -3,13 +3,14 @@ require 'uri'
 require 'rest-client'
 
 class Morpheus::APIClient
-  def initialize(access_token, refresh_token=nil,expires_in = nil, base_url=nil) 
+  def initialize(access_token, refresh_token=nil,expires_in = nil, base_url=nil, verify_ssl=true) 
     @access_token = access_token
     @refresh_token = refresh_token
     @base_url = base_url
     if expires_in != nil
       @expires_at = DateTime.now + expires_in.seconds
     end
+    set_ssl_verification_enabled(verify_ssl)
   end
 
   def dry_run(val=true)
@@ -21,7 +22,23 @@ class Morpheus::APIClient
     dry_run(true)
   end
 
+  def ssl_verification_enabled?
+    @verify_ssl
+  end
+
+  def set_ssl_verification_enabled(val)
+    @verify_ssl = !!val
+  end
+
   def execute(opts, parse_json=true)
+    # @verify_ssl is not used atm
+    # todo: finish this and use it instead of the global variable RestClient.ssl_verification_enabled?
+    # gotta clean up all APIClient subclasses new() methods to support this
+    # the CliCommand subclasses should be changed to @users_interface = @api_client.users
+    # also.. Credentials.new()
+    if @verify_ssl == false
+      opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
+    end
     if @dry_run
       # JD: could return a Request object instead...
       return opts

data/lib/morpheus/api/dashboard_interface.rb

@@ -20,7 +20,7 @@ class Morpheus::DashboardInterface < Morpheus::APIClient
   end
 
   def recent_activity(account_id=nil, options={})
-    url = "#{@base_url}/api/dashboard/recentActivity"
+    url = "#{@base_url}/api/dashboard/recent-activity"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
     headers[:params].merge!(options)
     headers[:params]['accountId'] = account_id if account_id

data/lib/morpheus/cli/cli_command.rb

@@ -547,6 +547,20 @@ module Morpheus
         @appliance_name = appliance[:name]
         @appliance_url = appliance[:host] || appliance[:url] # it's :host in the YAML..heh
 
+        # instead of toggling this global value
+        # this should just be an attribute of the api client
+        # for now, this fixes the issue where passing --insecure or --remote
+        # would then apply to all subsequent commands...
+        if options[:insecure]
+          Morpheus::RestClient.enable_ssl_verification = false
+        else
+          if appliance[:insecure] && Morpheus::RestClient.ssl_verification_enabled?
+            Morpheus::RestClient.enable_ssl_verification = false
+          elsif !appliance[:insecure] && !Morpheus::RestClient.ssl_verification_enabled?
+            Morpheus::RestClient.enable_ssl_verification = true
+          end
+        end
+
         # todo: support old way of accepting --username and --password on the command line
         # it's probably better not to do that tho, just so it stays out of history files
         

data/lib/morpheus/cli/groups.rb

@@ -277,7 +277,7 @@ class Morpheus::Cli::Groups
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print_green_success "Added cloud #{cloud["id"]} to group #{group['name']}"
+        print_green_success "Added cloud #{cloud["name"]} to group #{group['name']}"
         #list([])
         get([group["id"]])
       end

data/lib/morpheus/cli/instance_types.rb

@@ -93,13 +93,18 @@ class Morpheus::Cli::InstanceTypes
 
       if options[:json]
         print JSON.pretty_generate(json_response), "\n"
-        return
+        return 0
       end
 
       instance_types = json_response['instanceTypes']
-      print_h1 "Morpheus Instance Types"
+      title = "Morpheus Instance Types"
+      subtitles = []
+      if params[:phrase]
+        subtitles << "Search: #{params[:phrase]}".strip
+      end
+      print_h1 title, subtitles
       if instance_types.empty?
-        puts yellow,"No instance types currently configured.",reset
+        print yellow,"No instance types found.",reset,"\n"
       else
         instance_types.each do |instance_type|
           versions = instance_type['versions'].join(', ')
@@ -113,12 +118,12 @@ class Morpheus::Cli::InstanceTypes
           # end
           #print JSON.pretty_generate(instance_type['instanceTypeLayouts'].first), "\n"
         end
-
       end
       print reset,"\n"
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
   end
 end

data/lib/morpheus/cli/instances.rb

@@ -171,7 +171,8 @@ class Morpheus::Cli::Instances
   def add(args)
     options = {}
     optparse = OptionParser.new do|opts|
-      opts.banner = subcommand_usage("[type] [name]")
+      # opts.banner = subcommand_usage("[type] [name]")
+      opts.banner = subcommand_usage("[name] -c CLOUD -t TYPE")
       opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
         options[:group] = val
       end
@@ -187,32 +188,73 @@ class Morpheus::Cli::Instances
       opts.on("--layout-size NUMBER", Integer, "Apply a multiply factor of containers/vms within the instance") do |val|
         options[:layout_size] = val.to_i
       end
+      opts.on("--workflow ID", String, "Automation: Workflow ID") do |val|
+        options[:workflow_id] = val.to_i
+      end
+      # opts.on('-L', "--lb", "Enable Load Balancer") do
+      #   options[:enable_load_balancer] = true
+      # end
+      opts.on("--shutdown-days NUMBER", Integer, "Automation: Shutdown Days") do |val|
+        options[:expire_days] = val.to_i
+      end
+      opts.on("--expire-days NUMBER", Integer, "Automation: Expiration Days") do |val|
+        options[:expire_days] = val.to_i
+      end
+      opts.on("--create-backup on|off", String, "Automation: Create Backups.  Default is off") do |val|
+        options[:create_backup] = ['on','true','1'].include?(val.to_s.downcase) ? 'on' : 'off'
+      end
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
 
     optparse.parse!(args)
     connect(options)
 
-    # support old format of `instance add TYPE NAME`
+    # this is the old format of `instance add TYPE NAME`
+    # JD: it seems confusing, let's deprecate and go with `instances add [NAME] -t TYPE`
     if args[0]
       options[:instance_type_code] = args[0]
     end
     if args[1]
       options[:instance_name] = args[1]
     end
+
+    # if args.count > 1
+    #   print_error Morpheus::Terminal.angry_prompt
+    #   puts_error  "#{command_name} add has just 1 (optional) argument: NAME.  Got #{args.count} arguments: #{args.join(', ')}\n#{optparse}"
+    #   return 1
+    # end
+    # if args[0]
+    #   options[:instance_name] = args[0]
+    # end
+
     # use active group by default
     options[:group] ||= @active_group_id
 
     options[:name_required] = true
     begin
-
+      # this provisioning helper method handles all (most) of the parsing and prompting
+      # and it relies on the method to exit non-zero on error, like a bad CLOUD or TYPE value
       payload = prompt_new_instance(options)
+      
+      # other stuff
       payload[:copies] = options[:copies] if options[:copies] && options[:copies] > 0
       payload[:layoutSize] = options[:layout_size] if options[:layout_size] && options[:layout_size] > 0 # aka Scale Factor
+      payload[:createBackup] = options[:create_backup] ? 'on' : 'off' if options[:create_backup] == true
+      payload['instance']['expireDays'] = options[:expire_days] if options[:expire_days]
+      payload['instance']['shutdownDays'] = options[:shutdown_days] if options[:shutdown_days]
+      if options[:workflow_id]
+        payload['taskSetId'] = options[:workflow_id]
+      end
+      if options[:enable_load_balancer]
+        lb_payload = prompt_instance_load_balancer(payload['instance'], nil, options)
+        payload.deep_merge!(lb_payload)
+      end
+
       if options[:dry_run]
         print_dry_run @instances_interface.dry.create(payload)
-        return
+        return 0
       end
+
       json_response = @instances_interface.create(payload)
       if options[:json]
         puts as_json(json_response, options)
@@ -221,9 +263,10 @@ class Morpheus::Cli::Instances
         print_green_success "Provisioning instance #{instance_name}"
         #list([])
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
   end
 
@@ -598,6 +641,20 @@ class Morpheus::Cli::Instances
       }
       print_description_list(description_cols, instance)
 
+      if instance['statusMessage']
+        print_h2 "Status Message"
+        if instance['status'] == 'failed'
+          print red, instance['statusMessage'], reset
+        else
+          print instance['statusMessage']
+        end
+        print "\n"
+      end
+      if instance['errorMessage']
+        print_h2 "Error Message"
+        print red, instance['errorMessage'], reset
+        print "\n"
+      end
       if stats
         print_h2 "Instance Usage"
         print_stats_usage(stats)
@@ -650,15 +707,16 @@ class Morpheus::Cli::Instances
       if current_instance_lb
         print_h2 "Load Balancer"
         print cyan
+        # this api response is going to change again.. port is no longer returned atm.
         description_cols = {
           "LB ID" => lambda {|it| it['loadBalancer']['id'] },
           "Name" => lambda {|it| it['loadBalancer']['name'] },
           "Type" => lambda {|it| it['loadBalancer']['type'] ? it['loadBalancer']['type']['name'] : '' },
           "Host Name" => lambda {|it| it['loadBalancer']['host'] }, # instance.hostName ?
-          "Port" => lambda {|it| it['port']['port'] },
-          "Protocol" => lambda {|it| it['port']['proxyProtocol'] },
-          "SSL Enabled" => lambda {|it| format_boolean it['port']['sslEnabled'] },
-          "Cert" => lambda {|it| it['port']['sslCert'] ? it['port']['sslCert']['name'] : 'N/A' } # api needs to return this too..
+          "Port" => lambda {|it| it['port'] ? it['port']['port'] : '' },
+          "Protocol" => lambda {|it| it['port'] ? it['port']['proxyProtocol'] : '' },
+          "SSL Enabled" => lambda {|it| it['port'] ? format_boolean(it['port']['sslEnabled']) : '' },
+          "Cert" => lambda {|it| (it['port'] && it['port']['sslCert']) ? it['port']['sslCert']['name'] : '' }
         }
         print_description_list(description_cols, current_instance_lb)
         print "\n", reset
@@ -2054,20 +2112,20 @@ class Morpheus::Cli::Instances
       }
 
       cur_host_name = instance['hostName']
-      #host_name = params = Morpheus::Cli::OptionTypes.prompt([{fieldName:'hostName'}], options[:options], @api_client, {})
+      #host_name = params = Morpheus::Cli::OptionTypes.prompt([{'fieldName'=>'hostName', 'label'=>'Host Name', 'defaultValue'=>cur_host_name}], options[:options], @api_client, {})
       payload['instance']['hostName'] = instance['hostName']
 
-      payload['loadBalancerId'] = 9999
+      #payload['loadBalancerId'] = params['loadBalancerId']
 
       unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to update the load balancer for instance '#{instance['name']}'?", options)
         return 9, "aborted command"
       end
       
       if options[:dry_run]
-        print_dry_run @instances_interface.dry.update_threshold(instance['id'], payload)
+        print_dry_run @instances_interface.dry.update_load_balancer(instance['id'], payload)
         return
       end
-      json_response = @instances_interface.update_threshold(instance['id'], payload)
+      json_response = @instances_interface.update_load_balancer(instance['id'], payload)
       if options[:json]
         puts as_json(json_response, options)
       else

data/lib/morpheus/cli/load_balancers.rb

@@ -29,7 +29,7 @@ class Morpheus::Cli::LoadBalancers
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :json, :csv, :yaml, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
@@ -44,24 +44,41 @@ class Morpheus::Cli::LoadBalancers
       end
       json_response = @load_balancers_interface.get(params)
       if options[:json]
-        print JSON.pretty_generate(json_response)
+        if options[:include_fields]
+          json_response = {"loadBalancers" => filter_data(json_response["loadBalancers"], options[:include_fields]) }
+        end
+        puts as_json(json_response, options)
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response["loadBalancers"], options)
+        return 0
+      elsif options[:yaml]
+        if options[:include_fields]
+          json_response = {"loadBalancers" => filter_data(json_response["loadBalancers"], options[:include_fields]) }
+        end
+        puts as_yaml(json_response, options)
+        return 0
       else
         lbs = json_response['loadBalancers']
         print_h1 "Morpheus Load Balancers"
         if lbs.empty?
-          print cyan,"No load balancers found.",reset,"\n"
+          print yellow,"No load balancers found.",reset,"\n"
         else
-          print cyan
-          lb_table_data = lbs.collect do |lb|
-            {name: lb['name'], id: lb['id'], type: lb['type']['name']}
-          end
-          tp lb_table_data, :id, :name, :type
+          columns = [
+            {"ID" => 'id'},
+            {"Name" => 'name'},
+            {"Type" => lambda {|it| it['type'] ? it['type']['name'] : '' } },
+            {"Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' } },
+            {"Host" => lambda {|it| it['host'] } },
+          ]
+          print as_pretty_table(lbs, columns, options)
         end
         print reset,"\n"
+        return 0
       end
-                rescue RestClient::Exception => e
+    rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
     end
   end
 
@@ -69,7 +86,7 @@ class Morpheus::Cli::LoadBalancers
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_common_options(opts, options, [:json, :csv, :yaml, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -89,15 +106,62 @@ class Morpheus::Cli::LoadBalancers
       end
       lb = find_lb_by_name_or_id(lb_name)
       exit 1 if lb.nil?
+      # refetch
+      json_response = @load_balancers_interface.get(lb['id'])
       lb_type = load_balancer_type_for_name_or_id(lb['type']['code'])
+      #puts "LB TYPE: #{lb_type}"
       if options[:json]
         puts JSON.pretty_generate({loadBalancer: lb})
+        if options[:include_fields]
+          json_response = {"loadBalancer" => filter_data(json_response["loadBalancer"], options[:include_fields]) }
+        end
+        puts as_json(json_response, options)
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response["loadBalancer"], options)
+        return 0
+      elsif options[:yaml]
+        if options[:include_fields]
+          json_response = {"loadBalancer" => filter_data(json_response["loadBalancer"], options[:include_fields]) }
+        end
+        puts as_yaml(json_response, options)
+        return 0
       else
-        print "\n", cyan, "Lb #{lb['name']} - #{lb['type']['name']}\n\n"
-        # lb_type['optionTypes'].sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.each do |optionType|
-        # 	puts "  #{optionType['fieldLabel']} : " + (optionType['type'] == 'password' ? "#{task['taskOptions'][optionType['fieldName']] ? '************' : ''}" : "#{task['taskOptions'][optionType['fieldName']] || optionType['defaultValue']}")
-        # end
-        print reset,"\n\n"
+        print_h1 "Load Balancer Details"
+        description_cols = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Description" => 'description',
+          "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+          "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
+          "Visibility" => 'visibility',
+          "IP" => 'ip',
+          "Host" => 'host',
+          "Port" => 'port',
+          "Username" => 'username',
+          # "SSL Enabled" => lambda {|it| format_boolean it['sslEnabled'] },
+          # "SSL Cert" => lambda {|it| it['sslCert'] ? it['sslCert']['name'] : '' },
+          # "SSL" => lambda {|it| it['sslEnabled'] ? "Yes (#{it['sslCert'] ? it['sslCert']['name'] : 'none'})" : "No" },
+          "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+          "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+        }
+        print_description_list(description_cols, lb)
+
+
+        if lb['ports'] && lb['ports'].size > 0
+          print_h2 "LB Ports"
+          columns = [
+            {"ID" => 'id'},
+            {"Name" => 'name'},
+            #{"Description" => 'description'},
+            {"Port" => lambda {|it| it['port'] } },
+            {"Protocol" => lambda {|it| it['proxyProtocol'] } },
+            {"SSL" => lambda {|it| it['sslEnabled'] ? "Yes (#{it['sslCert'] ? it['sslCert']['name'] : 'none'})" : "No" } },
+          ]
+          print as_pretty_table(lb['ports'], columns, options)
+        end
+        print reset,"\n"
+        return 0
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)

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

@@ -482,7 +482,7 @@ module Morpheus::Cli::PrintHelper
     max_label_width = 0
     justify = opts.key?(:justify) ? opts[:justify] : "right"
     do_wrap = opts.key?(:wrap) ? !!opts[:wrap] : true
-    
+    color = opts.key?(:color) ? opts[:color] : cyan
     rows = []
     
     columns.flatten.each do |column_def|
@@ -501,6 +501,7 @@ module Morpheus::Cli::PrintHelper
     end
 
     out = ""
+    out << color if color
     rows.each do |row|
       value = row[:value].to_s
       if do_wrap
@@ -511,6 +512,7 @@ module Morpheus::Cli::PrintHelper
       end
       out << format_dt_dd(row[:label], value, label_width, justify) + "\n"
     end
+    out << reset if color
     return out
   end
 

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

@@ -324,6 +324,12 @@ module Morpheus::Cli::ProvisioningHelper
       payload['evars'] = evars
     end
 
+    # prompt for metadata variables
+    metadata = prompt_metadata(options)
+    if !metadata.empty?
+      payload['metadata'] = metadata
+    end
+
     return payload
   end
 
@@ -806,6 +812,10 @@ module Morpheus::Cli::ProvisioningHelper
     # puts JSON.pretty_generate(zone_network_options_json)
     zone_network_data = zone_network_options_json['data'] || {}
     networks = zone_network_data['networks']
+    network_groups = zone_network_data['networkGroups']
+    if network_groups
+      networks = network_groups + networks
+    end
     network_interface_types = (zone_network_data['networkTypes'] || []).sort { |x,y| x['displayOrder'] <=> y['displayOrder'] }
     enable_network_type_selection = (zone_network_data['enableNetworkTypeSelection'] == 'on' || zone_network_data['enableNetworkTypeSelection'] == true)
     has_networks = zone_network_data["hasNetworks"] == true
@@ -853,8 +863,8 @@ module Morpheus::Cli::ProvisioningHelper
       # choose network
       v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'networkId', 'type' => 'select', 'fieldLabel' => "Network", 'selectOptions' => network_options, 'required' => true, 'skipSingleOption' => false, 'description' => 'Choose a network for this interface.', 'defaultValue' => network_interface['networkId']}], options[:options])
       network_interface['network'] = {}
-      network_interface['network']['id'] = v_prompt[field_context]['networkId'].to_i
-      selected_network = networks.find {|it| it["id"] == network_interface['network']['id'] }
+      network_interface['network']['id'] = v_prompt[field_context]['networkId'].to_s
+      selected_network = networks.find {|it| it["id"].to_s == network_interface['network']['id'] }
 
       if !selected_network
         print_red_alert "Network not found by id #{network_interface['network']['id']}!"
@@ -868,7 +878,9 @@ module Morpheus::Cli::ProvisioningHelper
       end
 
       # choose IP unless network has a pool configured
-      if selected_network['pool']
+      if selected_network['id'].to_s.include?('networkGroup')
+        puts "IP Address: Using network group." if !no_prompt
+      elsif selected_network['pool']
         puts "IP Address: Using pool '#{selected_network['pool']['name']}'" if !no_prompt
       elsif selected_network['dhcpServer']
         puts "IP Address: Using DHCP" if !no_prompt
@@ -917,6 +929,73 @@ module Morpheus::Cli::ProvisioningHelper
     return evars
   end
 
+  # Prompts user for environment variables for new instance
+  # returns array of metadata objects {id: null, name: "MYTAG", value: "myvalue"}
+  def prompt_metadata(options={})
+    #puts "Configure Environment Variables:"
+    no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
+    metadata_array = []
+    metadata_index = 0
+    has_another_metadata = options[:options] && options[:options]["metadata#{metadata_index}"]
+    add_another_metadata = has_another_metadata || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add a metadata tag?", {default: false}))
+    while add_another_metadata do
+      field_context = "metadata#{metadata_index}"
+      metadata = {}
+      metadata['id'] = nil
+      metadata_label = metadata_index == 0 ? "Metadata Tag" : "Metadata Tag [#{metadata_index+1}]"
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "#{metadata_label} Name", 'required' => true, 'description' => 'Metadata Tag Name.', 'defaultValue' => metadata['name']}], options[:options])
+      # todo: metadata.type ?
+      metadata['name'] = v_prompt[field_context]['name']
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'value', 'type' => 'text', 'fieldLabel' => "#{metadata_label} Value", 'required' => true, 'description' => 'Metadata Tag Value', 'defaultValue' => metadata['value']}], options[:options])
+      metadata['value'] = v_prompt[field_context]['value']
+      metadata_array << metadata
+      metadata_index += 1
+      has_another_metadata = options[:options] && options[:options]["metadata#{metadata_index}"]
+      add_another_metadata = has_another_metadata || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another metadata tag?", {default: false}))
+    end
+
+    return metadata_array
+  end
+
+  # Prompts user for load balancer settings
+  # returns Hash of parameters like {loadBalancerId: "-1", etc}
+  def prompt_instance_load_balancer(instance, default_lb_id, options)
+    #puts "Configure Environment Variables:"
+    no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
+    payload = {}
+    api_params = {}
+    if instance['id']
+      api_params['instanceId'] = instance['id']
+    end
+    if instance['zone']
+      api_params['zoneId'] = instance['zone']['id']
+    elsif instance['cloud']
+      api_params['zoneId'] = instance['cloud']['id']
+    end
+    if instance['group']
+      api_params['siteId'] = instance['group']['id']
+    elsif instance['site']
+      api_params['siteId'] = instance['site']['id']
+    end
+    if instance['plan']
+      api_params['planId'] = instance['plan']['id']
+    end
+    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'loadBalancerId', 'type' => 'select', 'fieldLabel' => "Load Balancer", 'optionSource' => 'loadBalancers', 'required' => true, 'description' => 'Select Load Balancer for instance', 'defaultValue' => default_lb_id || ''}], options[:options], api_client, api_params)
+    lb_id = v_prompt['loadBalancerId']
+    payload['loadBalancerId'] = lb_id
+
+    # todo: finish implmenting this
+
+    # loadBalancerId
+    # loadBalancerProxyProtocol
+    # loadBalancerName
+    # loadBalancerDescription
+    # loadBalancerSslCert
+    # loadBalancerScheme
+    
+    return payload
+  end
+
   # reject old volume option types
   # these will eventually get removed from the associated optionTypes
   def reject_volume_option_types(option_types)

data/lib/morpheus/cli/recent_activity_command.rb

@@ -8,7 +8,6 @@ class Morpheus::Cli::RecentActivityCommand
   include Morpheus::Cli::AccountsHelper
 
   set_command_name :'recent-activity'
-  set_command_hidden # remove once this is done
 
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -37,7 +36,7 @@ class Morpheus::Cli::RecentActivityCommand
       opts.on('--end TIMESTAMP','--end TIMESTAMP', "End timestamp. Default is now.") do |val|
         options[:end] = parse_time(val).iso8601
       end
-      build_common_options(opts, options, [:account, :list, :json, :dry_run])
+      build_common_options(opts, options, [:account, :list, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
@@ -54,22 +53,90 @@ class Morpheus::Cli::RecentActivityCommand
       end
       json_response = @dashboard_interface.recent_activity(account_id, params)
       if options[:json]
+        if options[:include_fields]
+          json_response = {"activity" => filter_data(json_response["activity"], options[:include_fields]) }
+        end
         print JSON.pretty_generate(json_response)
         print "\n"
-      else
-
-        # todo: impersonate command and show that info here
+        return 0
+      end
+      if options[:csv]
+        puts records_as_csv(json_response["activity"], options)
+        return 0
+      end
+      if options[:yaml]
+        if options[:include_fields]
+          json_response = {"activity" => filter_data(json_response["activity"], options[:include_fields]) }
+        end
+        puts as_yaml(json_response, options)
+        return 0
+      end
 
-        print_h1 "Recent Activity"
-        print cyan
-        puts "Coming soon... see --json"
+      print_h1 "Recent Activity"
+      print cyan
+      items = json_response["activity"]
+      if items.empty?
+        puts "No activity found."
         print reset,"\n"
-
+        return 0
       end
+      # JD: this api response is funky, no meta and it includes date objects
+      items = items.select { |item| item['_id'] || item['name'] }
+      print_recent_activity_table(items, options)
+      print reset,"\n"
+      return 0
+
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
-      exit 1
+      return 1
+    end
+  end
+
+  def print_recent_activity_table(items, opts={})
+    columns = [
+      # {"ID" => lambda {|item| item['id'] } },
+      # {"SEVERITY" => lambda {|item| format_activity_severity(item['severity']) } },
+      {"TYPE" => lambda {|item| item['activityType'] } },
+      {"AUTHOR" => lambda {|item| item['userName'] || '' } },
+      {"MESSAGE" => lambda {|item| item['message'] || '' } },
+      # {"NAME" => lambda {|item| item['name'] } },
+      {"OBJECT" => lambda {|item| format_activity_display_object(item) } },
+      {"WHEN" => lambda {|item| format_local_dt(item['ts']) } }
+      # {"WHEN" => lambda {|item| "#{format_duration(item['ts'])} ago" } }
+    ]
+    if opts[:include_fields]
+      columns = opts[:include_fields]
+    end
+    print as_pretty_table(items, columns, opts)
+  end
+
+  def format_activity_severity(severity, return_color=cyan)
+    out = ""
+    status_string = severity
+    if status_string == 'critical'
+      out << "#{red}#{status_string.capitalize}#{return_color}"
+    elsif status_string == 'warning'
+      out << "#{yellow}#{status_string.capitalize}#{return_color}"
+    elsif status_string == 'info'
+      out << "#{cyan}#{status_string.capitalize}#{return_color}"
+    else
+      out << "#{cyan}#{status_string}#{return_color}"
+    end
+    out
+  end
+
+  def format_activity_display_object(item)
+    out = ""
+    if item['name']
+      out << item['name']
+    end
+    if item['objectType']
+      out << " (#{item['objectType']} #{item['objectId']})"
+    end
+    if item['deleted']
+      out << " [deleted]"
     end
+    out
   end
 
 end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "2.11.1"
+    VERSION = "2.11.3"
   end
 end

data/lib/morpheus/rest_client.rb

@@ -1,4 +1,4 @@
-require 'rest_client'
+require 'rest-client'
 
 module Morpheus
   # A wrapper around rest_client so we can more easily deal with passing options (like turning on/off SSL verification)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.11.3
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler