morpheus-cli 5.3.3 → 5.3.4

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

@@ -584,7 +584,7 @@ module Morpheus::Cli::ProvisioningHelper
     if options[:description]
       options[:options]['description'] = options[:description]
     end
-    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false}], options[:options])
+    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false, 'defaultValue' => options[:default_description]}], options[:options])
     payload['instance']['description'] = v_prompt['description'] if !v_prompt['description'].empty?
 
     # Environment
@@ -593,14 +593,14 @@ module Morpheus::Cli::ProvisioningHelper
     elsif options[:options]['instanceContext'] && !options[:options]['environment']
       options[:options]['environment'] = options[:options]['instanceContext']
     end
-    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'select', 'required' => false, 'selectOptions' => get_available_environments()}], options[:options])
+    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'select', 'required' => false, 'selectOptions' => get_available_environments(), 'defaultValue' => options[:default_environment]}], options[:options])
     payload['instance']['instanceContext'] = v_prompt['environment'] if !v_prompt['environment'].empty?
 
     # Labels (used to be called tags)
     if options[:labels]
       payload['instance']['labels'] = options[:labels].is_a?(Array) ? options[:labels] : options[:labels].to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq
     else
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false}], options[:options])
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'defaultValue' => options[:default_labels]}], options[:options])
       payload['instance']['labels'] = v_prompt['labels'].split(',').collect {|it| it.to_s.strip }.compact.uniq if !v_prompt['labels'].empty?
     end
 
@@ -986,20 +986,28 @@ module Morpheus::Cli::ProvisioningHelper
     end
 
     # metadata tags
-    if options[:options]['metadata'].is_a?(Array) && !options[:metadata]
-      options[:metadata] = options[:options]['metadata']
+    # metadata_tag_key = 'metadata'
+    metadata_tag_key = 'tags'
+    if !options[:metadata]
+      if options[:options]['metadata'].is_a?(Array)
+        options[:metadata] = options[:options]['metadata']
+      end
+      if options[:options]['tags'].is_a?(Array)
+        options[:metadata] = options[:options]['tags']
+      end
     end
     if options[:metadata]
+      metadata = []
       if options[:metadata] == "[]" || options[:metadata] == "null"
-        payload['metadata'] = []
+        metadata = []
       elsif options[:metadata].is_a?(Array)
-        payload['metadata'] = options[:metadata]
+        metadata = options[:metadata]
       else
         # parse string into format name:value, name:value
         # merge IDs from current metadata
         # todo: should allow quoted semicolons..
-        metadata_list = options[:metadata].split(",").select {|it| !it.to_s.empty? }
-        metadata_list = metadata_list.collect do |it|
+        metadata = options[:metadata].split(",").select {|it| !it.to_s.empty? }
+        metadata = metadata.collect do |it|
           metadata_pair = it.split(":")
           if metadata_pair.size < 2 && it.include?("=")
             metadata_pair = it.split("=")
@@ -1009,13 +1017,13 @@ module Morpheus::Cli::ProvisioningHelper
           row['value'] = metadata_pair[1].to_s.strip
           row
         end
-        payload['metadata'] = metadata_list
       end
+      payload[metadata_tag_key] = metadata
     else
       # prompt for metadata tags
       metadata = prompt_metadata(options)
       if !metadata.empty?
-        payload['metadata'] = metadata
+        payload[metadata_tag_key] = metadata
       end
     end
 
@@ -1737,6 +1745,19 @@ module Morpheus::Cli::ProvisioningHelper
     no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
     metadata_array = []
     metadata_index = 0
+    # Keep Current Tags (foo:bar,hello:world)
+    # this is used by clone()
+    if options[:current_tags] && !options[:current_tags].empty?
+      current_tags_string = options[:current_tags].collect { |tag| tag['name'].to_s + '=' + tag['value'].to_s }.join(', ')
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'keepExistingTags', 'type' => 'checkbox', 'fieldLabel' => "Keep existing metadata tags (#{current_tags_string}) ?", 'required' => true, 'description' => 'Whether or not to keep existing metadata tags', 'defaultValue' => true}], options[:options])
+      if ['on','true','1',''].include?(v_prompt['keepExistingTags'].to_s.downcase)
+        options[:current_tags].each do |tag|
+          current_tag = tag.clone
+          current_tag.delete('id')
+          metadata_array << current_tag
+        end
+      end
+    end
     has_another_metadata = options[:options] && options[:options]["metadata#{metadata_index}"]
     add_another_metadata = has_another_metadata || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add a metadata tag?", {default: false}))
     while add_another_metadata do

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

