morpheus-cli 5.4.4 → 5.4.5

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

@@ -0,0 +1,50 @@
+require 'morpheus/cli/mixins/print_helper'
+# Mixin for Morpheus::Cli command classes
+# Provides common methods for provisioning instances
+module Morpheus::Cli::ExecutionRequestHelper
+
+  def self.included(klass)
+    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 execution_request_interface
+    # get_interface('execution_request')
+    api_client.execution_request
+  end
+
+  # refresh execution request until it is finished
+  # returns json response data of the last execution request when status reached 'completed' or 'failed'
+  def wait_for_execution_request(execution_request_id, options={}, print_output = true)
+    refresh_interval = 10
+    if options[:refresh_interval].to_i > 0
+      refresh_interval = options[:refresh_interval]
+    end
+    execution_request = execution_request_interface.get(execution_request_id)['executionRequest']
+    refresh_display_seconds = refresh_interval % 1.0 == 0 ? refresh_interval.to_i : refresh_interval
+    # unless options[:quiet]
+    #   print cyan, "Execution request has not yet finished. Refreshing every #{refresh_display_seconds} seconds...", "\n", reset
+    # end
+    while execution_request['status'] == 'pending' || execution_request['status'] == 'new' do
+      sleep(refresh_interval)
+      execution_request = execution_request_interface.get(execution_request_id)['executionRequest']
+    end
+    if print_output && options[:quiet] != true
+      if execution_request['stdErr'].to_s.strip != '' && execution_request['stdErr'] != "stdin: is not a tty\n"
+        print_h2 "Error"
+        print execution_request['stdErr'].to_s.strip, reset, "\n"
+      end
+      if execution_request['stdOut'].to_s.strip != ''
+        print_h2 "Output"
+        print execution_request['stdOut'].to_s.strip, reset, "\n"
+      end
+      print reset, "\n"
+    end
+    return execution_request
+  end
+
+end

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

@@ -1120,7 +1120,7 @@ module Morpheus::Cli::ProvisioningHelper
       storage_type = nil
     else
       default_storage_type = root_storage_types.find {|t| t['value'].to_s == volume['storageType'].to_s}
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => 'Root Storage Type', 'selectOptions' => root_storage_types, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.', 'defaultValue' => default_storage_type ? default_storage_type['name'] : volume['storageType']}], options[:options])
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => 'Root Storage Type', 'selectOptions' => root_storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.', 'defaultValue' => default_storage_type ? default_storage_type['name'] : volume['storageType']}], options[:options])
       storage_type_id = v_prompt[field_context]['storageType']
       storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
       volume['storageType'] = storage_type_id
@@ -1191,7 +1191,7 @@ module Morpheus::Cli::ProvisioningHelper
             volume = options[:options]['volumes'][volume_index]
           end
 
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.', 'defaultValue' => volume['storageType']}], options[:options])
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.', 'defaultValue' => volume['storageType']}], options[:options])
           storage_type_id = v_prompt[field_context]['storageType']
           volume['storageType'] = storage_type_id
           storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
@@ -1313,7 +1313,7 @@ module Morpheus::Cli::ProvisioningHelper
         storage_type_id = nil
         storage_type = nil
       else
-        #v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => 'Root Storage Type', 'selectOptions' => root_storage_types, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
+        #v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => 'Root Storage Type', 'selectOptions' => root_storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
         #storage_type_id = v_prompt[field_context]['storageType']
         storage_type_id = current_root_volume['type'] || current_root_volume['storageType']
         storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
@@ -1461,7 +1461,7 @@ module Morpheus::Cli::ProvisioningHelper
 
             field_context = "dataVolume#{volume_index}"
 
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'storageType', 'type' => 'select', 'fieldLabel' => "Disk #{volume_index} Storage Type", 'selectOptions' => storage_types, 'required' => true, 'defaultFirstOption' => true, 'skipSingleOption' => true, 'description' => 'Choose a storage type.'}], options[:options])
             storage_type_id = v_prompt[field_context]['storageType']
             storage_type = plan_info['storageTypes'].find {|i| i['id'] == storage_type_id.to_i }
 

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

@@ -495,10 +495,16 @@ EOT
       return
     end
     json_response = rest_interface.create(parent_id, payload)
