morpheus-cli 5.4.4.2 → 5.5.0

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

@@ -187,6 +187,7 @@ EOT
           ""
         end
       },
+      "Tfvar Secret" => lambda {|it| it['tfvarSecret'] },
       # "Category" => lambda {|it| it['category'].to_s.capitalize },
       # # "Logo" => lambda {|it| it['logo'].to_s },
       # "Visiblity" => lambda {|it| it['visibility'].to_s.capitalize },
@@ -200,6 +201,7 @@ EOT
       # "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
     }
+    description_cols.delete("Tfvar Secret") if !(layout['provisionType'] && layout['provisionType']['code'] == 'terraform')
     print_description_list(description_cols, layout)
 
     
@@ -338,6 +340,9 @@ EOT
           params['specTemplates'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
+      opts.on('--tfvar-secret VALUE', String, "Tfvar Secret name, eg. 'tfvars/dev-key'") do |val|
+        params['tfvarSecret'] = val == 'null' ? nil : val
+      end
       add_perms_options(opts, options, layout_permission_excludes)
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
@@ -453,6 +458,13 @@ EOT
           return 1
         end
         
+        # TFVAR SECRET
+        if !params['tfvarSecret']
+          if provision_type && provision_type['code'] == 'terraform'
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'tfvarSecret', 'type' => 'select', 'optionSource' => 'tfvarSecrets', 'fieldLabel' => 'Tfvar Secret', 'required' => false}], options[:options], @api_client)
+            params['tfvarSecret'] = v_prompt['tfvarSecret'] if v_prompt['tfvarSecret']
+          end
+        end
 
         payload = {'instanceTypeLayout' => params}
         
@@ -544,6 +556,9 @@ EOT
           params['specTemplates'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
+      opts.on('--tfvar-secret VALUE', String, "Tfvar Secret name, eg. 'tfvars/dev-key'") do |val|
+        params['tfvarSecret'] = val == 'null' ? nil : val
+      end
       add_perms_options(opts, options, layout_permission_excludes)
       build_standard_update_options(opts, options)
             opts.footer = <<-EOT

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

@@ -156,9 +156,15 @@ class Morpheus::Cli::LibraryOptionListsCommand
           "Source URL" => 'sourceUrl',
           "Real Time" => lambda {|it| format_boolean it['realTime'] },
           "Ignore SSL Errors" => lambda {|it| format_boolean it['ignoreSSLErrors'] },
-          "Source Method" => lambda {|it| it['sourceMethod'].to_s.upcase }
+          "Source Method" => lambda {|it| it['sourceMethod'].to_s.upcase },
+          "Credentials" => lambda {|it| it['credential'] ? (it['credential']['type'] == 'local' ? '(Local)' : it['credential']['name']) : nil },
+          "Username" => 'serviceUsername',
+          "Password" => 'servicePassword',
         }
         option_list_columns.delete("API Type") if option_type_list['type'] != 'api'
+        option_list_columns.delete("Credentials") if !['rest','ldap'].include?(option_type_list['type']) # || !(option_type_list['credential'] && option_type_list['credential']['id'])
+        option_list_columns.delete("Username") if !['rest','ldap'].include?(option_type_list['type']) || !(option_type_list['serviceUsername'])
+        option_list_columns.delete("Password") if !['rest','ldap'].include?(option_type_list['type']) || !(option_type_list['servicePassword'])
         source_headers = []
         if option_type_list['config'] && option_type_list['config']['sourceHeaders']
           source_headers = option_type_list['config']['sourceHeaders'].collect do |header|
