morpheus-cli 5.5.1.3 → 5.5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c60f08b038db5460dc2fbcb4ca3626f8784164f89ff477cd9b4ef0b32073a16e
-  data.tar.gz: 1b2a47809e7826fec9893d7b9899ee96e536c6661f4de7eedc4f467756dde5e5
+  metadata.gz: 4c3d95bd4c6ab10da93d1c60ed9c046b3da95ff610a6d69f3b5fea7dd62aa6a0
+  data.tar.gz: 8235ec60e8b4385952b639b33bee047a005a55f9e64bdb4bb095420e5c88ce03
 SHA512:
-  metadata.gz: 89fcdd4815408d056d3fd6adb79bcc82f7d26eaf6fdc9d6d640289d554cdab0f7c4eeeef55f130299a67b599a1e2746263d55eab209165e91e11e68d1e5cb8f8
-  data.tar.gz: 7fa16441f2d3612f1af1f86f8cb3c86363abd2f36f49f8da47550b6b2901a60227acc8407ab93e9a71e9d147431e0513905b9d63153378294a7bd57e0127b656
+  metadata.gz: 903f50a32e744d725125edb26648a134b71c2844f5949943800290c2fce1af2c437de2016c9b06072efec8998e2992e3c9083c034adb6890809062a54e0d924f
+  data.tar.gz: b81fcbd866cbd4020908c99888b3e70cd669af87fe0f8834ad896f01036b16b98b417bd48858809ac54222526e34edd71165f63ad17ca28811995fd8bd29e73d

data/Dockerfile

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

data/lib/morpheus/api/instances_interface.rb

@@ -407,4 +407,12 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def remove_from_control(ids, params={})
+    url = "#{@base_url}/api/instances/removeFromControl"
+    payload = { ids: ids }
+    headers = { :params => params,:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
 end

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

@@ -736,9 +736,15 @@ class Morpheus::Cli::Clusters
       opts.on("--api-url [TEXT]", String, "Updates Cluster API Url") do |val|
         options[:apiUrl] = val.to_s
       end
+      opts.on("--api-token [TEXT]", String, "Updates Cluster API Token") do |val|
+        options[:apiToken] = val.to_s
+      end
       opts.on('--active [on|off]', String, "Can be used to enable / disable the cluster. Default is on") do |val|
         options[:active] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
+      opts.on('--managed [on|off]', String, "Can be used to enable / disable managed cluster. Default is on") do |val|
+        options[:managed] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
       opts.on( nil, '--refresh', "Refresh cluster" ) do
         options[:refresh] = true
       end
@@ -777,7 +783,9 @@ class Morpheus::Cli::Clusters
         cluster_payload['name'] = options[:name] if !options[:name].empty?
         cluster_payload['description'] = options[:description] if !options[:description].empty?
         cluster_payload['enabled'] = options[:active] if !options[:active].nil?
+        cluster_payload['managed'] = options[:managed] if !options[:managed].nil?
         cluster_payload['serviceUrl'] = options[:apiUrl] if !options[:apiUrl].nil?
+        cluster_payload['serviceToken'] = options[:apiToken] if !options[:apiToken].nil?
         cluster_payload['refresh'] = options[:refresh] if options[:refresh] == true
         cluster_payload['tenant'] = options[:tenant] if !options[:tenant].nil?
         payload = {"cluster" => cluster_payload}
@@ -788,9 +796,7 @@ class Morpheus::Cli::Clusters
         exit 1
       end
 
-      has_field_updates = ['name', 'description', 'enabled', 'serviceUrl'].find {|field| payload['cluster'] && !payload['cluster'][field].nil? && payload['cluster'][field] != cluster[field] ? field : nil}
-
-      if !has_field_updates && cluster_payload['refresh'].nil? && cluster_payload['tenant'].nil?
+      if cluster_payload.empty?
         print_green_success "Nothing to update"
         exit 1
       end

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

@@ -537,6 +537,7 @@ class Morpheus::Cli::Hosts
         # "Status" => lambda {|it| format_server_status(it) },
         # "Power" => lambda {|it| format_server_power_state(it) },
         "Status" => lambda {|it| format_server_status_friendly(it) }, # combo
+        "Managed" => lambda {|it| it['computeServerType'] ? it['computeServerType']['managed'] : ''}
       }
       server_columns.delete("Hostname") if server['hostname'].to_s.empty? || server['hostname'] == server['name']
       server_columns.delete("IP") if server['externalIp'].to_s.empty?

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

