morpheus-cli 5.2.4.1 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37c9d87f1bfe67cebd9a25486613f11f221f5600a3fc888f58f073c97c12a656
-  data.tar.gz: d1cbd8a33bea8749c042c3a3557760566102a24c8ddb54f7c4e5c0f833445504
+  metadata.gz: 4c04cf89b798df6d8dba342efe64eec23b5f97bbeef368072d56829c8b517707
+  data.tar.gz: 50a9448b2a167439efbd3f3bcd2f0ea91870681986108d975b058a40b5e14d69
 SHA512:
-  metadata.gz: 2d47d04efd457d117b30d3909707924f3215e5d7196692a9b4f6e2d83f553d6b0a78b8a07b03e2350f8ff0750c64c9265a4c58c496eab71901c89ac9cfc0cc58
-  data.tar.gz: fd8d5788f2288369735015854a5a6d469887d5624c8fe5fb212f077f54e15033397164f85c932883029f20f813296366fbe374855a7fd53461a58a022c384629
+  metadata.gz: 58613849cca0d5994cc866d6de770f0657b65ccbd3961e352ac934f21600f0888be755c70f54cc964a317fa12201a78800eb59447a664ec28df7eb00799cdc1f
+  data.tar.gz: 01307e6f8b6c91813a948d79b5dedc0914d5731b026d6152ddf1ea59d8ab9a830bca5305a28087623d088787464dc76ee3667673759467a2910723b06645a3b7

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 5.2.4
+RUN gem install morpheus-cli -v 5.3.0
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/cli/activity_command.rb

@@ -22,6 +22,9 @@ class Morpheus::Cli::ActivityCommand
     params, options = {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on('-a', '--details', "Display more details object id, full date and time, etc." ) do
+        options[:details] = true
+      end
       opts.on('-t','--type TYPE', "Activity Type eg. Provisioning, Admin") do |val|
         options[:type] ||= []
         options[:type] << val
@@ -115,20 +118,20 @@ EOT
           # {"SEVERITY" => lambda {|record| format_activity_severity(record['severity']) } },
           {"TYPE" => lambda {|record| record['activityType'] } },
           {"NAME" => lambda {|record| record['name'] } },
-          {"RESOURCE" => lambda {|record| "#{record['objectType']} #{record['objectId']}" } },
+          options[:details] ? {"RESOURCE" => lambda {|record| "#{record['objectType']} #{record['objectId']}" } } : nil,
           {"MESSAGE" => lambda {|record| record['message'] || '' } },
           {"USER" => lambda {|record| record['user'] ? record['user']['username'] : record['userName'] } },
           #{"DATE" => lambda {|record| "#{format_duration_ago(record['ts'] || record['timestamp'])}" } },
           {"DATE" => lambda {|record| 
-            # show full time if searching for custom timerange, otherwise the default is to show relative time
-            if params['start'] || params['end'] || params['timeframe']
+            # show full time if searching for custom timerange or --details, otherwise the default is to show relative time
+            if params['start'] || params['end'] || params['timeframe'] || options[:details]
               "#{format_local_dt(record['ts'] || record['timestamp'])}"
             else
               "#{format_duration_ago(record['ts'] || record['timestamp'])}"
             end
 
           } },
-        ]
+        ].compact
         print as_pretty_table(activity, columns, options)
         print_results_pagination(json_response)
       end

data/lib/morpheus/cli/dashboard_command.rb

@@ -272,20 +272,20 @@ This includes instance and backup counts, favorite instances, monitoring and rec
           # {"SEVERITY" => lambda {|record| format_activity_severity(record['severity']) } },
           {"TYPE" => lambda {|record| record['activityType'] } },
           {"NAME" => lambda {|record| record['name'] } },
-          {"RESOURCE" => lambda {|record| "#{record['objectType']} #{record['objectId']}" } },
+          options[:details] ? {"RESOURCE" => lambda {|record| "#{record['objectType']} #{record['objectId']}" } } : nil,
           {"MESSAGE" => lambda {|record| record['message'] || '' } },
           {"USER" => lambda {|record| record['user'] ? record['user']['username'] : record['userName'] } },
           #{"DATE" => lambda {|record| "#{format_duration_ago(record['ts'] || record['timestamp'])}" } },
           {"DATE" => lambda {|record| 
             # show full time if searching for custom timerange, otherwise the default is to show relative time
-            if params['start'] || params['end'] || params['timeframe']
+            if params['start'] || params['end'] || params['timeframe'] || options[:details]
               "#{format_local_dt(record['ts'] || record['timestamp'])}"
             else
               "#{format_duration_ago(record['ts'] || record['timestamp'])}"
             end
 
           } },
-        ]
+        ].compact
         print as_pretty_table(activity, columns, options)
         # print_results_pagination(json_response)
         # print reset,"\n"

data/lib/morpheus/cli/execution_request_command.rb

@@ -31,6 +31,10 @@ class Morpheus::Cli::ExecutionRequestCommand
     handle_subcommand(args)
   end
 
+  def default_refresh_interval
+    5
+  end
+
   def get(args)
     raw_args = args
     options = {}
@@ -134,7 +138,7 @@ class Morpheus::Cli::ExecutionRequestCommand
     options = {}
     params = {}
     script_content = nil
-    do_refresh = true
+    options[:refresh_until_finished] = true
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[options]")
       opts.on('--server ID', String, "Server ID") do |val|
@@ -161,8 +165,14 @@ class Morpheus::Cli::ExecutionRequestCommand
           exit 1
         end
       end
-      opts.on(nil, '--no-refresh', "Do not refresh until finished" ) do
-        do_refresh = false
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is finished. Default interval is #{default_refresh_interval} seconds.") do |val|
+        options[:refresh_until_finished] = true
+        if !val.to_s.empty?
+          options[:refresh_interval] = val.to_f
+        end
+      end
+      opts.on(nil, '--no-refresh', "Do not refresh. The default behavior is to refresh until finished." ) do
+        options[:refresh_until_finished] = false
       end
       #build_option_type_options(opts, options, add_user_source_option_types())
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
@@ -212,8 +222,8 @@ class Morpheus::Cli::ExecutionRequestCommand
       end
       execution_request = json_response['executionRequest']
       print_green_success "Executing request #{execution_request['uniqueId']}"
-      if do_refresh
-        get([execution_request['uniqueId'], "--refresh"] + (options[:remote] ? ["-r",options[:remote]] : []))
+      if options[:refresh_until_finished]
+        get([execution_request['uniqueId'], "--refresh", options[:refresh_interval] ? options[:refresh_interval].to_s : nil].compact + (options[:remote] ? ["-r",options[:remote]] : []))
       else
         get([execution_request['uniqueId']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end

data/lib/morpheus/cli/invoices_command.rb

@@ -140,32 +140,32 @@ class Morpheus::Cli::InvoicesCommand
     # construct params
     params.merge!(parse_list_options(options))
     if options[:clouds]
-      cloud_ids = parse_cloud_id_list(options[:clouds])
+      cloud_ids = parse_cloud_id_list(options[:clouds], {}, false, true)
       return 1, "clouds not found for #{options[:clouds]}" if cloud_ids.nil?
       params['zoneId'] = cloud_ids
     end
     if options[:groups]
-      group_ids = parse_group_id_list(options[:groups])
+      group_ids = parse_group_id_list(options[:groups], {}, false, true)
       return 1, "groups not found for #{options[:groups]}" if group_ids.nil?
       params['siteId'] = group_ids
     end
     if options[:instances]
-      instance_ids = parse_instance_id_list(options[:instances])
+      instance_ids = parse_instance_id_list(options[:instances], {}, false, true)
       return 1, "instances not found for #{options[:instances]}" if instance_ids.nil?
       params['instanceId'] = instance_ids
     end
     if options[:servers]
-      server_ids = parse_server_id_list(options[:servers])
+      server_ids = parse_server_id_list(options[:servers], {}, false, true)
       return 1, "servers not found for #{options[:servers]}" if server_ids.nil?
       params['serverId'] = server_ids
     end
     if options[:users]
-      user_ids = parse_user_id_list(options[:users])
+      user_ids = parse_user_id_list(options[:users], {}, false, true)
       return 1, "users not found for #{options[:users]}" if user_ids.nil?
       params['userId'] = user_ids
     end
     if options[:projects]
-      project_ids = parse_project_id_list(options[:projects])
+      project_ids = parse_project_id_list(options[:projects], {}, false, true)
       return 1, "projects not found for #{options[:projects]}" if project_ids.nil?
       params['projectId'] = project_ids
     end
@@ -636,37 +636,20 @@ Update an invoice.
     params = {}
     payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[--daily] [--costing] [--current] [-c CLOUD]")
-      opts.on( '--daily', "Refresh Daily Invoices" ) do
-        payload[:daily] = true
-      end
-      opts.on( '--costing', "Refresh Costing Data" ) do
-        payload[:costing] = true
-      end
-      opts.on( '--current', "Collect the most up to date costing data." ) do
-        payload[:current] = true
-      end
-      opts.on( '--date DATE', String, "Date to collect costing for. By default the cost data is collected for the end of the previous period." ) do |val|
-        payload[:date] = val.to_s
-      end
-      opts.on( '-c', '--cloud CLOUD', "Specify cloud(s) to refresh costing for." ) do |val|
+      opts.banner = subcommand_usage("[-c CLOUD]")
+      opts.on( '-c', '--clouds CLOUD', "Specify clouds to refresh costing for." ) do |val|
         payload[:clouds] ||= []
         payload[:clouds] << val
       end
-      opts.on( '--all', "Refresh costing for all clouds." ) do
+      opts.on( '--all', "Refresh costing for all clouds. This can be used instead of --clouds" ) do
         payload[:all] = true
       end
-      # opts.on( '-f', '--force', "Force Refresh" ) do
-      #   query_params[:force] = 'true'
-      # end
+      opts.on( '--date DATE', String, "Date to collect costing for. By default the cost data is collected for the end of the previous job interval (hour or day)." ) do |val|
+        payload[:date] = val.to_s
+      end
       build_standard_update_options(opts, options, [:query, :auto_confirm])
       opts.footer = <<-EOT
-Refresh invoices.
-By default, nothing is changed.
-Include --daily to regenerate invoice records.
-Include --costing to refresh actual costing data.
-Include --current to refresh costing data for the actual current time.
-To get the latest invoice costing data, include --daily --costing --current --all 
+Refresh invoice costing data for the specified clouds.
 EOT
     end
     optparse.parse!(args)
@@ -677,17 +660,11 @@ EOT
       payload = options[:payload]
     end
     payload.deep_merge!(parse_passed_options(options))
-    # --clouds
+    # --clouds lookup ID for name
     if payload[:clouds]
-      payload[:clouds] = parse_id_list(payload[:clouds]).collect {|cloud_id|
-        if cloud_id.to_s =~ /\A\d{1,}\Z/
-          cloud_id
-        else
-          cloud = find_cloud_option(cloud_id)
-          return 1 if cloud.nil?
-          cloud['id']
-        end
-      }
+      cloud_ids = parse_cloud_id_list(payload[:clouds], {}, false, true)
+      return 1, "clouds not found for #{payload[:clouds]}" if cloud_ids.nil?
+      payload[:clouds] = cloud_ids
     end
     # are you sure?
     unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to refresh invoices?")
@@ -831,32 +808,32 @@ EOT
     # construct params
     params.merge!(parse_list_options(options))
     if options[:clouds]
-      cloud_ids = parse_cloud_id_list(options[:clouds])
+      cloud_ids = parse_cloud_id_list(options[:clouds], {}, false, true)
       return 1, "clouds not found for #{options[:clouds]}" if cloud_ids.nil?
       params['zoneId'] = cloud_ids
     end
     if options[:groups]
-      group_ids = parse_group_id_list(options[:groups])
+      group_ids = parse_group_id_list(options[:groups], {}, false, true)
       return 1, "groups not found for #{options[:groups]}" if group_ids.nil?
       params['siteId'] = group_ids
     end
     if options[:instances]
-      instance_ids = parse_instance_id_list(options[:instances])
+      instance_ids = parse_instance_id_list(options[:instances], {}, false, true)
       return 1, "instances not found for #{options[:instances]}" if instance_ids.nil?
       params['instanceId'] = instance_ids
     end
     if options[:servers]
-      server_ids = parse_server_id_list(options[:servers])
+      server_ids = parse_server_id_list(options[:servers], {}, false, true)
       return 1, "servers not found for #{options[:servers]}" if server_ids.nil?
       params['serverId'] = server_ids
     end
     if options[:users]
-      user_ids = parse_user_id_list(options[:users])
+      user_ids = parse_user_id_list(options[:users], {}, false, true)
       return 1, "users not found for #{options[:users]}" if user_ids.nil?
       params['userId'] = user_ids
     end
     if options[:projects]
-      project_ids = parse_project_id_list(options[:projects])
+      project_ids = parse_project_id_list(options[:projects], {}, false, true)
       return 1, "projects not found for #{options[:projects]}" if project_ids.nil?
       params['projectId'] = project_ids
     end

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

@@ -720,6 +720,7 @@ module Morpheus::Cli::PrintHelper
       columns.each do |column_def|
         # r << column_def.display_method.respond_to?(:call) ? column_def.display_method.call(row_data) : get_object_value(row_data, column_def.display_method)
         value = column_def.display_method.call(row_data)        
+        value = JSON.fast_generate(value) if value.is_a?(Hash) || value.is_a?(Array)
         row << value
       end
       rows << row
@@ -802,6 +803,7 @@ module Morpheus::Cli::PrintHelper
           columns.each do |column_def|
             # r << column_def.display_method.respond_to?(:call) ? column_def.display_method.call(row_data) : get_object_value(row_data, column_def.display_method)
             value = column_def.display_method.call(row_data)        
+            value = JSON.fast_generate(value) if value.is_a?(Hash) || value.is_a?(Array)
             row << value
           end
           rows << row
@@ -879,6 +881,7 @@ module Morpheus::Cli::PrintHelper
       label = label.upcase if ALL_LABELS_UPCASE
       # value = get_object_value(obj, column_def.display_method)
       value = column_def.display_method.call(obj)
+      value = JSON.fast_generate(value) if value.is_a?(Hash) || value.is_a?(Array)
       if label.size > max_label_width
         max_label_width = label.size
       end

data/lib/morpheus/cli/remote.rb

@@ -1276,7 +1276,8 @@ EOT
 
   def format_remote_details(appliance, options={})
     columns = {
-      "Name" => :name,
+      #"Name" => :name,
+      "Name" => lambda {|it| it[:name].to_s },
       #"Name" => lambda {|it| it[:active] ? "#{it[:name]} #{bold}(current)#{reset}#{cyan}" : it[:name] },
       "URL" => lambda {|it| it[:url] || it[:host] },
       #"Status" => lambda {|it| format_appliance_status(it, cyan) },

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.2.4.1"
+    VERSION = "5.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.2.4.1
+  version: 5.3.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler