morpheus-cli 3.6.9 → 3.6.11

data/lib/morpheus/cli/image_builder_command.rb

@@ -59,7 +59,7 @@ class Morpheus::Cli::ImageBuilderCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :dry_run])
+      build_common_options(opts, options, [:list, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
@@ -68,7 +68,7 @@ class Morpheus::Cli::ImageBuilderCommand
       [:phrase, :offset, :max, :sort, :direction].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
-
+      @image_builds_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @image_builds_interface.dry.list(params)
         return
@@ -140,7 +140,7 @@ class Morpheus::Cli::ImageBuilderCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[image-build]")
-      build_common_options(opts, options, [:json, :dry_run])
+      build_common_options(opts, options, [:json, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -150,6 +150,7 @@ class Morpheus::Cli::ImageBuilderCommand
     end
     connect(options)
     begin
+      @image_builds_interface.setopts(options)
       if options[:dry_run]
         if args[0].to_s =~ /\A\d{1,}\Z/
           print_dry_run @image_builds_interface.dry.get(args[0].to_i)
@@ -342,7 +343,7 @@ class Morpheus::Cli::ImageBuilderCommand
       opts.on('--keepResults VALUE', String, "Keep only the most recent builds. Older executions will be deleted along with their associated Virtual Images. The value 0 disables this functionality.") do |val|
         options['keepResults'] = val.to_i
       end
-      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
     end
     optparse.parse!(args)
     if args.count > 1
@@ -373,7 +374,7 @@ class Morpheus::Cli::ImageBuilderCommand
         return 1 if !image_build_payload
         payload = {'imageBuild' => image_build_payload}
       end
-
+      @image_builds_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @image_builds_interface.dry.create(payload)
         return
@@ -470,7 +471,7 @@ class Morpheus::Cli::ImageBuilderCommand
         # 0 disables it
         # options['deleteOldResults'] = (options['keepResults'] > 0)
       end
-      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
     end
     optparse.parse!(args)
     if args.count != 1
@@ -494,7 +495,7 @@ class Morpheus::Cli::ImageBuilderCommand
         return 1 if !image_build_payload
         payload = {'imageBuild' => image_build_payload}
       end
-
+      @image_builds_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @image_builds_interface.dry.update(image_build["id"], payload)
         return
@@ -522,7 +523,7 @@ class Morpheus::Cli::ImageBuilderCommand
       opts.on( '-K', '--keep-virtual-images', "Preserve associated virtual images" ) do
         query_params['keepVirtualImages'] = 'on'
       end
-      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run])
+      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -544,6 +545,7 @@ class Morpheus::Cli::ImageBuilderCommand
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'keepVirtualImages', 'type' => 'checkbox', 'fieldLabel' => 'Keep Virtual Images?', 'required' => false, 'defaultValue' => false, 'description' => 'Preserve associated virtual images. By default, they are deleted as well.'}],options,@api_client,{})
         query_params['keepVirtualImages'] = v_prompt['keepVirtualImages']
       end
+      @image_builds_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @image_builds_interface.dry.destroy(image_build['id'], query_params)
         return 0
@@ -568,7 +570,7 @@ class Morpheus::Cli::ImageBuilderCommand
     query_params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[image-build]")
-      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run])
+      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -586,6 +588,7 @@ class Morpheus::Cli::ImageBuilderCommand
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to run the image build: #{image_build['name']}?")
         return 9, "aborted command"
       end
+      @image_builds_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @image_builds_interface.dry.run(image_build['id'], query_params)
         return 0
@@ -609,7 +612,7 @@ class Morpheus::Cli::ImageBuilderCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[image-build]")
-      build_common_options(opts, options, [:list, :json, :dry_run])
+      build_common_options(opts, options, [:list, :json, :dry_run, :remote])
       opts.footer = "List executions for an image build."
       opts.footer = "Display a list of executions for an image build.\n"
                     "[image-build] is the name or id of an image build."
@@ -629,6 +632,7 @@ class Morpheus::Cli::ImageBuilderCommand
     [:phrase, :offset, :max, :sort, :direction].each do |k|
       params[k] = options[k] unless options[k].nil?
     end
+    @image_builds_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @image_builds_interface.dry.list_executions(image_build['id'], params)
       return 0

data/lib/morpheus/cli/instance_types.rb

@@ -52,7 +52,7 @@ class Morpheus::Cli::InstanceTypes
     begin
       # construct payload
       params.merge!(parse_list_options(options))
-      # dry run?
+      @instance_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instance_types_interface.dry.list(params)
         return
@@ -119,6 +119,7 @@ class Morpheus::Cli::InstanceTypes
       if instance_type.nil?
         return 1
       end
+      @instance_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @instance_types_interface.dry.get(instance_type['id'])
         return

data/lib/morpheus/cli/instances.rb