@@ -13,7 +13,7 @@ class Morpheus::Cli::Instances
   set_command_name :instances
   set_command_description "View and manage instances."
   register_subcommands :list, :count, :get, :view, :add, :update, :remove, 
-                       :cancel_removal, :cancel_expiration, :cancel_shutdown, :extend_expiration, :extend_shutdown,
+                       :cancel_removal, :cancel_expiration, :cancel_shutdown, :extend_expiration, :extend_shutdown, :remove_from_control,
                        :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}, 
                        :logs, :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :stop_service, :start_service, :restart_service, 
                        :backup, :backups, :resize, :clone, :envs, :setenv, :delenv, 
@@ -3054,6 +3054,56 @@ EOT
     return 0, nil
   end
 
+  def remove_from_control(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name or id]")
+      opts.footer = "Remove a brownfield instance from Morpheus. This does not delete the cloud instance, only Morpheus' record of it.\n" +
+                    "[name or id] is required. The name or the id of the instance may be listed.\n" +
+                    "[name or id] [name or id] [name or id] ...  A list of names or ids, separated by a space, may be used for bulk removal."
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+      instance_ids = parse_id_list(args)
+      instances = []
+      instance_ids.each do |instance_id|
+        instance = find_instance_by_name_or_id(instance_id)
+        return 1 if instance.nil?
+        instances << instance
+      end
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove #{instances.size == 1 ? 'instance' : (instances.size.to_s + ' instances')} #{anded_list(instances.collect {|it| it['name'] })}?", options)
+        return 9, "aborted command"
+      end
+      @instances_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.remove_from_control(instances.collect {|it| it['id'] }, params)
+        return
+      end
+      json_response = @instances_interface.remove_from_control(instances.collect {|it| it['id'] }, params)
+      if options[:json]
+        puts as_json(json_response, options)
+      elsif !options[:quiet]
+        puts json_response
+        if json_response['success'] == false
+           print_red_alert json_response['msg']
+        else
+           print_green_success json_response['msg']
+        end
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   def firewall_disable(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|

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

@@ -180,7 +180,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
           {"VALUE" => lambda {|it| it['defaultValue'] } },
           {"TYPE" => lambda {|it| it['valueType'].to_s.capitalize } },
           {"EXPORT" => lambda {|it| format_boolean it['export'] } },
-          {"MASKED" => lambda {|it| format_boolean it['mask'] } },
+          {"MASKED" => lambda {|it| format_boolean it['masked'] } },
         ]
         print as_pretty_table(evars, evar_columns)
       else
@@ -255,6 +255,21 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       opts.on('--technology CODE', String, "Technology. This is the provision type code.") do |val|
         params['provisionTypeCode'] = val
       end
+      opts.on('--evars-json JSON', String, 'Environment variables JSON: {"name":"Foo", "value":"Bar", "masked":true, "export":true}' ) do |val|
+        begin
+          evars = JSON.parse(val.to_s)
+          evars = evars.kind_of?(Array) ? evars : [evars]
+        rescue JSON::ParserError => e
+          print_red_alert "Unable to parse evars JSON"
+          exit 1
+        end
+      end
+      opts.on('-e', '--evars LIST', Array, "Environment variables list. Comma delimited list of name=value pairs") do |val|
+        evars = val.collect do |nv|
+          parts = nv.split('=')
+          {'name' => parts[0].strip, 'value' => (parts.count > 1 ? parts[1].strip : '')}
+        end
+      end
       opts.on('--ports NAME=PORT,NAME=PORT', String, "List of exposed port definitions in the format NAME=PORT|PROTOCOL, Example: \"WEB=80|HTTP,SECURE=443|HTTPS\"") do |val|
         params['containerPorts'] ||= []
         parsed_ports = val.split(",").each do |value_pair|
@@ -358,7 +373,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
           # print "\n"
           puts field_group_name
           puts "==============="
-          provision_type_v_prompt = Morpheus::Cli::OptionTypes.prompt(provision_type_custom_option_types,options[:options],@api_client, {provisionTypCode: params['provisionTypeCode']})
+          provision_type_v_prompt = Morpheus::Cli::OptionTypes.prompt(provision_type_custom_option_types,options[:options],@api_client, {provisionTypeCode: params['provisionTypeCode']})
         end
         
         # payload.deep_merge!(provision_type_v_prompt)
@@ -371,7 +386,9 @@ class Morpheus::Cli::LibraryContainerTypesCommand
 
         # ENVIRONMENT VARIABLES
         if evars
-          params['environmentVariables'] = evars
+          # bug before 5.4.10/5.5.2 requires this to be passed at the root of the request instead of under containerType.
+          # params['environmentVariables'] = evars
+          payload['environmentVariables'] = evars
         else
           # prompt
           # parsed_evars = parse_environment_variables
@@ -386,7 +403,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
 
         # FILE TEMPLATES
         if file_template_ids
-          params['scripts'] = file_template_ids.collect {|it| it.to_i }.select { |it| it != 0 }
+          params['templates'] = file_template_ids.collect {|it| it.to_i }.select { |it| it != 0 }
         else
           # prompt
         end
@@ -447,6 +464,21 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       # opts.on('--technology CODE', String, "Technology") do |val|
       #   params['provisionTypeCode'] = val
       # end
+      opts.on('--evars-json JSON', String, 'Environment variables JSON: {"name":"Foo", "value":"Bar", "masked":true, "export":true}' ) do |val|
+        begin
+          evars = JSON.parse(val.to_s)
+          evars = evars.kind_of?(Array) ? evars : [evars]
+        rescue JSON::ParserError => e
+          print_red_alert "Unable to parse evars JSON"
+          exit 1
+        end
+      end
+      opts.on('-e', '--evars LIST', Array, "Environment variables list. Comma delimited list of name=value pairs") do |val|
+        evars = val.collect do |nv|
+          parts = nv.split('=')
+          {'name' => parts[0].strip, 'value' => (parts.count > 1 ? parts[1].strip : '')}
+        end
+      end
       opts.on('--ports NAME=PORT,NAME=PORT', String, "List of exposed port definitions in the format NAME=PORT|PROTOCOL, Example: \"WEB=80|HTTP,SECURE=443|HTTPS\"") do |val|
         params['containerPorts'] ||= []
         parsed_ports = val.split(",").each do |value_pair|
@@ -506,7 +538,9 @@ class Morpheus::Cli::LibraryContainerTypesCommand
 
         # ENVIRONMENT VARIABLES
         if evars
-
+          # bug before 5.4.10/5.5.2 requires this to be passed at the root of the request instead of under containerType.
+          # params['environmentVariables'] = evars
+          payload['environmentVariables'] = evars
         else
           # prompt
         end
@@ -525,7 +559,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
           # prompt
         end
 
-        if params.empty? && passed_options.empty?
+        if params.empty? && passed_options.empty? && evars.nil?
           raise_command_error "Specify at least one option to update.\n#{optparse}"
         end
 

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

@@ -187,7 +187,7 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
           {"VALUE" => lambda {|it| it['defaultValue'] } },
           {"TYPE" => lambda {|it| it['valueType'].to_s.capitalize } },
           {"EXPORT" => lambda {|it| format_boolean it['export'] } },