-    render_response(json_response, options, rest_object_key) do
-      record = json_response[rest_object_key]
-      print_green_success "Added #{rest_label.downcase} #{record['name'] || record['id']}"
-      return _get(parent_id, record["id"], {}, options)
+    if json_response['success']
+      render_response(json_response, options, rest_object_key) do
+        record = json_response[rest_object_key]
+        print_green_success "Added #{rest_label.downcase} #{record['name'] || record['id']}"
+        return _get(parent_id, record["id"], {}, options)
+      end
+    else
+      print red
+      print json_response['msg']
+      print "\n"
     end
     return 0, nil
   end

data/lib/morpheus/cli/option_types.rb

@@ -405,7 +405,7 @@ module Morpheus
             select_options = option_type['optionSource'].call(api_client, api_params || {})
           elsif option_type['optionSource'] == 'list'
             # /api/options/list is a special action for custom OptionTypeLists, just need to pass the optionTypeId parameter
-            select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {}.merge({'optionTypeId' => option_type['id']}))
+            select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, (api_params || {}).merge({'optionTypeId' => option_type['id']}))
           else
             # remote optionSource aka /api/options/$optionSource?
             select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {})
@@ -457,6 +457,12 @@ module Morpheus
             end
           end
         end
+        # default to the first option
+        if !value_found && default_value.nil? && option_type['defaultFirstOption'] && select_options && select_options[0]
+          # default_value = select_options[0][value_field]
+          # nicer to display name instead, it will match and replace with value
+          default_value = select_options[0]['name'] ? select_options[0]['name'] : select_options[0][value_field]
+        end
 
         if no_prompt
           if !value_found
@@ -822,7 +828,7 @@ module Morpheus
       def self.password_prompt(option_type)
         value_found = false
         while !value_found do
-          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+option_type['defaultValue'].to_s+']' : ''}: "
+          print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+'************'+']' : ''}: "
           input = $stdin.noecho(&:gets).chomp!
           value = input
           print "\n"
@@ -999,7 +1005,7 @@ module Morpheus
             select_options = option_type['optionSource'].call(api_client, api_params || {})
           elsif option_type['optionSource'] == 'list'
             # /api/options/list is a special action for custom OptionTypeLists, just need to pass the optionTypeId parameter
-            select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {}.merge({'optionTypeId' => option_type['id']}))
+            select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, (api_params || {}).merge({'optionTypeId' => option_type['id']}))
           else
             # remote optionSource aka /api/options/$optionSource?
             select_options = load_source_options(option_type['optionSource'], option_type['optionSourceType'], api_client, api_params || {})
@@ -1029,7 +1035,7 @@ module Morpheus
 
 
       def self.load_source_options(source,sourceType,api_client,params)
-        api_client.options.options_for_source("#{sourceType ? "#{sourceType}/" : ''}#{source}",params)['data']
+        api_client.options.options_for_source("#{sourceType ? "#{sourceType}/" : ''}#{source}", params)['data']
       end
 
       def self.format_select_options_help(opt, select_options = [], paging = nil)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.4.4"
+    VERSION = "5.4.5"
   end
 end

data/lib/morpheus/formatters.rb

@@ -476,3 +476,15 @@ end
 def a_or_an(v)
   v.to_s =~ /^[aeiou]/i ? "an" : "a"
 end
+
+def format_ok_status(status)
+  color = cyan
+  if ['ok'].include? status
+    color = green
+  elsif ['error'].include? status
+    color = red
+  elsif ['warning'].include? status
+    color = yellow
+  end
+  "#{color}#{status.to_s.upcase}#{cyan}"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.4.4
+  version: 5.4.5
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -498,6 +498,7 @@ files:
 - lib/morpheus/cli/mixins/accounts_helper.rb
 - lib/morpheus/cli/mixins/backups_helper.rb
 - lib/morpheus/cli/mixins/deployments_helper.rb
+- lib/morpheus/cli/mixins/execution_request_helper.rb
 - lib/morpheus/cli/mixins/infrastructure_helper.rb
 - lib/morpheus/cli/mixins/library_helper.rb
 - lib/morpheus/cli/mixins/load_balancers_helper.rb