morpheus-cli 0.9.9 → 0.9.10

data/lib/morpheus/cli/tasks.rb

@@ -1,14 +1,13 @@
 # require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'table_print'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Tasks
 	include Morpheus::Cli::CliCommand
-	include Term::ANSIColor
+
 	def initialize() 
 		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance	
 	end
@@ -25,7 +24,7 @@ class Morpheus::Cli::Tasks
 		@tasks_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).tasks
 		@task_sets_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).task_sets
 		if @access_token.empty?
-			print red,bold, "\nInvalid Credentials. Unable to acquire access token. Please verify your credentials and try again.\n\n",reset
+			print_red_alert "Invalid Credentials. Unable to acquire access token. Please verify your credentials and try again."
 			exit 1
 		end
 	end
@@ -60,20 +59,14 @@ class Morpheus::Cli::Tasks
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus tasks list [-s] [-o] [-m]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:list, :json, :remote])
 		end
 		optparse.parse(args)
 		connect(options)
 		begin
 			params = {}
-			if options[:offset]
-				params[:offset] = options[:offset]
-			end
-			if options[:max]
-				params[:max] = options[:max]
-			end
-			if options[:phrase]
-				params[:phrase] = options[:phrase]
+			[:phrase, :offset, :max, :sort, :direction].each do |k|
+				params[k] = options[k] unless options[k].nil?
 			end
 			json_response = @tasks_interface.get(params)
 			if options[:json]
@@ -94,13 +87,8 @@ class Morpheus::Cli::Tasks
 			end
 			
 			
-		rescue => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error,options)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -110,7 +98,7 @@ class Morpheus::Cli::Tasks
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus tasks details [task]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -133,12 +121,7 @@ class Morpheus::Cli::Tasks
 				print reset,"\n\n"
 			end
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error,options)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -149,7 +132,7 @@ class Morpheus::Cli::Tasks
 		account_name = nil
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus tasks update [task] [options]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:options, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -198,12 +181,7 @@ class Morpheus::Cli::Tasks
 				print "\n", cyan, "Task #{response['task']['name']} updated", reset, "\n\n"
 			end
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -213,7 +191,7 @@ class Morpheus::Cli::Tasks
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus tasks task-types"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:json, :remote])
 		end
 		optparse.parse(args)
 		connect(options)
@@ -238,13 +216,8 @@ class Morpheus::Cli::Tasks
 			end
 			
 			
-		rescue => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error,options)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
+		rescue RestClient::Exception => e
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -258,7 +231,7 @@ class Morpheus::Cli::Tasks
 			opts.on( '-t', '--type TASK_TYPE', "Task Type" ) do |val|
 				task_type_name = val
 			end
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:options, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -286,12 +259,7 @@ class Morpheus::Cli::Tasks
 				print "\n", cyan, "Task #{json_response['task']['name']} created successfully", reset, "\n\n"			
 			end
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error,options)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -301,7 +269,7 @@ class Morpheus::Cli::Tasks
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus tasks remove [task]"
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:auto_confirm, :json, :remote])
 		end
 		if args.count < 1
 			puts "\n#{optparse.banner}\n\n"
@@ -312,7 +280,9 @@ class Morpheus::Cli::Tasks
 		begin
 			task = find_task_by_name_or_code_or_id(task_name)
 			exit 1 if task.nil?
-			exit unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the task #{task['name']}?")
+			unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the task #{task['name']}?")
+				exit
+			end
 			json_response = @tasks_interface.destroy(task['id'])
 			if options[:json]
 					print JSON.pretty_generate(json_response)
@@ -320,12 +290,7 @@ class Morpheus::Cli::Tasks
 				print "\n", cyan, "Task #{task['name']} removed", reset, "\n\n"
 			end
 		rescue RestClient::Exception => e
-			if e.response.code == 400
-				error = JSON.parse(e.response.to_s)
-				::Morpheus::Cli::ErrorHandler.new.print_errors(error,options)
-			else
-				puts "Error Communicating with the Appliance. Please try again later. #{e}"
-			end
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
@@ -343,7 +308,7 @@ private
 			result = results['task']
 		end
 		if result.nil?
-			print red,bold, "\nTask not found by '#{val}'\n\n",reset
+			print_red_alert "Task not found by '#{val}'"
 			return nil
 		end
 		return result
@@ -360,7 +325,7 @@ private
 			result = results['taskType']
 		end
 		if result.nil?
-			print red,bold, "\nTask Type not found by '#{val}'\n\n",reset
+			print_red_alert "Task Type not found by '#{val}'"
 			return nil
 		end
 		return result
@@ -371,4 +336,4 @@ private
 			{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 0}
 		] + task_type['optionTypes']
 	end
-end
+end

data/lib/morpheus/cli/users.rb

@@ -1,7 +1,6 @@
 # require 'yaml'
 require 'io/console'
 require 'rest_client'
-require 'term/ansicolor'
 require 'optparse'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/option_types'
@@ -9,7 +8,6 @@ require 'morpheus/cli/mixins/accounts_helper'
 require 'json'
 
 class Morpheus::Cli::Users
-	include Term::ANSIColor
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
   
@@ -21,7 +19,7 @@ class Morpheus::Cli::Users
 	def connect(opts)
 		@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
 		if @access_token.empty?
-			print red,bold, "\nInvalid Credentials. Unable to acquire access token. Please verify your credentials and try again.\n\n",reset
+			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)
@@ -57,12 +55,9 @@ class Morpheus::Cli::Users
 	def list(args)
 		usage = "Usage: morpheus users list [options]"
 		options = {}
-		params = {}
-		account = nil
 		optparse = OptionParser.new do|opts|
 			opts.banner = usage
-			Morpheus::Cli::CliCommand.accountScopeOptions(opts,options)
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:account, :list, :json])
 		end
 		optparse.parse(args)
 		connect(options)
@@ -71,6 +66,7 @@ class Morpheus::Cli::Users
 			account = find_account_from_options(options)
 			account_id = account ? account['id'] : nil
 
+			params = {}
 			[:phrase, :offset, :max, :sort, :direction].each do |k|
 				params[k] = options[k] unless options[k].nil?
 			end
@@ -91,27 +87,26 @@ class Morpheus::Cli::Users
 				print reset,"\n\n"
 			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
 	def details(args)
 		usage = "Usage: morpheus users details [username] [options]"
-		if args.count < 1
-			puts "\n#{usage}\n\n"
-			exit 1
-		end
-		account = nil
-		username = args[0]
 		options = {}
-		params = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = usage
-      Morpheus::Cli::CliCommand.accountScopeOptions(opts,options)
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+      build_common_options(opts, options, [:account, :json])
 		end
 		optparse.parse(args)
+
+		if args.count < 1
+			puts "\n#{usage}\n\n"
+			exit 1
+		end
+		username = args[0]
+
 		connect(options)
 		begin
 			
@@ -124,7 +119,7 @@ class Morpheus::Cli::Users
 			exit 1 if user.nil?
 
 			if options[:json]
-				print JSON.pretty_generate(user)
+				print JSON.pretty_generate({user:user})
 				print "\n"
 			else
 				print "\n" ,cyan, bold, "User Details\n","==================", reset, "\n\n"
@@ -146,24 +141,17 @@ class Morpheus::Cli::Users
 				print reset,"\n\n"
 			end
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
 	def add(args)
 		usage = "Usage: morpheus users add [options]"
-		# if args.count > 0
-		# 	puts "\#{usage}\n\n"
-		# 	exit 1
-		# end
 		options = {}
-		#options['username'] = args[0] if args[0]
-		account = nil
 		optparse = OptionParser.new do|opts|
 			opts.banner = usage
-			Morpheus::Cli::CliCommand.accountScopeOptions(opts,options)
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:account, :options, :json])
 		end
 		optparse.parse(args)
 
@@ -174,55 +162,63 @@ class Morpheus::Cli::Users
 			account = find_account_from_options(options)
 			account_id = account ? account['id'] : nil
 
-			#params = Morpheus::Cli::OptionTypes.prompt(add_user_option_types, options)
-			params = Morpheus::Cli::OptionTypes.prompt(add_user_option_types, options[:options], @api_client, options[:params]) # options[:params] is mysterious
+			params = Morpheus::Cli::OptionTypes.prompt(add_user_option_types, options[:options], @api_client, options[:params])
 
 			#puts "parsed params is : #{params.inspect}"
 			user_keys = ['username', 'firstName', 'lastName', 'email', 'password', 'passwordConfirmation', 'instanceLimits']
 			user_payload = params.select {|k,v| user_keys.include?(k) }
+			if !user_payload['instanceLimits']
+				user_payload['instanceLimits'] = {}
+				user_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
+				user_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
+				user_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
+			end
 			if params['role'].to_s != ''
 				role = find_role_by_name(account_id, params['role'])
 				exit 1 if role.nil?
 				user_payload['role'] = {id: role['id']}
 			end
 			request_payload = {user: user_payload}
-			response = @users_interface.create(account_id, request_payload)
+			json_response = @users_interface.create(account_id, request_payload)
 
-			if account
-				print_green_success "Added user #{user_payload['username']} to account #{account['name']}"
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
 			else
-				print_green_success "Added user #{user_payload['username']}"
-			end
+				if account
+					print_green_success "Added user #{user_payload['username']} to account #{account['name']}"
+				else
+					print_green_success "Added user #{user_payload['username']}"
+				end
 
-			details_options = [user_payload["username"]]
-			if account
-				details_options.push "--account-id", account['id'].to_s
+				details_options = [user_payload["username"]]
+				if account
+					details_options.push "--account-id", account['id'].to_s
+				end
+				details(details_options)
 			end
-			details(details_options)
 
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
 	def update(args)
 		usage = "Usage: morpheus users update [username] [options]"
-		if args.count < 1
-			puts "\n#{usage}\n\n"
-			exit 1
-		end
-		account = nil
-		username = args[0]
 		options = {}
-		#options['username'] = args[0] if args[0]
 		optparse = OptionParser.new do|opts|
 			opts.banner = usage
-			Morpheus::Cli::CliCommand.accountScopeOptions(opts,options)
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:account, :options, :json])
 		end
 		optparse.parse(args)
 
+		if args.count < 1
+			puts "\n#{usage}\n\n"
+			exit 1
+		end
+		username = args[0]
+
 		connect(options)
 		
 		begin
@@ -233,11 +229,11 @@ class Morpheus::Cli::Users
 			user = find_user_by_username(account_id, username)
 			exit 1 if user.nil?
 
-			#params = Morpheus::Cli::OptionTypes.prompt(add_user_option_types, options[:options], @api_client, options[:params]) # options[:params] is mysterious
+			#params = Morpheus::Cli::OptionTypes.prompt(update_user_option_types, options[:options], @api_client, options[:params])
 			params = options[:options] || {}
 
 			if params.empty?
-				puts "\n#{usage}\n"
+				puts "\n#{usage}\n\n"
 				option_lines = update_user_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
 				puts "\nAvailable Options:\n#{option_lines}\n\n"
 				exit 1
@@ -246,43 +242,53 @@ class Morpheus::Cli::Users
 			#puts "parsed params is : #{params.inspect}"
 			user_keys = ['username', 'firstName', 'lastName', 'email', 'password', 'instanceLimits']
 			user_payload = params.select {|k,v| user_keys.include?(k) }
+			if !user_payload['instanceLimits']
+				user_payload['instanceLimits'] = {}
+				user_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
+				user_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
+				user_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
+			end
 			if params['role'].to_s != ''
 				role = find_role_by_name(account_id, params['role'])
 				exit 1 if role.nil?
 				user_payload['role'] = {id: role['id']}
 			end
 			request_payload = {user: user_payload}
-			response = @users_interface.update(account_id, user['id'], request_payload)
+			json_response = @users_interface.update(account_id, user['id'], request_payload)
 			
-			print_green_success "Updated user #{user_payload['username']}"
-
-			details_options = [user_payload["username"] || user['username']]
-			if account
-				details_options.push "--account-id", account['id'].to_s
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
+			else
+				print_green_success "Updated user #{user_payload['username']}"
+				details_options = [user_payload["username"] || user['username']]
+				if account
+					details_options.push "--account-id", account['id'].to_s
+				end
+				details(details_options)
 			end
-			details(details_options)
 
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end
 
 	def remove(args)
 		usage = "Usage: morpheus users remove [username]"
-		if args.count < 1
-			puts "\n#{usage}\n"
-			exit 1
-		end
-		account = nil
-		username = args[0]
 		options = {}
 		optparse = OptionParser.new do|opts|
 			opts.banner = usage
-			Morpheus::Cli::CliCommand.accountScopeOptions(opts,options)
-			Morpheus::Cli::CliCommand.genericOptions(opts,options)
+			build_common_options(opts, options, [:account, :auto_confirm, :json])
 		end
 		optparse.parse(args)
+
+		if args.count < 1
+			puts "\n#{usage}\n\n"
+			exit 1
+		end
+		username = args[0]
+
 		connect(options)
 		begin
 
@@ -291,12 +297,21 @@ class Morpheus::Cli::Users
 
 			user = find_user_by_username(account_id, username)
 			exit 1 if user.nil?
-			exit unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the user #{user['username']}?")
-			@users_interface.destroy(account_id, user['id'])
-			# list([])
-			print "\n", cyan, "User #{username} removed", reset, "\n\n"
+			unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the user #{user['username']}?")
+				exit
+			end
+			json_response = @users_interface.destroy(account_id, user['id'])
+
+			if options[:json]
+				print JSON.pretty_generate(json_response)
+				print "\n"
+			else
+				print_green_success "User #{username} removed"
+				# list([])
+			end
+			
 		rescue RestClient::Exception => e
-			::Morpheus::Cli::ErrorHandler.new.print_rest_exception(e)
+			print_rest_exception(e, options)
 			exit 1
 		end
 	end