@@ -10,7 +10,8 @@
 #  * load_balancer_column_definitions() - Column definitions for the "get" command display output.
 #  * load_balancer_list_column_definitions() - Column definitions for the "list" command display output.
 #
-# # An example of a RestCommand for `morpheus load-balancers`.
+# Example of a RestCommand for `morpheus load-balancers`.
+#
 # class Morpheus::Cli::LoadBalancers
 #
 #   include Morpheus::Cli::CliCommand
@@ -21,7 +22,7 @@
 #   # and would be the default values if not set.
 #   set_rest_name :load_balancers
 #   set_rest_label "Load Balancer"
-#   set_rest_plural_label "Load Balancers"
+#   set_rest_label_plural "Load Balancers"
 #   set_rest_object_key "load_balancer"
 #   set_rest_has_type true
 #   set_rest_type "load_balancer_types"
@@ -50,7 +51,7 @@ module Morpheus::Cli::RestCommand
     end
 
     def rest_name=(v)
-      @rest_name = v
+      @rest_name = v.to_s
     end
 
     alias :set_rest_name :rest_name=
@@ -61,11 +62,11 @@ module Morpheus::Cli::RestCommand
     end
 
     def default_rest_key
-      rest_name.chomp("s")
+      rest_name.to_s.chomp("s")
     end
 
     def rest_key=(v)
-      @rest_key = v
+      @rest_key = v.to_s
     end
 
     alias :set_rest_key :rest_key=
@@ -80,7 +81,7 @@ module Morpheus::Cli::RestCommand
     end
 
     def rest_arg=(v)
-      @rest_arg = v
+      @rest_arg = v.to_s
     end
 
     alias :set_rest_arg :rest_arg=
@@ -95,26 +96,26 @@ module Morpheus::Cli::RestCommand
     end
 
     def rest_label=(v)
-      @rest_label = v
+      @rest_label = v.to_s
     end
 
     alias :set_rest_label :rest_label=
 
     # the plural version of the label eg. "Neat Things"
-    def rest_plural_label
-      @rest_plural_label || default_rest_plural_label
+    def rest_label_plural
+      @rest_label_plural || default_rest_label_plural
     end
     
-    def default_rest_plural_label
+    def default_rest_label_plural
       #rest_name.to_s.split("_").collect {|it| it.to_s.capitalize }.join(" ")
       rest_label.to_s.pluralize
     end
 
-    def rest_plural_label=(v)
-      @rest_plural_label = v
+    def rest_label_plural=(v)
+      @rest_label_plural = v.to_s
     end
     
-    alias :set_rest_plural_label :rest_plural_label=
+    alias :set_rest_label_plural :rest_label_plural=
 
     # rest_interface_name is the interface name for the resource. eg. "neat_things"
     def rest_interface_name
@@ -126,7 +127,7 @@ module Morpheus::Cli::RestCommand
     end
 
     def rest_interface_name=(v)
-      @rest_interface_name = v
+      @rest_interface_name = v.to_s
     end
 
     alias :set_rest_interface_name :rest_interface_name=
@@ -158,7 +159,7 @@ module Morpheus::Cli::RestCommand
     end
 
     def rest_type_name=(v)
-      @rest_type_name = v
+      @rest_type_name = v.to_s
     end
 
     alias :set_rest_type_name :rest_type_name=
@@ -175,7 +176,7 @@ module Morpheus::Cli::RestCommand
     end
 
     def rest_type_key=(v)
-      @rest_type_key = v
+      @rest_type_key = v.to_s
     end
 
     alias :set_rest_type_key :rest_type_key=
@@ -190,7 +191,7 @@ module Morpheus::Cli::RestCommand
     end
 
     def rest_type_arg=(v)
-      @rest_type_arg = v
+      @rest_type_arg = v.to_s
     end
 
     alias :set_rest_type_arg :rest_type_arg=
@@ -205,26 +206,26 @@ module Morpheus::Cli::RestCommand
     end
 
     def rest_type_label=(v)
-      @rest_type_label = v
+      @rest_type_label = v.to_s
     end
 
     alias :set_rest_type_label :rest_type_label=
 
     # the plural version of the label eg. "Neat Things"
-    def rest_type_plural_label
-      @rest_type_plural_label || default_rest_type_plural_label
+    def rest_type_label_plural
+      @rest_type_label_plural || default_rest_type_label_plural
     end
     
