morpheus-cli 2.10.1 → 2.10.2

data/lib/morpheus/cli/app_templates.rb

@@ -151,13 +151,23 @@ class Morpheus::Cli::AppTemplates
       #   options[:options] ||= {}
       #   options[:options]['group'] = group
       # end
+      build_option_type_options(opts, options, add_app_template_option_types(false))
+      opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
+        options[:options] ||= {}
+        options[:options]['group']
+        # options[:group] = val
+      end
       build_common_options(opts, options, [:options, :json, :dry_run])
     end
     optparse.parse!(args)
     connect(options)
     begin
-
+      options[:options] ||= {}
+      # use active group by default
+      options[:options]['group'] ||= @active_group_id
+      
       params = Morpheus::Cli::OptionTypes.prompt(add_app_template_option_types, options[:options], @api_client, options[:params])
+      group = find_group_by_name_or_id_for_provisioning(params.delete('group'))
 
       #puts "parsed params is : #{params.inspect}"
       app_template_keys = ['name']
@@ -202,6 +212,7 @@ class Morpheus::Cli::AppTemplates
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name] [options]")
+      build_option_type_options(opts, options, update_app_template_option_types(false))
       build_common_options(opts, options, [:options, :json, :dry_run])
     end
     optparse.parse!(args)
@@ -222,9 +233,8 @@ class Morpheus::Cli::AppTemplates
       params = options[:options] || {}
 
       if params.empty?
+        print_red_alert "Specify atleast one option to update"
         puts optparse
-        option_lines = update_app_template_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
-        puts "\nAvailable Options:\n#{option_lines}\n\n"
         exit 1
       end
 
@@ -694,6 +704,7 @@ class Morpheus::Cli::AppTemplates
   def available_tiers(args)
     options = {}
     optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage()
       build_common_options(opts, options, [:json, :dry_run])
     end
     optparse.parse!(args)
@@ -737,6 +748,7 @@ class Morpheus::Cli::AppTemplates
   def available_types(args)
     options = {}
     optparse = OptionParser.new do|opts|
+      opts.banner = subcommand_usage()
       build_common_options(opts, options, [:json])
     end
     optparse.parse!(args)
@@ -781,15 +793,18 @@ class Morpheus::Cli::AppTemplates
   private
 
 
-  def add_app_template_option_types
+  def add_app_template_option_types(connected=true)
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-      {'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'text', 'required' => true, 'displayOrder' => 2},
+      {'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'selectOptions' => (connected ? get_available_groups() : []), 'required' => true}
     ]
   end
 
-  def update_app_template_option_types
-    add_app_template_option_types
+  def update_app_template_option_types(connected=true)
+    list = add_app_template_option_types(connected)
+    list = list.reject {|it| ["group"].include? it['fieldName'] }
+    list.each {|it| it['required'] = false }
+    list
   end
 
   def find_app_template_by_name_or_id(val)

data/lib/morpheus/cli/apps.rb

@@ -77,6 +77,8 @@ class Morpheus::Cli::Apps
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
+      
+      build_option_type_options(opts, options, add_app_option_types(false))
       opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
         options[:group] = val
       end
@@ -85,27 +87,21 @@ class Morpheus::Cli::Apps
     optparse.parse!(args)
     connect(options)
     begin
-      # use active group by default
-      options[:group] ||= @active_group_id
-      group = options[:group] ? find_group_by_name_or_id_for_provisioning(options[:group]) : nil
+      options[:options] ||= {}
+      # use the -g GROUP or active group by default
+      options[:options]['group'] ||= options[:group] || @active_group_id
+      # support [name] as first argument still
+      if args[0]
+        options[:options]['name'] = args[0]
+      end
 
       payload = {
         'app' => {}
       }
-      if args[0]
-        payload['app']['name'] = args[0]
-      else
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for this app'}], options[:options])
-        payload['app']['name'] = v_prompt['name']
-      end
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false}], options[:options])
-      payload['app']['description'] = v_prompt['description']
-      if group
-        payload['app']['site'] = {id: group["id"]}
-      else
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'selectOptions' => get_available_groups(), 'required' => true}], options[:options])
-        payload['app']['site'] = {id: v_prompt["group"]}
-      end
+      params = Morpheus::Cli::OptionTypes.prompt(add_app_option_types, options[:options], @api_client, options[:params])
+      group = find_group_by_name_or_id_for_provisioning(params.delete('group'))
+      payload['app'].merge!(params)
+      payload['app']['group'] = {id: group['id']}
 
       # todo: allow adding instances with creation..
 
