morpheus-cli 8.0.2 → 8.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06ea65156f0a57e7af971494347aae4844608a6cb877087dc9394a127841a75e
-  data.tar.gz: a93ddec1dc9e647e23a111a168126dbfc3b683d04844731f5bc53a461305b140
+  metadata.gz: b071ad7a069db88e11023de144dad8ad640f49b6a18becdfa60cd1e04312397f
+  data.tar.gz: b1deba83d4decb51b824fabfca0d8a615dbd17e6df7e07296de3a8dc3606f945
 SHA512:
-  metadata.gz: 9ca9b136bd006211eed46cd89103c2e7af9157d8111595f4e90b09a7a1e014570405256d64401c78311503e3d4b0aaecf5690526b2014985d79c515e0093eba3
-  data.tar.gz: f1355c6ec99b7a05e068e215ba4581a75a712bef545b661a04e7a31ad0b1711071d7f65c316e938171da60d66d0a297898068f5efb70e750a7dc987b2f12014e
+  metadata.gz: '04509b5731b2f5713189498b3a166b62735911c7c178d6480c5d54d4fd68827ef16f21431d5b7c49ce2209dca14dc402c65dc59e90268979b310855a08705598'
+  data.tar.gz: 179f4442f70f2f634746a11211f435ae119abd9dc0839e06c16142018afa3809bcdc995cc96ca3967734d06e578b80f7a6a680dbe3ba7c4bf643cc6318cb03d2

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 8.0.2
+RUN gem install morpheus-cli -v 8.0.3
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/cli/commands/clusters.rb

@@ -3784,7 +3784,7 @@ class Morpheus::Cli::Clusters
         subtitles << " Process ID: #{process_id}"
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles, options
-        print_process_details(process)
+        print_process_details(process, options)
 
         print_h2 "Process Events", options
         process_events = process['events'] || process['processEvents'] || []
@@ -4003,7 +4003,7 @@ class Morpheus::Cli::Clusters
         subtitles = []
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles, options
-        print_process_event_details(process_event)
+        print_process_event_details(process_event, options)
         print reset, "\n"
         return 0
       end
@@ -4015,37 +4015,6 @@ class Morpheus::Cli::Clusters
 
   private
 
-  def print_process_event_details(process_event, options={})
-    # process_event =~ process
-    description_cols = {
-        "Process ID" => lambda {|it| it['processId'] },
-        "Event ID" => lambda {|it| it['id'] },
-        "Name" => lambda {|it| it['displayName'] },
-        "Description" => lambda {|it| it['description'] },
-        "Process Type" => lambda {|it| it['processType'] ? (it['processType']['name'] || it['processType']['code']) : it['processTypeName'] },
-        "Created By" => lambda {|it| it['createdBy'] ? (it['createdBy']['displayName'] || it['createdBy']['username']) : '' },
-        "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
-        "End Date" => lambda {|it| format_local_dt(it['endDate']) },
-        "Duration" => lambda {|it| format_process_duration(it) },
-        "Status" => lambda {|it| format_process_status(it) },
-    }
-    print_description_list(description_cols, process_event)
-
-    if process_event['error']
-      print_h2 "Error", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process_event['error'].to_s.strip
-    end
-
-    if process_event['output']
-      print_h2 "Output", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process_event['output'].to_s.strip
-    end
-  end
-
   def print_clusters_table(clusters, opts={})
     table_color = opts[:color] || cyan
     rows = clusters.collect do |cluster|

data/lib/morpheus/cli/commands/instances.rb

@@ -2921,6 +2921,12 @@ class Morpheus::Cli::Instances
       opts.on( '--description VALUE', String, "Snapshot Description." ) do |val|
         options[:options]['description'] = val
       end
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is complete. Default interval is #{default_refresh_interval} seconds.") do |val|
+        options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
+      end
+      opts.on(nil, '--no-refresh', "Do not refresh" ) do
+        options[:no_refresh] = true
+      end
       build_standard_add_options(opts, options, [:auto_confirm])
       opts.footer = <<-EOT
 Create a snapshot for an instance.
@@ -2949,6 +2955,18 @@ EOT
     json_response = @instances_interface.snapshot(instance['id'], payload)
     render_response(json_response, options, 'snapshots') do
       print_green_success "Snapshot initiated."
