morpheus-cli 2.10.3 → 2.11.0

data/lib/morpheus/cli/tasks.rb

@@ -45,9 +45,9 @@ class Morpheus::Cli::Tasks
         print JSON.pretty_generate(json_response)
       else
         tasks = json_response['tasks']
-        print "\n" ,cyan, bold, "Morpheus Tasks\n","==================", reset, "\n\n"
+        print_h1 "Morpheus Tasks"
         if tasks.empty?
-          puts yellow,"No tasks currently configured.",reset
+          puts cyan,"No tasks found.",reset,"\n"
         else
           print cyan
           tasks_table_data = tasks.collect do |task|
@@ -94,16 +94,20 @@ class Morpheus::Cli::Tasks
         print "\n"
       else
         #print "\n", cyan, "Task #{task['name']} - #{task['taskType']['name']}\n\n"
-        print "\n" ,cyan, bold, "Task Details\n","==================", reset, "\n\n"
+        print_h1 "Task Details"
         print cyan
-        puts "ID: #{task['id']}"
-        puts "Name: #{task['name']}"
-        puts "Type: #{task['taskType']['name']}"
-        #puts "Description: #{workflow['description']}"
-        # print "\n", cyan, "Config:\n"
+        description_cols = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Type" => lambda {|it| it['taskType']['name'] },
+        }
+        print_description_list(description_cols, task)
+        
+        # JD: uhh, the api should NOT be returning passwords!!
         task_type['optionTypes'].sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.each do |optionType|
           if optionType['fieldLabel'].to_s.downcase == 'script'
-            print cyan,bold,"Script:","\n",reset,bright_black,"#{task['taskOptions'][optionType['fieldName']]}","\n",reset
+            print_h2 "Script"
+            print reset,bright_black,"#{task['taskOptions'][optionType['fieldName']]}","\n",reset
           else
             print cyan,("#{optionType['fieldLabel']} : " + (optionType['type'] == 'password' ? "#{task['taskOptions'][optionType['fieldName']] ? '************' : ''}" : "#{task['taskOptions'][optionType['fieldName']] || optionType['defaultValue']}")),"\n"
           end
@@ -195,18 +199,18 @@ class Morpheus::Cli::Tasks
       end
       json_response = @tasks_interface.task_types()
       if options[:json]
-        print JSON.pretty_generate(json_response)
+        print JSON.pretty_generate(json_response),"\n"
       else
         task_types = json_response['taskTypes']
-        print "\n" ,cyan, bold, "Morpheus Task Types\n","==================", reset, "\n\n"
+        print_h1 "Morpheus Task Types"
         if task_types.nil? || task_types.empty?
-          puts yellow,"No task types currently exist on this appliance. This could be a seed issue.",reset
+          print yellow,"No task types currently exist on this appliance. This could be a seed issue.",reset,"\n"
         else
           print cyan
           tasks_table_data = task_types.collect do |task_type|
             {name: task_type['name'], id: task_type['id'], code: task_type['code'], description: task_type['description']}
           end
-          tp tasks_table_data, :id, :name, :code, :description
+          tp tasks_table_data, :id, :name, :code
         end
 
         print reset,"\n"
@@ -248,7 +252,7 @@ class Morpheus::Cli::Tasks
       end
       json_response = @tasks_interface.create(payload)
       if options[:json]
-        print JSON.pretty_generate(json_response)
+        print JSON.pretty_generate(json_response),"\n"
       elsif !options[:quiet]
         print "\n", cyan, "Task #{json_response['task']['name']} created successfully", reset, "\n\n"
         list([])
