morpheus-cli 5.4.5.1 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84ddc5a04df52338a55327598f760d41e51d93d6a03fbebac557202c3a952116
-  data.tar.gz: 3a586a705cd480573bd9da349c737a18761999096ec59bd77ce98a27a41f07d4
+  metadata.gz: ca02ec5cffb310afe4458568f745332e8f81f1d03a525ad1a9d9d1a3ecd08313
+  data.tar.gz: 323d4e3627c67fbd676bb34eb0b6f62b0eecff6180285af93599aba21f0a9781
 SHA512:
-  metadata.gz: 43dab7d23d4e1889dfc611445dcd2da0c61dc8c7ec1245cddebea0469cede7ebfdeb453b718e0bbbc247b620be9ae4af5698f46bf1d0c689f38940894b112e7f
-  data.tar.gz: fb08c98c2395a86b41df4fe8ce6aaa7b8d4306aa39461d849ee121a256cfcc733ab1aa58c171c6b181ca62c824a2b3e55c80a206194a5e4993d7495413472617
+  metadata.gz: bc72cdba318abc74aef8dec7ab8602ad7ec7196101950dfc0b29b8fe8c4298c2de5b41265a386457c38fa0ac9e46082cb86d04d7cfbc75652a1824d5a036cec1
+  data.tar.gz: f546fe9ed24fcc380d8aa1f2fc6d05a1cfb7186dcee48e66c340c51951b69e3b04408db5400ddcb23c9c596ccb14867571f1e21b6ceeb3e253c720d0525c21b0

data/Dockerfile

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

data/lib/morpheus/api/prices_interface.rb

@@ -62,4 +62,10 @@ class Morpheus::PricesInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
+
+  def list_currencies(params={})
+    url = "#{base_path}/currencies"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
 end

data/lib/morpheus/cli/cli_command.rb

@@ -253,7 +253,7 @@ module Morpheus
 
       # list is GET that supports phrase,max,offset,sort,direction
       def build_standard_list_options(opts, options, includes=[], excludes=[])
-        build_standard_get_options(opts, options, [:list] + includes, excludes=[])
+        build_standard_get_options(opts, options, [:list] + includes, excludes)
       end
 
       def build_standard_add_options(opts, options, includes=[], excludes=[])
@@ -1569,7 +1569,7 @@ module Morpheus
         #Morpheus::Logging::DarkPrinter.puts "find_all(#{args.join(', ')})" if Morpheus::Logging.debug?
         type, *request_args = args
         type = type.to_s.singularize.underscore
-        list_key = respond_to?("#{type}_list_key", true) ? send("#{type}_list_key") : type.camelcase.pluralize
+        list_key = respond_to?("#{type}_list_key", true) ? send("#{type}_list_key") : get_list_key(type)
         json_response = find_all_json(*args)
         if !json_response.key?(list_key)
           # maybe just use the first key like this:
@@ -1600,7 +1600,7 @@ module Morpheus
         #Morpheus::Logging::DarkPrinter.puts "find_record(#{args.join(', ')})" if Morpheus::Logging.debug?
         type, *request_args = args
         type = type.to_s.singularize.underscore
-        object_key = respond_to?("#{type}_object_key", true) ? send("#{type}_object_key") : type.camelcase.singularize
+        object_key = respond_to?("#{type}_object_key", true) ? send("#{type}_object_key") : get_object_key(type)
         json_response = find_record_json(*args)
         if !json_response.key?(object_key)
           # maybe just use the first key like this:
@@ -1645,6 +1645,19 @@ module Morpheus
         return interface
       end
 
+      def get_list_key(type)
+        return get_object_key(type).pluralize
+      end
+
+      def get_object_key(type)
+        key = type.camelcase.singularize
+        # add aliases here as needed
+        if key == "cloud"
+          key = "zone"
+        end
+        return key
+      end
+
       module ClassMethods
 
         def prog_name

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

@@ -80,8 +80,9 @@ class Morpheus::Cli::Clouds
         print_h1 title, subtitles
         if clouds.empty?
           print cyan,"No clouds found.",reset,"\n"
-        else
-          print_clouds_table(clouds, options)
+        else          
+          columns = cloud_list_column_definitions(options).upcase_keys!
+          print as_pretty_table(clouds, columns, options)
           print_results_pagination(json_response)
         end
         print reset,"\n"
@@ -164,13 +165,14 @@ class Morpheus::Cli::Clouds
       else
         server_counts = json_response['serverCounts'] # legacy
       end