-          {"MASKED" => lambda {|it| format_boolean it['mask'] } },
+          {"MASKED" => lambda {|it| format_boolean it['masked'] } },
         ]
         print as_pretty_table(instance_type_evars, evar_columns)
       else

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

@@ -214,7 +214,7 @@ EOT
         {"VALUE" => lambda {|it| it['defaultValue'] } },
         {"TYPE" => lambda {|it| it['valueType'].to_s.capitalize } },
         {"EXPORT" => lambda {|it| format_boolean it['export'] } },
-        {"MASKED" => lambda {|it| format_boolean it['mask'] } },
+        {"MASKED" => lambda {|it| format_boolean it['masked'] } },
       ]
       print as_pretty_table(layout_evars, evar_columns)
     else

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

@@ -577,6 +577,7 @@ EOT
   def change_password(args)
     params = {}
     options = {}
+    payload = {}
     new_password = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[user] [password] [options]")
@@ -651,7 +652,7 @@ EOT
       return
     end
     json_response = @account_users_interface.update(account_id, user['id'], payload)
-    render_response(json_response, optparse, "user") do
+    render_response(json_response, options, "user") do
       print_green_success "Updated password for user #{user['username']}"
     end
     return exit_code, err

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

@@ -1019,7 +1019,14 @@ EOT
 
     # Marketplace Publisher & Offer
     marketplace_api_params = {'zoneId' => cloud_id}
-    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'offer', 'fieldLabel' => 'Azure Marketplace Offer', 'type' => 'typeahead', 'optionSource' => 'searchAzureMarketplace', 'required' => true, 'description' => "Select Azure Marketplace Offer."}], options[:options],@api_client, marketplace_api_params)
+    v_prompt = nil
+    # API endpoints moved from /api/options to /api/options/azure...
+    begin
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'offer', 'fieldLabel' => 'Azure Marketplace Offer', 'type' => 'typeahead', 'optionSourceType' => 'azure', 'optionSource' => 'searchAzureMarketplace', 'required' => true, 'description' => "Select Azure Marketplace Offer."}], options[:options],@api_client, marketplace_api_params)
+    rescue => ex
+      Morpheus::Logging::DarkPrinter.puts "Failed to load azure marketplace offers, trying older endpoint" if Morpheus::Logging.debug?
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'offer', 'fieldLabel' => 'Azure Marketplace Offer', 'type' => 'typeahead', 'optionSource' => 'searchAzureMarketplace', 'required' => true, 'description' => "Select Azure Marketplace Offer."}], options[:options],@api_client, marketplace_api_params)
+    end
     # offer_value = v_prompt['marketplace']
     # actually need both offer and publisher of these to query correctly..sigh
     marketplace_option = Morpheus::Cli::OptionTypes.get_last_select()
@@ -1032,7 +1039,12 @@ EOT
       options[:options]['sku'] = options[:options]['sku'] + '|' + options[:options]['version']
     end
     sku_api_params = {'zoneId' => cloud_id, publisher: publisher_value, offer: offer_value}
-    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'sku', 'fieldLabel' => 'Azure Marketplace SKU', 'type' => 'select', 'optionSource' => 'searchAzureMarketplaceSkus', 'required' => true, 'description' => "Select Azure Marketplace SKU and Version, the format is SKU|Version"}], options[:options],@api_client, sku_api_params)
+    begin
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'sku', 'fieldLabel' => 'Azure Marketplace SKU', 'type' => 'select', 'optionSourceType' => 'azure', 'optionSource' => 'searchAzureMarketplaceSkus', 'required' => true, 'description' => "Select Azure Marketplace SKU and Version, the format is SKU|Version"}], options[:options],@api_client, sku_api_params)
+    rescue => ex
+      Morpheus::Logging::DarkPrinter.puts "Failed to load azure marketplace offers, trying older endpoint" if Morpheus::Logging.debug?
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'sku', 'fieldLabel' => 'Azure Marketplace SKU', 'type' => 'select', 'optionSource' => 'searchAzureMarketplaceSkus', 'required' => true, 'description' => "Select Azure Marketplace SKU and Version, the format is SKU|Version"}], options[:options],@api_client, sku_api_params)
+    end
     # marketplace_option = Morpheus::Cli::OptionTypes.get_last_select()
     # sku_value = marketplace_option['sku']
     # version_value = marketplace_option['version']

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

@@ -577,6 +577,10 @@ module Morpheus::Cli::ProvisioningHelper
       (2..10).each {|i| arbitrary_options.delete('dataVolume' + i.to_s) }
       arbitrary_options.delete('lockedFields')
       # arbitrary_options.delete('ports')
+      arbitrary_options.delete('marketplacePublisher')
+      arbitrary_options.delete('marketplaceOffer')
+      arbitrary_options.delete('marketplaceSku')
+      arbitrary_options.delete('marketplaceVersion')
       payload.deep_merge!(arbitrary_options)
     end
 
@@ -1664,6 +1668,10 @@ module Morpheus::Cli::ProvisioningHelper
         end
       end
 
+      if ip_required == false && network_interface['ipAddress'] == nil && selected_network['dhcpServer'] == true
+        network_interface['ipMode'] = 'dhcp'
+      end
+
       network_interfaces << network_interface
       interface_index += 1
       if options[:options] && options[:options]['networkInterfaces'] && options[:options]['networkInterfaces'][interface_index]

data/lib/morpheus/cli/option_types.rb

@@ -252,6 +252,15 @@ module Morpheus
               if !value_found
                 # select type is special because it supports skipSingleOption
                 # and prints the available options on error
+                if option_type['type'] == 'azureMarketplace'
+                  value = azure_marketplace_prompt(option_type, options, api_client, option_params)
+                  # inject {marketplacePublisher:'...',} into config, not as config.azureMarketplace = {}
+                  # and remove any passed in values from
+                  if value.is_a?(Hash)
+                    context_map.merge!(value)
+                  end
+                  next
+                end
                 if ['select', 'multiSelect'].include?(option_type['type'])
                   value = select_prompt(option_type, api_client, option_params, true, nil, false, ignore_empty)
                   value_found = !!value
@@ -334,6 +343,14 @@ module Morpheus
               value = file_content_prompt(option_type, options, api_client, {})
             elsif option_type['type'] == 'multiText'
               value = multitext_prompt(option_type)
+            elsif option_type['type'] == 'azureMarketplace'
+              value = azure_marketplace_prompt(option_type, options, api_client, option_params)
+              # inject {marketplacePublisher:'...',} into config, not as config.azureMarketplace = {}
+              # and remove any passed in values from
+              if value.is_a?(Hash)
+                context_map.merge!(value)
+              end
+              next
             else
               value = generic_prompt(option_type)
             end
@@ -1033,6 +1050,62 @@ module Morpheus
         rtn
       end
 