@@ -284,7 +288,7 @@ class Morpheus::Cli::Tasks
       end
       json_response = @tasks_interface.destroy(task['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response)
+        print JSON.pretty_generate(json_response),"\n"
       elsif !options[:quiet]
         print "\n", cyan, "Task #{task['name']} removed", reset, "\n\n"
       end

data/lib/morpheus/cli/users.rb

@@ -63,8 +63,10 @@ class Morpheus::Cli::Users
         if account
           subtitles << "Account: #{account['name']}".strip
         end
-        subtitle = subtitles.join(', ')
-        print "\n" ,cyan, bold, title, (subtitle.empty? ? "" : " - #{subtitle}"), "\n", "==================", reset, "\n\n"
+        if params[:phrase]
+          subtitles << "Search: #{params[:phrase]}".strip
+        end
+        print_h1 title, subtitles
         if users.empty?
           puts yellow,"No users found.",reset
         else
@@ -146,26 +148,34 @@ class Morpheus::Cli::Users
           print "\n"
         end
       else
-        print "\n" ,cyan, bold, "User Details\n","==================", reset, "\n\n"
+        print_h1 "User Details"
         print cyan
-        puts "ID: #{user['id']}"
-        puts "Account: #{user['account'] ? user['account']['name'] : nil}"
-        puts "First Name: #{user['firstName']}"
-        puts "Last Name: #{user['lastName']}"
-        puts "Username: #{user['username']}"
-        puts "Email: #{user['email']}"
-        puts "Role: #{format_user_role_names(user)}"
-        puts "Date Created: #{format_local_dt(user['dateCreated'])}"
-        puts "Last Updated: #{format_local_dt(user['lastUpdated'])}"
-        print "\n" ,cyan, bold, "User Instance Limits\n","==================", reset, "\n\n"
+        description_cols = {
+          "ID" => 'id',
+          "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+          # "First" => 'firstName',
+          # "Last" => 'lastName',
+          # "Name" => 'displayName',
+          "Name" => lambda {|it| it['firstName'] ? it['displayName'] : '' },
+          "Username" => 'username',
+          "Email" => 'email',
+          "Role" => lambda {|it| format_user_role_names(it) },
+          "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+          "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+        }
+        print_description_list(description_cols, user)
+
+        print_h2 "User Instance Limits"
         print cyan
-        puts "Max Storage (bytes): #{user['instanceLimits'] ? user['instanceLimits']['maxStorage'] : 0}"
-        puts "Max Memory (bytes): #{user['instanceLimits'] ? user['instanceLimits']['maxMemory'] : 0}"
-        puts "CPU Count: #{user['instanceLimits'] ? user['instanceLimits']['maxCpu'] : 0}"
+        print_description_list({
+          "Max Storage"  => lambda {|it| (it && it['maxStorage'].to_i != 0) ? Filesize.from("#{it['maxStorage']} B").pretty : "no limit" },
+          "Max Memory"  => lambda {|it| (it && it['maxMemory'].to_i != 0) ? Filesize.from("#{it['maxMemory']} B").pretty : "no limit" },
+          "CPU Count"  => lambda {|it| (it && it['maxCpu'].to_i != 0) ? it['maxCpu'] : "no limit" }
+        }, user['instanceLimits'])
 
         if options[:include_feature_access] && user_feature_permissions
           if user_feature_permissions
-            print "\n" ,cyan, bold, "Feature Permissions\n","==================", reset, "\n\n"
+            print_h2 "Feature Permissions"
             print cyan
             rows = user_feature_permissions.collect do |code, access|
               {code: code, access: get_access_string(access) }

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "2.10.3"
+    VERSION = "2.11.0"
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -67,9 +67,20 @@ class Morpheus::Cli::VirtualImages
         print JSON.pretty_generate(json_response)
       else
         images = json_response['virtualImages']
-        print "\n" ,cyan, bold, "Morpheus Virtual Images\n","=======================", reset, "\n\n"
+        title = "Morpheus Virtual Images"
+        subtitles = []
+        if options[:imageType]
+          subtitles << "Image Type: #{options[:imageType]}".strip
+        end
+        if options[:filterType]
+          subtitles << "Image Type: #{options[:filterType]}".strip
+        end
+        if params[:phrase]
+          subtitles << "Search: #{params[:phrase]}".strip
+        end
+        print_h1 title, subtitles
         if images.empty?
-          puts yellow,"No virtual images currently exist.",reset
+          print yellow,"No virtual images found.",reset,"\n"
         else
           print cyan
           image_table_data = images.collect do |image|
@@ -122,15 +133,19 @@ class Morpheus::Cli::VirtualImages
       else
         image_type = virtual_image_type_for_name_or_code(image['imageType'])
         image_type_display = image_type ? "#{image_type['name']}" : image['imageType']
-        print "\n" ,cyan, bold, "Virtual Image Details\n","==================", reset, "\n\n"
+        print_h1 "Virtual Image Details"
         print cyan
-        puts "ID: #{image['id']}"
-        puts "Name: #{image['name']}"
-        puts "Type: #{image_type_display}"
-        #puts "Date Created: #{format_local_dt(image['dateCreated'])}"
-        #puts "Last Updated: #{format_local_dt(image['lastUpdated'])}"
+        description_cols = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Type" => lambda {|it| image_type_display },
+          # "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+          # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+        }
+        print_description_list(description_cols, image)
+
         if image_files
-          puts "Files:"
+          print_h2 "Files"
           image_files.each {|image_file|
             pretty_filesize = Filesize.from("#{image_file['size']} B").pretty
             print cyan,"  =  #{image_file['name']} [#{pretty_filesize}]", "\n"
@@ -216,9 +231,9 @@ class Morpheus::Cli::VirtualImages
         print JSON.pretty_generate(json_response)
       else
         image_types = json_response['virtualImageTypes']
-        print "\n" ,cyan, bold, "Morpheus Virtual Image Types\n","============================", reset, "\n\n"
+        print_h1 "Morpheus Virtual Image Types"
         if image_types.nil? || image_types.empty?
-          puts yellow,"No image types currently exist on this appliance. This could be a seed issue.",reset
+          print yellow,"No image types currently exist on this appliance. This could be a seed issue.",reset,"\n"
         else
           print cyan
           lb_table_data = image_types.collect do |lb_type|
@@ -227,7 +242,7 @@ class Morpheus::Cli::VirtualImages
           tp lb_table_data, :name, :code
         end
 
-        print reset,"\n\n"
+        print reset,"\n"
       end
                 rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -513,7 +528,7 @@ class Morpheus::Cli::VirtualImages
     if image_type_code == 'ami'
       tmp_option_types << {'fieldName' => 'externalId', 'fieldLabel' => 'AMI id', 'type' => 'text', 'required' => false, 'displayOrder' => 10}
       tmp_option_types << {'fieldName' => 'imageFile', 'fieldLabel' => 'Image File', 'type' => 'file', 'required' => true, 'displayOrder' => 10}
-    elsif image_type_code == 'vmware'
+    elsif image_type_code == 'vmware' || image_type_code == 'vmdk'
       tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageFile', 'fieldLabel' => 'OVF File', 'type' => 'file', 'required' => true, 'displayOrder' => 10}
       tmp_option_types << {'fieldContext' => 'virtualImageFiles', 'fieldName' => 'imageDescriptorFile', 'fieldLabel' => 'VMDK File', 'type' => 'file', 'required' => false, 'displayOrder' => 10}
     elsif image_type_code == 'pxe'

data/lib/morpheus/cli/whoami.rb

@@ -22,9 +22,14 @@ class Morpheus::Cli::Whoami
   end
 
   def connect(opts)
-    @api_client = establish_remote_appliance_connection(opts)
-    @groups_interface = @api_client.groups
-    @active_group_id = Morpheus::Cli::Groups.active_group
+    #@api_client = establish_remote_appliance_connection(opts)
+    # begin
+      @api_client = establish_remote_appliance_connection(opts.merge({:no_prompt => true, :skip_verify_access_token => true}))
+      @groups_interface = @api_client.groups
+      @active_group_id = Morpheus::Cli::Groups.active_group
+    # rescue Morpheus::Cli::CommandError => err
+    #   puts_error err
+    # end
   end
 
   def handle(args)
@@ -33,11 +38,17 @@ class Morpheus::Cli::Whoami
 
   def show(args)
     options = {}
+    username_only = false
+    access_token_only = false
     optparse = OptionParser.new do|opts|
       opts.banner = usage
-      opts.on(nil,'--feature-access', "Display Feature Access") do |val|
+      opts.on( '-n', '--name', "Print only your username." ) do
+        username_only = true
+      end
+      opts.on('-f','--feature-access', "Display Feature Access") do
         options[:include_feature_access] = true
       end
+      # these are things that morpheus users get has to display...
       # opts.on(nil,'--group-access', "Display Group Access") do
       #   options[:include_group_access] = true
       # end
@@ -47,61 +58,112 @@ class Morpheus::Cli::Whoami
       # opts.on(nil,'--instance-type-access', "Display Instance Type Access") do
       #   options[:include_instance_type_access] = true
       # end
-      opts.on(nil,'--all-access', "Display All Access Lists") do
-        options[:include_feature_access] = true
-        options[:include_group_access] = true
-        options[:include_cloud_access] = true
-        options[:include_instance_type_access] = true
+      # opts.on('-a','--all-access', "Display All Access Lists") do
+      #   options[:include_feature_access] = true
+      #   options[:include_group_access] = true
+      #   options[:include_cloud_access] = true
+      #   options[:include_instance_type_access] = true
+      # end
+      opts.on('-t','--token-only', "Print your access token only") do
+        access_token_only = true
       end
-      build_common_options(opts, options, [:json, :remote, :dry_run]) # todo: support :remote too
+      build_common_options(opts, options, [:json, :remote, :dry_run])
     end
     optparse.parse!(args)
-    # todo: check to see if they have credentials instead of just trying to connect (and prompting)
     connect(options)
     begin
-      json_response = load_whoami()
-      group = nil
+      # check to see if they have credentials instead of just trying to connect (and prompting)
+
+      if !@appliance_name
+        # never gets here..
+        #raise_command_error "Please specify a Morpheus Appliance with -r or see the command `remote use`"
+        print yellow,"Please specify a Morpheus Appliance with -r or see `remote use`.#{reset}\n"
+        return 1
+      end
+      
+
+      creds = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
+      
+      if !creds
+        if options[:quiet]
+          return 1
+        elsif access_token_only
+          puts_error "(logged out)" # stderr probably
+          return 1
+        else
+          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 1
+        end
+      end
+
+
+      load_whoami()
+      
+      user = @current_user # from load_whoami()  meh
+
+
+      if access_token_only
+        if options[:quiet]
+          return 1
+        end
+        if !@access_token
+          print yellow,"\n","No access token. Please login",reset,"\n"
+          return false
+        end
+        print cyan,@access_token.to_s,reset,"\n"
+        return 0
+      end
+
+      if username_only
+        if options[:quiet]
+          return 1
+        end
+        if !user
+          puts "(logged out)" # "(anonymous)" || ""
+          return 1
+        end
+        print cyan,user['username'].to_s,reset,"\n"
+        return 0
+      end
+
+      
+      active_group = nil
       begin
-        group = @active_group_id ? find_group_by_name_or_id(@active_group_id) : nil # via InfrastructureHelper mixin
+        active_group = @active_group_id ? find_group_by_name_or_id(@active_group_id) : nil # via InfrastructureHelper mixin
       rescue => err
         if options[:debug]
           print red,"Unable to determine active group: #{err}\n",reset
         end
       end
+
       if options[:json]
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        user = @current_user
         if !user
-          puts yellow,"No active session. Please login",reset
+          print yellow,"\n","No active session. Please login",reset,"\n"
           exit 1
         end
 
-        # todo: impersonate command and show that info here
-
-        print "\n" ,cyan, bold, "Current User\n","==================", reset, "\n\n"
+        print_h1 "Current User"
         print cyan
-        # if @is_master_account
-        puts "ID: #{user['id']}"
-        puts "Account: #{user['account'] ? user['account']['name'] : nil}" + (@is_master_account ? " (Master Account)" : "")
-        # end
-        puts "First Name: #{user['firstName']}"
-        puts "Last Name: #{user['lastName']}"
-        puts "Username: #{user['username']}"
-        puts "Email: #{user['email']}"
-        puts "Role: #{format_user_role_names(user)}"
-        # puts "Date Created: #{format_local_dt(user['dateCreated'])}"
-        # puts "Last Updated: #{format_local_dt(user['lastUpdated'])}"
-        # print "\n" ,cyan, bold, "User Instance Limits\n","==================", reset, "\n\n"
+        print_description_list({
+          "ID" => 'id',
+          "Account" => lambda {|it| (it['account'] ? it['account']['name'] : '') + (@is_master_account ? " (Master Account)" : '') },
+          # "First Name" => 'firstName',
+          # "Last Name" => 'lastName',
+          # "Name" => 'displayName',
+          "Name" => lambda {|it| it['firstName'] ? it['displayName'] : '' },
+          "Username" => 'username',
+          "Email" => 'email',
+          "Role" => lambda {|it| format_user_role_names(it) }
+        }, user)
         print cyan
-        # puts "Max Storage (bytes): #{user['instanceLimits'] ? user['instanceLimits']['maxStorage'] : 0}"
-        # puts "Max Memory (bytes): #{user['instanceLimits'] ? user['instanceLimits']['maxMemory'] : 0}"
-        # puts "CPU Count: #{user['instanceLimits'] ? user['instanceLimits']['maxCpu'] : 0}"
 
         if options[:include_feature_access]
           if @user_permissions
-            print "\n" ,cyan, bold, "Feature Permissions\n","==================", reset, "\n\n"
+            print_h2 "Feature Permissions"
             print cyan
             rows = @user_permissions.collect do |code, access|
               {code: code, access: get_access_string(access) }
@@ -112,29 +174,47 @@ class Morpheus::Cli::Whoami
           end
         end
 
-        print "\n" ,cyan, bold, "Remote Appliance\n","==================", reset, "\n\n"
-        print cyan
-        if @appliance_name
-          puts "Name: #{@appliance_name}"
-        end
-        if @appliance_url
-          puts "Url: #{@appliance_url}"
-        end
-        if @appliance_build_verison
-          puts "Build Version: #{@appliance_build_verison}"
-        end
+        print_h1 "Remote Appliance"
         print cyan
+        appliance_data = {
+          'name' => @appliance_name,
+          'url' => @appliance_url,
+          'buildVersion' => @appliance_build_verison
+        }
+        print_description_list({
+          "Name" => 'name',
+          "Url" => 'url',
+          "Version" => 'buildVersion'
+        }, appliance_data)
 
-        if group
-          print "\n" ,cyan, bold, "Active Group\n","==================", reset, "\n\n"
+        if active_group
           print cyan
-          print "ID: #{group['id']}\n" 
-          print "Name: #{group['name']}\n" 
+          # print_h1 "Active Group"
+          # print cyan
+          # print_description_list({
+          #   "ID" => 'id',
+          #   "Name" => 'name'
+          # }, active_group)
+          print cyan, "\n# => Currently using group #{active_group['name']}\n", reset
         else
-          print "\n"
+          print "\n", reset
           print "No active group. See `groups use`\n",reset
         end
 
+        # save pertinent session info to the appliance
+        begin
+          now = Time.now.to_i
+          app_map = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
+          app_map[:username] = user['username']
+          app_map[:authenticated] = true
+          app_map[:status] = 'ready'
+          app_map[:build_version] = @appliance_build_verison if @appliance_build_verison
+          app_map[:last_success_at] = now
+          ::Morpheus::Cli::Remote.save_remote(@appliance_name, app_map)
+        rescue => err
+          puts "failed to save remote appliance info"
+        end
+
         print reset,"\n"
       end
     rescue RestClient::Exception => e
@@ -149,5 +229,4 @@ class Morpheus::Cli::Whoami
     end
   end
 
-
 end