morpheus-cli 5.3.3 → 5.4.2

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

@@ -57,9 +57,9 @@ module Morpheus::Cli::ProvisioningHelper
     @api_client.accounts
   end
 
-  def get_available_groups(refresh=false)
+  def get_available_groups(params = {}, refresh=false)
     if !@available_groups || refresh
-      option_results = options_interface.options_for_source('groups',{})
+      option_results = options_interface.options_for_source('groups', params)
       @available_groups = option_results['data'].collect {|it|
         {"id" => it["value"], "name" => it["name"], "value" => it["value"]}
       }
@@ -68,9 +68,9 @@ module Morpheus::Cli::ProvisioningHelper
     return @available_groups
   end
 
-  def get_available_clouds(group_id, refresh=false)
+  def get_available_clouds(group_id, params = {}, refresh=false)
     if !group_id
-      option_results = options_interface.options_for_source('clouds', {'default' => 'false'})
+      option_results = options_interface.options_for_source('clouds', params.merge({'default' => 'false'}))
       return option_results['data'].collect {|it|
         {"id" => it["value"], "name" => it["name"], "value" => it["value"], "zoneTypeId" => it["zoneTypeId"]}
       }
@@ -80,7 +80,7 @@ module Morpheus::Cli::ProvisioningHelper
       return []
     end
     if !group["clouds"] || refresh
-      option_results = options_interface.options_for_source('clouds', {groupId: group_id})
+      option_results = options_interface.options_for_source('clouds', params.merge({groupId: group_id}))
       group["clouds"] = option_results['data'].collect {|it|
         {"id" => it["value"], "name" => it["name"], "value" => it["value"], "zoneTypeId" => it["zoneTypeId"]}
       }
@@ -484,7 +484,7 @@ module Morpheus::Cli::ProvisioningHelper
     if options[:instance_type_code]
       instance_type_code = options[:instance_type_code]
     else
-      instance_type_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => 'Type', 'optionSource' => 'instanceTypes', 'required' => true, 'description' => 'Select Instance Type.'}],options[:options],api_client,{groupId: group_id}, no_prompt, true)
+      instance_type_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'fieldLabel' => 'Type', 'optionSource' => 'instanceTypes', 'required' => true, 'description' => 'Select Instance Type.'}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, restrictProvisionType:true}, no_prompt, true)
       instance_type_code = instance_type_prompt['type']
     end
     if instance_type_code.to_s =~ /\A\d{1,}\Z/
@@ -584,7 +584,7 @@ module Morpheus::Cli::ProvisioningHelper
     if options[:description]
       options[:options]['description'] = options[:description]
     end
-    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false}], options[:options])
+    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false, 'defaultValue' => options[:default_description]}], options[:options])
     payload['instance']['description'] = v_prompt['description'] if !v_prompt['description'].empty?
 
     # Environment
@@ -593,14 +593,14 @@ module Morpheus::Cli::ProvisioningHelper
     elsif options[:options]['instanceContext'] && !options[:options]['environment']
       options[:options]['environment'] = options[:options]['instanceContext']
     end
-    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'select', 'required' => false, 'selectOptions' => get_available_environments()}], options[:options])
+    v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'select', 'required' => false, 'selectOptions' => get_available_environments(), 'defaultValue' => options[:default_environment]}], options[:options])
     payload['instance']['instanceContext'] = v_prompt['environment'] if !v_prompt['environment'].empty?
 
     # Labels (used to be called tags)
     if options[:labels]
       payload['instance']['labels'] = options[:labels].is_a?(Array) ? options[:labels] : options[:labels].to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq
     else
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false}], options[:options])
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text', 'required' => false, 'defaultValue' => options[:default_labels]}], options[:options])
       payload['instance']['labels'] = v_prompt['labels'].split(',').collect {|it| it.to_s.strip }.compact.uniq if !v_prompt['labels'].empty?
     end
 
