morpheus-cli 2.9.4 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7efa35bc257cb762e29ce35995cc2291e5d21e54
-  data.tar.gz: ca41c50847ed8ee3a5e50d7e75c773332b1b64da
+  metadata.gz: 575e23105fe6df10494bb38dcdc54e02b582d3ac
+  data.tar.gz: fb5e3ea23fc52347ecab160d92442029f6ea3ecb
 SHA512:
-  metadata.gz: ff52228f42aca0f2caa7727e9a14f9e1004c3878d62fa5a121efff7f7b240141b9914c64ebdc060828079df1fb2fcbfcfbbbfc5fdb89568b2b4263f4302e372a
-  data.tar.gz: 37c3835e75478fc8b595e86486b237941798d66806aea5c8d607803cc5f49aad1715b364aa607f46a9e568ec9b8e9e1ac65d7bd70cfb8ab4407b4c78f664039b
+  metadata.gz: 873500f5e460eaf1c1e56e5e223b3e1c52d83955786d7d4b5ed7642025e3001758a0dbdd5c6ca59cdf3b8385ffca0b473cf401d779a8166675f0c996d0ca6a1a
+  data.tar.gz: 667d412138a4cb25766b8a55cea03cf20749caad2ad10d97ebd39ccf4da99d5830dd5b5d4ba629f6ceb66a8e4e771a4e9ff8b06abbb8ee90731ba60d4ddd9514

data/lib/morpheus/api/apps_interface.rb

@@ -26,36 +26,38 @@ class Morpheus::AppsInterface < Morpheus::APIClient
 		JSON.parse(response.to_s)
 	end
 
-	def get_envs(id, options=nil)
-		url = "#{@base_url}/api/apps/#{id}/envs"
-		headers = { params: {}, authorization: "Bearer #{@access_token}" }
-		response = Morpheus::RestClient.execute(method: :get, url: url,
-                                                     timeout: 30, headers: headers)
+	def create(options)
+		url = "#{@base_url}/api/apps"
+		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		
+		payload = options
+		response = Morpheus::RestClient.execute(method: :post, url: url,
+                                                     timeout: 30, headers: headers, payload: payload.to_json)
 		JSON.parse(response.to_s)
 	end
 
-	def create_env(id, options)
-		url = "#{@base_url}/api/apps/#{id}/envs"
+	def update(app_id, options)
+		url = "#{@base_url}/api/apps/#{app_id}"
 		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
 		
-		payload = {envs: options}
-		response = Morpheus::RestClient.execute(method: :post, url: url,
-                            timeout: 30, headers: headers, payload: payload.to_json)
+		payload = options
+		response = Morpheus::RestClient.execute(method: :put, url: url,
+                                                     timeout: 30, headers: headers, payload: payload.to_json)
 		JSON.parse(response.to_s)
 	end
 
-	def del_env(id, name)
-		url = "#{@base_url}/api/apps/#{id}/envs/#{name}"
+	def add_instance(app_id, options)
+		url = "#{@base_url}/api/apps/#{app_id}/add-instance"
 		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
 		
-		response = Morpheus::RestClient.execute(method: :delete, url: url,
-                                                     timeout: 30, headers: headers)
+		payload = options
+		response = Morpheus::RestClient.execute(method: :post, url: url,
+                                                     timeout: 30, headers: headers, payload: payload.to_json)
 		JSON.parse(response.to_s)
 	end
 
-
-	def create(options)
-		url = "#{@base_url}/api/apps"
+	def remove_instance(app_id, options)
+		url = "#{@base_url}/api/apps/#{app_id}/remove-instance"
 		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
 		
 		payload = options
@@ -72,6 +74,7 @@ class Morpheus::AppsInterface < Morpheus::APIClient
 		JSON.parse(response.to_s)
 	end
 
+=begin
 	def stop(id)
 		url = "#{@base_url}/api/apps/#{id}/stop"
 		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -95,6 +98,7 @@ class Morpheus::AppsInterface < Morpheus::APIClient
                                                      timeout: 30, headers: headers)
 		JSON.parse(response.to_s)
 	end
+=end
 
 	def firewall_disable(id)
 		url = "#{@base_url}/api/apps/#{id}/security-groups/disable"