-      cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
+      #cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
       print_h1 "Cloud Details"
       print cyan
       description_cols = {
         "ID" => 'id',
         "Name" => 'name',
-        "Type" => lambda {|it| cloud_type ? cloud_type['name'] : '' },
+        # "Type" => lambda {|it| cloud_type ? cloud_type['name'] : '' },
+        "Type" => lambda {|it| it['zoneType'] ? it['zoneType']['name'] : '' },
         "Code" => 'code',
         "Location" => 'location',
         "Region Code" => 'regionCode',
@@ -215,6 +217,13 @@ class Morpheus::Cli::Clouds
       opts.on( '--certificate-provider CODE', String, "Certificate Provider. Default is 'internal'" ) do |val|
         params[:certificate_provider] = val
       end
+      opts.on('--costing-mode VALUE', String, "Costing Mode can be off,costing,full, Default is off." ) do |val|
+        options[:options]['costingMode'] = val
+      end
+      opts.on('--credential VALUE', String, "Credential ID or \"local\"" ) do |val|
+        options[:options]['credential'] = val
+      end
+
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -329,6 +338,12 @@ class Morpheus::Cli::Clouds
       # opts.on( '-d', '--description DESCRIPTION', "Description (optional)" ) do |desc|
       #   params[:description] = desc
       # end
+      opts.on('--costing-mode VALUE', String, "Costing Mode can be off, costing, or full. Default is off." ) do |val|
+        options[:options]['costingMode'] = val
+      end
+      opts.on('--credential VALUE', String, "Credential ID or \"local\"" ) do |val|
+        options[:options]['credential'] = val
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -352,12 +367,26 @@ class Morpheus::Cli::Clouds
         cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
         cloud_payload = {}
         all_option_types = update_cloud_option_types(cloud_type)
-        #params = Morpheus::Cli::OptionTypes.prompt(all_option_types, options[:options], @api_client, {zoneTypeId: cloud_type['id']})
+        #params = Morpheus::Cli::OptionTypes.no_prompt(all_option_types, options[:options], @api_client, {zoneId: cloud['id'], zoneTypeId: cloud_type['id']})
         params = options[:options] || {}
+
+        # Credentials (ideally only if value passed in and name can be parsed)
+        if options[:options]['credential']
+          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, "zoneId" => cloud['id']}
+          credential_value = Morpheus::Cli::OptionTypes.select_prompt(credential_option_type, @api_client, credential_params, true, options[:options][credential_code])
+          if !credential_value.to_s.empty?
+            if credential_value == "local"
+              params[credential_code] = {"type" => credential_value}
+            elsif credential_value.to_s =~ /\A\d{1,}\Z/
+              params[credential_code] = {"id" => credential_value.to_i}
+            end
+          end
+        end
         if params.empty?
-          puts_error optparse.banner
-          puts_error format_available_options(all_option_types)
-          exit 1
+          raise_command_error "Specify at least one option to update.\n#{optparse}"
         end
         # some optionTypes have fieldContext='zone', so move those to the root level of the zone payload
         if params['zone'].is_a?(Hash)
@@ -919,25 +948,17 @@ class Morpheus::Cli::Clouds
 
   private
 
-  def print_clouds_table(clouds, opts={})
-    table_color = opts[:color] || cyan
-    rows = clouds.collect do |cloud|
-      cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
-      {
-        id: cloud['id'],
-        name: cloud['name'],
-        type: cloud_type ? cloud_type['name'] : '',
-        location: cloud['location'],
-        "REGION CODE": cloud['regionCode'],
-        groups: (cloud['groups'] || []).collect {|it| it.instance_of?(Hash) ? it['name'] : it.to_s }.join(', '),
-        servers: cloud['serverCount'],
-        status: format_cloud_status(cloud)
-      }
-    end
-    columns = [
-      :id, :name, :type, :location, "REGION CODE", :groups, :servers, :status
-    ]
-    print as_pretty_table(rows, columns, opts)
+  def cloud_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Type" => lambda {|it| it['zoneType'] ? it['zoneType']['name'] : '' },
+      "Location" => 'location',
+      "Region Code" => lambda {|it| it['regionCode'] },
+      "Groups" => lambda {|it| (it['groups'] || []).collect {|g| g.instance_of?(Hash) ? g['name'] : g.to_s }.join(', ') },
+      "Servers" => lambda {|it| it['serverCount'] },
+      "Status" => lambda {|it| format_cloud_status(it) },
+    }
   end
 
   def add_cloud_option_types(cloud_type)
@@ -948,6 +969,9 @@ class Morpheus::Cli::Clouds
       {'fieldName' => 'code', 'fieldLabel' => 'Code', 'type' => 'text', 'required' => false, 'displayOrder' => 2},
       {'fieldName' => 'location', 'fieldLabel' => 'Location', 'type' => 'text', 'required' => false, 'displayOrder' => 3},
       {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}], 'required' => false, 'description' => 'Visibility', 'category' => 'permissions', 'defaultValue' => 'private', 'displayOrder' => 4},
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 5},
+      {'fieldName' => 'autoRecoverPowerState', 'fieldLabel' => 'Automatically Power On VMs', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'displayOrder' => 6},
+      {'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
     ]
 
     # TODO: Account

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

@@ -185,30 +185,29 @@ class Morpheus::Cli::CypherCommand
       # This response does contain cypher too though.
       
       if cypher_item.empty?
-        puts_error "Cypher data not found in response"
-        return 1
-      end
-      description_cols = {
-        #"ID" => 'id',
-        "Key" => lambda {|it| it["itemKey"] },
-        "TTL" => lambda {|it| 
-          format_expiration_ttl(it["expireDate"])
-        },
-        # "Type" => lambda {|it| 
-        #   data_type
-        # },
-        "Expiration" => lambda {|it| 
-          format_expiration_date(it["expireDate"])
-        },
-        # "Date Created" => lambda {|it| format_local_dt(it["dateCreated"]) },
-        "Last Updated" => lambda {|it| format_local_dt(it["lastUpdated"]) },
-        "Last Accessed" => lambda {|it| format_local_dt(it["lastAccessed"]) }
-      }
-      if cypher_item["expireDate"].nil?
-        description_cols.delete("Expires")
+        puts "Cypher item not found in response"
+      else
+        description_cols = {
+          #"ID" => 'id',
+          "Key" => lambda {|it| it["itemKey"] },
+          "TTL" => lambda {|it| 
+            format_expiration_ttl(it["expireDate"])
+          },
+          # "Type" => lambda {|it| 
+          #   data_type
+          # },
+          "Expiration" => lambda {|it| 
+            format_expiration_date(it["expireDate"])
+          },
+          # "Date Created" => lambda {|it| format_local_dt(it["dateCreated"]) },
+          "Last Updated" => lambda {|it| format_local_dt(it["lastUpdated"]) },
+          "Last Accessed" => lambda {|it| format_local_dt(it["lastAccessed"]) }
+        }
+        if cypher_item["expireDate"].nil?
+          description_cols.delete("Expires")
+        end
+        print_description_list(description_cols, cypher_item)
       end
-      print_description_list(description_cols, cypher_item)
-
       # print_h2 "Value", options
       # print_h2 "Data", options
       print_h2 "Data (#{data_type})", options

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

@@ -496,15 +496,15 @@ class Morpheus::Cli::Instances
         payload["zoneId"] = cloud["id"]
         payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
       end
-        if options[:cloud]
-          group_id = group ? group["id"] : ((payload["instance"] && payload["instance"]["site"].is_a?(Hash)) ? payload["instance"]["site"]["id"] : nil)
-          cloud = find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud])
-          if cloud.nil?
-            return 1, "cloud not found by #{options[:cloud]}"
-          end
-          payload["zoneId"] = cloud["id"]
-          payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
-        end
+        # if options[:cloud]
+        #   group_id = group ? group["id"] : ((payload["instance"] && payload["instance"]["site"].is_a?(Hash)) ? payload["instance"]["site"]["id"] : nil)
+        #   cloud = find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud])
+        #   if cloud.nil?
+        #     return 1, "cloud not found by #{options[:cloud]}"
+        #   end
+        #   payload["zoneId"] = cloud["id"]
+        #   payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
+        # end
       if options[:instance_type_code]
         # should just use find_instance_type_by_name_or_id
         # note that the api actually will match name name or code
@@ -539,7 +539,7 @@ class Morpheus::Cli::Instances
         end
       end
     end
-
+    
     payload['instance'] ||= {}
     if options[:instance_name]
       payload['instance']['name'] = options[:instance_name]

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/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/provisioning_helper.rb

@@ -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])

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

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.4.5.1"
+    VERSION = "5.5.0"
   end
 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.5.1
+  version: 5.5.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-15 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler