morpheus-cli 2.10.3 → 2.11.0

data/lib/morpheus/cli/clouds.rb

@@ -72,9 +72,20 @@ class Morpheus::Cli::Clouds
         print "\n"
       else
         clouds = json_response['zones']
-        print "\n" ,cyan, bold, "Morpheus Clouds\n","==================", reset, "\n\n"
+        title = "Morpheus Clouds"
+        subtitles = []
+        if group
+          subtitles << "Group: #{group['name']}".strip
+        end
+        if cloud_type
+          subtitles << "Type: #{cloud_type['name']}".strip
+        end
+        if params[:phrase]
+          subtitles << "Search: #{params[:phrase]}".strip
+        end
+        print_h1 title, subtitles
         if clouds.empty?
-          puts yellow,"No clouds found.",reset
+          print cyan,"No clouds found.",reset,"\n"
         else
           print_clouds_table(clouds)
           print_results_pagination(json_response)
@@ -114,26 +125,29 @@ class Morpheus::Cli::Clouds
         return
       end
       cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
-      print "\n" ,cyan, bold, "Cloud Details\n","==================", reset, "\n\n"
+      print_h1 "Cloud Details"
       print cyan
-      puts "ID: #{cloud['id']}"
-      puts "Name: #{cloud['name']}"
-      puts "Type: #{cloud_type ? cloud_type['name'] : ''}"
-      puts "Code: #{cloud['code']}"
-      puts "Location: #{cloud['location']}"
-      puts "Visibility: #{cloud['visibility'].to_s.capitalize}"
-      puts "Groups: #{cloud['groups'].collect {|it| it.instance_of?(Hash) ? it['name'] : it.to_s }.join(', ')}"
-      status = nil
-      if cloud['status'] == 'ok'
-        status = "#{green}OK#{cyan}"
-      elsif cloud['status'].nil?
-        status = "#{white}UNKNOWN#{cyan}"
-      else
-        status = "#{red}#{cloud['status'] ? cloud['status'].upcase : 'N/A'}#{cloud['statusMessage'] ? "#{cyan} - #{cloud['statusMessage']}" : ''}#{cyan}"
-      end
-      puts "Status: #{status}"
-
-      print "\n" ,cyan, "Cloud Servers (#{cloud['serverCount']})\n","==================", reset, "\n\n"
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Type" => lambda {|it| cloud_type ? cloud_type['name'] : '' },
+        "Code" => 'code',
+        "Location" => 'location',
+        "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
+        "Groups" => lambda {|it| it['groups'].collect {|g| g.instance_of?(Hash) ? g['name'] : g.to_s }.join(', ') },
+        "Status" => lambda {|it| format_cloud_status(it) }
+      }
+      print_description_list(description_cols, cloud)
+      # puts "ID: #{cloud['id']}"
+      # puts "Name: #{cloud['name']}"
+      # puts "Type: #{cloud_type ? cloud_type['name'] : ''}"
+      # puts "Code: #{cloud['code']}"
+      # puts "Location: #{cloud['location']}"
+      # puts "Visibility: #{cloud['visibility'].to_s.capitalize}"
+      # puts "Groups: #{cloud['groups'].collect {|it| it.instance_of?(Hash) ? it['name'] : it.to_s }.join(', ')}"
+      # puts "Status: #{format_cloud_status(cloud)}"
+
+      print_h2 "Cloud Servers"
       print cyan
       if server_counts
         print "Container Hosts: #{server_counts['containerHost']}".center(20)
@@ -439,11 +453,13 @@ class Morpheus::Cli::Clouds
         return
       end
       securityGroups = json_response['securityGroups']
-      print "\n" ,cyan, bold, "Morpheus Security Groups for Cloud: #{cloud['name']}\n","==================", reset, "\n\n"
-      print cyan, "Firewall Enabled=#{json_response['firewallEnabled']}\n\n"
+      print_h1 "Morpheus Security Groups for Cloud: #{cloud['name']}"
+      print cyan
+      print_description_list({"Firewall Enabled" => lambda {|it| format_boolean it['firewallEnabled'] } }, json_response)
       if securityGroups.empty?
-        puts yellow,"No security groups currently applied.",reset
+        print yellow,"\n","No security groups currently applied.",reset,"\n"
       else
+        print "\n"
         securityGroups.each do |securityGroup|
           print cyan, "=  #{securityGroup['id']} (#{securityGroup['name']}) - (#{securityGroup['description']})\n"
         end
@@ -515,9 +531,9 @@ class Morpheus::Cli::Clouds
         print JSON.pretty_generate({zoneTypes: cloud_types})
         print "\n"
       else
-        print "\n" ,cyan, bold, "Morpheus Cloud Types\n","==================", reset, "\n\n"
+        print_h1 "Morpheus Cloud Types"
         if cloud_types.empty?
-          puts yellow,"No cloud types found.",reset
+          print yellow,"No instances found.",reset,"\n"
         else
           print cyan
           cloud_types = cloud_types.select {|it| it['enabled'] }
@@ -610,4 +626,17 @@ class Morpheus::Cli::Clouds
     get_available_cloud_types().select {|it| it['enabled'] }.collect {|it| {'name' => it['name'], 'value' => it['code']} }
   end
 
+  def format_cloud_status(cloud, return_color=cyan)
+    out = ""
+    status_string = cloud['status']
+    if status_string.nil? || status_string.empty? || status_string == "unknown"
+      out << "#{white}UNKNOWN#{return_color}"
+    elsif status_string == 'ok'
+      out << "#{green}#{status_string.upcase}#{return_color}"
+    else
+      out << "#{red}#{status_string ? status_string.upcase : 'N/A'}#{cloud['statusMessage'] ? "#{return_color} - #{cloud['statusMessage']}" : ''}#{return_color}"
+    end
+    out
+  end
+
 end

data/lib/morpheus/cli/command_error.rb

@@ -0,0 +1,12 @@
+# A standard error to raise in your CliCommand classes.
+class Morpheus::Cli::CommandError < StandardError
+  
+  # attr_reader :args, :options
+    
+  # def initialize(msg, args=[], options={})
+  #   @args = args
+  #   @options = options
+  #   super(msg)
+  # end
+
+end

data/lib/morpheus/cli/credentials.rb

@@ -11,18 +11,18 @@ module Morpheus
     class Credentials
       include Morpheus::Cli::PrintHelper
 
-      @@saved_credentials_map = nil
+      @@appliance_credentials_map = nil
 
       def initialize(appliance_name, appliance_url)
-        @appliance_url = appliance_url
         @appliance_name = appliance_name
+        @appliance_url = appliance_url
       end
       
       def request_credentials(opts = {})
         #puts "request_credentials(#{opts})"
         username = nil
         password = nil
-        creds = nil
+        access_token = nil
         skip_save = false
         # We should return an access Key for Morpheus CLI Here
         if !opts[:remote_username].nil?
@@ -30,10 +30,10 @@ module Morpheus
           password = opts[:remote_password]
           skip_save = opts[:remote_url] ? true : false
         else
-          creds = load_saved_credentials
+          access_token = load_saved_credentials
         end
-        if creds
-          return creds
+        if access_token
+          return access_token
         end
         unless opts[:quiet] || opts[:no_prompt]
           # if username.empty? || password.empty?
@@ -65,14 +65,14 @@ module Morpheus
             print reset, "\n"
           end
           access_token = json_response['access_token']
-          if !access_token.empty?
+          if access_token && access_token != ""
             unless skip_save
               save_credentials(@appliance_name, access_token)
             end
-            return access_token
+            # return access_token
           else
             print_red_alert "Credentials not verified."
-            return nil
+            # return nil
           end
         rescue ::RestClient::Exception => e
           #raise e
@@ -86,8 +86,40 @@ module Morpheus
           else
             print_rest_exception(e, opts)
           end
+          access_token = nil
+        end
+
+
+        unless skip_save
+          begin
+          # save pertinent session info to the appliance
+            now = Time.now.to_i
+            appliance = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
+            if appliance
+              if access_token
+                appliance = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
+                appliance[:authenticated] = true
+                appliance[:username] = username
+                appliance[:status] = "ready"
+                appliance[:last_login_at] = now
+                appliance[:last_success_at] = now
+                ::Morpheus::Cli::Remote.save_remote(@appliance_name, appliance)
+              else
+                now = Time.now.to_i
+                appliance = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
+                appliance[:authenticated] = false
+                #appliance[:username] = username
+                #appliance[:last_login_at] = now
+                #appliance[:error] = "Credentials not verified"
+                ::Morpheus::Cli::Remote.save_remote(@appliance_name, appliance)
+              end
+            end
+          rescue => e
+            #puts "failed to update remote appliance config: (#{e.class}) #{e.message}"
+          end
         end
 
+        return access_token
       end
 
       def login(opts = {})
@@ -97,35 +129,45 @@ module Morpheus
 
       def logout()
         clear_saved_credentials(@appliance_name)
+        # save pertinent session info to the appliance
+        appliance = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
+        if appliance
+          appliance.delete(:username) # could leave this...
+          appliance[:authenticated] = false
+          appliance[:last_logout_at] = Time.now.to_i
+          ::Morpheus::Cli::Remote.save_remote(@appliance_name, appliance)
+        end
+        true
       end
 
       def clear_saved_credentials(appliance_name)
-        @@saved_credentials_map = load_credentials_file || {}
-        @@saved_credentials_map.delete(appliance_name)
-        print "#{dark} #=> updating credentials file #{credentials_file_path}#{reset}\n"  if Morpheus::Logging.debug?
-        File.open(credentials_file_path, 'w') {|f| f.write @@saved_credentials_map.to_yaml } #Store
+        @@appliance_credentials_map = load_credentials_file || {}
+        @@appliance_credentials_map.delete(appliance_name)
+        Morpheus::Logging::DarkPrinter.puts "clearing credentials for #{appliance_name} from file #{credentials_file_path}" if Morpheus::Logging.debug?
+        File.open(credentials_file_path, 'w') {|f| f.write @@appliance_credentials_map.to_yaml } #Store
       end
 
       def load_saved_credentials(reload=false)
-        if saved_credentials_map && !reload
-          return saved_credentials_map
+        if saved_credentials && !reload
+          return saved_credentials
         end
-        @@saved_credentials_map = load_credentials_file || {}
-        return @@saved_credentials_map[@appliance_name]
+        #Morpheus::Logging::DarkPrinter.puts "loading credentials for #{appliance_name}" if Morpheus::Logging.debug?
+        @@appliance_credentials_map = load_credentials_file || {}
+        return @@appliance_credentials_map[@appliance_name]
       end
 
       # Provides the current credential information, simply :appliance_name => "access_token"
-      def saved_credentials_map
-        if !defined?(@@saved_credentials_map)
-          @@saved_credentials_map = load_credentials_file
+      def saved_credentials
+        if !defined?(@@appliance_credentials_map)
+          @@appliance_credentials_map = load_credentials_file
         end
-        return @@saved_credentials_map ? @@saved_credentials_map[@appliance_name.to_sym] : nil
+        return @@appliance_credentials_map ? @@appliance_credentials_map[@appliance_name.to_sym] : nil
       end
 
       def load_credentials_file
         fn = credentials_file_path
         if File.exist? fn
-          print "#{dark} #=> loading credentials file #{fn}#{reset}\n" if Morpheus::Logging.debug?
+          Morpheus::Logging::DarkPrinter.puts "loading credentials file #{fn}" if Morpheus::Logging.debug?
           return YAML.load_file(fn)
         else
           return nil
@@ -136,20 +178,20 @@ module Morpheus
         File.join(Morpheus::Cli.home_directory, "credentials")
       end
 
-      def save_credentials(app_name, token)
-        # credential_map = saved_credentials_map
+      def save_credentials(appliance_name, token)
+        # credential_map = appliance_credentials_map
         # reloading file is better for now, otherwise you can lose credentials with multiple shells.
         credential_map = load_credentials_file || {}
         if credential_map.nil?
           credential_map = {}
         end
-        credential_map[app_name] = token
+        credential_map[appliance_name] = token
         begin
           fn = credentials_file_path
           if !Dir.exists?(File.dirname(fn))
             FileUtils.mkdir_p(File.dirname(fn))
           end
-          print "#{dark} #=> adding credentials to #{fn}#{reset}\n" if Morpheus::Logging.debug?
+          Morpheus::Logging::DarkPrinter.puts "adding credentials for #{appliance_name} to #{fn}" if Morpheus::Logging.debug?
           File.open(fn, 'w') {|f| f.write credential_map.to_yaml } #Store
           FileUtils.chmod(0600, fn)
         rescue => e

data/lib/morpheus/cli/curl_command.rb

@@ -0,0 +1,98 @@
+require 'optparse'
+require 'morpheus/logging'
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::CurlCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :curl
+  set_command_hidden
+
+  def handle(args)
+    split_args = args.join(" ").split(" -- ")
+    args = split_args[0].split(" ")
+    curl_args = split_args[1] ? split_args[1].split(" ") : []
+    # puts "args is : #{args}"
+    # puts "curl_args is : #{curl_args}"
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus curl [path] -- [*args]"
+      build_common_options(opts, options, [:remote])
+      opts.footer = <<-EOT
+This invokes the `curl` command with url "appliance_url/api/$0
+and includes the authorization header -H "Authorization: Bearer access_token"
+Arguments for the curl command should be passed after ' -- '
+Example: morpheus curl "/api/servers/1" -- -XGET -sV
+
+EOT
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      return false
+    end
+    
+    if !command_available?("curl")
+      print "#{red}The 'curl' command is not available on your system.#{reset}\n"
+      return false
+    end
+    
+    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true}))
+
+    if !@appliance_name
+      print yellow,"Please specify a Morpheus Appliance with -r or see the command `remote use`#{reset}\n"
+      return false
+    end
+
+    # curry --insecure to curl
+    if options[:insecure] || !Morpheus::RestClient.ssl_verification_enabled?
+      #curl_args.unshift "-k"
+      curl_args.unshift "--inescure"
+    end
+
+    creds = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
+    if !creds
+      print yellow,"You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}",reset,"\n"
+      print yellow,"Use the 'login' command.",reset,"\n"
+      return 0
+    end
+
+    if !@appliance_url
+      raise "Unable to determine remote appliance url"
+      print "#{red}Unable to determine remote appliance url.#{reset}\n"
+      return false
+    end
+
+    # determine curl url
+    base_url = @appliance_url.chomp("/")
+    api_path = args[0].sub(/^\//, "")
+    url = "#{base_url}/#{api_path}"
+    curl_cmd = "curl \"#{url}\""
+    curl_cmd << " -H \"Authorization: Bearer #{@access_token}\""
+    if !curl_args.empty?
+      curl_cmd << " " + curl_args.join(' ')
+    end
+    
+    # Morpheus::Logging::DarkPrinter.puts "#{curl_cmd}" if Morpheus::Logging.debug?
+    print cyan
+    print "#{cyan}#{curl_cmd}#{reset}"
+    print "\n\n"
+    print reset
+    # print result
+    curl_output = `#{curl_cmd}`
+    puts curl_output
+    return $?.success?
+
+  end
+
+  def command_available?(cmd)
+    has_it = false
+    begin
+      system("which #{cmd} > /dev/null 2>&1")
+      has_it = $?.success?
+    rescue => e
+      raise e
+    end
+    return has_it
+  end
+
+end

data/lib/morpheus/cli/dashboard_command.rb

@@ -45,14 +45,9 @@ class Morpheus::Cli::DashboardCommand
         print "\n"
       else
 
-        # todo: impersonate command and show that info here
-
-        print "\n" ,cyan, bold, "Dashboard\n","==================", reset, "\n\n"
+        print_h1 "Dashboard"
         print cyan
-        print "\n"
-        puts "Coming soon.... see --json"
-        print "\n"
-
+        puts "Coming soon... see --json"
         print reset,"\n"
 
       end

data/lib/morpheus/cli/deployments.rb

@@ -44,9 +44,9 @@ class Morpheus::Cli::Deployments
         puts JSON.pretty_generate(json_response)
       else
         deployments = json_response['deployments']
-        print "\n" ,cyan, bold, "Morpheus Deployments\n","====================", reset, "\n\n"
+        print_h1 "Morpheus Deployments"
         if deployments.empty?
-          puts yellow,"No deployments currently configured.",reset
+          print yellow,"No deployments currently configured.",reset,"\n"
         else
           print cyan
           deployments_table_data = deployments.collect do |deployment|
@@ -92,9 +92,9 @@ class Morpheus::Cli::Deployments
         puts JSON.pretty_generate(json_response)
       else
         versions = json_response['versions']
-        print "\n" ,cyan, bold, "Morpheus Deployment Versions\n","=============================", reset, "\n\n"
+        print_h1 "Deployment Versions: #{deployment['name']}"
         if versions.empty?
-          puts yellow,"No deployment versions currently exist.",reset
+          print yellow,"No deployment versions currently exist.",reset,"\n"
         else
           print cyan
           versions_table_data = versions.collect do |version|