@@ -217,6 +213,7 @@ class Morpheus::Cli::Apps
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
+      build_option_type_options(opts, options, update_app_option_types(false))
       build_common_options(opts, options, [:options, :json, :dry_run])
     end
     optparse.parse!(args)
@@ -233,17 +230,11 @@ class Morpheus::Cli::Apps
         'app' => {id: app["id"]}
       }
 
-      update_app_option_types = [
-        {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for this app'},
-        {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false}
-      ]
-
       params = options[:options] || {}
 
       if params.empty?
-        puts opts
-        option_lines = update_app_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
-        puts "\nAvailable Options:\n#{option_lines}\n\n"
+        print_red_alert "Specify atleast one option to update"
+        puts optparse
         exit 1
       end
 
@@ -341,7 +332,7 @@ class Morpheus::Cli::Apps
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :quiet])
+      build_common_options(opts, options, [:json, :dry_run, :quiet, :auto_confirm])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -701,6 +692,21 @@ class Morpheus::Cli::Apps
 
   private
 
+  def add_app_option_types(connected=true)
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for this app'},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false},
+      {'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'selectOptions' => (connected ? get_available_groups() : []), 'required' => true},
+    ]
+  end
+
+  def update_app_option_types(connected=true)
+    list = add_app_option_types(connected)
+    list = list.reject {|it| ["group"].include? it['fieldName'] }
+    list.each {|it| it['required'] = false }
+    list
+  end
+
   def find_app_by_id(id)
     app_results = @apps_interface.get(id.to_i)
     if app_results['app'].empty?

data/lib/morpheus/cli/cli_command.rb

@@ -16,7 +16,90 @@ module Morpheus
         Morpheus::Cli::CliRegistry.add(klass, klass.command_name)
       end
 
+      # the beginning of instance variables from optparse !
+
+      # this setting makes it easy for the called to disable prompting
+      attr_reader :no_prompt
+
+      # disabled prompting for this command
+      def noninteractive()
+        @no_prompt = true
+        self
+      end
+
+      # whether to prompt or not, this is true by default.
+      def interactive?
+        @no_prompt != true
+      end
+
+      # Appends Array of OptionType definitions to an OptionParser instance
+      # This adds an option like --fieldContext.fieldName="VALUE"
+      # @param opts [OptionParser]
+      # @param options [Hash] output map that is being constructed
+      # @param option_types [Array] list of OptionType definitions to add
+      # @return void, this modifies the opts in place.
+      def build_option_type_options(opts, options, option_types=[])
+        #opts.separator ""
+        #opts.separator "Options:"
+        options[:options] ||= {} # this is where these go..for now
+        custom_options = options[:options]
+        
+        # add each one to the OptionParser
+        option_types.each do |option_type|
+          field_namespace = []
+          field_name = option_type['fieldName'].to_s
+          if field_name.empty?
+            puts "Missing fieldName for option type: #{option_type}" if Morpheus::Logging.debug?
+            next
+          end
+          
+          if !option_type['fieldContext'].to_s.empty?
+            option_type['fieldContext'].split(".").each do |ns|
+              field_namespace << ns
+            end
+          end
+          
+          full_field_name = field_name
+          if !field_namespace.empty?
+            full_field_name = "#{field_namespace.join('.')}.#{field_name}"
+          end
+
+          description = "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{option_type['defaultValue'] ? ' Default: '+option_type['defaultValue'].to_s : ''}"
+          # description = option_type['description'].to_s
+          # if option_type['defaultValue']
+          #   description = "#{description} Default: #{option_type['defaultValue']}"
+          # end
+          # if option_type['required'] == true
+          #   description = "(Required) #{description}"
+          # end
+          
+          opts.on("--#{full_field_name} VALUE", String, description) do |val|
+            cur_namespace = custom_options
+            field_namespace.each do |ns|
+              next if ns.empty?
+              cur_namespace[ns.to_s] ||= {}
+              cur_namespace = cur_namespace[ns.to_s]
+            end
+            cur_namespace[field_name] = val
+          end
+
+          # todo: all the various types
+          # number 
+          # checkbox [on|off]
+          # select for optionSource and selectOptions
+
+        end
+        opts
+      end
+
+      # appends to the passed OptionParser all the generic options
+      # @param opts [OptionParser] the option parser object being constructed
+      # @param options [Hash] the output Hash that is to being modified
+      # @param includes [Array] which options to include eg. :options, :json, :remote
+      # @return opts
       def build_common_options(opts, options, includes=[])
+        #opts.separator ""
+        opts.separator "Common options:"
         includes = includes.clone
         while (option_key = includes.shift) do
           case option_key.to_sym
@@ -32,7 +115,9 @@ module Morpheus
           when :options
             options[:options] ||= {}
             opts.on( '-O', '--option OPTION', "Option in the format var=\"value\"" ) do |option|
-              custom_option_args = option.split('=')
+              # todo: look ahead and parse ALL the option=value args after -O switch
+              #custom_option_args = option.split('=')
+              custom_option_args = option.sub(/\s?\=\s?/, '__OPTION_DELIM__').split('__OPTION_DELIM__')
               custom_options = options[:options]
               option_name_args = custom_option_args[0].split('.')
               if option_name_args.count > 1
@@ -114,21 +199,24 @@ module Morpheus
             opts.on( '-T', '--token ACCESS_TOKEN', "Access Token" ) do |remote|
               options[:remote_token] = remote
             end
-                      when :auto_confirm
+            
+          when :auto_confirm
             opts.on( '-y', '--yes', "Auto Confirm" ) do
               options[:yes] = true
             end
-                      when :json
-            opts.on('-j','--json', "JSON Output") do |json|
+          
+          when :json
+            opts.on('-j','--json', "JSON Output") do
               options[:json] = true
             end
 
           when :dry_run
-            opts.on('-d','--dry-run', "Dry Run, print the API request instead of executing it") do |json|
+            opts.on('-d','--dry-run', "Dry Run, print the API request instead of executing it") do
               options[:dry_run] = true
             end
-                      when :quiet
-            opts.on('-q','--quiet', "No Output, when successful") do |json|
+
+          when :quiet
+            opts.on('-q','--quiet', "No Output, when successful") do
               options[:quiet] = true
             end
 
@@ -144,9 +232,10 @@ module Morpheus
           Term::ANSIColor::coloring = false
         end
 
-        opts.on('-V','--debug', "Print extra output for debugging. ") do |json|
+        opts.on('-V','--debug', "Print extra output for debugging. ") do
           options[:debug] = true
           Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
+          ::RestClient.log = Morpheus::Logging.debug? ? STDOUT : nil
           # perhaps...
           # create a new logger instance just for this command instance
           # this way we don't elevate the global level for subsequent commands in a shell
@@ -160,7 +249,7 @@ module Morpheus
           puts opts
           exit
         end
-
+        opts
       end
 
       def command_name
@@ -215,17 +304,21 @@ module Morpheus
           raise "#{self.class} has no available subcommands"
         end
         # meh, could deprecate and make subcommand define handle() itself
-        if args.count == 0 && default_subcommand
-          # p "using default subcommand #{default_subcommand}"
-          return self.send(default_subcommand, args || [])
+        # if args.count == 0 && default_subcommand
+        #   # p "using default subcommand #{default_subcommand}"
+        #   return self.send(default_subcommand, args || [])
+        # end
+        subcommand_name = args[0]
+        if args[0] == "-h" || args[0] == "--help" || args[0] == "help"
+          print_usage
+          exit
         end
-        cmd_name = args[0]
-        if subcommand_aliases[cmd_name]
-          cmd_name = subcommand_aliases[cmd_name]
+        if subcommand_aliases[subcommand_name]
+          subcommand_name = subcommand_aliases[subcommand_name]
         end
-        cmd_method = subcommands[cmd_name]
-        if cmd_name && !cmd_method
-          #puts "unknown command '#{cmd_name}'"
+        cmd_method = subcommands[subcommand_name]
+        if subcommand_name && !cmd_method
+          puts "unknown command '#{self.command_name} #{subcommand_name}'"
         end
         if !cmd_method
           print_usage
@@ -240,7 +333,8 @@ module Morpheus
 
       # This supports the simple remote option eg. `instances add --remote "qa"`
       # It will establish a connection to the pre-configured appliance named "qa"
-      # The calling command needs to populate @appliances and/or @appliance_name
+      # The calling command can populate @appliances and/or @appliance_name
+      # Otherwise, the current active appliance is used...
       # This returns a new instance of Morpheus::APIClient (and sets @access_token, and @appliance)
       # Your command should be ready to make api requests after this.
       # todo: probably don't exit here, just return nil or raise
@@ -284,18 +378,32 @@ module Morpheus
 
         # ok, get some credentials.
         # this prompts for username, password  without options[:no_prompt]
-        @access_token = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).request_credentials(options)
-        
-        # bail if we got nothing
+        # used saved credentials please
+        @api_credentials = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url)
+        @access_token = @api_credentials.load_saved_credentials()
+        if @access_token.to_s.empty?
+          unless options[:no_prompt]
+            @access_token = @api_credentials.request_credentials(options)
+          end
+        end
+
+        # bail if we got nothing still
+        unless options[:skip_verify_access_token]
+          verify_access_token!
+        end
+
+        # ok, connect to the appliance.. actually this just instantiates an ApiClient
+        api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
+        @api_client = api_client # meh, just return w/o setting instance attrs
+        return api_client
+      end
+
+      def verify_access_token!
         if @access_token.empty?
           print_red_alert "Invalid Credentials. Unable to acquire access token. Please verify your credentials and try again."
           exit 1
         end
-
-        # ok, connect to the appliance.. actually this just instantiates an ApiClient
-        # setup our api client for all including commands to use.
-        @api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
-        return @api_client
+        true
       end
 
       module ClassMethods

data/lib/morpheus/cli/clouds.rb

@@ -229,6 +229,10 @@ class Morpheus::Cli::Clouds
 
       all_option_types = add_cloud_option_types(cloud_type)
       params = Morpheus::Cli::OptionTypes.prompt(all_option_types, options[:options], @api_client, {zoneTypeId: cloud_type['id']})
+      # some optionTypes have fieldContext='zone', so move those to the root level of the zone payload
+      if params['zone'].is_a?(Hash)
+        cloud_payload.merge!(params.delete('zone'))
+      end
       cloud_payload.merge!(params)
       payload = {zone: cloud_payload}
       if options[:dry_run]
@@ -284,6 +288,10 @@ class Morpheus::Cli::Clouds
         print_available_options(all_option_types)
         exit 1
       end
+      # some optionTypes have fieldContext='zone', so move those to the root level of the zone payload
+      if params['zone'].is_a?(Hash)
+        cloud_payload.merge!(params.delete('zone'))
+      end
       cloud_payload.merge!(params)
       payload = {zone: cloud_payload}
 
@@ -493,9 +501,6 @@ class Morpheus::Cli::Clouds
     params = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage()
-      opts.on( '-g', '--group GROUP', "Group Name" ) do |group|
-        options[:group] = group
-      end
       build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)

data/lib/morpheus/cli/coloring_command.rb

@@ -0,0 +1,39 @@
+require 'optparse'
+require 'morpheus/cli/cli_command'
+require 'json'
+
+# This is for use in dotfile scripts
+# It allows you to turn colors on or off globally
+class Morpheus::Cli::ColoringCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :coloring
+  set_command_hidden
+
+  def handle(args)
+    append_newline = true
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name} [on|off]"
+      #build_common_options(opts, options, [])
+      opts.on('-h', '--help', "Prints this help" ) do
+        puts opts
+        exit
+      end
+      opts.footer = "Enable [on] or Disable [off] ANSI Colors for all output."
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      puts optparse
+      exit 1
+    end
+    is_on = ["on","true", "1"].include?(args[0].to_s.strip.downcase)
+    is_off = ["off","false", "0"].include?(args[0].to_s.strip.downcase)
+    if !is_on && !is_off
+      puts optparse
+      exit 1
+    end
+    Term::ANSIColor::coloring = is_on
+    return true
+  end
+
+end