-    def default_rest_type_plural_label
+    def default_rest_type_label_plural
       #rest_type_name.to_s.split("_").collect {|it| it.to_s.capitalize }.join(" ")
       rest_type_label.to_s.pluralize
     end
 
-    def rest_type_plural_label=(v)
-      @rest_type_plural_label = v
+    def rest_type_label_plural=(v)
+      @rest_type_label_plural = v.to_s
     end
     
-    alias :set_rest_type_plural_label :rest_type_plural_label=
+    alias :set_rest_type_label_plural :rest_type_label_plural=
 
     # the name of the default interface, matches the rest name eg. "neat_things"
     def rest_type_interface_name
@@ -236,7 +237,7 @@ module Morpheus::Cli::RestCommand
     end
 
     def rest_type_interface_name=(v)
-      @rest_type_interface_name = v
+      @rest_type_interface_name = v.to_s
     end
 
     alias :set_rest_type_interface_name :rest_type_interface_name=
@@ -247,7 +248,7 @@ module Morpheus::Cli::RestCommand
     def register_interfaces(*interfaces)
       @registered_interfaces ||= []
       interfaces.flatten.each do |it|
-        @registered_interfaces << it.to_sym
+        @registered_interfaces << it.to_s
       end
       # put the default rest_interface first
       if rest_interface_name && !@registered_interfaces.include?(rest_interface_name)
@@ -300,8 +301,8 @@ module Morpheus::Cli::RestCommand
     self.class.rest_label
   end
 
-  def rest_plural_label
-    self.class.rest_plural_label
+  def rest_label_plural
+    self.class.rest_label_plural
   end
 
   def rest_interface_name
@@ -356,8 +357,8 @@ module Morpheus::Cli::RestCommand
     self.class.rest_type_label
   end
 
-  def rest_type_plural_label
-    self.class.rest_type_plural_label
+  def rest_type_label_plural
+    self.class.rest_type_label_plural
   end
 
   def rest_type_interface_name
@@ -415,9 +416,12 @@ module Morpheus::Cli::RestCommand
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
+      opts.banner = subcommand_usage("[search]")
       build_standard_list_options(opts, options)
-      opts.footer = "List #{rest_plural_label.downcase}."
+            opts.footer = <<-EOT
+List #{rest_label_plural.downcase}.
+[search] is optional. This is a search phrase to filter the results.
+EOT
     end
     optparse.parse!(args)
     connect(options)
@@ -433,9 +437,9 @@ module Morpheus::Cli::RestCommand
     json_response = rest_interface.list(params)
     render_response(json_response, options, rest_list_key) do
       records = json_response[rest_list_key]
-      print_h1 "Morpheus #{rest_plural_label}"
+      print_h1 "Morpheus #{rest_label_plural}"
       if records.nil? || records.empty?
-        print cyan,"No #{rest_plural_label.downcase} found.",reset,"\n"
+        print cyan,"No #{rest_label_plural.downcase} found.",reset,"\n"
       else
         print as_pretty_table(records, rest_list_column_definitions.upcase_keys!, options)
         print_results_pagination(json_response) if json_response['meta']
@@ -449,7 +453,7 @@ module Morpheus::Cli::RestCommand
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[type]")
+      opts.banner = subcommand_usage("[#{rest_arg}]")
       build_standard_get_options(opts, options)
       opts.footer = <<-EOT
 Get details about #{a_or_an(rest_label)} #{rest_label.downcase}.
@@ -504,17 +508,21 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       if rest_has_type
-        opts.banner = subcommand_usage("[name] -t 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("[name]")
+        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
       build_standard_add_options(opts, options)
+      opts.footer = <<-EOT
+Create a new #{rest_label.downcase}.
+[#{rest_arg}] is required. This is the name of the new #{rest_label.downcase}.
+EOT
     end
     optparse.parse!(args)
     # todo: make supporting args[0] optional and more flexible
@@ -592,6 +600,10 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[#{rest_arg}] [options]")
       build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Update an existing #{rest_label.downcase}.
+[#{rest_arg}] is required. This is the name or id of #{a_or_an(rest_label)} #{rest_label.downcase}.
+EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -629,6 +641,10 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[#{rest_arg}]")
       build_standard_remove_options(opts, options)
+      opts.footer = <<-EOT
+Delete an existing #{rest_label.downcase}.
+[#{rest_arg}] is required. This is the name or id of #{a_or_an(rest_label)} #{rest_label.downcase}.
+EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)