morpheus-cli 3.6.8 → 3.6.9

data/lib/morpheus/cli/login.rb

@@ -18,7 +18,7 @@ class Morpheus::Cli::Login
   end
 
   def usage
-    "Usage: morpheus login"
+    "Usage: morpheus login [username] [password]"
   end
 
   def handle(args)
@@ -36,13 +36,33 @@ class Morpheus::Cli::Login
       opts.on( '-p', '--password PASSWORD', "Password" ) do |val|
         password = val
       end
-      opts.on( '-T', '--token ACCESS_TOKEN', "Use an existing access token instead of authenticating with a username and password." ) do |val|
+      opts.on( '-t', '--test', "Test credentials only, does not update stored credentials for the appliance." ) do
+        options[:test_only] = true
+      end
+      opts.on( '-T', '--token ACCESS_TOKEN', "Use an existing access token to login instead of authenticating with a username and password." ) do |val|
         options[:remote_token] = val
       end
-      build_common_options(opts, options, [:json, :remote, :quiet])
+      build_common_options(opts, options, [:json, :dry_run, :remote, :quiet], [:remote_username, :remote_password, :remote_token])
+      opts.footer = "Login to a remote appliance with a username and password or an access token.\n" +
+                    "[username] is required .\n" +
+                    "[password] is required.\n" +
+                    "Logging in with username and password will make an authentication api request to obtain an access token.\n" +
+                    "The --token option can be used to login with an existing token instead of username and password.\n" +
+                    "Using --token makes a whoami api request to validate the token.\n" +
+                    "If successful, the access token will be saved with the active session for the remote appliance.\n" +
+                    "This command will first logout any active session before attempting to login.\n" + 
+                    "The --test option can be used for testing credentials without updating your active session."
+                    
     end
     optparse.parse!(args)
-
+    if args.count > 2
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "#{command_name} list expects 0-2 arguments and received #{args.count}: #{args}\n#{optparse}"
+      return 1
+    end
+    username = args[0] if args[0]
+    password = args[1] if args[1]
+    
     # connect(options)
     if options[:remote]
       appliance = Morpheus::Cli::Remote.appliances[options[:remote].to_sym]
@@ -53,41 +73,74 @@ class Morpheus::Cli::Login
       end
       if !@appliance_name
         print_error red, "You have no appliance named '#{options[:remote]}' configured. See the `remote list` command.", reset, "\n"
-        return false
+        return 1
       end
+    elsif options[:remote_url]
+      # --remote-url
+      @appliance_name, @appliance_url = nil, appliance[:remote_url]
     else
       @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
       if !@appliance_name
         print_error yellow, "Please specify a remote appliance with -r or see the command `remote use`", reset, "\n"
-        return false
+        return 1
       end
     end
 
     begin
-      if options[:quiet]
-        if ((!options[:remote_token]) && !(username && password))
-          print_error yellow,"Please specify a username and password, or token.", reset, "\n"
-          return false
-        end
+      if (options[:quiet] && (!options[:remote_token]) && !(username && password))
+        print_error yellow,"Please specify username and password, or token.", reset, "\n"
+        return 1
       end
-      options[:remote_username] = username if username
-      options[:remote_password] = password if password
-      #options[:remote_url] = true # will skip credentials save
-      login_result = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).login(options)
 
-      # check to see if we got credentials, or just look at login_result above...
-      creds = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials() # .load_saved_credentials(true)
+      options[:username] = username if username
+      options[:password] = password if password
 
-      # recalcuate echo vars
+      do_save = true
+      if options[:test_only] || options[:remote_url]
+        do_save = false
+      end
+      #old_wallet = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
+      
+      login_result = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).login(options, do_save)
+      if options[:dry_run]
+        return 0
+      end
+      wallet = login_result
+
+      # needed here too?
       ::Morpheus::Cli::Remote.recalculate_variable_map()
 
-      if creds
+      # should happen here, not in Credentials.login()
+      # if options[:json]
+      #   puts as_json(login_result)
+      #   return (login_result && login_result['access_token']) ? 0 : 1
+      # end
+
+      if wallet && wallet['access_token']
+        # Login Success!
         if !options[:quiet]
-          print green,"Logged in to #{@appliance_name} as #{::Morpheus::Cli::Remote.load_remote(@appliance_name)[:username]}#{reset}", reset, "\n"
+          if options[:test_only]
+            print green,"Success! Credentials verified for #{wallet['username']}.", reset, "\n"
+          else
+            print green,"Success! Logged in to #{@appliance_name} as #{wallet['username']}.", reset, "\n"
+          end
         end
         return 0 # ,  nil
       else
-        return 1 # , "Login failed"
+        # Login Failed
+        # so login() already prints 'Bad Credentials' (deprecate class Credentials plz)
+        # tell them if they're logged out now.
+        if !options[:quiet]
+          if options[:test_only]
+            # you are fine, nothing has changed
+          else
+            # if old_wallet && old_wallet['access_token']
+            #   #print reset,"You are no longer logged in. Goodbye #{old_wallet['username']}!", reset, "\n"
+            #    # todo: prompt to recover wallet ?
+            # end
+          end
+        end
+        return 1, "Login failed"
       end
 
     rescue RestClient::Exception => e

data/lib/morpheus/cli/logout.rb

@@ -17,7 +17,6 @@ class Morpheus::Cli::Logout
 
   def connect(opts)
     #@api_client = establish_remote_appliance_connection(opts)
-    #@access_token = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials(options)
   end
 
   def usage
@@ -45,8 +44,8 @@ class Morpheus::Cli::Logout
         puts_error "Please specify a Morpheus Appliance to logout of with -r or see the command `remote use`"
         return 1
       end
-      creds = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url)
-      token = creds.load_saved_credentials
+      wallet = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials
+      token = wallet ? wallet['access_token'] : nil
       if !token
         if !options[:quiet]
           puts "You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}"
@@ -57,7 +56,7 @@ class Morpheus::Cli::Logout
         # note: this also handles updating appliance session info
         Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).logout()
         if !options[:quiet]
-          puts "#{cyan}Logged out of #{@appliance_name}. Goodbye.#{reset}"
+          puts "#{cyan}Logged out of #{@appliance_name}. Goodbye #{wallet['username']}!#{reset}"
         end
       end
       # recalcuate echo vars

data/lib/morpheus/cli/mixins/accounts_helper.rb

@@ -110,7 +110,7 @@ module Morpheus::Cli::AccountsHelper
       return nil
     elsif roles.size > 1
       print_red_alert "#{roles.size} roles by name #{name}"
-      print_roles_table(roles, {color: red})
+      print_roles_table(roles, {color: red, thin: true})
       print reset,"\n\n"
       return nil
     else
@@ -148,7 +148,7 @@ module Morpheus::Cli::AccountsHelper
       return nil
     elsif users.size > 1
       print_red_alert "#{users.size} users by username #{username}"
-      print_users_table(users, {color: red})
+      print_users_table(users, {color: red, thin: true})
       print reset,"\n\n"
       return nil
     else
@@ -156,8 +156,32 @@ module Morpheus::Cli::AccountsHelper
     end
   end
 
-  def print_accounts_table(accounts, opts={})
-    table_color = opts[:color] || cyan
+  def find_all_user_ids(account_id, usernames)
+    user_ids = []
+    if usernames.is_a?(String)
+      usernames = usernames.split(",").collect {|it| it.to_s.strip }.select {|it| it }.uniq
+    else
+      usernames = usernames.collect {|it| it.to_s.strip }.select {|it| it }.uniq
+    end
+    usernames.each do |username|
+      # save a query
+      #user = find_user_by_username_or_id(nil, username)
+      if username.to_s =~ /\A\d{1,}\Z/
+        user_ids << username.to_i
+      else
+        user = find_user_by_username(account_id, username)
+        if user.nil?
+          return nil
+        else
+          user_ids << user['id']
+        end
+      end
+    end
+    user_ids
+  end
+
+  def print_accounts_table(accounts, options={})
+    table_color = options.key?(:color) ? options[:color] : cyan
     rows = accounts.collect do |account|
       status_state = nil
       if account['active']
@@ -205,8 +229,8 @@ module Morpheus::Cli::AccountsHelper
     return str
   end
 
-  def print_roles_table(roles, opts={})
-    table_color = opts[:color] || cyan
+  def print_roles_table(roles, options={})
+    table_color = options.key?(:color) ? options[:color] : cyan
     # tp roles, [
     #   'id',
     #   'name',
@@ -226,28 +250,36 @@ module Morpheus::Cli::AccountsHelper
         dateCreated: format_local_dt(role['dateCreated'])
       }
     end