@@ -2776,6 +2776,11 @@ class Morpheus::Cli::Instances
       opts.on( nil, '--output', "Display process output." ) do
         options[:show_output] = true
       end
+      opts.on(nil, '--details', "Display more details. Shows everything, untruncated." ) do
+        options[:show_events] = true
+        options[:show_output] = true
+        options[:details] = true
+      end
       opts.on('--process-id ID', String, "Display details about a specfic process only." ) do |val|
         options[:process_id] = val
       end
@@ -2849,8 +2854,8 @@ class Morpheus::Cli::Instances
               startDate: format_local_dt(process['startDate']),
               duration: format_process_duration(process),
               status: format_process_status(process),
-              error: format_process_error(process),
-              output: format_process_output(process)
+              error: format_process_error(process, options[:details] ? nil : 20),
+              output: format_process_output(process, options[:details] ? nil : 20)
             }
             history_records << row
             process_events = process['events'] || process['processEvents']
@@ -2868,8 +2873,8 @@ class Morpheus::Cli::Instances
                     startDate: format_local_dt(process_event['startDate']),
                     duration: format_process_duration(process_event),
                     status: format_process_status(process_event),
-                    error: format_process_error(process_event),
-                    output: format_process_output(process_event)
+                    error: format_process_error(process_event, options[:details] ? nil : 20),
+                    output: format_process_output(process_event, options[:details] ? nil : 20)
                   }
                   history_records << event_row
                 end

data/lib/morpheus/cli/key_pairs.rb

@@ -31,7 +31,7 @@ class Morpheus::Cli::KeyPairs
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:account, :list, :json])
+      build_common_options(opts, options, [:account, :list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
@@ -40,24 +40,23 @@ class Morpheus::Cli::KeyPairs
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
 
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
+      params.merge!(parse_list_options(options))
+      @key_pairs_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @key_pairs_interface.dry.list(account_id, params)
+        return 0
       end
-
       json_response = @key_pairs_interface.list(account_id, params)
+      render_result = render_with_format(json_response, options, 'keyPairs')
+      return 0 if render_result
       key_pairs = json_response['keyPairs']
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      else
+      unless options[:quiet]
         title = "Morpheus Key Pairs"
         subtitles = []
         if account
           subtitles << "Account: #{account['name']}".strip
         end
-        if params[:phrase]
-          subtitles << "Search: #{params[:phrase]}".strip
-        end
+        subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
         if key_pairs.empty?
           puts yellow,"No key pairs found.",reset
@@ -67,6 +66,7 @@ class Morpheus::Cli::KeyPairs
         end
         print reset,"\n"
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -78,7 +78,7 @@ class Morpheus::Cli::KeyPairs
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:account, :json])
+      build_common_options(opts, options, [:account, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -92,13 +92,22 @@ class Morpheus::Cli::KeyPairs
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
 
+      @key_pairs_interface.setopts(options)
+      if options[:dry_run]
+        if val.to_s =~ /\A\d{1,}\Z/
+          print_dry_run @key_pairs_interface.dry.get(account_id, id.to_i)
+        else
+          print_dry_run @key_pairs_interface.dry.list(account_id, {name: name.to_s})
+        end
+        return 0
+      end
       key_pair = find_key_pair_by_name_or_id(account_id, args[0])
-      exit 1 if key_pair.nil?
-
-      if options[:json]
-        print JSON.pretty_generate({keyPair: key_pair})
-        print "\n"
-      else
+      return 1 if key_pair.nil?
+      json_response = {'keyPair' => key_pair}
+      render_result = render_with_format(json_response, options, 'keyPair')
+      return 0 if render_result
+      
+      unless options[:quiet]
         print_h1 "Key Pair Details"
         print cyan
         if account
@@ -176,7 +185,7 @@ class Morpheus::Cli::KeyPairs
         options[:options]['privateKey'] = options['privateKey']
       end
 
-      build_common_options(opts, options, [:account, :options, :json, :dry_run])
+      build_common_options(opts, options, [:account, :options, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     # if args.count < 1
@@ -209,6 +218,7 @@ class Morpheus::Cli::KeyPairs
 
       key_pair_payload = params.select {|k,v| ['name','publicKey', 'privateKey', 'passphrase'].include?(k) }
       payload = {keyPair: key_pair_payload}
+      @key_pairs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @key_pairs_interface.dry.create(account_id, payload)
         return
@@ -232,7 +242,7 @@ class Morpheus::Cli::KeyPairs
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_key_pair_option_types)
-      build_common_options(opts, options, [:account, :options, :json, :dry_run])
+      build_common_options(opts, options, [:account, :options, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -262,6 +272,7 @@ class Morpheus::Cli::KeyPairs
 
       key_pair_payload = params.select {|k,v| ['name'].include?(k) }
       payload = {keyPair: key_pair_payload}
+      @key_pairs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @key_pairs_interface.dry.update(account_id, key_pair['id'], payload)
         return
@@ -284,7 +295,7 @@ class Morpheus::Cli::KeyPairs
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run])
+      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -305,6 +316,7 @@ class Morpheus::Cli::KeyPairs
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the key pair #{key_pair['name']}?")
         exit
       end
+      @key_pairs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @key_pairs_interface.dry.destroy(account_id, key_pair['id'])
         return

data/lib/morpheus/cli/library_container_scripts_command.rb

@@ -34,7 +34,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
     begin
       # construct payload
       params.merge!(parse_list_options(options))
-      # dry run?
+      @container_scripts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @container_scripts_interface.dry.list(params)
         return
@@ -95,6 +95,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       if container_script.nil?
         return 1
       end
+      @container_scripts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @container_scripts_interface.dry.get(container_script['id'])
         return
@@ -204,6 +205,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
         # todo: prompt?
         payload = {'containerScript' => params}
       end
+      @container_scripts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @container_scripts_interface.dry.create(payload)
         return
@@ -287,6 +289,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
         payload = {'containerScript' => params}
       end
+      @container_scripts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @container_scripts_interface.dry.update(container_script["id"], payload)
         return
@@ -334,7 +337,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       # }
       # payload['containerScript'].merge!(container_script)
       payload = params
-
+      @container_scripts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @container_scripts_interface.dry.destroy(container_script["id"])
         return

data/lib/morpheus/cli/library_container_templates_command.rb

@@ -31,7 +31,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
-
+      @container_templates_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @container_templates_interface.dry.list(params)
         return
@@ -100,6 +100,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       if container_template.nil?
         return 1
       end
+      @container_templates_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @container_templates_interface.dry.get(container_template['id'])
         return
@@ -227,6 +228,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
         # todo: prompt?
         payload = {'containerTemplate' => params}
       end
+      @container_templates_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @container_templates_interface.dry.create(payload)
         return
@@ -311,6 +313,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
         payload = {'containerTemplate' => params}
       end
+      @container_templates_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @container_templates_interface.dry.update(container_template["id"], payload)
         return
@@ -358,7 +361,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       # }
       # payload['containerTemplate'].merge!(container_template)
       payload = params
-
+      @container_templates_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @container_templates_interface.dry.destroy(container_template["id"])
         return

data/lib/morpheus/cli/library_container_types_command.rb

@@ -58,7 +58,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
     begin
       # construct payload
       params.merge!(parse_list_options(options))
-      # dry run?
+      @library_container_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @library_container_types_interface.dry.list(layout_id, params)
         return
@@ -121,6 +121,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
   def _get(id, options)
     layout_id = nil
     begin
+      @library_container_types_interface.setopts(options)
       if options[:dry_run]
         if arg.to_s =~ /\A\d{1,}\Z/
           print_dry_run @library_container_types_interface.dry.get(layout_id, arg.to_i)
@@ -375,7 +376,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
         
 
       end
-
+      @library_container_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @library_container_types_interface.dry.create(layout_id, payload)
         return
@@ -480,7 +481,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
         payload['containerType'].deep_merge!(params)
 
       end
-
+      @library_container_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @library_container_types_interface.dry.update(layout_id, container_type['id'], payload)
         return
@@ -523,6 +524,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the node type #{container_type['name']}?", options)
         exit
       end
+      @library_container_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @library_container_types_interface.dry.destroy(nil, container_type['id'])
         return

data/lib/morpheus/cli/library_instance_types_command.rb

@@ -55,7 +55,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
     begin
       # construct payload
       params.merge!(parse_list_options(options))
-      # dry run?
+      @library_instance_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @library_instance_types_interface.dry.list(params)
         return
@@ -116,6 +116,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       if instance_type.nil?
         return 1
       end
+      @library_instance_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @library_instance_types_interface.dry.get(instance_type['id'])
         return
@@ -270,6 +271,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         params['hasAutoScale'] = ['on','true','1'].include?(params['hasAutoScale'].to_s) if params.key?('hasAutoScale')
         params['hasDeployment'] = ['on','true','1'].include?(params['hasDeployment'].to_s) if params.key?('hasDeployment')
         payload = {instanceType: params}
+        @library_instance_types_interface.setopts(options)
         if options[:dry_run]
           print_dry_run @library_instance_types_interface.dry.create(payload)
           if logo_file
@@ -344,7 +346,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         end
         payload = {'instanceType' => params}
       end
-
+      @library_instance_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @library_instance_types_interface.dry.update(instance_type['id'], payload)
         return
@@ -398,6 +400,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
         end
         logo_file = File.new(filename, 'rb')
       end
+      @library_instance_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @library_instance_types_interface.dry.update_logo(instance_type['id'], logo_file)
         return
@@ -436,6 +439,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the instance type #{instance_type['name']}?", options)
         exit
       end
+      @library_instance_types_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @library_instance_types_interface.dry.destroy(instance_type['id'])
         return