+      # file_content_prompt() prompts for source (local,repository,url) and then content or repo or.
+      # returns a Hash like {sourceType:"local",content:"yadda",contentPath:null,contentRef:null}
+      def self.azure_marketplace_prompt(option_type, options={}, api_client=nil, api_params={})
+        cloud_id = api_params[:zoneId] || api_params[:cloudId] || api_params["zoneId"] || api_params["cloudId"]
+        if cloud_id.nil?
+          Morpheus::Logging::DarkPrinter.puts "Failed to load azure marketplace offers without a zoneId" if Morpheus::Logging.debug?
+          return nil
+        end
+        # lets go!
+        rtn = {}
+        publisher_value, offer_value, sku_value, version_value = nil, nil, nil, nil
+
+        # Marketplace Publisher & Offer
+        marketplace_api_params = {'zoneId' => cloud_id}
+        v_prompt = nil
+        # API endpoints moved from /api/options to /api/options/azure...
+        begin
+          v_prompt = prompt([{'fieldName' => 'marketplaceOffer', 'fieldLabel' => 'Azure Marketplace Offer', 'type' => 'typeahead', 'optionSourceType' => 'azure', 'optionSource' => 'searchAzureMarketplace', 'required' => true, 'description' => "Select Azure Marketplace Offer."}], options,api_client, marketplace_api_params)
+        rescue => ex
+          Morpheus::Logging::DarkPrinter.puts "Failed to load azure marketplace offers, trying older endpoint" if Morpheus::Logging.debug?
+          v_prompt = prompt([{'fieldName' => 'marketplaceOffer', 'fieldLabel' => 'Azure Marketplace Offer', 'type' => 'typeahead', 'optionSource' => 'searchAzureMarketplace', 'required' => true, 'description' => "Select Azure Marketplace Offer."}], options,api_client, marketplace_api_params)
+        end
+        # offer_value = v_prompt['marketplaceOffer']
+        # actually need both offer and publisher of these to query correctly..sigh
+        marketplace_option = Morpheus::Cli::OptionTypes.get_last_select()
+        offer_value = marketplace_option['offer']
+        publisher_value = marketplace_option['publisher']
+
+        # SKU & VERSION
+        if options && options['marketplaceSku'] && options['marketplaceVersion']
+          # the value to match on is actually sku|version
+          options['marketplaceSku'] = options['marketplaceSku'] + '|' + options['marketplaceVersion']
+        end
+        sku_api_params = {'zoneId' => cloud_id, publisher: publisher_value, offer: offer_value}
+        begin
+          v_prompt = prompt([{'fieldName' => 'marketplaceSku', 'fieldLabel' => 'Azure Marketplace SKU', 'type' => 'select', 'optionSourceType' => 'azure', 'optionSource' => 'searchAzureMarketplaceSkus', 'required' => true, 'description' => "Select Azure Marketplace SKU and Version, the format is SKU|Version"}], options,api_client, sku_api_params)
+        rescue => ex
+          Morpheus::Logging::DarkPrinter.puts "Failed to load azure marketplace offers, trying older endpoint" if Morpheus::Logging.debug?
+          v_prompt = prompt([{'fieldName' => 'marketplaceSku', 'fieldLabel' => 'Azure Marketplace SKU', 'type' => 'select', 'optionSource' => 'searchAzureMarketplaceSkus', 'required' => true, 'description' => "Select Azure Marketplace SKU and Version, the format is SKU|Version"}], options,api_client, sku_api_params)
+        end
+        # marketplace_option = Morpheus::Cli::OptionTypes.get_last_select()
+        # sku_value = marketplace_option['sku']
+        # version_value = marketplace_option['version']
+        sku_value = v_prompt['marketplaceSku']
+        if sku_value && sku_value.include?("|")
+          sku_value, version_value = sku_value.split("|")
+        end
+        # rtn['publisher'] = publisher_value
+        # rtn['offer'] = offer_value
+        # rtn['sku'] = sku_value
+        # rtn['version'] = version_value
+        # return rtn
+        # instance provisioning expects these parameters...
+        return {'marketplacePublisher' => publisher_value, 'marketplaceOffer' => offer_value, 'marketplaceSku' => sku_value, 'marketplaceVersion' => version_value}
+      end
+
       def self.load_options(option_type, api_client, api_params, query_value=nil)
         field_key = [option_type['fieldContext'], option_type['fieldName']].select {|it| it && it != '' }.join('.')
         help_field_key = option_type[:help_field_prefix] ? "#{option_type[:help_field_prefix]}.#{field_key}" : field_key

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.5.1.3"
+    VERSION = "5.5.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.5.1.3
+  version: 5.5.1.4
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler