morpheus-cli 5.3.4 → 5.4.0

data/lib/morpheus/cli/{tasks.rb → commands/tasks.rb}

@@ -1,7 +1,3 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Tasks

data/lib/morpheus/cli/{tenants_command.rb → commands/tenants_command.rb}

@@ -1,11 +1,4 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/option_types'
-require 'morpheus/cli/mixins/accounts_helper'
-require 'json'
 
 class Morpheus::Cli::TenantsCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/commands/{standard/update_command.rb → update_command.rb}

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'json'
 
 # This is for use in dotfile scripts and the shell..
 class Morpheus::Cli::UpdateCommand

data/lib/morpheus/cli/{user_groups_command.rb → commands/user_groups_command.rb}

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/accounts_helper'
 
 class Morpheus::Cli::UserGroupsCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{user_sources_command.rb → commands/user_sources_command.rb}

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/accounts_helper'
 
 class Morpheus::Cli::UserSourcesCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{users.rb → commands/users.rb}

@@ -1,11 +1,4 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/option_types'
-require 'morpheus/cli/mixins/accounts_helper'
-require 'json'
 
 class Morpheus::Cli::Users
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{virtual_images.rb → commands/virtual_images.rb}

@@ -1,7 +1,3 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
 
 # JD: I don't think a lot of this has ever worked, fix it up.

data/lib/morpheus/cli/{whitelabel_settings_command.rb → commands/whitelabel_settings_command.rb}

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/accounts_helper'
 
 class Morpheus::Cli::WhitelabelSettingsCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{whoami.rb → commands/whoami.rb}

@@ -1,8 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/whoami_helper'
-require 'morpheus/cli/mixins/accounts_helper'
-require 'fileutils'
-require 'yaml'
 
 class Morpheus::Cli::Whoami
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{wiki_command.rb → commands/wiki_command.rb}

@@ -1,9 +1,4 @@
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/option_types'
-require 'json'
 
 class Morpheus::Cli::WikiCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{workflows.rb → commands/workflows.rb}

@@ -1,6 +1,3 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Workflows

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

@@ -68,7 +68,7 @@ module Morpheus::Cli::LogsHelper
       else
         log_msg = truncate_string(log_entry['message'].to_s.strip.gsub(/\r?\n/, " "), message_col_width)
       end
-      out << "- #{log_msg}"
+      out << "#{log_msg}"
       out << table_color if table_color
       out << "\n"
     end

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

@@ -6,6 +6,7 @@ require 'ostruct'
 require 'io/console'
 require 'morpheus/logging'
 require 'fileutils'
+require 'filesize'
 
 module Morpheus::Cli::PrintHelper
 

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

@@ -39,7 +39,7 @@ module Morpheus::Cli::RestCommand
 
   module ClassMethods
 
-    # rest_name is the plural name of the rest command resource eg. NeatThingsCommand would be "neat_things"
+    # rest_name is the plural name of the resource eg. NeatThings would be "neat_things"
     # It is used to derive all other default rest settings key, label, etc.  
     # The default name the command name with underscores `_` instead of dashes `-`.
     def rest_name
@@ -504,20 +504,22 @@ EOT
   end
 
   def add(args)
+    record_type = nil
     record_type_id = nil
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[#{rest_arg}]")
       if rest_has_type
-        opts.banner = subcommand_usage("[#{rest_arg}] -t TYPE")
         opts.on( '-t', "--#{rest_type_arg} TYPE", "#{rest_type_label}" ) do |val|
           record_type_id = val
         end
-      else
-        opts.banner = subcommand_usage("[#{rest_arg}]")
       end
-      # if defined?(add_#{rest_key}_option_types)
-      #   build_option_type_options(opts, options, add_#{rest_key}_option_types)
-      # end
+      if self.class.method_defined?("add_#{rest_key}_option_types")
+        build_option_type_options(opts, options, self.send("add_#{rest_key}_option_types"))
+      end
+      if self.class.method_defined?("add_#{rest_key}_advanced_option_types")
+        build_option_type_options(opts, options, self.send("add_#{rest_key}_advanced_option_types"))
+      end
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
 Create a new #{rest_label.downcase}.
@@ -532,14 +534,15 @@ EOT
       record_name = args[0]
     end
     verify_args!(args:args, optparse:optparse, min:0, max: 1)
-    # todo: maybe need a flag to make this required, it could be an option type too, so
+    connect(options)
+    # load or prompt for type
     if rest_has_type
       if record_type_id.nil?
-        raise_command_error "#{rest_type_label} is required.\n#{optparse}"
+        #raise_command_error "#{rest_type_label} is required.\n#{optparse}"
+        type_list = rest_type_interface.list({max:10000})[rest_type_list_key]
+        type_dropdown_options = type_list.collect {|it| {'name' => it['name'], 'value' => it['code']} }
+        record_type_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => rest_type_label, 'type' => 'select', 'selectOptions' => type_dropdown_options, 'required' => true}], options[:options], @api_client)['type']
       end
-    end
-    connect(options)
-    if rest_has_type
       record_type = rest_type_find_by_name_or_id(record_type_id)
       if record_type.nil?
         raise_command_error "#{rest_type_label} not found for '#{record_type_id}'.\n#{optparse}"
@@ -557,11 +560,21 @@ EOT
         options[:options]['name'] = record_name # injected for prompt
       end
       if rest_has_type && record_type
-        # record_payload['type'] = {'code' => record_type['code']}
+        # inject type to options for prompting
         record_payload['type'] = record_type['code']
-        options[:options]['type'] = record_type['code'] # injected for prompt
+        options[:options]['type'] = record_type['code']
+        # initialize params for loading optionSource data
+        options[:params] ||= {}
+        options[:params]['type'] = record_type['code']
       end
       record_payload.deep_merge!(passed_options)
+      if self.class.method_defined?("add_#{rest_key}_option_types")
+        add_option_types = self.send("add_#{rest_key}_option_types")
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(add_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
       # options by type
       my_option_types = record_type ? record_type['optionTypes'] : nil
       if my_option_types && !my_option_types.empty?
@@ -576,6 +589,14 @@ EOT
         v_prompt.booleanize! # 'on' => true
         record_payload.deep_merge!(v_prompt)
       end
+      # advanced options (uses no_prompt)
+      if self.class.method_defined?("add_#{rest_key}_advanced_option_types")
+        add_advanced_option_types = self.send("add_#{rest_key}_advanced_option_types")
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(add_advanced_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
       payload[rest_object_key] = record_payload
     end
     rest_interface.setopts(options)
@@ -594,11 +615,17 @@ EOT
 
   def update(args)
     id = args[0]
+    record_type = nil
+    record_type_id = nil
     options = {}
-    params = {}
-    account_name = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[#{rest_arg}] [options]")
+      if self.class.method_defined?("update_#{rest_key}_option_types")
+        build_option_type_options(opts, options, self.send("update_#{rest_key}_option_types"))
+      end
+      if self.class.method_defined?("update_#{rest_key}_advanced_option_types")
+        build_option_type_options(opts, options, self.send("update_#{rest_key}_advanced_option_types"))
+      end
       build_standard_update_options(opts, options)
       opts.footer = <<-EOT
 Update an existing #{rest_label.downcase}.
@@ -609,13 +636,72 @@ EOT
     verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
     record = rest_find_by_name_or_id(id)
+    if record.nil?
+      return 1, "#{rest_name} not found for '#{id}'"
+    end
+    # load type so we can prompt for those option types
+    if rest_has_type
+      record_type_id = record['type']['id']
+      record_type = rest_type_find_by_name_or_id(record_type_id)
+      if record_type.nil?
+        raise_command_error "#{rest_type_label} not found for '#{record_type_id}'.\n#{optparse}"
+      end
+    end
     passed_options = parse_passed_options(options)
-    payload = nil
+    payload = {}
     if options[:payload]
       payload = options[:payload]
       payload.deep_merge!({rest_object_key => passed_options}) unless passed_options.empty?
     else
       record_payload = passed_options
+      if rest_has_type && record_type
+        # inject type to options for prompting
+        # record_payload['type'] = record_type['code']
+        # options[:options]['type'] = record_type['code']
+        # initialize params for loading optionSource data
+        options[:params] ||= {}
+        options[:params]['type'] = record_type['code']
+      end
+      # update options without prompting by default
+      if self.class.method_defined?("update_#{rest_key}_option_types")
+        update_option_types = self.send("update_#{rest_key}_option_types")
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(update_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
+      # options by type
+      my_option_types = record_type ? record_type['optionTypes'] : nil
+      if my_option_types && !my_option_types.empty?
+        # remove redundant fieldContext
+        # make them optional for updates
+        # todo: use current value as default instead of just making things optioanl
+        # maybe new prompt() options like {:mode => :edit, :object => storage_server} or something
+        my_option_types.each do |option_type| 
+          if option_type['fieldContext'] == rest_object_key
+            option_type['fieldContext'] = nil
+          end
+          option_type.delete('required')
+          option_type.delete('defaultValue')
+        end
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(my_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
+      # advanced options
+      if self.class.method_defined?("update_#{rest_key}_advanced_option_types")
+        update_advanced_option_types = self.send("update_#{rest_key}_advanced_option_types")
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(update_advanced_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
+      # remove empty config, compact could hanlde this
+      if record_payload['config'] && record_payload['config'].empty?
+        record_payload.delete('config')
+      end
+      # prevent updating with empty payload
       if record_payload.empty?
         raise_command_error "Specify at least one option to update.\n#{optparse}"
       end

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

@@ -303,16 +303,16 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       if rest_has_type
-        opts.banner = subcommand_usage("[#{rest_parent_arg}] [#{rest_arg}] -t TYPE")
         opts.on( '-t', "--#{rest_type_arg} TYPE", "#{rest_type_label}" ) do |val|
           record_type_id = val
         end
-      else
-        opts.banner = subcommand_usage("[#{rest_parent_arg}] [#{rest_arg}]")
       end
-      # if defined?(add_#{rest_key}_option_types)
-      #   build_option_type_options(opts, options, add_#{rest_key}_option_types)
-      # end
+      if self.class.method_defined?("add_#{rest_key}_option_types")
+        build_option_type_options(opts, options, self.send("add_#{rest_key}_option_types"))
+      end
+      if self.class.method_defined?("add_#{rest_key}_advanced_option_types")
+        build_option_type_options(opts, options, self.send("add_#{rest_key}_advanced_option_types"))
+      end
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
 Create a new #{rest_label.downcase}.
@@ -329,24 +329,27 @@ EOT
     if args[1] # && rest_has_name
       record_name = args[1]
     end
-    # todo: maybe need a flag to make this required, it could be an option type too, so
+    connect(options)
+    # load parent record
+    # todo: prompt instead of error
+    parent_record = rest_parent_find_by_name_or_id(parent_id)
+    if parent_record.nil?
+      raise_command_error "#{rest_parent_label} not found for '#{parent_id}'.\n#{optparse}"
+    end
+    parent_id = parent_record['id']
+    # load or prompt for type
     if rest_has_type
       if record_type_id.nil?
-        raise_command_error "#{rest_type_label} is required.\n#{optparse}"
+        #raise_command_error "#{rest_type_label} is required.\n#{optparse}"
+        type_list = rest_type_interface.list({max:10000})[rest_type_list_key]
+        type_dropdown_options = type_list.collect {|it| {'name' => it['name'], 'value' => it['code']} }
+        record_type_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => rest_type_label, 'type' => 'select', 'selectOptions' => type_dropdown_options, 'required' => true}], options[:options], @api_client)['type']
       end
-    end
-    connect(options)
-    if rest_has_type
       record_type = rest_type_find_by_name_or_id(record_type_id)
       if record_type.nil?
         raise_command_error "#{rest_type_label} not found for '#{record_type_id}'.\n#{optparse}"
       end
     end
-    parent_record = rest_parent_find_by_name_or_id(parent_id)
-    if parent_record.nil?
-      raise_command_error "#{rest_parent_label} not found for '#{parent_id}'.\n#{optparse}"
-    end
-    parent_id = parent_record['id']
     passed_options = parse_passed_options(options)
     payload = {}
     if options[:payload]
@@ -362,8 +365,18 @@ EOT
         # record_payload['type'] = {'code' => record_type['code']}
         record_payload['type'] = record_type['code']
         options[:options]['type'] = record_type['code'] # injected for prompt
+        # initialize params for loading optionSource data
+        options[:params] ||= {}
+        options[:params]['type'] = record_type['code']
       end
       record_payload.deep_merge!(passed_options)
+      if self.class.method_defined?("add_#{rest_key}_option_types")
+        add_option_types = self.send("add_#{rest_key}_option_types")
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(add_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
       # options by type
       my_option_types = record_type ? record_type['optionTypes'] : nil
       if my_option_types && !my_option_types.empty?
@@ -378,6 +391,14 @@ EOT
         v_prompt.booleanize! # 'on' => true
         record_payload.deep_merge!(v_prompt)
       end
+      # advanced options (uses no_prompt)
+      if self.class.method_defined?("add_#{rest_key}_advanced_option_types")
+        add_advanced_option_types = self.send("add_#{rest_key}_advanced_option_types")
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(add_advanced_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
       payload[rest_object_key] = record_payload
     end
     rest_interface.setopts(options)
@@ -397,11 +418,18 @@ EOT
   def update(args)
     parent_id = args[0]
     id = args[1]
+    record_type = nil
+    record_type_id = nil
     options = {}
     params = {}
-    account_name = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[#{rest_parent_arg}] [#{rest_arg}] [options]")
+      if self.class.method_defined?("update_#{rest_key}_option_types")
+        build_option_type_options(opts, options, self.send("update_#{rest_key}_option_types"))
+      end
+      if self.class.method_defined?("update_#{rest_key}_advanced_option_types")
+        build_option_type_options(opts, options, self.send("update_#{rest_key}_advanced_option_types"))
+      end
       build_standard_update_options(opts, options)
       opts.footer = <<-EOT
 Update an existing #{rest_label.downcase}.
@@ -418,13 +446,72 @@ EOT
     parent_id = parent_record['id']
     connect(options)
     record = rest_find_by_name_or_id(id)
+    if record.nil?
+      return 1, "#{rest_name} not found for '#{id}'"
+    end
+    # load type so we can prompt for those option types
+    if rest_has_type
+      record_type_id = record['type']['id']
+      record_type = rest_type_find_by_name_or_id(record_type_id)
+      if record_type.nil?
+        raise_command_error "#{rest_type_label} not found for '#{record_type_id}'.\n#{optparse}"
+      end
+    end
     passed_options = parse_passed_options(options)
-    payload = nil
+    payload = {}
     if options[:payload]
       payload = options[:payload]
       payload.deep_merge!({rest_object_key => passed_options}) unless passed_options.empty?
     else
       record_payload = passed_options
+      if rest_has_type && record_type
+        # inject type to options for prompting
+        # record_payload['type'] = record_type['code']
+        # options[:options]['type'] = record_type['code']
+        # initialize params for loading optionSource data
+        options[:params] ||= {}
+        options[:params]['type'] = record_type['code']
+      end
+      # update options without prompting by default
+      if self.class.method_defined?("update_#{rest_key}_option_types")
+        update_option_types = self.send("update_#{rest_key}_option_types")
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(update_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
+      # options by type
+      my_option_types = record_type ? record_type['optionTypes'] : nil
+      if my_option_types && !my_option_types.empty?
+        # remove redundant fieldContext
+        # make them optional for updates
+        # todo: use current value as default instead of just making things optioanl
+        # maybe new prompt() options like {:mode => :edit, :object => storage_server} or something
+        my_option_types.each do |option_type| 
+          if option_type['fieldContext'] == rest_object_key
+            option_type['fieldContext'] = nil
+          end
+          option_type.delete('required')
+          option_type.delete('defaultValue')
+        end
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(my_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
+      # advanced options
+      if self.class.method_defined?("update_#{rest_key}_advanced_option_types")
+        update_advanced_option_types = self.send("update_#{rest_key}_advanced_option_types")
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(update_advanced_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
+      # remove empty config, compact could hanlde this
+      if record_payload['config'] && record_payload['config'].empty?
+        record_payload.delete('config')
+      end
+      # prevent updating with empty payload
       if record_payload.empty?
         raise_command_error "Specify at least one option to update.\n#{optparse}"
       end