data/lib/morpheus/api/instances_interface.rb

@@ -63,6 +63,16 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
 		JSON.parse(response.to_s)
 	end
 
+	def update(id, options)
+		url = "#{@base_url}/api/instances/#{id}"
+		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+		
+		payload = options
+		response = Morpheus::RestClient.execute(method: :put, url: url,
+                            timeout: 30, headers: headers,verify_ssl: false, payload: payload.to_json)
+		JSON.parse(response.to_s)
+	end
+
 	def destroy(id, params = {})
 		url = "#{@base_url}/api/instances/#{id}"
 		headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/cli/accounts.rb

@@ -13,7 +13,6 @@ class Morpheus::Cli::Accounts
   
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-		#@active_groups = ::Morpheus::Cli::Groups.load_group_file
 	end
 
 	def connect(opts)

data/lib/morpheus/cli/apps.rb

@@ -5,9 +5,11 @@ require 'optparse'
 require 'filesize'
 require 'table_print'
 require 'morpheus/cli/cli_command'
+require 'morpheus/cli/mixins/provisioning_helper'
 
 class Morpheus::Cli::Apps
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::ProvisioningHelper
 
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -19,39 +21,49 @@ class Morpheus::Cli::Apps
 			print_red_alert "Invalid Credentials. Unable to acquire access token. Please verify your credentials and try again."
 			exit 1
 		end
+		@api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
 		@apps_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).apps
 		@instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instance_types
-		@apps_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).apps
+		@instances_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instances
+    @options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
 		@groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
+		@logs_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).logs
 		@active_groups = ::Morpheus::Cli::Groups.load_group_file
 	end
 
 	def handle(args) 
-		usage = "Usage: morpheus apps [list,remove,stop,start,restart,resize,upgrade,clone,envs,setenv,delenv,firewall_disable,firewall_enable,security_groups,apply_security_groups] [name]"
+		usage = "Usage: morpheus apps [list,details,add,update,remove,add-instance,remove-instance,logs,firewall_disable,firewall_enable,security_groups,apply_security_groups] [name]"
 		case args[0]
 			when 'list'
 				list(args[1..-1])
-			# JD: this has never worked, it is time to implement it!
-			# when 'add'
-			# 	add(args[1..-1])
+			when 'details'
+				details(args[1..-1])
+			when 'add'
+				add(args[1..-1])
+			when 'update'
+				update(args[1..-1])
 			when 'remove'
 				remove(args[1..-1])
+			when 'add-instance'
+				add_instance(args[1..-1])
+			when 'remove-instance'
+				remove_instance(args[1..-1])
 			when 'stop'
 				stop(args[1..-1])
 			when 'start'
 				start(args[1..-1])
 			when 'restart'
 				restart(args[1..-1])
-			when 'stats'
-				stats(args[1..-1])
-			when 'details'
-				details(args[1..-1])
-			when 'envs'
-				envs(args[1..-1])
-			when 'setenv'
-				setenv(args[1..-1])	
-			when 'delenv'
-				delenv(args[1..-1])
+			when 'logs'
+				logs(args[1..-1])
+			# when 'stats'
+			# 	stats(args[1..-1])
+			# when 'envs'
+			# 	envs(args[1..-1])
+			# when 'setenv'
+			# 	setenv(args[1..-1])	
+			# when 'delenv'
+			# 	delenv(args[1..-1])
 			when 'firewall_disable'
 				firewall_disable(args[1..-1])	
 			when 'firewall_enable'
@@ -66,109 +78,107 @@ class Morpheus::Cli::Apps
 		end
 	end
 
-	def add(args)
+	def list(args)
 		options = {}
 		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus apps add NAME TYPE"
-			build_common_options(opts, options, [])
+			opts.banner = "Usage: morpheus apps list"
+			build_common_options(opts, options, [:list, :json])
 		end
 		optparse.parse(args)
-		if args.count < 2
-			puts "\n#{optparse.banner}\n\n"
-			exit 1
-		end
 		connect(options)
+		begin
+      params = {}
+			[:phrase, :offset, :max, :sort, :direction].each do |k|
+				params[k] = options[k] unless options[k].nil?
+			end
 
-		app_name = args[0]
-		instance_type_code = args[1]
-		instance_type = find_instance_type_by_code(instance_type_code)
-		if instance_type.nil?
+			json_response = @apps_interface.get(params)
+			
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
+				return
+			end
+			apps = json_response['apps']
+			print "\n" ,cyan, bold, "Morpheus Apps\n","==================", reset, "\n\n"
+			if apps.empty?
+				puts yellow,"No apps currently configured.",reset
+			else
+				print_apps_table(apps)
+			end
 			print reset,"\n\n"
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
 			exit 1
 		end
+	end
 
-		groupId = @active_groups[@appliance_name.to_sym]
-
-		params = {
-			:servicePlan => nil,
-			:app => {
-				:name => app_name,
-				:site => {
-					:id => groupId
-				},
-				:appType => {
-					:code => instance_type_code
-				}
-			}
-		}
-
-		# JD: this is old and busted.. appTypeLayouts is not returned..
-		instance_type['appTypeLayouts'].sort! { |x,y| y['sortOrder'] <=> x['sortOrder'] }
-		puts "Configurations: "
-		instance_type['appTypeLayouts'].each_with_index do |layout, index|
-			puts "  #{index+1}) #{layout['name']} (#{layout['code']})"
-		end
-		print "Selection: "
-		layout_selection = nil
-		layout = nil
-		while true do
-			layout_selection = $stdin.gets.chomp!
-			if layout_selection.to_i.to_s == layout_selection
-				layout_selection = layout_selection.to_i
-				break
+	def add(args)
+		usage = "Usage: morpheus apps add"
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = usage
+      opts.on( '-g', '--group GROUP', "Group Name" ) do |val|
+				options[:group_name] = val
 			end
-		end
-		layout = instance_type['appTypeLayouts'][layout_selection-1]['id']
-		params[:app][:layout] = {id: layout}
-		print "\n"
-		if params[:servicePlan].nil?
-			plans = @instance_types_interface.service_plans(layout)
-			puts "Select a Plan: "
-			plans['servicePlans'].each_with_index do |plan, index|
-				puts "  #{index+1}) #{plan['name']}"
+			opts.on( '-G', '--group-id ID', "Group Id" ) do |val|
+				options[:group_id] = val
 			end
-			print "Selection: "
-			plan_selection = nil
-			while true do
-				plan_selection = $stdin.gets.chomp!
-				if plan_selection.to_i.to_s == plan_selection
-					plan_selection = plan_selection.to_i
-					break
-				end
+      build_common_options(opts, options, [:options, :json, :dry_run])
+    end
+    optparse.parse(args)
+    connect(options)
+    begin
+  		
+  		# use active group by default
+			if !options[:group_name] && !options[:group_id]
+				options[:group_id] = @active_groups[@appliance_name.to_sym]
 			end
-			params[:servicePlan] = plans['servicePlans'][plan_selection-1]['id']
-			print "\n"
-		end
-
-		if !instance_type['config'].nil?
-			instance_type_config = JSON.parse(instance_type['config'])
-			if instance_type_config['options'].nil? == false
-				instance_type_config['options'].each do |opt|
-					print "#{opt['label']}: "
-					if(opt['name'].downcase.include?("password"))
-						params[opt['name']] = STDIN.noecho(&:gets).chomp!
-						print "\n"
-					else
-						params[opt['name']] = $stdin.gets.chomp!
-					end
-					
-				end
+			group = find_group_from_options(options)
+
+			payload = {
+				'app' => {}
+			}
+
+			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for this app'}], options[:options])
+			payload['app']['name'] = v_prompt['name']
+			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false}], options[:options])
+			payload['app']['description'] = v_prompt['description']
+			if group
+				payload['app']['site'] = {id: group["id"]}
+			else
+				v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'selectOptions' => get_available_groups(), 'required' => true}], options[:options])
+				payload['app']['site'] = {id: v_prompt["group"]}
 			end
-		end
-		begin
-			@apps_interface.create(params)
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-		list([])
+
+			# todo: allow adding instances with creation..
+
+      if options[:dry_run]
+        print_dry_run("POST #{@appliance_url}/api/apps", payload)
+        return
+      end
+      json_response = @apps_interface.create(payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Added app #{payload['app']['name']}"
+        list([])
+        # details_options = [payload['app']['name']]
+        # details(details_options)
+      end
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
 	end
 
-	def logs(args) 
+	def details(args)
 		options = {}
 		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus apps logs [name] [options]"
-			build_common_options(opts, options, [:list, :json])
+			opts.banner = "Usage: morpheus apps details [name]"
+			build_common_options(opts, options, [:json])
 		end
 		optparse.parse(args)
 		if args.count < 1
@@ -177,111 +187,199 @@ class Morpheus::Cli::Apps
 		end
 		connect(options)
 		begin
-			app = find_app_by_name(args[0])
-			containers = []
-			app['appTiers'].each do |app_tier|
-				app_tier['appInstances'].each do |app_instance|
-					containers += app_instance['instance']['containers']
-				end
-			end
-			params = {}
-			[:phrase, :offset, :max, :sort, :direction].each do |k|
-				params[k] = options[k] unless options[k].nil?
-			end
-			logs = @logs_interface.container_logs(containers, params)
+			app = find_app_by_name_or_id(args[0])
 			if options[:json]
-				puts logs
+				print JSON.pretty_generate({app: app})
+				return
+			end
+			
+			print "\n" ,cyan, bold, "App Details\n","==================", reset, "\n\n"
+			print cyan
+			puts "ID: #{app['id']}"
+			puts "Name: #{app['name']}"
+			puts "Description: #{app['description']}"
+			puts "Account: #{app['account'] ? app['account']['name'] : ''}"
+			# puts "Group: #{app['siteId']}"
+			
+			stats = app['stats']
+			print cyan, "Memory: \t#{Filesize.from("#{stats['usedMemory']} B").pretty} / #{Filesize.from("#{stats['maxMemory']} B").pretty}\n"
+			print cyan, "Storage: \t#{Filesize.from("#{stats['usedStorage']} B").pretty} / #{Filesize.from("#{stats['maxStorage']} B").pretty}\n\n",reset
+
+			app_tiers = app['appTiers']
+			if app_tiers.empty?
+				puts yellow, "This app is empty", reset
 			else
-				logs['data'].reverse.each do |log_entry|
-					log_level = ''
-					case log_entry['level']
-						when 'INFO'
-							log_level = "#{blue}#{bold}INFO#{reset}"
-						when 'DEBUG'
-							log_level = "#{white}#{bold}DEBUG#{reset}"
-						when 'WARN'
-							log_level = "#{yellow}#{bold}WARN#{reset}"
-						when 'ERROR'
-							log_level = "#{red}#{bold}ERROR#{reset}"
-						when 'FATAL'
-							log_level = "#{red}#{bold}FATAL#{reset}"
+				app_tiers.each do |app_tier|
+					print "\n" ,cyan, bold, "Tier: #{app_tier['tier']['name']}\n","==================", reset, "\n\n"
+					print cyan
+					instances = (app_tier['appInstances'] || []).collect {|it| it['instance']}
+					if instances.empty?
+						puts yellow, "This tier is empty", reset
+					else
+						instance_table = instances.collect do |instance|
+							status_string = instance['status']
+							if status_string == 'running'
+								status_string = "#{green}#{status_string.upcase}#{cyan}"
+							elsif status_string == 'stopped' or status_string == 'failed'
+								status_string = "#{red}#{status_string.upcase}#{cyan}"
+							elsif status_string == 'unknown'
+								status_string = "#{white}#{status_string.upcase}#{cyan}"
+							else
+								status_string = "#{yellow}#{status_string.upcase}#{cyan}"
+							end
+							connection_string = ''
+							if !instance['connectionInfo'].nil? && instance['connectionInfo'].empty? == false
+								connection_string = "#{instance['connectionInfo'][0]['ip']}:#{instance['connectionInfo'][0]['port']}"
+							end
+							{id: instance['id'], name: instance['name'], connection: connection_string, environment: instance['instanceContext'], nodes: instance['containers'].count, status: status_string, type: instance['instanceType']['name'], group: !instance['group'].nil? ? instance['group']['name'] : nil, cloud: !instance['cloud'].nil? ? instance['cloud']['name'] : nil}
+						end
+						tp instance_table, :id, :name, :cloud, :type, :environment, :nodes, :connection, :status
 					end
-					puts "[#{log_entry['ts']}] #{log_level} - #{log_entry['message']}"
 				end
-				print reset,"\n"
 			end
+			print cyan
+
+			print reset,"\n"
+
 		rescue RestClient::Exception => e
 			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
-	def stats(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus apps stats [name]"
-			build_common_options(opts, options, [:json])
-		end
-		optparse.parse(args)
-		if args.count < 1
+	def update(args)
+		usage = "Usage: morpheus apps update [name] [options]"
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = usage
+      build_common_options(opts, options, [:options, :json, :dry_run])
+    end
+    optparse.parse(args)
+    if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
 			exit 1
 		end
-		connect(options)
-		begin
-			app_results = @apps_interface.get({name: args[0]})
-			if app_results['apps'].empty?
-				print_red_alert "App not found by name #{args[0]}"
-				exit 1
-			end
-			app = app_results['apps'][0]
-			app_id = app['id']
-			stats = app_results['stats'][app_id.to_s]
-			print "\n" ,cyan, bold, "#{app['name']} (#{app['appType']['name']})\n","==================", reset, "\n\n"
-			print cyan, "Memory: \t#{Filesize.from("#{stats['usedMemory']} B").pretty} / #{Filesize.from("#{stats['maxMemory']} B").pretty}\n"
-			print cyan, "Storage: \t#{Filesize.from("#{stats['usedStorage']} B").pretty} / #{Filesize.from("#{stats['maxStorage']} B").pretty}\n\n",reset
-			puts 
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
+    connect(options)
+
+    begin
+  		
+  		app = find_app_by_name_or_id(args[0])
+
+			# group = find_group_from_options(options)
+
+			payload = {
+				'app' => {id: app["id"]}
+			}
+
+			update_app_option_types = [
+				{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for this app'},
+				{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false}
+			]
+
+			params = options[:options] || {}
+
+      if params.empty?
+        puts "\n#{usage}\n"
+        option_lines = update_app_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
+        puts "\nAvailable Options:\n#{option_lines}\n\n"
+        exit 1
+      end
+
+      #puts "parsed params is : #{params.inspect}"
+      app_keys = ['name', 'description']
+      params = params.select {|k,v| app_keys.include?(k) }
+      payload['app'].merge!(params)
+
+      if options[:dry_run]
+        print_dry_run("PUT #{@appliance_url}/api/apps/#{app['id']}", payload)
+        return
+      end
+      json_response = @apps_interface.update(app["id"], payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Updated app #{app['name']}"
+        list([])
+        # details_options = [payload['app']['name']]
+        # details(details_options)
+      end
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
 	end
 
-	def details(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus apps details [name]"
-			build_common_options(opts, options, [:json])
-		end
-		optparse.parse(args)
-		if args.count < 1
+
+	def add_instance(args)
+		usage = "Usage: morpheus apps add-instance [name] [instance] [tier]"
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = usage
+      build_common_options(opts, options, [:options, :json, :dry_run])
+    end
+    optparse.parse(args)
+    if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
 			exit 1
 		end
-		connect(options)
-		begin
-			app_results = @apps_interface.get({name: args[0]})
-			if app_results['apps'].empty?
-				print_red_alert "App not found by name #{args[0]}"
-				exit 1
+		# optional [tier] and [instance] arguments
+		if args[1] && args[1] !~ /\A\-/
+			options[:instance_name] = args[1]
+			if args[2] && args[2] !~ /\A\-/
+				options[:tier_name] = args[2]
 			end
-			app = app_results['apps'][0]
-			app_id = app['id']
-			stats = app_results['stats'][app_id.to_s]
-			print "\n" ,cyan, bold, "#{app['name']} (#{app['appType']['name']})\n","==================", reset, "\n\n"
-			print cyan, "Memory: \t#{Filesize.from("#{stats['usedMemory']} B").pretty} / #{Filesize.from("#{stats['maxMemory']} B").pretty}\n"
-			print cyan, "Storage: \t#{Filesize.from("#{stats['usedStorage']} B").pretty} / #{Filesize.from("#{stats['maxStorage']} B").pretty}\n\n",reset
-			puts app
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
 		end
+    connect(options)
+    begin
+  		
+  		app = find_app_by_name_or_id(args[0])
+
+  		# Only supports adding an existing instance right now..
+
+  		payload = {}
+
+  		if options[:instance_name]
+  			instance = find_instance_by_name_or_id(options[:instance_name])
+  		else
+  			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'instance', 'fieldLabel' => 'Instance', 'type' => 'text', 'required' => true, 'description' => 'Enter the instance name or id'}], options[:options])
+  			instance = find_instance_by_name_or_id(v_prompt['instance'])
+  		end
+  		payload[:instanceId] = instance['id']
+
+  		if options[:tier_name]
+  			payload[:tierName] = options[:tier_name]
+  		else
+  			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'tier', 'fieldLabel' => 'Tier', 'type' => 'text', 'required' => true, 'description' => 'Enter the name of the tier'}], options[:options])
+  			payload[:tierName] = v_prompt['tier']
+  		end
+
+      if options[:dry_run]
+        print_dry_run("POST #{@appliance_url}/api/apps/#{app['id']}/add-instance", payload)
+        return
+      end
+      json_response = @apps_interface.add_instance(app['id'], payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Added instance #{instance['name']} to app #{app['name']}"
+        list([])
+        # details_options = [app['name']]
+        # details(details_options)
+      end
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
 	end
 
-	def envs(args)
+	def remove(args)
 		options = {}
 		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus apps envs [name]"
+			opts.banner = "Usage: morpheus apps remove [name]"
 			build_common_options(opts, options, [:json])
 		end
 		optparse.parse(args)
@@ -290,97 +388,128 @@ class Morpheus::Cli::Apps
 			exit 1
 		end
 		connect(options)
+
 		begin
-			app_results = @apps_interface.get({name: args[0]})
-			if app_results['apps'].empty?
-				print_red_alert "App not found by name #{args[0]}"
-				return
-			end
-			app = app_results['apps'][0]
-			app_id = app['id']
-			env_results = @apps_interface.get_envs(app_id)
-			print "\n" ,cyan, bold, "#{app['name']} (#{app['appType']['name']})\n","==================", "\n\n", reset, cyan
-			envs = env_results['envs'] || {}
-			if env_results['readOnlyEnvs']
-				envs += env_results['readOnlyEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") ? "********" : v, :export => true}}
+			app = find_app_by_name_or_id(args[0])
+			unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the app '#{app['name']}'?", options)
+				exit 1
 			end
-			tp envs, :name, :value, :export
-			print "\n" ,cyan, bold, "Importad Envs\n","==================", "\n\n", reset, cyan
-			 imported_envs = env_results['importedEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") ? "********" : v}}
-			 tp imported_envs
-			print reset, "\n"
-			
+			@apps_interface.destroy(app_results['app']['id'])
+			list([])
 		rescue RestClient::Exception => e
 			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
-	def setenv(args)
-		options = {}
-		evar = {name: args[1], value: args[2], export: false}
-		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus apps setenv INSTANCE NAME VALUE [-e]"
-			opts.on( '-e', "Exportable" ) do |exportable|
-				evar[:export] = exportable
-			end
-			build_common_options(opts, options, [:json])
-		end
-		optparse.parse(args)
-		if args.count < 3
+	def remove_instance(args)
+		usage = "Usage: morpheus apps remove-instance [name] [instance]"
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = usage
+      build_common_options(opts, options, [:options, :json, :dry_run])
+    end
+    optparse.parse(args)
+    if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
 			exit 1
 		end
-		connect(options)
-		begin
-			app_results = @apps_interface.get({name: args[0]})
-			if app_results['apps'].empty?
-				print_red_alert "App not found by name #{args[0]}"
-				exit 1
-			end
-			app = app_results['apps'][0]
-			app_id = app['id']
-			params = {}
-
-			@apps_interface.create_env(app_id, [evar])
-			envs([args[0]])
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
+		# optional [tier] and [instance] arguments
+		if args[1] && args[1] !~ /\A\-/
+			options[:instance_name] = args[1]
+		end
+    connect(options)
+    begin
+  		
+  		app = find_app_by_name_or_id(args[0])
+
+  		payload = {}
+
+  		if options[:instance_name]
+  			instance = find_instance_by_name_or_id(options[:instance_name])
+  		else
+  			v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'instance', 'fieldLabel' => 'Instance', 'type' => 'text', 'required' => true, 'description' => 'Enter the instance name or id'}], options[:options])
+  			instance = find_instance_by_name_or_id(v_prompt['instance'])
+  		end
+  		payload[:instanceId] = instance['id']
+
+      if options[:dry_run]
+        print_dry_run("POST #{@appliance_url}/api/apps/#{app['id']}/remove-instance", payload)
+        return
+      end
+
+      json_response = @apps_interface.remove_instance(app['id'], payload)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Removed instance #{instance['name']} from app #{app['name']}"
+        list([])
+        # details_options = [app['name']]
+        # details(details_options)
+      end
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
 	end
 
-	def delenv(args)
+	def logs(args) 
 		options = {}
 		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus apps setenv INSTANCE NAME"
-			build_common_options(opts, options, [:json])
+			opts.banner = "Usage: morpheus apps logs [name]"
+			build_common_options(opts, options, [:list, :json])
 		end
 		optparse.parse(args)
-		if args.count < 2
+		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
 			exit 1
 		end
 		connect(options)
-
 		begin
-			app_results = @apps_interface.get({name: args[0]})
-			if app_results['apps'].empty?
-				print_red_alert "App not found by name #{args[0]}"
-				exit 1
+			app = find_app_by_name_or_id(args[0])
+			containers = []
+			app['appTiers'].each do |app_tier|
+				app_tier['appInstances'].each do |app_instance|
+					containers += app_instance['instance']['containers']
+				end
+			end
+			params = {}
+			[:phrase, :offset, :max, :sort, :direction].each do |k|
+				params[k] = options[k] unless options[k].nil?
+			end
+			logs = @logs_interface.container_logs(containers, params)
+			if options[:json]
+				print JSON.pretty_generate(logs)
+				print "\n"
+			else
+				logs['data'].reverse.each do |log_entry|
+					log_level = ''
+					case log_entry['level']
+						when 'INFO'
+							log_level = "#{blue}#{bold}INFO#{reset}"
+						when 'DEBUG'
+							log_level = "#{white}#{bold}DEBUG#{reset}"
+						when 'WARN'
+							log_level = "#{yellow}#{bold}WARN#{reset}"
+						when 'ERROR'
+							log_level = "#{red}#{bold}ERROR#{reset}"
+						when 'FATAL'
+							log_level = "#{red}#{bold}FATAL#{reset}"
+					end
+					puts "[#{log_entry['ts']}] #{log_level} - #{log_entry['message']}"
+				end
+				print reset,"\n"
 			end