-    print table_color
-    tp rows, [
+    columns = [
       :id,
       :name,
       :description,
-      # opts[:is_master_account] ? :scope : nil,
-      opts[:is_master_account] ? :type : nil,
-      opts[:is_master_account] ? :multitenant : nil,
-      opts[:is_master_account] ? :owner : nil,
+      # options[:is_master_account] ? :scope : nil,
+      options[:is_master_account] ? :type : nil,
+      options[:is_master_account] ? :multitenant : nil,
+      options[:is_master_account] ? :owner : nil,
       {:dateCreated => {:display_name => "Date Created"} }
     ].compact
-    print reset
+    if options[:include_fields]
+      columns = options[:include_fields]
+    end
+    # print table_color if table_color
+    print as_pretty_table(rows, columns, options)
+    # print reset if table_color
   end
 
-  def print_users_table(users, opts={})
-    table_color = opts[:color] || cyan
+  def print_users_table(users, options={})
+    table_color = options[:color] || cyan
     rows = users.collect do |user|
       {id: user['id'], username: user['username'], name: user['displayName'], first: user['firstName'], last: user['lastName'], email: user['email'], role: format_user_role_names(user), account: user['account'] ? user['account']['name'] : nil}
     end
-    print table_color
-    tp rows, :id, :account, :first, :last, :username, :email, :role
-    print reset
+    columns = [:id, :account, :first, :last, :username, :email, :role]
+    if options[:include_fields]
+      columns = options[:include_fields] 
+    end
+    #print table_color if table_color
+    print as_pretty_table(rows, columns, options)
+    #print reset if table_color
   end
 
   def format_user_role_names(user)

data/lib/morpheus/cli/mixins/print_helper.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'yaml'
 require 'ostruct'
 require 'io/console'
+require 'morpheus/logging'
 
 module Morpheus::Cli::PrintHelper
 
@@ -34,6 +35,7 @@ module Morpheus::Cli::PrintHelper
   end
 
   # puts red message to stderr
+  # why this not stderr yet?  use print_error or if respond_to?(:my_terminal)
   def print_red_alert(msg)
     #$stderr.print "#{red}#{msg}#{reset}\n"
     print "#{red}#{msg}#{reset}\n"
@@ -51,9 +53,18 @@ module Morpheus::Cli::PrintHelper
   # title - subtitle1, subtitle2
   # ==================
   #
-  def print_h1(title, subtitles=[], color=cyan)
-    #print "\n" ,color, bold, title, (subtitles.empty? ? "" : " - #{subtitles.join(', ')}"), "\n", "==================", reset, "\n\n"
-    subtitles = subtitles.flatten
+  def print_h1(title, subtitles=nil, options=nil)
+    # ok, support all these formats for now:
+    # print_h1(title, options={})
+    # print_h1(title, subtitles, options={})
+    # this can go away when we have a dirty @current_options
+    if subtitles.is_a?(Hash)
+      options = subtitles
+      subtitles = (options[:subtitles] || []).flatten
+    end
+    subtitles = (subtitles || []).flatten
+    options ||= {}
+    color = options[:color] || cyan
     out = ""
     out << "\n"
     out << "#{color}#{bold}#{title}#{reset}"
@@ -61,15 +72,27 @@ module Morpheus::Cli::PrintHelper
       out << "#{color} | #{subtitles.join(', ')}#{reset}"
     end
     out << "\n"
-    out << "#{color}#{bold}==================#{reset}"
-    out << "\n\n"
-    out << reset
+    if options[:border_style] == :thin
+      out << "\n"
+    else
+      out << "#{color}#{bold}==================#{reset}\n\n"
+    end
     print out
   end
 
-  def print_h2(title, subtitles=[], color=cyan)
-    #print "\n" ,color, bold, title, (subtitles.empty? ? "" : " - #{subtitles.join(', ')}"), "\n", "---------------------", reset, "\n\n"
-    subtitles = subtitles.flatten
+  def print_h2(title, subtitles=nil, options=nil)
+    # ok, support all these formats for now:
+    # print_h2(title={})
+    # print_h2(title, options={})
+    # print_h2(title, subtitles, options={})
+    # this can go away when we have a dirty @current_options
+    if subtitles.is_a?(Hash)
+      options = subtitles
+      subtitles = (options[:subtitles] || []).flatten
+    end
+    subtitles = (subtitles || []).flatten
+    options ||= {}
+    color = options[:color] || cyan
     out = ""
     out << "\n"
     out << "#{color}#{bold}#{title}#{reset}"
@@ -77,9 +100,11 @@ module Morpheus::Cli::PrintHelper
       out << "#{color} - #{subtitles.join(', ')}#{reset}"
     end
     out << "\n"
-    out << "#{color}---------------------#{reset}"
-    out << "\n\n"
-    out << reset
+    if options[:border_style] == :thin
+      out << "\n"
+    else
+      out << "#{color}---------------------#{reset}\n\n"
+    end
     print out
   end
 
@@ -99,45 +124,92 @@ module Morpheus::Cli::PrintHelper
     end
   end
 
-  def print_dry_run(opts, command_string=nil)
-    http_method = opts[:method]
-    url = opts[:url]
-    params = opts[:params]
-    params = opts[:headers][:params] if opts[:headers] && opts[:headers][:params]
-    query_string = params.respond_to?(:map) ? URI.encode_www_form(params) : query_string
+  def print_dry_run(api_request, options={})
+    # 2nd argument used to be command_string (String)
+    command_string = nil
+    if options.is_a?(String)
+      command_string = options
+      options = {}
+    end
+    options ||= {}
+    # api client injects common command options here
+    if api_request[:command_options]
+      options = options.merge(api_request[:command_options])
+    end
+    options ||= {}
+    # parse params request arguments
+    http_method = api_request[:method]
+    url = api_request[:url]
+    headers = api_request[:headers]
+    params = nil
+    if api_request[:params] && !api_request[:params].empty?
+      params = api_request[:params]
+    elsif api_request[:headers] && api_request[:headers][:params]
+      # params inside headers for restclient reasons..
+      params = api_request[:headers][:params]
+    elsif api_request[:query] && !api_request[:query].empty?
+      params = api_request[:query]
+    end
+    query_string = params
+    if query_string.respond_to?(:map)
+      query_string = URI.encode_www_form(query_string)
+    end
     if query_string && !query_string.empty?
       url = "#{url}?#{query_string}"
     end
     request_string = "#{http_method.to_s.upcase} #{url}".strip
-    payload = opts[:payload] || opts[:body]
-    if command_string != false
-      if command_string
-        print_h1 "DRY RUN > #{command_string}"
-      else
-        print_h1 "DRY RUN"
-      end
+    payload = api_request[:payload] || api_request[:body]
+
+    #Morpheus::Logging::DarkPrinter.puts "API payload is: (#{payload.class}) #{payload.inspect}"
+
+    # curl output?
+    if api_request[:curl] || options[:curl]
+      print "\n"
+      puts "#{cyan}#{bold}#{dark}CURL COMMAND#{reset}\n"
+      print format_curl_command(http_method, url, headers, payload, options)
+      print "\n",reset
+      return
     end
-    print cyan
-    print "Request: ", "\n"
-    print reset
+
+    # print this thing:
+    # REQUEST:
+    # POST http://morpheusdata.com/api/whoami
+    # f it..removing this, just DRY RUN printed at the start of command
+    print "\n"
+    # if command_string != false
+    #   if command_string
+    #     print_h1 "DRY RUN > #{command_string}"
+    #   else
+    #     #print "\n"
+    #     #print_h1 "DRY RUN"
+    #   end
+    # end
+    puts "#{cyan}#{bold}#{dark}REQUEST#{reset}\n"
+    # print cyan
+    # print "Request: ", "\n"
+    # print reset
+    request_string = "#{http_method.to_s.upcase} #{url}".strip
     print request_string, "\n"
     print cyan
     if payload
-      if payload.is_a?(String)
-        begin
-          payload = JSON.parse(payload)
-        rescue => e
-          #payload = "(unparsable) #{payload}"
-        end
-      end
+      
       print "\n"
-      if opts[:headers] && opts[:headers]['Content-Type'] == 'application/json'
-        print "JSON: ", "\n"
-        print reset
+      if api_request[:headers] && api_request[:headers]['Content-Type'] == 'application/json'
+        if payload.is_a?(String)
+          begin
+            payload = JSON.parse(payload)
+          rescue => e
+            #payload = "(unparsable) #{payload}"
+          end
+        end
+        puts "#{cyan}#{bold}#{dark}JSON#{reset}\n"
+        # print "JSON: ", "\n"
+        # print reset
         print JSON.pretty_generate(payload)
       else
-        print "Content-Type: #{opts[:headers]['Content-Type']}", "\n"
-        #print "BODY: ", "\n"
+        content_type = api_request[:headers]['Content-Type'] || 'application/x-www-form-urlencoded'
+        print "Content-Type: #{content_type}", "\n"
+        # print "Body: ", "\n"
         print reset
         if payload.is_a?(File)
           # pretty_size = Filesize.from("#{payload.size} B").pretty.strip
@@ -147,7 +219,17 @@ module Morpheus::Cli::PrintHelper
         elsif payload.is_a?(String)
           print payload
         else
-          print payload.inspect
+          if content_type == 'application/x-www-form-urlencoded'
+            body_str = payload.to_s
+            begin
+              body_str = URI.encode_www_form(payload)
+            rescue => ex
+              # raise ex
+            end
+            print body_str
+          else
+            print payload
+          end
         end
       end
     end
@@ -155,6 +237,82 @@ module Morpheus::Cli::PrintHelper
     print reset
   end
 
+  # format_curl_command generates a valid curl command for the given api request
+  # @param api_request [Hash] api request, typically returned from api_client.dry.execute()
+  # @param options [Hash] common cli options
+  # formats command like:
+  #
+  # curl -XPOST "https://api.gomorpheus.com/api/cypher" \
+  #   -H "Authorization: BEARER ******************" \
+  #   -H "Content-Type: application/json" \
+  #   -d '{
+  #     "value": "mysecret"
+  #   }'
+  def format_curl_command(http_method, url, headers, payload=nil, options={})
+    options ||= {}
+    # build curl [options]
+    out = ""
+    out << "curl -X#{http_method.to_s.upcase} '#{url}'"
+    if headers
+      headers.each do |k,v|
+        # avoid weird [:headers][:params]
+        unless k == :params
+          header_value = v
+          out <<  ' \\' + "\n"
+          header_line = "  -H \"#{k.is_a?(Symbol) ? k.to_s.capitalize : k.to_s}: #{v}\""
+          out << header_line
+        end
+      end
+    end
+    if payload && !payload.empty?
+      out <<  + ' \\' + "\n"
+      if headers && headers['Content-Type'] == 'application/json'
+        if payload.is_a?(String)
+          begin
+            payload = JSON.parse(payload)
+          rescue => e
+            #payload = "(unparsable) #{payload}"
+          end
+        end
+        if payload.is_a?(Hash)
+          out << "  -d '#{as_json(payload, options)}'"
+        else
+          out << "  -d '#{payload}'"
+        end
+      else
+        content_type = headers['Content-Type'] || 'application/x-www-form-urlencoded'
+        
+        if payload.is_a?(File)
+          # pretty_size = Filesize.from("#{payload.size} B").pretty.strip
+          pretty_size = "#{payload.size} B"
+          # print "File: #{payload.path} (#{payload.size} bytes)"
+          out << "  -d @#{payload.path}"
+        elsif payload.is_a?(String)
+          out << "  -d '#{payload}'"
+        else
+          if content_type == 'application/x-www-form-urlencoded'
+            body_str = payload.to_s
+            begin
+              body_str = URI.encode_www_form(payload)
+            rescue => ex
+              # raise ex
+            end
+            out << "  -d '#{body_str}'"
+          else
+            out << "  -d '#{payload}'"
+          end
+        end
+      end
+      out << "\n"
+    else
+      out << "\n"
+    end
+    if options[:scrub]
+      out = Morpheus::Logging.scrub_message(out)
+    end
+    return out
+    
+  end
   def print_results_pagination(json_response, options={})
     # print cyan,"\nViewing #{json_response['meta']['offset'].to_i + 1}-#{json_response['meta']['offset'].to_i + json_response['meta']['size'].to_i} of #{json_response['meta']['total']}\n", reset
     print format_results_pagination(json_response, options)
@@ -473,7 +631,14 @@ module Morpheus::Cli::PrintHelper
     end
     
     # format header spacer row
-    h_line = header_cells.collect {|cell| ("-" * cell.size) }.join(cell_delim.gsub(" ", "-"))
+    if options[:border_style] == :thin
+      # a simpler looking table
+      cell_delim = "   "
+      h_line = header_cells.collect {|cell| ("-" * cell.strip.size).ljust(cell.size, ' ') }.join(cell_delim)
+    else
+      # default border style
+      h_line = header_cells.collect {|cell| ("-" * cell.size) }.join(cell_delim.gsub(" ", "-"))
+    end
     
     # format data rows
     formatted_rows = []