morpheus-cli 4.1.5 → 4.1.6

data/lib/morpheus/cli/remote.rb

@@ -1534,7 +1534,7 @@ EOT
     def load_appliance_file
       fn = appliances_file_path
       if File.exist? fn
-        Morpheus::Logging::DarkPrinter.puts "loading appliances file #{fn}" if Morpheus::Logging.debug?
+        #Morpheus::Logging::DarkPrinter.puts "loading appliances file #{fn}" if Morpheus::Logging.debug?
         return YAML.load_file(fn)
       else
         return {}
@@ -1773,7 +1773,6 @@ EOT
       rescue => err
         # should save before raising atleast..sheesh
         raise err
-        # Morpheus::Cli::ErrorHandler.new.handle_error(e)
         app_map[:status] = 'error'
         app_map[:last_check][:error] = err.message
       end

data/lib/morpheus/cli/security_groups.rb

@@ -116,7 +116,7 @@ class Morpheus::Cli::SecurityGroups
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Get details about a security group."
     end
     optparse.parse!(args)
@@ -124,33 +124,30 @@ class Morpheus::Cli::SecurityGroups
       raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
     connect(options)
-    begin
-      @security_groups_interface.setopts(options)
-
-      if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @security_groups_interface.dry.get(args[0].to_i)
-        else
-          print_dry_run @security_groups_interface.dry.list({name:args[0]})
-        end
-        return 0
-      end
-      security_group = find_security_group_by_name_or_id(args[0])
-      return 1 if security_group.nil?
-      json_response = nil
+    exit_code, err = 0, nil
+    
+      security_group_id = nil
       if args[0].to_s =~ /\A\d{1,}\Z/
-        json_response = {'securityGroup' => security_group}  # skip redundant request
+        security_group_id = args[0].to_i
       else
-        json_response = @security_groups_interface.get(security_group['id'])
+        security_group = find_security_group_by_name(args[0])
+        return 1, "Security Group not found" if security_group.nil?
+        security_group_id = security_group['id']
       end
-
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-        return
+      @security_groups_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @security_groups_interface.dry.get(security_group_id)
+        return exit_code, err
       end
+      json_response = @security_groups_interface.get(security_group_id)
+      render_result = render_with_format(json_response, options, 'securityGroup')
+      return exit_code, err if render_result
+
       security_group = json_response['securityGroup']
-      print_h1 "Morpheus Security Group"
+      security_group_locations = json_response['locations'] || security_group['locations']
+      security_group_rules = json_response['rules'] || security_group['rules']
+
+      print_h1 "Security Group Details"
       print cyan
       description_cols = {
         "ID" => 'id',
@@ -162,7 +159,7 @@ class Morpheus::Cli::SecurityGroups
       print_description_list(description_cols, security_group)
       # print reset,"\n"
 
-      if security_group['locations'] && security_group['locations'].size > 0
+      if security_group_locations && security_group_locations.size > 0
         print_h2 "Locations"
         print cyan
         location_cols = {
@@ -171,13 +168,13 @@ class Morpheus::Cli::SecurityGroups
           "EXTERNAL ID" => lambda {|it| it['externalId'] },
           "RESOURCE POOL" => lambda {|it| it['zonePool'] ? it['zonePool']['name'] : '' }
         }
-        puts as_pretty_table(security_group['locations'], location_cols)
+        puts as_pretty_table(security_group_locations, location_cols)
       else
         print reset,"\n"
       end
 
-      if security_group['rules']
-        if security_group['rules'].size == 0
+      if security_group_rules
+        if security_group_rules == 0
           #print cyan,"No rules.",reset,"\n"
         else
           print_h2 "Rules"
@@ -217,15 +214,11 @@ class Morpheus::Cli::SecurityGroups
             "PROTOCOL" => lambda {|it| it['protocol'] },
             "PORT RANGE" => lambda {|it| it['portRange'] }
           }
-          puts as_pretty_table(security_group['rules'], rule_cols)
+          puts as_pretty_table(security_group_rules, rule_cols)
         end
       end
 
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
+      return exit_code, err
   end
 
   def add(args)

data/lib/morpheus/cli/shell.rb

@@ -442,7 +442,7 @@ class Morpheus::Cli::Shell
         log_history_command(input)
         return Morpheus::Cli::SourceCommand.new.handle(input.split[1..-1])
       end
-      cmd_result = nil
+      exit_code, err = 0, nil
       begin
         argv = Shellwords.shellsplit(input)
         cmd_name = argv[0]
@@ -462,28 +462,28 @@ class Morpheus::Cli::Shell
               start_benchmark(benchmark_name)
             end
           end
-          cmd_exit_code, cmd_err = Morpheus::Cli::CliRegistry.exec_expression(input)
-          #cmd_result = Morpheus::Cli::CliRegistry.exec(cmd_name, cmd_args)
-          #cmd_exit_code, cmd_err = Morpheus::Cli::CliRegistry.parse_command_result(cmd_result)
-          benchmark_record = stop_benchmark(cmd_exit_code, cmd_err) # if benchmarking?
+          exit_code, err = Morpheus::Cli::CliRegistry.exec_expression(input)
+          benchmark_record = stop_benchmark(exit_code, err) # if benchmarking?
           Morpheus::Logging::DarkPrinter.puts(cyan + dark + benchmark_record.msg) if benchmark_record
         # else
         #   puts_error "#{Morpheus::Terminal.angry_prompt}'#{cmd_name}' is not recognized. Use 'help' to see the list of available commands."
         #   @history_logger.warn "Unrecognized Command #{cmd_name}" if @history_logger
-        #   cmd_result = -1
+        #   exit_code, err = -1, "Command not recognized"
         # end
       rescue Interrupt
-        # nothing to do
+        # user pressed ^C to interrupt a command
         @history_logger.warn "shell interrupt" if @history_logger
         print "\nInterrupt. aborting command '#{input}'\n"
+        exit_code, err = 9, "aborted command"
       rescue SystemExit => cmdexit
-        # nothing to do
+        # nothing to do, assume the command that exited printed an error already
         # print "\n"
-        cmd_result = cmdexit.status
+        exit_code, err = cmdexit.status, "Command exited early."
       rescue => e
+        # some other type of failure..
         @history_logger.error "#{e.message}" if @history_logger
-        cmd_result = Morpheus::Cli::ErrorHandler.new(my_terminal.stderr).handle_error(e) # lol
-        # exit 1
+        exit_code, err = Morpheus::Cli::ErrorHandler.new(my_terminal.stderr).handle_error(e) # lol
+        
       ensure
         if @return_to_log_level
           Morpheus::Logging.set_log_level(@return_to_log_level)
@@ -501,11 +501,7 @@ class Morpheus::Cli::Shell
         end
       end
 
-      # commands should be a number or nil (treated as 0)
-      if cmd_result == true
-        cmd_result = 0
-      end
-      return cmd_result
+      return exit_code, err
     end
 
   end