@@ -420,14 +426,18 @@ class Morpheus::Cli::LibraryOptionListsCommand
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'ignoreSSLErrors', 'fieldLabel' => 'Ignore SSL Errors', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 6},
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'realTime', 'fieldLabel' => 'Real Time', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 7},
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'sourceMethod', 'fieldLabel' => 'Source Method', 'type' => 'select', 'selectOptions' => [{'name' => 'GET', 'value' => 'GET'}, {'name' => 'POST', 'value' => 'POST'}], 'defaultValue' => 'GET', 'required' => true, 'displayOrder' => 8},
+        {'dependsOnCode' => 'optionTypeList.type:rest|ldap', 'fieldName' => 'credential', 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Credential ID or use "local" to specify username and password', 'displayOrder' => 9, 'defaultValue' => "local", 'required' => true, :for_help_only => true}, # hacky way to render this but not prompt for it
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'serviceUsername', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => "A Basic Auth Username for use when type is 'rest'.", 'displayOrder' => 9, "credentialFieldContext" => 'credential', "credentialFieldName" => 'username', "credentialType" => "username-password,oauth2"},
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'servicePassword', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => "A Basic Auth Password for use when type is 'rest'.", 'displayOrder' => 10, "credentialFieldContext" => 'credential', "credentialFieldName" => 'password', "credentialType" => "username-password,oauth2"},
         # sourceHeaders component (is done afterwards manually)
-        {'dependsOnCode' => 'optionTypeList.type:api', 'fieldName' => 'apiType', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'apiOptionLists', 'required' => true, 'description' => 'The code of the api option list to use, eg. clouds, environments, groups, instances, instance-wiki, networks, servicePlans, resourcePools, securityGroups, servers, server-wiki', 'displayOrder' => 9},
-        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'sourceUsername', 'fieldLabel' => 'Source Username', 'type' => 'text', 'description' => "An LDAP Username for use when type is 'ldap'.", 'displayOrder' => 10},
-        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'sourcePassword', 'fieldLabel' => 'Source Username', 'type' => 'text', 'description' => "An LDAP Password for use when type is 'ldap'.", 'displayOrder' => 11},
-        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'ldapQuery', 'fieldLabel' => 'LDAP Query', 'type' => 'text', 'description' => "LDAP Queries are standard LDAP formatted queries where different objects can be searched. Dependent parameters can be loaded into the query using the <%=phrase%> syntax.", 'displayOrder' => 12},
-        {'dependsOnCode' => 'optionTypeList.type:rest|api|manual', 'fieldName' => 'initialDataset', 'fieldLabel' => 'Initial Dataset', 'type' => 'code-editor', 'description' => "Create an initial json dataset to be used as the collection for this option list. It should be a list containing objects with properties 'name', and 'value'. However, if there is a translation script, that will also be passed through.", 'displayOrder' => 13, 'dataType' => 'string'},
-        {'dependsOnCode' => 'optionTypeList.type:rest|api|ldap', 'fieldName' => 'translationScript', 'fieldLabel' => 'Translation Script', 'type' => 'code-editor', 'description' => "Create a js script to translate the result data object into an Array containing objects with properties name, and value. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 14, 'dataType' => 'string'},
-        {'dependsOnCode' => 'optionTypeList.type:rest|api', 'fieldName' => 'requestScript', 'fieldLabel' => 'Request Script', 'type' => 'code-editor', 'description' => "Create a js script to prepare the request. Return a data object as the body for a post, and return an array containing properties name and value for a get. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 15, 'dataType' => 'string'},
+        {'dependsOnCode' => 'optionTypeList.type:api', 'fieldName' => 'apiType', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'apiOptionLists', 'required' => true, 'description' => 'The code of the api option list to use, eg. clouds, environments, groups, instances, instance-wiki, networks, servicePlans, resourcePools, securityGroups, servers, server-wiki', 'displayOrder' => 10},
+        {'dependsOnCode' => 'optionTypeList.type:rest|ldap', 'fieldName' => 'credential', 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Credential ID or use "local" to specify username and password', 'displayOrder' => 9, 'defaultValue' => "local", 'required' => true, :for_help_only => true}, # hacky way to render this but not prompt for it
+        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'serviceUsername', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => "An LDAP Username for use when type is 'ldap'.", 'displayOrder' => 11, "credentialFieldContext" => 'credential', "credentialFieldName" => 'username', "credentialType" => "username-password"},
+        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'servicePassword', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => "An LDAP Password for use when type is 'ldap'.", 'displayOrder' => 12, "credentialFieldContext" => 'credential', "credentialFieldName" => 'password', "credentialType" => "username-password"},
+        {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'ldapQuery', 'fieldLabel' => 'LDAP Query', 'type' => 'text', 'description' => "LDAP Queries are standard LDAP formatted queries where different objects can be searched. Dependent parameters can be loaded into the query using the <%=phrase%> syntax.", 'displayOrder' => 13},
+        {'dependsOnCode' => 'optionTypeList.type:rest|api|manual', 'fieldName' => 'initialDataset', 'fieldLabel' => 'Initial Dataset', 'type' => 'code-editor', 'description' => "Create an initial json dataset to be used as the collection for this option list. It should be a list containing objects with properties 'name', and 'value'. However, if there is a translation script, that will also be passed through.", 'displayOrder' => 14, 'dataType' => 'string'},
+        {'dependsOnCode' => 'optionTypeList.type:rest|api|ldap', 'fieldName' => 'translationScript', 'fieldLabel' => 'Translation Script', 'type' => 'code-editor', 'description' => "Create a js script to translate the result data object into an Array containing objects with properties name, and value. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 15, 'dataType' => 'string'},
+        {'dependsOnCode' => 'optionTypeList.type:rest|api', 'fieldName' => 'requestScript', 'fieldLabel' => 'Request Script', 'type' => 'code-editor', 'description' => "Create a js script to prepare the request. Return a data object as the body for a post, and return an array containing properties name and value for a get. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 16, 'dataType' => 'string'},
       ]
 
   end

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

@@ -238,11 +238,7 @@ class Morpheus::Cli::PricesCommand
         end
       end
       opts.on("--currency [CURRENCY]", String, "Price currency") do |val|
-        if avail_currencies.include?(val.upcase)
-          params['currency'] = val.upcase
-        else
-          raise_command_error "Unsupported currency '#{val}'. Available currencies: #{avail_currencies.join(', ')}"
-        end
+        options[:currency] = val
       end
       opts.on("--cost [AMOUNT]", Float, "Price cost") do |val|
         params['cost'] = val
@@ -269,6 +265,15 @@ class Morpheus::Cli::PricesCommand
       return 1
     end
 
+    if options[:currency]
+      if avail_currencies.include?(options[:currency].upcase)
+        params['currency'] = options[:currency].upcase
+      else
+        raise_command_error "Unsupported currency '#{options[:currency]}'. Available currencies: #{avail_currencies.join(', ')}"
+        return 1
+      end
+    end
+
     begin
       payload = parse_payload(options)
 
@@ -402,11 +407,7 @@ class Morpheus::Cli::PricesCommand
         end
       end
       opts.on("--currency [CURRENCY]", String, "Price currency") do |val|
-        if avail_currencies.include?(val.upcase)
-          params['currency'] = val.upcase
-        else
-          raise_command_error "Unsupported currency '#{val}'. Available currencies: #{avail_currencies.join(', ')}"
-        end
+        options[:currency] = val
       end
       opts.on("--cost [AMOUNT]", Float, "Price cost") do |val|
         params['cost'] = val
@@ -431,11 +432,21 @@ class Morpheus::Cli::PricesCommand
     end
     optparse.parse!(args)
     connect(options)
+
     if args.count != 1
       raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
       return 1
     end
 
+    if options[:currency]
+      if avail_currencies.include?(options[:currency].upcase)
+        params['currency'] = options[:currency].upcase
+      else
+        raise_command_error "Unsupported currency '#{options[:currency]}'. Available currencies: #{avail_currencies.join(', ')}"
+        return 1
+      end
+    end
+
     begin
       price = find_price(args[0])
 
@@ -608,7 +619,10 @@ class Morpheus::Cli::PricesCommand
   end
 
   def avail_currencies
-    ['CAD','EUR', 'IDR', 'XCD', 'USD', 'XOF', 'NOK', 'AUD', 'XAF', 'NZD', 'MAD', 'DKK', 'GBP', 'CHF', 'XPF', 'ILS', 'ROL', 'TRL','SEK', 'ZAR']
+    if @avail_currencies.nil?
+      @avail_currencies = @prices_interface.list_currencies()['currencies'].collect {|it| it['value']}
+    end
+    @avail_currencies
   end
 
   def prompt_for_price_type(params, options, price={})

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

@@ -489,7 +489,7 @@ class Morpheus::Cli::ProvisioningLicensesCommand
       {'fieldName' => 'licenseVersion', 'fieldLabel' => 'Version', 'type' => 'text', 'displayOrder' => 6},
       {'fieldName' => 'copies', 'fieldLabel' => 'Copies', 'type' => 'number', 'required' => true, 'defaultValue' => 1, 'displayOrder' => 7},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 8},
-      {'fieldName' => 'virtualImages', 'fieldLabel' => 'Virtual Images', 'type' => 'multiSelect', 'optionSource' => lambda { 
+      {'fieldName' => 'virtualImages', 'fieldLabel' => 'Virtual Images', 'type' => 'multiSelect', 'optionSource' => lambda { |api_client, api_params| 
         # @options_interface.options_for_source("virtualImages", {})['data']
         get_virtual_images_dropdown()
       }, 'displayOrder' => 9},

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

@@ -297,6 +297,9 @@ class Morpheus::Cli::Tasks
       opts.on('--execute-target VALUE', String, "Execute Target" ) do |val|
         options[:options]['executeTarget'] = val
       end
+      opts.on('--credential VALUE', String, "Credential ID or \"local\"" ) do |val|
+        options[:options]['credential'] = val
+      end
       opts.on('--target-host VALUE', String, "Target Host" ) do |val|
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['host'] = val
@@ -313,6 +316,10 @@ class Morpheus::Cli::Tasks
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['password'] = val
       end
+      opts.on('--target-ssh-key VALUE', String, "Target SSH Key" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['sshKey'] = val
+      end
       opts.on('--git-repo VALUE', String, "Git Repo ID" ) do |val|
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['localScriptGitId'] = val
@@ -521,17 +528,38 @@ class Morpheus::Cli::Tasks
             payload['task']['taskOptions'] ||= {}
             payload['task']['taskOptions']['port'] = v_prompt['taskOptions']['port']
           end
-          # Host
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => 'Username for remote execution'}], options[:options], @api_client)
-          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['username'].to_s.empty?
-            payload['task']['taskOptions'] ||= {}
-            payload['task']['taskOptions']['username'] = v_prompt['taskOptions']['username']
+          # Credentials
+          credential_code = "credential"
+          credential_option_type = {'code' => credential_code, 'fieldName' => credential_code, 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Enter an existing credential ID or choose "local"', 'defaultValue' => "local", 'required' => true}
+          supported_credential_types = ['username-keypair', 'username-password', 'username-password-keypair'].compact.flatten.join(",").split(",").collect {|it| it.strip }
+          credential_params = {"new" => false, "credentialTypes" => supported_credential_types}
+          credential_value = Morpheus::Cli::OptionTypes.select_prompt(credential_option_type, @api_client, credential_params, options[:no_prompt], options[:options][credential_code])
+          if !credential_value.to_s.empty?
+            if credential_value == "local"
+              payload['task'][credential_code] = {"type" => credential_value}
+            elsif credential_value.to_s =~ /\A\d{1,}\Z/
+              payload['task'][credential_code] = {"id" => credential_value.to_i}
+            end
           end
-          # Host
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => 'Password for remote execution'}], options[:options], @api_client)
-          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['password'].to_s.empty?
-            payload['task']['taskOptions'] ||= {}
-            payload['task']['taskOptions']['password'] = v_prompt['taskOptions']['password']
+          if credential_value == "local"
+            # Username
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => 'Username for remote execution'}], options[:options], @api_client)
+            if v_prompt['taskOptions'] && !v_prompt['taskOptions']['username'].to_s.empty?
+              payload['task']['taskOptions'] ||= {}
+              payload['task']['taskOptions']['username'] = v_prompt['taskOptions']['username']
+            end
+            # Password
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => 'Password for remote execution'}], options[:options], @api_client)
+            if v_prompt['taskOptions'] && !v_prompt['taskOptions']['password'].to_s.empty?
+              payload['task']['taskOptions'] ||= {}
+              payload['task']['taskOptions']['password'] = v_prompt['taskOptions']['password']
+            end
+            # SSH Key
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'sshKey', 'fieldLabel' => 'Key', 'type' => 'select', 'optionSource' => 'keyPairs', 'description' => 'SSH Key for remote execution'}], options[:options], @api_client)
+            if v_prompt['taskOptions'] && !v_prompt['taskOptions']['sshKey'].to_s.empty?
+              payload['task']['taskOptions'] ||= {}
+              payload['task']['taskOptions']['sshKey'] = v_prompt['taskOptions']['sshKey']
+            end
           end
         end
 
