morpheus-cli 0.9.10 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d8887267dd938f32dd8541223f21e0011b15f9f
-  data.tar.gz: 9654191eb9c4bf4162c42f3cad2955ff9502c79d
+  metadata.gz: 812e393024472b2ee42ef0136aa373a8de3d85e3
+  data.tar.gz: 8d2947e92d627e420f6e18c1349b92294d5f9999
 SHA512:
-  metadata.gz: e3999564f5e8a363160a78f50e8b55ae27ca7835982eb777fa8645b573833231f23c5ffae9b444e5d4a494d5661376611542a8b40d96b5cdab000715c2463b21
-  data.tar.gz: 792e9432f9817331b73dceca9d476c763953b912b49d1253db36b715452d581e8cff554233c4c80a87d8e000167a458fb073d5aff2c0ebb12c3d2947653fc2be
+  metadata.gz: 4744303a2f1d76a3ed90c8ecf084729ed06ea0ee7b10360fd488bd27f903a1309f124008202378cffa27093bda79562123000a5ed63cede7dafae87c563240f1
+  data.tar.gz: fcaa57787c5421fb1a12edac4c60907765b718b1f3516e8944c44bc91cf3f9e30bd0d8f1d1bc3ce91a29fa46116513b641ed516592e5eb5ee632adab4d17cb66

data/bin/morpheus

@@ -1,44 +1,59 @@
 #!/usr/bin/env ruby
+require 'optparse'
 require 'morpheus/cli'
 require 'morpheus/rest_client'
 require 'morpheus/cli/cli_registry'
 
-remote_handler = Morpheus::Cli::Remote.new()
-
-# parse args to handle global issues
-if ARGV.find {|arg| arg == '--insecure'}
-  Morpheus::RestClient.enable_ssl_verification = false
+# short circuit version switch
+if ARGV[0] == '-v' && ARGV.size == 1
+  version = Morpheus::Cli::VERSION
+  puts version
+  exit 0
 end
 
-filtered_args = ARGV.find_all {|arg| arg != '--insecure'}
+# handle global options
+args = ARGV
+# set global log level to debug (print stack trace for bubbled exceptions)
+if args.find {|arg| arg == '-V' || arg == '--debug'}
+  Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
+end
+args = args.find_all {|arg| arg != '-V' && arg != '--debug'}
 
-if Morpheus::Cli::CliRegistry.has_command?(ARGV[0])
-  Morpheus::Cli::CliRegistry.exec(ARGV[0], filtered_args[1..-1])
-  exit 0
+# JD: figure out what to do with --insecure option
+if args.find {|arg| arg == '--insecure'}
+  Morpheus::RestClient.enable_ssl_verification = false
 end
+args = args.find_all {|arg| arg != '--insecure'}
 
-case ARGV[0]
-	when 'remote'
-		remote_handler.handle(filtered_args[1..-1])
-	when 'login'
-		appliance_name, appliance_url = Morpheus::Cli::Remote.active_appliance
-		Morpheus::Cli::Credentials.new(appliance_name,appliance_url).login()
-	when 'logout'
-		appliance_name, appliance_url = Morpheus::Cli::Remote.active_appliance
-		creds = Morpheus::Cli::Credentials.new(appliance_name,appliance_url).load_saved_credentials()
-		if !creds
-			puts "\nYou are not logged in.\n"
-		else
-			Morpheus::Cli::Credentials.new(appliance_name,appliance_url).logout()
-		end
-	else
-		puts "\nUsage: morpheus [command] [options]\n"
-    puts "\nCommands:\n"
-    puts "\tremote"
-    puts "\tlogin"
-    puts "\tlogout"
-    Morpheus::Cli::CliRegistry.all.each {|cmd,klass|
-      puts "\t#{cmd.to_s}"
-    }
-    puts ""
+# all commands should be registered commands
+if Morpheus::Cli::CliRegistry.has_command?(args[0])
+  begin
+    Morpheus::Cli::CliRegistry.exec(args[0], args[1..-1])
+    exit 0
+  rescue OptionParser::InvalidOption => e
+    # raise e
+    print Term::ANSIColor.red, "\n", "#{e.message}", "", Term::ANSIColor.reset
+    print "\n", "Try -h for help with this command.", "\n\n"
+    if Morpheus::Logging.print_stacktrace?
+      print Term::ANSIColor.red, "\n", "#{e.class}: #{e.message}", "\n", Term::ANSIColor.reset
+      print e.backtrace.join("\n"), "\n\n"
+    end
+    exit 1
+  rescue => e
+    print Term::ANSIColor.red, "\n", "Unexpected Error", "\n\n", Term::ANSIColor.reset
+    if Morpheus::Logging.print_stacktrace?
+      print Term::ANSIColor.red, "\n", "#{e.class}: #{e.message}", "\n", Term::ANSIColor.reset
+      print e.backtrace.join("\n"), "\n\n"
+    end
+    exit 1
+  end
+  exit 0
+else
+  puts "\nUsage: morpheus [command] [options]\n"
+  puts "\nCommands:\n"
+  Morpheus::Cli::CliRegistry.all.each {|cmd,klass|
+    puts "\t#{cmd.to_s}"
+  }
+  puts ""
+  exit 127
 end