@@ -942,6 +942,7 @@ module Morpheus::Cli::ProvisioningHelper
     # prompt for option types
     api_params['config'] = payload['config'] if payload['config']
     api_params['poolId'] = payload['config']['resourcePoolId'] if payload['config'] && payload['config']['resourcePoolId']
+    api_params['resourcePoolId'] = api_params['poolId']
 
     # set option type defaults from config
     if options[:default_config]
@@ -986,20 +987,28 @@ module Morpheus::Cli::ProvisioningHelper
     end
 
     # metadata tags
-    if options[:options]['metadata'].is_a?(Array) && !options[:metadata]
-      options[:metadata] = options[:options]['metadata']
+    # metadata_tag_key = 'metadata'
+    metadata_tag_key = 'tags'
+    if !options[:metadata]
+      if options[:options]['metadata'].is_a?(Array)
+        options[:metadata] = options[:options]['metadata']
+      end
+      if options[:options]['tags'].is_a?(Array)
+        options[:metadata] = options[:options]['tags']
+      end
     end
     if options[:metadata]
+      metadata = []
       if options[:metadata] == "[]" || options[:metadata] == "null"
-        payload['metadata'] = []
+        metadata = []
       elsif options[:metadata].is_a?(Array)
-        payload['metadata'] = options[:metadata]
+        metadata = options[:metadata]
       else
         # parse string into format name:value, name:value
         # merge IDs from current metadata
         # todo: should allow quoted semicolons..
-        metadata_list = options[:metadata].split(",").select {|it| !it.to_s.empty? }
-        metadata_list = metadata_list.collect do |it|
+        metadata = options[:metadata].split(",").select {|it| !it.to_s.empty? }
+        metadata = metadata.collect do |it|
           metadata_pair = it.split(":")
           if metadata_pair.size < 2 && it.include?("=")
             metadata_pair = it.split("=")
@@ -1009,13 +1018,13 @@ module Morpheus::Cli::ProvisioningHelper
           row['value'] = metadata_pair[1].to_s.strip
           row
         end
-        payload['metadata'] = metadata_list
       end
+      payload[metadata_tag_key] = metadata
     else
       # prompt for metadata tags
       metadata = prompt_metadata(options)
       if !metadata.empty?
-        payload['metadata'] = metadata
+        payload[metadata_tag_key] = metadata
       end
     end
 
@@ -1737,6 +1746,19 @@ module Morpheus::Cli::ProvisioningHelper
     no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
     metadata_array = []
     metadata_index = 0
+    # Keep Current Tags (foo:bar,hello:world)
+    # this is used by clone()
+    if options[:current_tags] && !options[:current_tags].empty?
+      current_tags_string = options[:current_tags].collect { |tag| tag['name'].to_s + '=' + tag['value'].to_s }.join(', ')
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'keepExistingTags', 'type' => 'checkbox', 'fieldLabel' => "Keep existing metadata tags (#{current_tags_string}) ?", 'required' => true, 'description' => 'Whether or not to keep existing metadata tags', 'defaultValue' => true}], options[:options])
+      if ['on','true','1',''].include?(v_prompt['keepExistingTags'].to_s.downcase)
+        options[:current_tags].each do |tag|
+          current_tag = tag.clone
+          current_tag.delete('id')
+          metadata_array << current_tag
+        end
+      end
+    end
     has_another_metadata = options[:options] && options[:options]["metadata#{metadata_index}"]
     add_another_metadata = has_another_metadata || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add a metadata tag?", {default: false}))
     while add_another_metadata do
@@ -2072,6 +2094,15 @@ module Morpheus::Cli::ProvisioningHelper
     permissions
   end
 
+  def prompt_permissions_v2(options, excludes = [])
+    perms = prompt_permissions(options, excludes)
+    rtn = {}
+
+    rtn['visibility'] = perms['resourcePool']['visibility'] if !perms['resourcePool'].nil?
+    rtn['tenants'] = ((perms['tenantPermissions'] || {})['accounts'] || []).collect {|it| {'id' => it}}
+    rtn
+  end
+
   def print_permissions(permissions, excludes = [])
     if permissions.nil?
       print_h2 "Permissions"