morpheus-cli 4.2.8 → 4.2.10

data/lib/morpheus/cli/whoami.rb

@@ -17,26 +17,17 @@ class Morpheus::Cli::Whoami
 
   # no subcommands, just show()
 
-  def initialize()
-    # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-  end
-
-  def connect(opts)
-    #@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_groups[@appliance_name]
-    # rescue Morpheus::Cli::CommandError => err
-    #   puts_error err
-    # end
+  def connect(options)
+    # @api_client = establish_remote_appliance_connection(options)
+    @api_client = establish_remote_appliance_connection(options.merge({:skip_verify_access_token => true, :skip_login => true}))
+    @whoami_interface = @api_client.whoami
   end
 
   def handle(args)
-    show(args)
+    get(args)
   end
 
-  def show(args)
+  def get(args)
     options = {}
     params = {}
     username_only = false
@@ -46,12 +37,22 @@ class Morpheus::Cli::Whoami
       opts.on( '-n', '--name', "Print only your username." ) do
         username_only = true
       end
-      opts.on('-a','--all', "Display All Details (Feature Access)") do
+      opts.on('-a','--all', "Display All Details") 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('-f','--feature-access', "Display Feature Access") do
+      opts.on('-p','--permissions', "Display Permissions") 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('-f','--feature-access', "Display Feature Access") do
+      #   options[:include_feature_access] = true
+      # end
+      # opts.add_hidden_option('--feature-access')
       # these are things that morpheus users get has to display...
       # opts.on(nil,'--group-access', "Display Group Access") do
       #   options[:include_group_access] = true
@@ -62,63 +63,60 @@ class Morpheus::Cli::Whoami
       # opts.on(nil,'--instance-type-access', "Display Instance Type Access") do
       #   options[:include_instance_type_access] = true
       # end
-      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, :quiet])
+      opts.on('--offline', '--offline', "Do this offline without an api request to refresh the remote appliance status.") do
+        options[:do_offline] = true
+      end
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+View information about the current user.
+EOT
     end
     optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:0)
     connect(options)
     begin
-      # 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
+      if @access_token.nil?
+        print_error yellow,"You are not currently logged in",reset,"\n"
+        return 1, "no current user"
       end
-      
+      @whoami_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @api_client.whoami.setopts(options).dry.get(params)
+        print_dry_run @whoami_interface.dry.get(params)
         return 0
       end
 
-      # todo: fix potential issue here, should be able to use --remote-url or --username
-      # in which case you do not have to be logged in (saved credentials)...
-      # maybe just update connect() to do @api_client = establish_remote_appliance_connection(opts)
-      # wallet = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).request_credentials(options)
-      wallet = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
-      token = wallet ? wallet['access_token'] : nil
-      if !token
-        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
-
       #json_response = load_whoami()
-
-      whoami_interface = @api_client.whoami.setopts(options)
-      whoami_response = whoami_interface.get()
+      whoami_response = nil
+      if options[:do_offline]
+        # if @remote_appliance && @remote_appliance[:username]
+        #   exit_code = 0
+        # else
+        #   exit_code = 1
+        # end
+        # no permissions, or even name stored atm, we should start storing that.
+        # then we can start checking permissions nd restricting command visibility.
+        whoami_response = {
+          "user": {
+            "username" => @remote_appliance ? @remote_appliance[:username] : nil
+          },
+          # "isMasterAccount" => true,
+          "permissions" => [],
+          "appliance" => {
+           "buildVersion" => @remote_appliance ? @remote_appliance[:build_version] : nil
+          }
+        }
+      else
+        whoami_response = @whoami_interface.get(params)
+      end
       json_response = whoami_response
       @current_user = whoami_response["user"]
-      if @current_user.empty?
-        print_red_alert "Unauthenticated. Please login."
-        exit 1
-      end
+      # if @current_user.nil?
+      #   print_red_alert "Unauthenticated. Please login."
+      #   exit 1
+      # end
       @is_master_account = whoami_response["isMasterAccount"]
       @user_permissions = whoami_response["permissions"]
 
@@ -128,62 +126,52 @@ class Morpheus::Cli::Whoami
         @appliance_build_verison = nil
       end
 
-      if access_token_only
-        if options[:quiet]
-          return @current_user ? 0 : 1
-        end
-        if @access_token.nil?
-          print yellow,"\n","No access token. Please login",reset,"\n"
-          return false
-        end
-        print cyan,@access_token.to_s,reset,"\n"
-        return 0
-      end
+      render_response(json_response, options) do
 
-      if username_only
-        if options[:quiet]
-          return @current_user ? 0 : 1
-        end
-        if @current_user.nil?
-          puts_error "(logged out)" # "(anonymous)" || ""
-          return 1
-        else
-          print cyan,@current_user['username'].to_s,reset,"\n"
+        if access_token_only
+          if options[:quiet]
+            return @current_user ? 0 : 1
+          end
+          if @access_token.nil?
+            print yellow,"\n","No access token. Please login",reset,"\n"
+            return false
+          end
+          print cyan,@access_token.to_s,reset,"\n"
           return 0
         end
-      end
 
-      
-      active_group = nil
-      begin
-        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
+        if username_only
+          if options[:quiet]
+            return @current_user ? 0 : 1
+          end
+          if @current_user.nil?
+            puts_error "(logged out)" # "(anonymous)" || ""
+            return 1
+          else
+            print cyan,@current_user['username'].to_s,reset,"\n"
+            return 0
+          end
         end
-      end
 
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      else
         if @current_user.nil?
           print yellow,"\n","No active session. Please login",reset,"\n"
           exit 1
         end
-
-        print_h1 "Current User", options
+        subtitles = []
+        #subtitles << "#{display_appliance(@appliance_name, @appliance_url)}"
+        print_h1 "Current User", subtitles, options
         print cyan
         print_description_list({
           "ID" => 'id',
-          "Account" => lambda {|it| (it['account'] ? it['account']['name'] : '') + (@is_master_account ? " (Master Account)" : '') },
-          # "First Name" => 'firstName',
-          # "Last Name" => 'lastName',
+          "Tenant" => 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'] : '' },
+          #"Name" => lambda {|it| it['firstName'] ? it['displayName'] : '' },
           "Username" => 'username',
           "Email" => 'email',
-          "Role" => lambda {|it| format_user_role_names(it) }
+          "Role" => lambda {|it| format_user_role_names(it) },
+          #"Remote" => lambda {|it| display_appliance(@appliance_name, @appliance_url) },
         }, @current_user)
         print cyan
 
@@ -196,12 +184,12 @@ class Morpheus::Cli::Whoami
               if @user_permissions.is_a?(Hash)
                 # api used to return map like [code:access]
                 rows = @user_permissions.collect do |code, access|
-                  {permission: code, access: get_access_string(access) }
+                  {permission: code, access: format_access_string(access) }
                 end
               else
                 # api now returns an array of objects like [[name:"Foo",code:"foo",access:"full"], ...]
                 rows = @user_permissions.collect do |it|
-                  {permission: (it['name'] || it['code']), access: get_access_string(it['access']) }
+                  {permission: (it['name'] || it['code']), access: format_access_string(it['access']) }
                 end
               end
               # api sort sux right now
@@ -215,34 +203,7 @@ class Morpheus::Cli::Whoami
           end
         end
 
-        print_h1 "Remote Appliance", options
-        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 active_group
-          print cyan
-          # print_h1 "Active Group", options
-          # print cyan
-          # print_description_list({
-          #   "ID" => 'id',
-          #   "Name" => 'name'
-          # }, active_group)
-          print cyan, "\n# => Currently using group #{active_group['name']}\n", reset
-          print reset,"\n"
-        else
-          print "\n", reset
-          print cyan, "No active group. See `groups use`\n",reset
-          print reset,"\n"
-        end
+        print reset, "\n"
 
         # save pertinent session info to the appliance
         begin

data/lib/morpheus/cli/wiki_command.rb

@@ -173,23 +173,11 @@ class Morpheus::Cli::WikiCommand
 
       link = "#{@appliance_url}/login/oauth-redirect?access_token=#{@access_token}\\&redirectUri=/operations/wiki/#{page['urlName']}"
 
-      open_command = nil
-      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
-        open_command = "start #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /darwin/
-        open_command = "open #{link}"
-      elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
-        open_command = "xdg-open #{link}"
-      end
-
       if options[:dry_run]
-        puts "system: #{open_command}"
+        puts Morpheus::Util.open_url_command(link)
         return 0
       end
-
-      system(open_command)
-      
-      return 0
+      return Morpheus::Util.open_url(link)
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/ext/rest_client.rb

@@ -0,0 +1,36 @@
+# this does some monkey patching of third party RestClient
+# to modify the logging output a bit
+require 'rest-client'
+
+module RestClient  
+  class Request
+
+    def log_request
+      begin
+        return unless RestClient.log
+        out = []
+        # out << "RestClient.#{method} #{redacted_url.inspect}"
+        out << "#{method.to_s.upcase} #{redacted_url.inspect}"
+        out << payload.short_inspect if payload
+        out << processed_headers.to_a.sort.map { |(k, v)| [k.inspect, v.inspect].join("=>") }.join(", ")
+        RestClient.log << out.join(', ') + "\n"
+      rescue => ex
+        # something went wrong, wrong gem version maybe...above is from rest-client 2.0.2
+        # do it the old way
+        super
+      end
+    end
+=begin
+    def log_response res
+      return unless RestClient.log
+      size = if @raw_response
+               File.size(@tf.path)
+             else
+               res.body.nil? ? 0 : res.body.size
+             end
+
+      RestClient.log << "# => #{res.code} #{res.class.to_s.gsub(/^Net::HTTP/, '')} | #{(res['Content-type'] || '').gsub(/;.*$/, '')} #{size} bytes\n"
+    end
+=end
+  end
+end

data/lib/morpheus/formatters.rb

@@ -91,6 +91,20 @@ def format_duration(start_time, end_time=nil, format="human")
   format_duration_seconds(seconds, format)
 end
 
+def format_duration_ago(start_time, end_time=nil)
+  if !start_time
+    return ""
+  end
+  start_time = parse_time(start_time)
+  if end_time
+    end_time = parse_time(end_time)
+  else
+    end_time = Time.now
+  end
+  seconds = (end_time - start_time).abs
+  format_human_duration(seconds, true)
+end
+
 def format_duration_seconds(seconds, format="human")
   seconds = seconds.abs
   out = ""
@@ -120,7 +134,7 @@ end
 
 # returns a human readable time duration
 # @param seconds - duration in seconds
-def format_human_duration(seconds)
+def format_human_duration(seconds, show_relative=false)
   out = ""
   #seconds = seconds.round
   days, hours, minutes = (seconds / (60*60*24)).floor, (seconds / (60*60)).floor, (seconds / (60)).floor
@@ -152,18 +166,30 @@ def format_human_duration(seconds)
     ms = (seconds.to_f * 1000).to_i
     out << "#{ms}ms"
   else
-    seconds = seconds.floor
-    if seconds == 1
+    if seconds.floor == 1
       out << "1 second"
     else
-      out << "#{seconds} seconds"
+      out << "#{seconds.floor} seconds"
+    end
+  end
+  if show_relative
+    if seconds < 1
+      out = "just now"
+    else
+      out << " ago"
     end
   end
   out
 end
 
 def display_appliance(name, url)
-  "#{name} - #{url}"
+  if name.to_s == "" || name == 'remote-url'
+    # "#{url}"
+    "#{url}"
+  else
+    # "#{name} #{url}"
+    "[#{name}] #{url}"
+  end
 end
 
 def iso8601(dt)
@@ -321,6 +347,7 @@ def no_colors(str)
   str.to_s.gsub /\e\[\d+m/, ""
 end
 
+
 def format_number(n, opts={})
   delim = opts[:delimiter] || ','
   out = ""
@@ -338,6 +365,16 @@ def format_number(n, opts={})
   return out
 end
 
+def format_sig_dig(n, sig_dig=3)
+  out = ""
+  parts = n.to_f.round(sig_dig).to_s.split(".")
+  if parts.size > 1 && sig_dig
+    parts[1] = parts[1].ljust(sig_dig, "0")
+  end
+  out << parts.join(".")
+  return out
+end
+
 def currency_sym(currency)
   Money::Currency.new((currency || 'usd').to_sym).symbol
 end