data/lib/morpheus/api/api_client.rb

@@ -11,6 +11,10 @@ class Morpheus::APIClient
 		end
 	end
 
+	def whoami
+		Morpheus::WhoamiInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+	end
+
 	def options
 		Morpheus::OptionsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
 	end
@@ -103,4 +107,12 @@ class Morpheus::APIClient
 		Morpheus::LicenseInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
 	end
 
+	def custom_instance_types
+		Morpheus::CustomInstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+	end
+
+	def dashboard
+		Morpheus::DashboardInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+	end
+
 end

data/lib/morpheus/api/custom_instance_types.rb

@@ -0,0 +1,55 @@
+require 'json'
+require 'morpheus/rest_client'
+
+class Morpheus::CustomInstanceTypesInterface < 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(id)
+    url = "#{@base_url}/api/custom-instance-types"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 10, headers: headers, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+	def list(options={})
+    url = "#{@base_url}/api/custom-instance-types"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 10, headers: headers, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def create(options)
+    url = "#{@base_url}/api/custom-instance-types"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    response = Morpheus::RestClient.execute(method: :post, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def update(id, options)
+    url = "#{@base_url}/api/custom-instance-types/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    response = Morpheus::RestClient.execute(method: :put, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def destroy(id)
+    url = "#{@base_url}/api/custom-instance-types/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    response = Morpheus::RestClient.execute(method: :delete, url: url,
+                            timeout: 10, headers: headers, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+end

data/lib/morpheus/api/custom_instance_types_interface.rb

@@ -0,0 +1,133 @@
+require 'json'
+require 'morpheus/rest_client'
+
+class Morpheus::CustomInstanceTypesInterface < 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 list(options={})
+    url = "#{@base_url}/api/custom-instance-types"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 10, headers: headers, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def get(id)
+    url = "#{@base_url}/api/custom-instance-types/#{id}"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 10, headers: headers, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def create(options)
+    url = "#{@base_url}/api/custom-instance-types"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    payload = options
+    # payload[:multipart] = true
+    # convert to grails params
+    # it = payload.delete('instanceType') || payload.delete(:instanceType)
+    # if it
+    #   it.each { |k,v| payload["instanceType.#{k}"] = v }
+    # end
+    response = Morpheus::RestClient.execute(method: :post, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def update(id, options)
+    url = "#{@base_url}/api/custom-instance-types/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    payload = options
+    # payload[:multipart] = true
+    # convert to grails params
+    # it = payload.delete('instanceType') || payload.delete(:instanceType)
+    # if it
+    #   it.each { |k,v| payload["instanceType.#{k}"] = v }
+    # end
+    response = Morpheus::RestClient.execute(method: :put, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  # NOT json, multipart file upload
+  def update_logo(id, logo_file)
+    url = "#{@base_url}/api/custom-instance-types/#{id}/updateLogo"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}"}
+    payload = {}
+    payload[:logo] = logo_file
+    payload[:multipart] = true
+    response = Morpheus::RestClient.execute(method: :post, url: url,
+                            timeout: 10, headers: headers, payload: payload, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def destroy(id)
+    url = "#{@base_url}/api/custom-instance-types/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    response = Morpheus::RestClient.execute(method: :delete, url: url,
+                            timeout: 10, headers: headers, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def create_version(instance_type_id, options)
+    url = "#{@base_url}/api/custom-instance-types/#{instance_type_id}/versions"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    payload = options
+    response = Morpheus::RestClient.execute(method: :post, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def update_version(instance_type_id, id, options)
+    url = "#{@base_url}/api/custom-instance-types/#{instance_type_id}/versions/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    payload = options
+    response = Morpheus::RestClient.execute(method: :put, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def destroy_version(instance_type_id, id)
+    url = "#{@base_url}/api/custom-instance-types/#{instance_type_id}/versions/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    payload = options
+    response = Morpheus::RestClient.execute(method: :delete, url: url,
+                            timeout: 10, headers: headers, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def create_upgrade(instance_type_id, options)
+    url = "#{@base_url}/api/custom-instance-types/#{instance_type_id}/upgrades"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    payload = options
+    response = Morpheus::RestClient.execute(method: :post, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def update_upgrade(instance_type_id, id, options)
+    url = "#{@base_url}/api/custom-instance-types/#{instance_type_id}/upgrades/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    payload = options
+    response = Morpheus::RestClient.execute(method: :put, url: url,
+                            timeout: 10, headers: headers, payload: payload.to_json, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+  def destroy_upgrade(instance_type_id, id)
+    url = "#{@base_url}/api/custom-instance-types/#{instance_type_id}/upgrades/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
+    payload = options
+    response = Morpheus::RestClient.execute(method: :delete, url: url,
+                            timeout: 10, headers: headers, verify_ssl:false)
+    JSON.parse(response.to_s)
+  end
+
+end

data/lib/morpheus/api/dashboard_interface.rb

@@ -0,0 +1,37 @@
+require 'json'
+require 'rest-client'
+
+class Morpheus::DashboardInterface < 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(options={})
+    dashboard(options)
+  end
+
+  def dashboard(options={})
+    url = "#{@base_url}/api/dashboard"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 30, headers: headers, verify_ssl: false)
+    JSON.parse(response.to_s)
+  end
+
+	def recent_activity(account_id=nil, options={})
+    url = "#{@base_url}/api/dashboard/recentActivity"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    headers[:params]['accountId'] = account_id if account_id
+    response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 10, headers: headers)
+    JSON.parse(response.to_s)
+  end
+
+	
+
+end

data/lib/morpheus/api/users_interface.rb

@@ -28,6 +28,23 @@ class Morpheus::UsersInterface < Morpheus::APIClient
 		JSON.parse(response.to_s)
 	end
 
+	def feature_permissions(account_id, id)
+		url = build_url(account_id, id) + "/feature-permissions"
+		headers = { params: {}, authorization: "Bearer #{@access_token}" }
+		response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 10, headers: headers)
+		JSON.parse(response.to_s)
+	end
+
+	def available_roles(account_id, id=nil, options={})
+		url = build_url(account_id, id) + "/available-roles"
+		headers = { params: {}, authorization: "Bearer #{@access_token}" }
+		headers[:params].merge!(options)
+		response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 10, headers: headers)
+		JSON.parse(response.to_s)
+	end
+
 	def create(account_id, options)
 		url = build_url(account_id)
 		headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/whoami_interface.rb

@@ -0,0 +1,20 @@
+require 'json'
+require 'rest-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
+	end
+
+	def get()
+		url = "#{@base_url}/api/whoami"
+		headers = { params: {}, authorization: "Bearer #{@access_token}" }
+		response = Morpheus::RestClient.execute(method: :get, url: url,
+                            timeout: 30, headers: headers, verify_ssl: false)
+		JSON.parse(response.to_s)
+	end
+
+end

data/lib/morpheus/cli.rb

@@ -1,6 +1,7 @@
 require "morpheus/cli/version"
 require "morpheus/rest_client"
 require 'morpheus/formatters'
+require 'morpheus/logging'
 require 'term/ansicolor'
 
 Dir[File.dirname(__FILE__)  + "/ext/*.rb"].each {|file| require file }
@@ -8,6 +9,7 @@ Dir[File.dirname(__FILE__)  + "/ext/*.rb"].each {|file| require file }
 module Morpheus
   module Cli
   	require 'morpheus/api/api_client'
+    require 'morpheus/api/whoami_interface'
     require 'morpheus/api/options_interface'
   	require 'morpheus/api/groups_interface'
   	require 'morpheus/api/clouds_interface'
@@ -31,9 +33,17 @@ module Morpheus
     require 'morpheus/api/logs_interface'
     require 'morpheus/api/roles_interface'
     require 'morpheus/api/key_pairs_interface'
+    require 'morpheus/api/custom_instance_types_interface'
+    require 'morpheus/api/dashboard_interface'
   	
+    require 'morpheus/cli/cli_command'
+    require 'morpheus/cli/remote'
+    require 'morpheus/cli/login'
+    require 'morpheus/cli/logout'
+    require 'morpheus/cli/whoami'
+    require 'morpheus/cli/dashboard_command'
+    require 'morpheus/cli/recent_activity_command'
     require 'morpheus/cli/credentials'
-  	require 'morpheus/cli/remote'
   	require 'morpheus/cli/groups'
   	require 'morpheus/cli/clouds'
   	require 'morpheus/cli/hosts'
@@ -55,6 +65,8 @@ module Morpheus
     require 'morpheus/cli/roles'
     require 'morpheus/cli/key_pairs'
     require 'morpheus/cli/virtual_images'
+    require 'morpheus/cli/library'
+    require 'morpheus/cli/version_command'
     # Your code goes here...
   end
 end

data/lib/morpheus/cli/app_templates.rb

@@ -813,7 +813,7 @@ private
       json_response = @app_templates_interface.get(id.to_i)
       return json_response['appTemplate']
     rescue RestClient::Exception => e
-      if e.response.code == 404
+      if e.response && e.response.code == 404
         print_red_alert "App Template not found by id #{id}"
       else
         raise e