morpheus-cli 5.3.2.3 → 5.4.1

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"
@@ -38,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
@@ -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,11 +81,27 @@ module Morpheus::Cli::RestCommand
     end
 
     def rest_arg=(v)
-      @rest_arg = v
+      @rest_arg = v.to_s
     end
 
     alias :set_rest_arg :rest_arg=
 
+    # rest_has_name indicates a resource has a name and can be retrieved by name or id
+    # true by default, set to false for lookups by only id
+    def rest_has_name
+      @rest_has_name != nil ? @rest_has_name :  default_rest_has_name
+    end
+
+    def default_rest_has_name
+      true
+    end
+
+    def rest_has_name=(v)
+      @rest_has_name = !!v
+    end
+
+    alias :set_rest_has_name :rest_has_name=
+
     # rest_label is the capitalized resource label eg. "Neat Thing"    
     def rest_label
       @rest_label || default_rest_label
@@ -95,26 +112,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 +143,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 +175,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 +192,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 +207,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 +222,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 +253,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 +264,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)
@@ -296,12 +313,16 @@ module Morpheus::Cli::RestCommand
     self.class.rest_arg
   end
 
+  def rest_has_name
+    self.class.rest_has_name
+  end
+
   def rest_label
     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
@@ -315,23 +336,37 @@ module Morpheus::Cli::RestCommand
   end
 
   def rest_object_key
-    self.send("#{rest_key}_object_key")
+    send("#{rest_key}_object_key")
   end
 
   def rest_list_key
-    self.send("#{rest_key}_list_key")
+    send("#{rest_key}_list_key")
   end
 
-  def rest_column_definitions
-    self.send("#{rest_key}_column_definitions")
+  def rest_column_definitions(options)
+    send("#{rest_key}_column_definitions", options)
   end
 
-  def rest_list_column_definitions
-    self.send("#{rest_key}_list_column_definitions")
+  def rest_list_column_definitions(options)
+    send("#{rest_key}_list_column_definitions", options)
   end
 
-  def rest_find_by_name_or_id(name)
-    return self.send("find_#{rest_key}_by_name_or_id", name)
+  def rest_find_by_name_or_id(val)
+    # use explicitly defined finders
+    # else default to new generic CliCommand method to find anything by type (singular underscore)
+    if rest_has_name
+      if respond_to?("find_#{rest_key}_by_name_or_id", true)
+        send("find_#{rest_key}_by_name_or_id", val)
+      else
+        find_by_name_or_id(rest_key, val)
+      end
+    else
+      if respond_to?("find_#{rest_key}_by_id", true)
+        send("find_#{rest_key}_by_id", val)
+      else
+        find_by_id(rest_key, val)
+      end
+    end
   end
 
   def rest_has_type
@@ -352,12 +387,16 @@ module Morpheus::Cli::RestCommand
     self.class.rest_type_arg
   end
 
+  def rest_has_name
+    self.class.rest_type_arg
+  end
+
   def rest_type_label
     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
@@ -369,23 +408,29 @@ module Morpheus::Cli::RestCommand
   end
 
   def rest_type_object_key
-    self.send("#{rest_type_key}_object_key")
+    send("#{rest_type_key}_object_key")
   end
 
   def rest_type_list_key
-    self.send("#{rest_type_key}_list_key")
+    send("#{rest_type_key}_list_key")
   end
 
-  def rest_type_column_definitions
-    self.send("#{rest_type_key}_column_definitions")
+  def rest_type_column_definitions(options)
+    send("#{rest_type_key}_column_definitions", options)
   end
 
-  def rest_type_list_column_definitions
-    self.send("#{rest_type_key}_list_column_definitions")
+  def rest_type_list_column_definitions(options)
+    send("#{rest_type_key}_list_column_definitions", options)
   end
 
-  def rest_type_find_by_name_or_id(name)
-    return self.send("find_#{rest_type_key}_by_name_or_id", name)
+  def rest_type_find_by_name_or_id(val)
+    # use explicately defined finders
+    # else default to new generic CliCommand method to find anything by type (singular underscore)
+    if respond_to?("find_#{rest_type_key}_by_name_or_id", true)
+      send("find_#{rest_type_key}_by_name_or_id", val)
+    else
+      find_by_name_or_id(rest_type_key, val)
+    end
   end
 
   def registered_interfaces
@@ -415,16 +460,16 @@ module Morpheus::Cli::RestCommand
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_standard_list_options(opts, options)
-      opts.footer = "List #{rest_plural_label.downcase}."
+      opts.banner = subcommand_usage("[search]")
+      build_list_options(opts, options, params)
+      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)
-    if args.count > 0
-      options[:phrase] = args.join(" ")
-    end
-    params.merge!(parse_list_options(options))
+    parse_list_options!(args, options, params)
     rest_interface.setopts(options)
     if options[:dry_run]
       print_dry_run rest_interface.dry.list(params)
@@ -433,11 +478,11 @@ 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 as_pretty_table(records, rest_list_column_definitions(options).upcase_keys!, options)
         print_results_pagination(json_response) if json_response['meta']
       end
       print reset,"\n"
@@ -449,28 +494,26 @@ module Morpheus::Cli::RestCommand
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[type]")
-      build_standard_get_options(opts, options)
+      opts.banner = subcommand_usage("[#{rest_arg}]")
+      build_get_options(opts, options, params)
       opts.footer = <<-EOT
 Get details about #{a_or_an(rest_label)} #{rest_label.downcase}.
-[#{rest_arg}] is required. This is the name or id of #{a_or_an(rest_label)} #{rest_label.downcase}.
+[#{rest_arg}] is required. This is the #{rest_has_name ? 'name or id' : 'id'} of #{a_or_an(rest_label)} #{rest_label.downcase}.
 EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
-    params.merge!(parse_query_options(options))
-    id_list = parse_id_list(args)
-    return run_command_for_each_arg(id_list) do |arg|
-      _get(arg, params, options)
-    end
+    parse_get_options!(args, options, params)
+    id = args.join(" ")
+    _get(id, params, options)
   end
 
   def _get(id, params, options)
-    if id !~ /\A\d{1,}\Z/
+    if id !~ /\A\d{1,}\Z/ && rest_has_name
       record = rest_find_by_name_or_id(id)
       if record.nil?
-        raise_command_error "#{rest_label} not found for name '#{id}'"
+        return 1, "#{rest_label} not found for '#{id}'"
       end
       id = record['id']
     end
@@ -489,8 +532,14 @@ EOT
       record = json_response[rest_object_key]
       print_h1 rest_label, [], options
       print cyan
-      print_description_list(rest_column_definitions, record, options)
-      # show config settings...
+      print_description_list(rest_column_definitions(options), record, options)
+      # # could always show config eh? or maybe only with --config if that is nicer.
+      # # config = record['config'].is_a?(Hash) && !record['config'].empty?
+      # if config && !config.empty?
+      #   print_h2 "Configuration"
+      #   print_description_list(config.keys, config)
+      # end
+      # Option Types
       if record['optionTypes'] && record['optionTypes'].size > 0
         print_h2 "Option Types", options
         print format_option_types_table(record['optionTypes'], options, rest_object_key)
@@ -500,41 +549,51 @@ EOT
   end
 
   def add(args)
+    record_type = nil
     record_type_id = nil
     options = {}
+    option_types = respond_to?("add_#{rest_key}_option_types", true) ? send("add_#{rest_key}_option_types") : []
+    advanced_option_types = respond_to?("add_#{rest_key}_advanced_option_types", true) ? send("add_#{rest_key}_advanced_option_types") : []
+    type_option_type = option_types.find {|it| it['fieldName'] == 'type'} 
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      if rest_has_type
-        opts.banner = subcommand_usage("[name] -t TYPE")
+      opts.banner = subcommand_usage("[#{rest_arg}]")
+      if rest_has_type && type_option_type.nil?
         opts.on( '-t', "--#{rest_type_arg} TYPE", "#{rest_type_label}" ) do |val|
           record_type_id = val
         end
-      else
-        opts.banner = subcommand_usage("[name]")
       end
-      # if defined?(add_#{rest_key}_option_types)
-      #   build_option_type_options(opts, options, add_#{rest_key}_option_types)
-      # end
+      build_option_type_options(opts, options, option_types)
+      build_option_type_options(opts, options, advanced_option_types)
       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
     # for now args[0] is assumed to be the 'name'
     record_name = nil
-    if args[0] # && rest_has_name
-      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
-    if rest_has_type
-      if record_type_id.nil?
-        raise_command_error "#{rest_type_label} is required.\n#{optparse}"
+    if rest_has_name
+      if args.count > 0
+        record_name = args.join(" ")
       end
+      verify_args!(args:args, optparse:optparse, min:0, max: 1)
+    else
+      verify_args!(args:args, optparse:optparse, count: 0)
     end
     connect(options)
-    if rest_has_type
+    # load or prompt for type
+    if rest_has_type && type_option_type.nil?
+      if record_type_id.nil?
+        #raise_command_error "#{rest_type_label} is required.\n#{optparse}"
+        type_list = rest_type_interface.list({max:10000, creatable:true})[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
       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}"
+        return 1, "#{rest_type_label} not found for '#{record_type_id}"
       end
     end
     passed_options = parse_passed_options(options)
@@ -549,13 +608,40 @@ 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 option_types && !option_types.empty?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(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 rest_has_type && record_type.nil?
+        type_value = record_payload['type'].is_a?(Hash) ? record_payload['type']['id'] : record_payload['type']
+        if type_value
+          record_type = rest_type_find_by_name_or_id(type_value)
+          if record_type.nil?
+            return 1, "#{rest_type_label} not found for '#{type_value}"
+          end
+        end
+        # reload the type by id to get all the details ie. optionTypes
+        if record_type && record_type['optionTypes'].nil?
+          record_type = rest_type_find_by_name_or_id(record_type['id'])
+        end
+      end
+      my_option_types = nil
+      if respond_to?("load_option_types_for_#{rest_key}", true)
+        my_option_types = send("load_option_types_for_#{rest_key}", record_type, nil)
+      else
+        my_option_types = record_type ? record_type['optionTypes'] : nil
+      end
       if my_option_types && !my_option_types.empty?
         # remove redundant fieldContext
         my_option_types.each do |option_type| 
@@ -563,7 +649,15 @@ EOT
             option_type['fieldContext'] = nil
           end
         end
-        v_prompt = Morpheus::Cli::OptionTypes.prompt(my_option_types, options[:options], @api_client, options[:params])
+        api_params = (options[:params] || {}).merge(record_payload)
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(my_option_types, options[:options], @api_client, api_params)
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
+      # advanced options (uses no_prompt)
+      if advanced_option_types && !advanced_option_types.empty?
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(advanced_option_types, options[:options], @api_client, options[:params])
         v_prompt.deep_compact!
         v_prompt.booleanize! # 'on' => true
         record_payload.deep_merge!(v_prompt)
@@ -586,24 +680,100 @@ EOT
 
   def update(args)
     id = args[0]
+    record_type = nil
+    record_type_id = nil
     options = {}
-    params = {}
-    account_name = nil
+    option_types = respond_to?("update_#{rest_key}_option_types", true) ? send("update_#{rest_key}_option_types") : []
+    advanced_option_types = respond_to?("update_#{rest_key}_advanced_option_types", true) ? send("update_#{rest_key}_advanced_option_types") : []
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[#{rest_arg}] [options]")
+      build_option_type_options(opts, options, option_types)
+      build_option_type_options(opts, options, advanced_option_types)
       build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Update an existing #{rest_label.downcase}.
+[#{rest_arg}] is required. This is the #{rest_has_name ? 'name or id' : 'id'} of #{a_or_an(rest_label)} #{rest_label.downcase}.
+EOT
     end
     optparse.parse!(args)
     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?
+        return 1, "#{rest_type_label} not found for '#{record_type_id}"
+      end
+      # reload the type by id to get all the details ie. optionTypes
+      if record_type['optionTypes'].nil?
+        record_type = rest_type_find_by_name_or_id(record_type['id'])
+      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 option_types && !option_types.empty?
+        api_params = (options[:params] || {}).merge(record_payload) # need to merge in values from record too, ughhh
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(option_types, options[:options], @api_client, api_params)
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
+      # options by type
+      my_option_types = nil
+      if respond_to?("load_option_types_for_#{rest_key}", true)
+        my_option_types = send("load_option_types_for_#{rest_key}", record_type, nil)
+      else
+        my_option_types = record_type ? record_type['optionTypes'] : nil
+      end
+      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
+        api_params = (options[:params] || {}).merge(record_payload) # need to merge in values from record too, ughhh
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(my_option_types, options[:options], @api_client, api_params)
+        v_prompt.deep_compact!
+        v_prompt.booleanize! # 'on' => true
+        record_payload.deep_merge!(v_prompt)
+      end
+      # advanced options
+      if advanced_option_types && !advanced_option_types.empty?
+        v_prompt = Morpheus::Cli::OptionTypes.no_prompt(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
@@ -629,6 +799,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 #{rest_has_name ? 'name or id' : 'id'} of #{a_or_an(rest_label)} #{rest_label.downcase}.
+EOT
     end
     optparse.parse!(args)
     verify_args!(args:args, optparse:optparse, count:1)
@@ -643,7 +817,7 @@ EOT
     end
     rest_interface.setopts(options)
     if options[:dry_run]
-      print_dry_run rest_interface.dry.destroy(record['id'])
+      print_dry_run rest_interface.dry.destroy(record['id'], params)
       return 0, nil
     end
     json_response = rest_interface.destroy(record['id'], params)