-			app = app_results['apps'][0]
-			app_id = app['id']
-			name = args[1]
-
-			@apps_interface.del_env(app_id, name)
-			envs([args[0]])
 		rescue RestClient::Exception => e
 			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
+=begin
 	def stop(args)
 		options = {}
 		optparse = OptionParser.new do|opts|
@@ -458,70 +587,7 @@ class Morpheus::Cli::Apps
 			exit 1
 		end
 	end
-
-	def list(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus apps list"
-			opts.on( '-g', '--group GROUP', "Group Name" ) do |group|
-				options[:group] = group
-			end
-			build_common_options(opts, options, [:json])
-		end
-		optparse.parse(args)
-
-		connect(options)
-		
-		begin
-			params = {}
-			[:phrase, :offset, :max, :sort, :direction].each do |k|
-				params[k] = options[k] unless options[k].nil?
-			end
-			# todo: include options[:group] in params?
-			json_response = @apps_interface.get(params)
-			apps = json_response['apps']
-			print "\n" ,cyan, bold, "Morpheus Apps\n","==================", reset, "\n\n"
-			if apps.empty?
-				puts yellow,"No apps currently configured.",reset
-			else
-				apps.each do |app|
-					print cyan, "=  #{app['name']}\n"
-				end
-			end
-			print reset,"\n\n"
-			
-		rescue => e
-			puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			return nil
-		end
-	end
-
-	def remove(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = "Usage: morpheus apps remove [name]"
-			build_common_options(opts, options, [:json])
-		end
-		optparse.parse(args)
-		if args.count < 1
-			puts "\n#{optparse.banner}\n\n"
-			exit 1
-		end
-		connect(options)
-
-		begin
-			app_results = @apps_interface.get({name: args[0]})
-			if app_results['apps'].empty?
-				print_red_alert "App not found by name #{args[0]}"
-				exit 1
-			end
-			@apps_interface.destroy(app_results['apps'][0]['id'])
-			list([])
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-	end
+=end
 
 	def firewall_disable(args)
 		options = {}
@@ -620,7 +686,7 @@ class Morpheus::Cli::Apps
 
 	def apply_security_groups(args)
 		usage = <<-EOF
-Usage: morpheus apps apply_security_groups [name] [options]
+Usage: morpheus apps apply_security_groups [name]
 EOF
 
 		options = {}
@@ -668,7 +734,16 @@ EOF
 		end
 	end
 
-private 
+private
+
+	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.get({name: name})
@@ -678,21 +753,88 @@ private
 		end
 		return app_results['apps'][0]
 	end
-	def find_group_by_name(name)
-		group_results = @groups_interface.get(name)
-		if group_results['groups'].empty?
-			puts "Group not found by name #{name}"
-			return nil
+
+	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
-		return group_results['groups'][0]
 	end
 
-	def find_instance_type_by_code(code)
-		instance_type_results = @instance_types_interface.get({code: code})
-		if instance_type_results['appTypes'].empty?
-			puts "Instance Type not found by code #{code}"
-			return nil
+	def find_instance_by_id(id)
+		instance_results = @instances_interface.get(id.to_i)
+		if instance_results['instance'].empty?
+			print_red_alert "Instance not found by id #{id}"
+			exit 1
+		end
+		return instance_results['instance']
+	end
+
+	def find_instance_by_name(name)
+		instance_results = @instances_interface.get({name: name})
+		if instance_results['instances'].empty?
+			print_red_alert "Instance not found by name #{name}"
+			exit 1
 		end
-		return instance_type_results['appTypes'][0]
+		return instance_results['instances'][0]
 	end
+
+	def find_instance_by_name_or_id(val)
+		if val.to_s =~ /\A\d{1,}\Z/
+			return find_instance_by_id(val)
+		else
+			return find_instance_by_name(val)
+		end
+	end
+
+	def print_apps_table(apps, opts={})
+    table_color = opts[:color] || cyan
+    rows = apps.collect do |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"
+    	status_string = app['status']
+    	if app['instanceCount'].to_i == 0
+    		# show this instead of WARNING
+    		status_string = "#{white}EMPTY#{table_color}"
+			elsif status_string == 'running'
+				status_string = "#{green}#{status_string.upcase}#{table_color}"
+			elsif status_string == 'stopped' or status_string == 'failed'
+				status_string = "#{red}#{status_string.upcase}#{table_color}"
+			elsif status_string == 'unknown'
+				status_string = "#{white}#{status_string.upcase}#{table_color}"
+			else
+				status_string = "#{yellow}#{status_string.upcase}#{table_color}"
+			end
+			
+      {
+        id: app['id'], 
+        name: app['name'], 
+        instances: instances_str,
+        containers: containers_str,
+        account: app['account'] ? app['account']['name'] : nil, 
+        status: status_string, 
+        #dateCreated: format_local_dt(app['dateCreated']) 
+      }
+    end
+    
+    print table_color
+    tp rows, [
+      :id, 
+      :name, 
+      :instances,
+      :containers,
+      #:account, 
+      :status,
+      #{:dateCreated => {:display_name => "Date Created"} }
+    ]
+    print reset
+  end
+
+  def generate_id(len=16)
+    id = ""
+    len.times { id << (1 + rand(9)).to_s }
+    id
+  end
+
 end