@@ -639,6 +667,9 @@ class Morpheus::Cli::Tasks
       opts.on('--execute-target VALUE', String, "Execute Target" ) do |val|
         options[:options]['executeTarget'] = val
       end
+      opts.on('--credential VALUE', String, "Credential ID or \"local\"" ) do |val|
+        options[:options]['credential'] = val
+      end
       opts.on('--target-host VALUE', String, "Target Host" ) do |val|
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['host'] = val
@@ -655,6 +686,10 @@ class Morpheus::Cli::Tasks
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['password'] = val
       end
+      opts.on('--target-ssh-key VALUE', String, "Target SSH Key" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['sshKey'] = val
+      end
       opts.on('--git-repo VALUE', String, "Git Repo ID" ) do |val|
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['localScriptGitId'] = val

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
@@ -1160,6 +1160,7 @@ module Morpheus::Cli::ProvisioningHelper
       #volume['size'] = plan_size
       #volume['sizeId'] = nil #volume.delete('sizeId')
     end
+    
     if !datastore_options.empty?
       default_datastore = datastore_options.find {|ds| ds['value'].to_s == volume['datastoreId'].to_s}
       v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'datastoreId', 'type' => 'select', 'fieldLabel' => 'Root Datastore', 'selectOptions' => datastore_options, 'required' => true, 'description' => 'Choose a datastore.', 'defaultValue' => default_datastore ? default_datastore['name'] : volume['datastoreId']}], options[:options])
@@ -1191,7 +1192,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 +1314,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 +1462,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/option_types.rb

@@ -62,10 +62,12 @@ module Morpheus
             option_type['type'] = 'multiText'
           end
         end
+        credential_option_types = {}
         # puts "Options Prompt #{options}"
         # Sort options by default, group, advanced
         cur_field_group = 'default'
         self.sorted_option_types(option_types).each do |option_type|
+          next if option_type[:for_help_only] == true # hacky
           context_map = results
           value = nil
           value_found = false
@@ -145,6 +147,29 @@ module Morpheus
             next if !found_dep_value
           end
 
+          # inject a Credentials prompt for optionTypes that have been replaced by credentials
+          credential_code = option_type['credentialFieldContext']
+          if !credential_code.to_s.empty?
+            if !credential_option_types[credential_code]
+              credential_option_type = {'code' => credential_code, 'fieldName' => credential_code, 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Credential ID or use "local" to specify username and password', 'defaultValue' => "local", 'required' => true}
+              credential_option_types[credential_code] = credential_option_type
+              supported_credential_types = [option_type['credentialType'], option_type['credentialTypes']].compact.flatten.join(",").split(",").collect {|it| it.strip }
+              credential_params = {"new" => false, "credentialTypes" => supported_credential_types}
+              credential_value = select_prompt(credential_option_type, api_client, credential_params, no_prompt, options[credential_code])
+              if !credential_value.to_s.empty?
+                if credential_value == "local"
+                  context_map[credential_code] = {"type" => credential_value}
+                elsif credential_value.to_s =~ /\A\d{1,}\Z/
+                  context_map[credential_code] = {"id" => credential_value.to_i}
+                end
+              end
+            end
+            # skip this option unless using local credentials
+            if context_map[credential_code].is_a?(Hash) && context_map[credential_code]["type"] != "local"
+              next
+            end
+          end
+
           cur_namespace = options
           parent_context_map = context_map
           parent_ns = field_name
@@ -457,6 +482,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 +853,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"

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.4.4.2"
+    VERSION = "5.5.0"
   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

data/lib/morpheus/routes.rb

@@ -16,11 +16,9 @@ module Morpheus::Routes
       analytics: {},
       guidance: {},
       wiki: {},
-      costing: {
-        budgets: {},
-        invoices: {},
-        usage: {},
-      },
+      budgets: {},
+      invoices: {},
+      usage: {},
       approvals: {},
       activity: {},
       alarms: {},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.4.4.2
+  version: 5.5.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-05-13 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