morpheus-cli 4.2.8 → 4.2.10

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -355,93 +355,6 @@ class Morpheus::Cli::LibraryOptionListsCommand
 
   private
 
-  def find_instance_type_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_instance_type_by_id(val)
-    else
-      return find_instance_type_by_name(val)
-    end
-  end
-
-  def find_instance_type_by_id(id)
-    begin
-      json_response = @library_instance_types_interface.get(id.to_i)
-      return json_response['instanceType']
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "Instance Type not found by id #{id}"
-      else
-        raise e
-      end
-    end
-  end
-
-  def find_instance_type_by_name(name)
-    json_response = @library_instance_types_interface.list({name: name.to_s})
-    instance_types = json_response['instanceTypes']
-    if instance_types.empty?
-      print_red_alert "Instance Type not found by name #{name}"
-      return nil
-    elsif instance_types.size > 1
-      print_red_alert "#{instance_types.size} instance types found by name #{name}"
-      print_instance_types_table(instance_types, {color: red})
-      print_red_alert "Try using ID instead"
-      print reset,"\n"
-      return nil
-    else
-      return instance_types[0]
-    end
-  end
-
-  def print_instance_types_table(instance_types, opts={})
-    columns = [
-      {"ID" => lambda {|instance_type| instance_type['id'] } },
-      {"NAME" => lambda {|instance_type| instance_type['name'] } },
-      {"CODE" => lambda {|instance_type| instance_type['code'] } },
-      {"TECHNOLOGY" => lambda {|instance_type| format_instance_type_technology(instance_type) } },
-      {"CATEGORY" => lambda {|instance_type| instance_type['category'].to_s.capitalize } },
-      {"FEATURED" => lambda {|instance_type| format_boolean instance_type['featured'] } },
-      {"OWNER" => lambda {|instance_type| instance_type['account'] ? instance_type['account']['name'] : '' } },
-    ]
-    if opts[:include_fields]
-      columns = opts[:include_fields]
-    end
-    print as_pretty_table(instance_types, columns, opts)
-  end
-
-  def format_instance_type_technology(instance_type)
-    if instance_type
-      instance_type['provisionTypeCode'].to_s.capitalize
-    else
-      ""
-    end
-  end
-
-  def add_instance_type_option_types
-    [
-      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-      {'fieldName' => 'code', 'fieldLabel' => 'Code', 'type' => 'text', 'required' => true, 'displayOrder' => 2, 'description' => 'Useful shortcode for provisioning naming schemes and export reference.'},
-      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 3},
-      {'fieldName' => 'category', 'fieldLabel' => 'Category', 'type' => 'select', 'optionSource' => 'categories', 'required' => true, 'displayOrder' => 4},
-      {'fieldName' => 'logo', 'fieldLabel' => 'Icon File', 'type' => 'text', 'displayOrder' => 5},
-      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 6},
-      {'fieldName' => 'environmentPrefix', 'fieldLabel' => 'Environment Prefix', 'type' => 'text', 'displayOrder' => 7, 'description' => 'Used for exportable environment variables when tying instance types together in app contexts. If not specified a name will be generated.'},
-      {'fieldName' => 'hasSettings', 'fieldLabel' => 'Enable Settings', 'type' => 'checkbox', 'displayOrder' => 8},
-      {'fieldName' => 'hasAutoScale', 'fieldLabel' => 'Enable Scaling (Horizontal)', 'type' => 'checkbox', 'displayOrder' => 9},
-      {'fieldName' => 'hasDeployment', 'fieldLabel' => 'Supports Deployments', 'type' => 'checkbox', 'displayOrder' => 10, 'description' => 'Requires a data volume be configured on each version. Files will be copied into this location.'}
-    ]
-  end
-
-  def update_instance_type_option_types(instance_type=nil)
-    opts = add_instance_type_option_types
-    opts = opts.reject {|it| ["logo"].include? it['fieldName'] }
-    if instance_type
-      opts = add_instance_type_option_types
-      opts.find {|opt| opt['fieldName'] == 'name'}['defaultValue'] = instance_type['name']
-    end
-    opts
-  end
-
   def find_option_type_list_by_name_or_id(val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_option_type_list_by_id(val)

data/lib/morpheus/cli/library_option_types_command.rb

@@ -289,102 +289,6 @@ class Morpheus::Cli::LibraryOptionTypesCommand
 
   private
 
-  def find_instance_type_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_instance_type_by_id(val)
-    else
-      return find_instance_type_by_name(val)
-    end
-  end
-
-  def find_instance_type_by_id(id)
-    begin
-      json_response = @library_instance_types_interface.get(id.to_i)
-      return json_response['instanceType']
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "Instance Type not found by id #{id}"
-      else
-        raise e
-      end
-    end
-  end
-
-  def find_instance_type_by_name(name)
-    json_response = @library_instance_types_interface.list({name: name.to_s})
-    instance_types = json_response['instanceTypes']
-    if instance_types.empty?
-      print_red_alert "Instance Type not found by name #{name}"
-      return nil
-    elsif instance_types.size > 1
-      print_red_alert "#{instance_types.size} instance types found by name #{name}"
-      print_instance_types_table(instance_types, {color: red})
-      print_red_alert "Try using ID instead"
-      print reset,"\n"
-      return nil
-    else
-      return instance_types[0]
-    end
-  end
-
-  def print_instance_types_table(instance_types, opts={})
-    columns = [
-      {"ID" => lambda {|instance_type| instance_type['id'] } },
-      {"NAME" => lambda {|instance_type| instance_type['name'] } },
-      {"CODE" => lambda {|instance_type| instance_type['code'] } },
-      {"TECHNOLOGY" => lambda {|instance_type| format_instance_type_technology(instance_type) } },
-      {"CATEGORY" => lambda {|instance_type| instance_type['category'].to_s.capitalize } },
-      {"FEATURED" => lambda {|instance_type| format_boolean instance_type['featured'] } },
-      {"OWNER" => lambda {|instance_type| instance_type['account'] ? instance_type['account']['name'] : '' } },
-    ]
-    if opts[:include_fields]
-      columns = opts[:include_fields]
-    end
-    print as_pretty_table(instance_types, columns, opts)
-  end
-
-  def format_instance_type_technology(instance_type)
-    if instance_type
-      instance_type['provisionTypeCode'].to_s.capitalize
-    else
-      ""
-    end
-  end
-
-  def add_instance_type_option_types
-    [
-      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-      {'fieldName' => 'code', 'fieldLabel' => 'Code', 'type' => 'text', 'required' => true, 'displayOrder' => 2, 'description' => 'Useful shortcode for provisioning naming schemes and export reference.'},
-      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 3},
-      {'fieldName' => 'category', 'fieldLabel' => 'Category', 'type' => 'select', 'optionSource' => 'categories', 'required' => true, 'displayOrder' => 4},
-      {'fieldName' => 'logo', 'fieldLabel' => 'Icon File', 'type' => 'text', 'displayOrder' => 5},
-      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'displayOrder' => 6},
-      {'fieldName' => 'environmentPrefix', 'fieldLabel' => 'Environment Prefix', 'type' => 'text', 'displayOrder' => 7, 'description' => 'Used for exportable environment variables when tying instance types together in app contexts. If not specified a name will be generated.'},
-      {'fieldName' => 'hasSettings', 'fieldLabel' => 'Enable Settings', 'type' => 'checkbox', 'displayOrder' => 8},
-      {'fieldName' => 'hasAutoScale', 'fieldLabel' => 'Enable Scaling (Horizontal)', 'type' => 'checkbox', 'displayOrder' => 9},
-      {'fieldName' => 'hasDeployment', 'fieldLabel' => 'Supports Deployments', 'type' => 'checkbox', 'displayOrder' => 10, 'description' => 'Requires a data volume be configured on each version. Files will be copied into this location.'}
-    ]
-  end
-
-  def update_instance_type_option_types(instance_type=nil)
-    opts = add_instance_type_option_types
-    opts = opts.reject {|it| ["logo"].include? it['fieldName'] }
-    if instance_type
-      opts = add_instance_type_option_types
-      opts.find {|opt| opt['fieldName'] == 'name'}['defaultValue'] = instance_type['name']
-    end
-    opts
-  end
-
-  def load_balance_protocols
-    [
-      {'name' => 'None', 'value' => ''},
-      {'name' => 'HTTP', 'value' => 'HTTP'},
-      {'name' => 'HTTPS', 'value' => 'HTTPS'},
-      {'name' => 'TCP', 'value' => 'TCP'}
-    ]
-  end
-
   # finders are in LibraryHelper
 
   # lol

data/lib/morpheus/cli/license.rb

@@ -9,6 +9,9 @@ class Morpheus::Cli::License
   register_subcommands :get, :install, :uninstall, :test
   # deprecated
   register_subcommands :decode, :apply
+
+  set_subcommands_hidden :decode, :apply
+  
   #alias_subcommand :details, :get
 
   def initialize() 

data/lib/morpheus/cli/login.rb

@@ -14,7 +14,7 @@ class Morpheus::Cli::Login
   end
 
   def connect(opts)
-    #@api_client = establish_remote_appliance_connection(opts)
+    # @api_client = establish_remote_appliance_connection({:skip_verify_access_token => true, :skip_login => true}.merge(opts))
   end
 
   def usage
@@ -47,47 +47,27 @@ class Morpheus::Cli::Login
         options[:remote_token] = val
       end
       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."
+      opts.footer = <<-EOT
+Login to a remote appliance with a username and password or using an access token.
+Logging in with username and password will make an authentication api request to obtain an access token.
+The --token option can be used to login with a valid access token instead of username and password.
+The specified token will be verified by making a whoami api request
+If successful, the access token will be saved with the active session for the remote appliance.
+This command will first logout any active session before attempting authorization.
+The --test option is available for testing credentials without updating your active session, neithing logging you out or in.
+EOT
                     
     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
+    verify_args!(args:args, max:2, optparse:optparse)
     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]
-      if appliance
-        @appliance_name, @appliance_url = options[:remote].to_sym, appliance[:host]
-      else
-        @appliance_name, @appliance_url = nil, nil
-      end
-      if !@appliance_name
-        print_error red, "You have no appliance named '#{options[:remote]}' configured. See the `remote list` command.", reset, "\n"
-        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 1
-      end
+    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
+    
+    if @remote_appliance[:authenticated]
+      puts "You will be automatically logged out of your current session as '#{@remote_appliance[:username]}'"
     end
 
     begin
@@ -124,9 +104,9 @@ class Morpheus::Cli::Login
         # Login Success!
         if !options[:quiet]
           if options[:test_only]
-            print green,"Success! Credentials verified for #{wallet['username']}.", reset, "\n"
+            print green,"Success! Test Credentials verified for #{wallet['username']}", reset, "\n"
           else
-            print green,"Success! Logged in to #{@appliance_name} as #{wallet['username']}.", reset, "\n"
+            print green,"Success! Logged in as #{wallet['username']}", reset, "\n"
           end
         end
         return 0 # ,  nil

data/lib/morpheus/cli/logout.rb

@@ -15,8 +15,8 @@ class Morpheus::Cli::Logout
     @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
   end
 
-  def connect(opts)
-    #@api_client = establish_remote_appliance_connection(opts)
+  def connect(options)
+    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
   end
 
   def usage
@@ -32,12 +32,16 @@ class Morpheus::Cli::Logout
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
       build_common_options(opts, options, [:remote, :quiet])
+      opts.footer = <<-EOT
+Logout of a remote appliance.
+This clears your credentials so that you will need to login again.
+EOT
     end
     optparse.parse!(args)
-    # connect(options)
+    verify_args!(args:args,count:0,optpare:optparse)
+    connect(options)
     # establish @appliance_name, @appliance_url, 
-    @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true}))
-
+    #@api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
     begin
       if !@appliance_name
         print_error Morpheus::Terminal.angry_prompt

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

@@ -317,6 +317,8 @@ module Morpheus::Cli::AccountsHelper
     #print reset if table_color
   end
 
+  ## These user access formatted methods should probably move up to PrintHelper to be more ubiquitous.
+
   def format_user_role_names(user)
     role_names = ""
     if user && user['roles']
@@ -327,15 +329,89 @@ module Morpheus::Cli::AccountsHelper
     role_names
   end
 
-  def get_access_string(val)
-    val ||= 'none'
-    if val == 'none'
-      "#{white}#{val.to_s.capitalize}#{cyan}"
-    # elsif val == 'read'
-    #   "#{cyan}#{val.to_s.capitalize}#{cyan}"
+  def get_access_color(access)
+    access ||= 'none'
+    if access == 'none'
+      # maybe reset instead of white?
+      white
+    elsif access == 'read'
+      cyan
+    else
+      green
+    end
+  end
+
+  def get_access_string(access, return_color=cyan)
+    get_access_color(access) + access + return_color
+    # access ||= 'none'
+    # if access == 'none'
+    #   "#{white}#{access.to_s}#{return_color}"
+    # elsif access == 'read'
+    #   "#{cyan}#{access.to_s.capitalize}#{return_color}"
+    # else
+    #   "#{green}#{access.to_s}#{return_color}"
+    # end
+  end
+
+  # this outputs a string that matches the length of all available access levels
+  # for outputting in a grid that looks like this:
+  #
+  #  none
+  #              full
+  #              full
+  #          user
+  #      read
+  #              full
+  #  none
+  #
+  # Examples: format_permission_access("read")
+  #           format_permission_access("custom", "full,custom,none")
+  def format_access_string(access, access_levels=nil, return_color=cyan)
+    access = access.to_s.downcase.strip
+    if access.empty?
+      access = "none"
+    end
+    if access_levels.nil?
+      access_levels = ["none","read","user","full"]
+    elsif access_levels.is_a?(Array)
+      # access_levels = access_levels
     else
-      "#{green}#{val.to_s.capitalize}#{cyan}"
+      # parse values like "full,custom,none"
+      access_levels = [access_levels].flatten.collect {|it| it.strip.split(",") }.flatten.collect {|it| it.strip }.compact
+    end
+    # build padded string that contains access eg. 'full' or '    read'
+    access_levels_string = access_levels.join(",")
+    padded_value = ""
+    access_levels.each do |a|
+      # handle some unusual access values
+      # print custom, and provision where 'user' normally is at index 1
+      if (access == "custom" || access == "provision") && a == "user"
+        padded_value << access
+      else
+        if access == a
+          padded_value << access
+        else
+          padded_value << " " * a.size
+        end
+      end
+    end
+    # no matching access was found, so just print it in one slot
+    if padded_value == ""
+      padded_value = " " * access_levels[0].to_s.size
+      padded_value << access
+    end
+    # strip any extra whitespace off the end
+    if padded_value.size > access_levels_string.size
+      padded_value = padded_value.rstrip
     end
+    # ok build out string
+    out = ""
+    access_color = get_access_color(access)
+    out << access_color if access_color
+    out << padded_value
+    out << reset if access_color
+    out << return_color if return_color
+    return out
   end
 
 end

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

@@ -0,0 +1,41 @@
+require 'morpheus/cli/mixins/print_helper'
+
+# Mixin for Morpheus::Cli command classes
+# Provides common methods for working with Operations.
+# This includes the Dashboard, Activity, and more... (coming soon)
+module Morpheus::Cli::OperationsHelper
+
+  def self.included(klass)
+    klass.send :include, Morpheus::Cli::PrintHelper
+  end
+
+  def format_activity_severity(severity, return_color=cyan)
+    out = ""
+    status_string = severity
+    if status_string == 'critical'
+      out << "#{red}#{status_string.capitalize}#{return_color}"
+    elsif status_string == 'warning'
+      out << "#{yellow}#{status_string.capitalize}#{return_color}"
+    elsif status_string == 'info'
+      out << "#{cyan}#{status_string.capitalize}#{return_color}"
+    else
+      out << "#{cyan}#{status_string}#{return_color}"
+    end
+    out
+  end
+
+  def format_activity_display_object(item)
+    out = ""
+    if item['name']
+      out << item['name']
+    end
+    if item['objectType']
+      out << " (#{item['objectType']} #{item['objectId']})"
+    end
+    if item['deleted']
+      out << " [deleted]"
+    end
+    out
+  end
+
+end