+      process_id = json_response['processIds'][0] rescue nil
+      if process_id
+        unless options[:no_refresh]
+          process = wait_for_process_execution(process_id, options)
+          snapshot_id = process['resultId']
+          if snapshot_id
+            Morpheus::Cli::Snapshots.new.handle(["get", snapshot_id] + (options[:remote] ? ["-r",options[:remote]] : []))
+          end
+        end
+      else
+        # puts "No process returned"
+      end
     end
     return 0, nil
   end
@@ -3707,7 +3725,7 @@ EOT
       if options[:json]
         puts as_json(json_response, options)
       else
-        print_green_success "Snapshots attaced to instance #{instance['name']} queued for deletion."
+        print_green_success "Snapshots attached to instance #{instance['name']} queued for deletion."
       end
       return 0
 
@@ -4496,7 +4514,7 @@ EOT
         subtitles << " Process ID: #{process_id}"
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles, options
-        print_process_details(process)
+        print_process_details(process, options)
   
         print_h2 "Process Events", options
         process_events = process['events'] || process['processEvents'] || []
@@ -5502,67 +5520,6 @@ private
       {'fieldName' => 'maxDisk', 'fieldLabel' => 'Max Disk', 'type' => 'number', 'description' => 'Maximum storage percent (0-100)'},
     ]
   end
-
-  def print_process_details(process)
-    description_cols = {
-      "Process ID" => lambda {|it| it['id'] },
-      "Name" => lambda {|it| it['displayName'] },
-      "Description" => lambda {|it| it['description'] },
-      "Process Type" => lambda {|it| it['processType'] ? (it['processType']['name'] || it['processType']['code']) : it['processTypeName'] },
-      "Created By" => lambda {|it| it['createdBy'] ? (it['createdBy']['displayName'] || it['createdBy']['username']) : '' },
-      "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
-      "End Date" => lambda {|it| format_local_dt(it['endDate']) },
-      "Duration" => lambda {|it| format_process_duration(it) },
-      "Status" => lambda {|it| format_process_status(it) },
-      # "# Events" => lambda {|it| (it['events'] || []).size() },
-    }
-    print_description_list(description_cols, process)
-
-    if process['error']
-      print_h2 "Error", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process['error'].to_s.strip
-    end
-
-    if process['output']
-      print_h2 "Output", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process['output'].to_s.strip
-    end
-  end
-
-  def print_process_event_details(process_event, options={})
-    # process_event =~ process
-    description_cols = {
-      "Process ID" => lambda {|it| it['processId'] },
-      "Event ID" => lambda {|it| it['id'] },
-      "Name" => lambda {|it| it['displayName'] },
-      "Description" => lambda {|it| it['description'] },
-      "Process Type" => lambda {|it| it['processType'] ? (it['processType']['name'] || it['processType']['code']) : it['processTypeName'] },
-      "Created By" => lambda {|it| it['createdBy'] ? (it['createdBy']['displayName'] || it['createdBy']['username']) : '' },
-      "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
-      "End Date" => lambda {|it| format_local_dt(it['endDate']) },
-      "Duration" => lambda {|it| format_process_duration(it) },
-      "Status" => lambda {|it| format_process_status(it) },
-    }
-    print_description_list(description_cols, process_event)
-
-    if process_event['error']
-      print_h2 "Error", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process_event['error'].to_s.strip
-    end
-
-    if process_event['output']
-      print_h2 "Output", options
-      print reset
-      #puts format_process_error(process_event)
-      puts process_event['output'].to_s.strip
-    end
-  end
   
   def update_wiki_page_option_types
     [

data/lib/morpheus/cli/commands/processes_command.rb

@@ -295,7 +295,7 @@ class Morpheus::Cli::Processes
         subtitles << " Process ID: #{process_id}"
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
-        print_process_details(process)
+        print_process_details(process, options)
   
         print_h2 "Process Events"
         process_events = process['events'] || process['processEvents'] || []
@@ -456,7 +456,7 @@ EOT
         subtitles = []
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
-        print_process_event_details(process_event)
+        print_process_event_details(process_event, options)
         print reset, "\n"
         return 0
       end

data/lib/morpheus/cli/commands/snapshots.rb

@@ -73,15 +73,15 @@ class Morpheus::Cli::Snapshots
         "Name" => 'name',
         "Description" => 'description',
         "External Id" => 'externalId',
-        "Status" => 'status',
-        "State" => 'state',
+        # "State" => 'state',
         "Snapshot Type" => 'snapshotType',
-        "Snapshot Created" => 'snapshotCreated',
-        "Cloud" => 'zone.name',
-        "Datastore" => 'datastore',
-        "Parent Snapshot" => 'parentSnapshot',
-        "Active" => 'currentlyActive',
-        "Date Created" => 'dateCreated'
+        "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
+        "Cloud" => lambda {|it| format_name_and_id(it['zone']) },
+        "Datastore" => lambda {|it| format_name_and_id(it['datastore']) },
+        "Parent Snapshot" => lambda {|it| format_name_and_id(it['parentSnapshot']) },
+        "Active" => lambda {|it| format_boolean(it['currentlyActive']) },
+        "Date Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+        "Status" => lambda {|it| format_snapshot_status(it) }
       }
       print_description_list(description_cols, snapshot)
 
@@ -134,4 +134,20 @@ class Morpheus::Cli::Snapshots
       exit 1
     end
   end
+
+  protected
+
+  def format_snapshot_status(snapshot, return_color=cyan)
+    out = ""
+    status_string = snapshot['status'].to_s
+    if status_string == 'complete'
+      out << "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'failed'
+      out << "#{red}#{status_string.upcase}#{return_color}"
+    else
+      out << "#{cyan}#{status_string.upcase}#{return_color}"
+    end
+    out
+  end
+
 end

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

@@ -8,8 +8,17 @@ module Morpheus::Cli::ProcessesHelper
     klass.send :include, Morpheus::Cli::PrintHelper
   end
 
+  def api_client
+    raise "#{self.class} has not defined @api_client" if @api_client.nil?
+    @api_client
+  end
+
+  def processes_interface
+    # get_interface('processes')
+    api_client.processes
+  end
 
-  def print_process_details(process)
+  def print_process_details(process, options={})
     description_cols = {
       "Process ID" => lambda {|it| it['id'] },
       "Name" => lambda {|it| it['displayName'] },
@@ -22,7 +31,7 @@ module Morpheus::Cli::ProcessesHelper
       "Status" => lambda {|it| format_process_status(it) },
       # "# Events" => lambda {|it| (it['events'] || []).size() },
     }
-    print_description_list(description_cols, process)
+    print_description_list(description_cols, process, options)
 
     if process['error']
       print_h2 "Error"
@@ -39,7 +48,7 @@ module Morpheus::Cli::ProcessesHelper
     end
   end
 
-  def print_process_event_details(process_event)
+  def print_process_event_details(process_event, options={})
     # process_event =~ process
     description_cols = {
       "Process ID" => lambda {|it| it['processId'] },
@@ -53,7 +62,7 @@ module Morpheus::Cli::ProcessesHelper
       "Duration" => lambda {|it| format_process_duration(it) },
       "Status" => lambda {|it| format_process_status(it) },
     }
-    print_description_list(description_cols, process_event)
+    print_description_list(description_cols, process_event, options)
 
     if process_event['error']
       print_h2 "Error"
@@ -111,4 +120,25 @@ module Morpheus::Cli::ProcessesHelper
     out
   end
 
+  def wait_for_process_execution(process_id, options={}, print_output = true)
+    refresh_interval = 10
+    if options[:refresh_interval].to_i > 0
+      refresh_interval = options[:refresh_interval]
+    end
+    refresh_display_seconds = refresh_interval % 1.0 == 0 ? refresh_interval.to_i : refresh_interval
+    unless options[:quiet]
+      print cyan, "Refreshing every #{refresh_display_seconds} seconds until process is complete...", "\n", reset
+    end
+    process = processes_interface.get(process_id)['process']
+    while ['new','queued','pending','running'].include?(process['status']) do
+      sleep(refresh_interval)
+      process = processes_interface.get(process_id)['process']
+    end
+    if print_output && options[:quiet] != true
+      print_h1 "Process Details", [], options
+      print_process_details(process, options)
+    end
+    return process
+  end
+
 end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "8.0.2"
+    VERSION = "8.0.3"
   end
 end

data/lib/morpheus/formatters.rb

@@ -486,7 +486,7 @@ def format_name_and_id(obj)
   elsif(obj.is_a?(Hash))
     "#{obj['name']} [#{obj['id']}]" rescue ""
   else
-    object.to_s
+    obj.to_s
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 8.0.2
+  version: 8.0.3
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-16 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix