morpheus-cli 4.2.12 → 4.2.17

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.12"
+    VERSION = "4.2.17"
   end
 end

data/lib/morpheus/cli/whitelabel_settings_command.rb

@@ -29,9 +29,13 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      opts.on( '-a', '--tenant TENANT', "Tenant Name or ID" ) do |val|
+      opts.on( '--tenant TENANT', String, "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
+      opts.on( '-a', '--account ACCOUNT', "Tenant Name or ID" ) do |val|
+        options[:account] = val
+      end
+      opts.add_hidden_option('-a, --account') if opts.is_a?(Morpheus::Cli::OptionParser)
       opts.on('--details', "Show full (not truncated) contents of Terms of Use, Privacy Policy, Override CSS" ) do
         options[:details] = true
       end
@@ -148,13 +152,17 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     query_params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage()
+      opts.on( '--tenant TENANT', String, "Tenant Name or ID" ) do |val|
+        options[:account] = val
+      end
       opts.on( '-a', '--account ACCOUNT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
+      opts.add_hidden_option('-a, --account') if opts.is_a?(Morpheus::Cli::OptionParser)
       opts.on('--active [on|off]', String, "Can be used to enable / disable whitelabel feature") do |val|
         params['enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
-      opts.on("--appliance-name NAME", String, "Appliance name. Only available to master account") do |val|
+      opts.on("--appliance-name NAME", String, "Appliance name. Only available to master tenant") do |val|
         params['applianceName'] = val == 'null' ? nil : val
       end
       opts.on("--disable-support-menu [on|off]", ['on','off'], "Can be used to disable support menu") do |val|
@@ -314,9 +322,13 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage()
+      opts.on( '--tenant TENANT', String, "Tenant Name or ID" ) do |val|
+        options[:account] = val
+      end
       opts.on( '-a', '--account ACCOUNT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
+      opts.add_hidden_option('-a, --account') if opts.is_a?(Morpheus::Cli::OptionParser)
       opts.on("--header-logo FILE", String, "Header logo image. Local path of a file to upload (png|jpg|svg)") do |val|
         options[:headerLogo] = val
       end
@@ -412,9 +424,13 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage("[image-type]")
-      opts.on( '-a', '--tenant TENANT', "Tenant Name or ID" ) do |val|
+      opts.on( '--tenant TENANT', String, "Tenant Name or ID" ) do |val|
+        options[:account] = val
+      end
+      opts.on( '-a', '--account ACCOUNT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
+      opts.add_hidden_option('-a, --account') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
       opts.footer = "Reset your whitelabel image.\n" +
           "[image-type] is required. This is the whitelabel image type (#{@image_types.collect {|k,v| k}.join('|')})"
@@ -468,9 +484,13 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage("[image-type]")
-      opts.on( '-a', '--tenant TENANT', "Tenant Name or ID" ) do |val|
+      opts.on( '--tenant TENANT', String, "Tenant Name or ID" ) do |val|
+        options[:account] = val
+      end
+      opts.on( '-a', '--account ACCOUNT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
+      opts.add_hidden_option('-a, --account') if opts.is_a?(Morpheus::Cli::OptionParser)
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
       opts.footer = "View your image of specified [image-type].\n" +
           "[image-type] is required. This is the whitelabel image type (#{@image_types.collect {|k,v| k}.join('|')})\n" +
@@ -532,9 +552,13 @@ class Morpheus::Cli::WhitelabelSettingsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = opts.banner = subcommand_usage("[image-type] [local-file]")
-      opts.on( '-a', '--tenant TENANT', "Tenant Name or ID" ) do |val|
+      opts.on( '--tenant TENANT', String, "Tenant Name or ID" ) do |val|
+        options[:account] = val
+      end
+      opts.on( '-a', '--account ACCOUNT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
+      opts.add_hidden_option('-a, --account') if opts.is_a?(Morpheus::Cli::OptionParser)
       opts.on( '-f', '--force', "Overwrite existing [local-file] if it exists." ) do
         options[:overwrite] = true
       end

data/lib/morpheus/cli/whoami.rb

@@ -1,11 +1,8 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/whoami_helper'
 require 'morpheus/cli/mixins/accounts_helper'
-require 'json'
+require 'fileutils'
+require 'yaml'
 
 class Morpheus::Cli::Whoami
   include Morpheus::Cli::CliCommand
@@ -163,7 +160,7 @@ EOT
         print cyan
         print_description_list({
           "ID" => 'id',
-          "Tenant" => lambda {|it| (it['account'] ? it['account']['name'] : '') + (@is_master_account ? " (Master Account)" : '') },
+          "Tenant" => lambda {|it| (it['account'] ? it['account']['name'] : '') + (@is_master_account ? " (Master Tenant)" : '') },
           "First Name" => 'firstName',
           "Last Name" => 'lastName',
           # "Name" => 'displayName',
@@ -232,4 +229,114 @@ EOT
     end
   end
 
+  # Whoami class methods
+  class << self
+    include Term::ANSIColor
+
+    # @@whoami_cache is for caching the the contents the Whoami api results
+    # as YAML files at $home/whoami/$appliance_name/$user_id.json
+    @@whoami_cache = nil 
+
+    def whoami_cache
+      if @@whoami_cache.nil?
+        @@whoami_cache = {}
+      end
+      return @@whoami_cache
+    end
+
+    def clear_whoami_cache(appliance_name, user_id)
+      @@whoami_cache ||= {}
+      @@whoami_cache[appliance_name.to_s] ||= {}
+      @@whoami_cache[appliance_name.to_s][user_id.to_s] = result
+    end
+
+    def set_whoami_cache(appliance_name, user_id, result)
+      @@whoami_cache ||= {}
+      @@whoami_cache[appliance_name.to_s] ||= {}
+      @@whoami_cache[appliance_name.to_s][user_id.to_s] = result
+    end
+
+    def get_whoami_cache(appliance_name, user_id)
+      @@whoami_cache ||= {}
+      @@whoami_cache[appliance_name.to_s] ? @@whoami_cache[appliance_name.to_s][user_id.to_s] : nil
+    end
+
+    def whoami_file_path
+      File.join(Morpheus::Cli.home_directory, "cache", "whoami")
+    end
+
+    def save_whoami_file(appliance_name, user_id, json_response)
+      fn = File.join(whoami_file_path, appliance_name.to_s, user_id.to_s + ".json")
+      if !Dir.exists?(File.dirname(fn))
+        FileUtils.mkdir_p(File.dirname(fn))
+      end
+      Morpheus::Logging::DarkPrinter.puts "writing file #{fn}" if Morpheus::Logging.debug?
+      File.open(fn, 'w') {|f| f.write json_response.to_yaml }
+      FileUtils.chmod(0600, fn)
+      return json_response
+    end
+
+    def delete_whoami_file(appliance_name, user_id)
+      fn = File.join(whoami_file_path, appliance_name.to_s, user_id.to_s + ".json")
+      if File.exist?(fn)
+        #Morpheus::Logging::DarkPrinter.puts "deleting file #{fn}" if Morpheus::Logging.debug?
+        FileUtils.rm(fn)
+      end
+      return nil
+    end
+
+    def load_whoami_file(appliance_name, user_id)
+      raise "appliance_name is required" if appliance_name.to_s.empty?
+      raise "user_id is required" if user_id.to_s.empty?
+      fn = File.join(whoami_file_path, appliance_name.to_s, user_id.to_s + ".json")
+      if File.exist?(fn)
+        Morpheus::Logging::DarkPrinter.puts "reading file #{fn}" if Morpheus::Logging.debug?
+        return YAML.load_file(fn)
+      else
+        return nil
+      end
+    end
+
+    def save_whoami(appliance_name, user_id, result)
+      save_whoami_file(appliance_name, user_id, result)
+      set_whoami_cache(appliance_name, user_id, result)
+    end
+
+    def clear_whoami(appliance_name, user_id)
+      delete_whoami_file(appliance_name, user_id)
+      set_whoami_cache(appliance_name, user_id, nil)
+    end
+
+    def load_whoami(appliance_name, user_id, refresh=false)
+      result = nil
+      # load from cache (memory) or file or else api
+      if refresh == false
+        # load from memory
+        result = whoami_cache[appliance_name.to_s] ? whoami_cache[appliance_name.to_s][user_id.to_s] : nil
+        # load from file
+        if result.nil?
+          result = load_whoami_file(appliance_name, user_id)
+          set_whoami_cache(appliance_name, user_id, result)
+        end
+      end
+      # if result.nil?
+      #   # appliance needs to be passed in here...heh
+      #   appliance = ::Morpheus::Cli::Remote.load_remote(appliance_name)
+      #   if appliance.nil?
+      #     raise "Remote not found for name '#{appliance_name}'"
+      #   end
+      #   wallet = ::Morpheus::Cli::Credentials.new(appliance[:name], appliance[:url]).load_saved_credentials()
+      #   if wallet.nil? || wallet['access_token'].nil?
+      #     raise "Access token not found for remote '#{appliance_name}'"
+      #   end
+      #   access_token = wallet['access_token']
+      #   whoami_interface = Morpheus::WhoamiInterface.new({url: appliance[:url], access_token: wallet['access_token']})
+      #   whoami_response = whoami_interface.get()
+      #   result = whoami_response
+      # end
+      return result
+    end
+
+  end
+
 end

data/lib/morpheus/cli/workflows.rb

@@ -619,7 +619,7 @@ class Morpheus::Cli::Workflows
         elsif target_type == 'appliance'
           # cool, run it locally.
         else
-          raise_command_error "missing required option: --instance or --host\n#{optparse}"
+          raise_command_error "missing required option: --instance, --host or --appliance\n#{optparse}"
         end
 
         # todo: prompt to workflow optionTypes for customOptions

data/lib/morpheus/ext/hash.rb

@@ -85,4 +85,25 @@ class Hash
     self
   end
 
+  def upcase_keys!
+    self.keys.each do |k| 
+      self[k.to_s.upcase] = self.delete(k)
+    end
+    self
+  end
+
+  def downcase_keys!
+    self.keys.each do |k|
+      self[k.to_s.downcase] = self.delete(k)
+    end
+    self
+  end
+
+  def capitalize_keys!
+    self.keys.each do |k|
+      self[k.to_s.capitalize] = self.delete(k)
+    end
+    self
+  end
+
 end

data/lib/morpheus/formatters.rb

@@ -365,14 +365,8 @@ 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
+def format_sig_dig(n, sigdig=3)
+  sprintf("%.#{sigdig}f", n)
 end
 
 def currency_sym(currency)
@@ -382,22 +376,16 @@ end
 # returns currency amount formatted like "$4,5123.00". 0.00 is formatted as "$0"
 # this is not ideal
 def format_money(amount, currency='usd', opts={})
-  if amount.to_f == 0
+  amount = amount.to_f
+  if amount == 0
     return currency_sym(currency).to_s + "0"
   # elsif amount.to_f < 0.01
   #   # return exponent notation like 3.4e-09
   #   return currency_sym(currency).to_s + "#{amount}"
   else
-    rtn = amount.to_f.round(2).to_s
-    if rtn.index('.').nil?
-      rtn += '.00'
-    elsif rtn.split('.')[1].length < 2
-      rtn = rtn + (['0'] * (2 - rtn.split('.')[1].length) * '')
-    end
-    dollars,cents = rtn.split(".")
-    rtn = currency_sym(currency).to_s + format_number(dollars.to_i.abs) + "." + cents
-
-    if dollars.to_i < 0
+    sigdig = opts[:sigdig] ? opts[:sigdig].to_i : 2
+    rtn = currency_sym(currency).to_s + format_number(sprintf("%.#{sigdig}f", amount))
+    if amount.to_i < 0
       rtn = "(#{rtn})"
       if opts[:minus_color]
         rtn = "#{opts[:minus_color]}#{rtn}#{opts[:return_color] || cyan}"

data/lib/morpheus/terminal.rb

@@ -264,6 +264,7 @@ module Morpheus
         opts.on('-V','--debug', "Print extra output for debugging.") do |json|
           @terminal_log_level = Morpheus::Logging::Logger::DEBUG
           Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
+          # if !options[:quiet]
           ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
         end
         opts.on('-v','--version', "Print the version.") do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.12
+  version: 4.2.17
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,7 +182,9 @@ files:
 - lib/morpheus/api/archive_buckets_interface.rb
 - lib/morpheus/api/archive_files_interface.rb
 - lib/morpheus/api/auth_interface.rb
+- lib/morpheus/api/backup_jobs_interface.rb
 - lib/morpheus/api/backup_settings_interface.rb
+- lib/morpheus/api/backups_interface.rb
 - lib/morpheus/api/blueprints_interface.rb
 - lib/morpheus/api/budgets_interface.rb
 - lib/morpheus/api/cloud_datastores_interface.rb
@@ -198,6 +200,7 @@ files:
 - lib/morpheus/api/datastores_interface.rb
 - lib/morpheus/api/deploy_interface.rb
 - lib/morpheus/api/deployments_interface.rb
+- lib/morpheus/api/doc_interface.rb
 - lib/morpheus/api/environments_interface.rb
 - lib/morpheus/api/execute_schedules_interface.rb
 - lib/morpheus/api/execution_request_interface.rb
@@ -266,6 +269,7 @@ files:
 - lib/morpheus/api/provisioning_licenses_interface.rb
 - lib/morpheus/api/provisioning_settings_interface.rb
 - lib/morpheus/api/reports_interface.rb
+- lib/morpheus/api/rest_interface.rb
 - lib/morpheus/api/roles_interface.rb
 - lib/morpheus/api/security_group_rules_interface.rb
 - lib/morpheus/api/security_groups_interface.rb
@@ -295,8 +299,9 @@ files:
 - lib/morpheus/cli/approvals_command.rb
 - lib/morpheus/cli/apps.rb
 - lib/morpheus/cli/archives_command.rb
-- lib/morpheus/cli/auth_command.rb
+- lib/morpheus/cli/backup_jobs_command.rb
 - lib/morpheus/cli/backup_settings_command.rb
+- lib/morpheus/cli/backups_command.rb
 - lib/morpheus/cli/blueprints_command.rb
 - lib/morpheus/cli/boot_scripts_command.rb
 - lib/morpheus/cli/budgets_command.rb
@@ -333,8 +338,10 @@ files:
 - lib/morpheus/cli/credentials.rb
 - lib/morpheus/cli/cypher_command.rb
 - lib/morpheus/cli/dashboard_command.rb
+- lib/morpheus/cli/deploy.rb
 - lib/morpheus/cli/deployments.rb
 - lib/morpheus/cli/deploys.rb
+- lib/morpheus/cli/doc.rb
 - lib/morpheus/cli/dot_file.rb
 - lib/morpheus/cli/environments_command.rb
 - lib/morpheus/cli/error_handler.rb
@@ -372,6 +379,8 @@ files:
 - lib/morpheus/cli/logout.rb
 - lib/morpheus/cli/logs_command.rb
 - lib/morpheus/cli/mixins/accounts_helper.rb
+- lib/morpheus/cli/mixins/backups_helper.rb
+- lib/morpheus/cli/mixins/deployments_helper.rb
 - lib/morpheus/cli/mixins/infrastructure_helper.rb
 - lib/morpheus/cli/mixins/library_helper.rb
 - lib/morpheus/cli/mixins/logs_helper.rb

data/lib/morpheus/cli/auth_command.rb

@@ -1,105 +0,0 @@
-require 'morpheus/cli/cli_command'
-
-# JD: this is not in use, we have login, logout and access-token instead
-# This provides commands for authentication 
-# This also includes credential management.
-class Morpheus::Cli::AuthCommand
-  include Morpheus::Cli::CliCommand
-
-  set_command_name :'auth'
-
-  register_subcommands :get
-  # register_subcommands :list # yes plz
-  # register_subcommands :'access-token' => :print_access_token
-  # register_subcommands :'refresh-token' => :print_refresh_token
-  # register_subcommands :'use-refresh-token' => :use_refresh_token
-  register_subcommands :login, :logout
-  register_subcommands :test => :login_test
-
-  def connect(options)
-    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
-    # automatically get @appliance_name, @appliance_url, @wallet
-    if !@appliance_name
-      raise_command_error "#{command_name} requires a remote to be specified, use -r [remote] or set the active remote with `remote use`"
-    end
-    if !@appliance_url
-      unless options[:quiet]
-        print red,"Unable to determine remote appliance url. Review your remote configuration.#{reset}\n"
-      end
-      return 1
-    end
-    #@wallet = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
-    if @wallet.nil? || @wallet['access_token'].nil?
-      unless options[:quiet]
-        print_error yellow,"You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}",reset,"\n"
-        print_error yellow,"Use `login` to authenticate.",reset,"\n"
-      end
-      return 1
-    end
-  end
-
-  def handle(args)
-    handle_subcommand(args)
-  end
-
-  def get(args)
-    options = {}
-    params = {}
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:remote, :quiet])
-      opts.footer = "Print your current authentication info.\n" +
-                    "This contains tokens that should be kept secret, be careful."
-    end
-    optparse.parse!(args)
-    if args.count != 0
-      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
-    end
-    connect_result = connect(options)
-    return connect_result if (connect_result.is_a?(Numeric) && connect_result != 0)
-  
-    # could fetch and show whoami info as well eh?
-    # extra api call though..
-
-    #print_h1 "Morpheus Credentials", [display_appliance(@appliance_name, @appliance_url)], options
-    print_h1 "Morpheus Credentials", [], options
-    description_cols = {
-      "Remote" => lambda {|wallet| @appliance_name },
-      "Username" => lambda {|wallet| wallet['username'] },
-      "Access Token" => lambda {|wallet| wallet['access_token'] },
-      "Refresh Token" => lambda {|wallet| wallet['refresh_token'] },
-      "Login Date" => lambda {|wallet| format_local_dt(wallet['login_date']) },
-      "Expire Date" => lambda {|wallet| wallet['expire_date'] ? format_local_dt(wallet['expire_date']) : "" },
-    }
-    print cyan
-    puts as_description_list(@wallet, description_cols)
-    print reset
-    return 0
-  end
-  
-  # these are all just aliases, heh
-
-  def login(args)
-    ::Morpheus::Cli::Login.new.handle(args)
-  end
-
-  def login_test(args)
-    ::Morpheus::Cli::Login.new.handle(['--test'] + args)
-  end
-
-  def logout(args)
-    ::Morpheus::Cli::Logout.new.handle(args)
-  end
-
-  def print_access_token(args)
-    ::Morpheus::Cli::AccessTokenCommand.new.handle(args)
-  end
-
-  def use_refresh_token(args)
-    ::Morpheus::Cli::AccessTokenCommand.new.handle(['refresh'] + args)
-  end
-
-
-  protected
-
-end