morpheus-cli 3.6.25 → 3.6.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5d560e8e83081efac41b0771522d543965ad22b5ad58391961f08c1f90a3696
-  data.tar.gz: 2a257d25fb63d46f2124c78eebfc8769a3de2b7e6329e48a6d12368f49ca6251
+  metadata.gz: 2ac74bdb3ec6ec96f297eba0833d4da4d2bc8e331883a523e7bb723001d29bd3
+  data.tar.gz: 67686ea02a9c555f40c3f79e989ba761d3f24fb4334e63b7e3759e253897e6cc
 SHA512:
-  metadata.gz: 7e9c4bb406ef1254080c48039036475d6561f94e965b889f96de523afbfc2ca724f170f7109cb84db1bdb8b268c1b978e4041ab2c49c875907b2fa7ac027fff5
-  data.tar.gz: dd8377ea9e349bcaa9dedf0339f344e5f11c763d310861c81f9bef83b45f8a9a430204ea30d84cd8e1795d11393e21f8f2e4d55a18f4808cbfeeeebbc0b67f3e
+  metadata.gz: 9413a5ba7b807aebbf688768a7c954642120948ce8b1f829e52a2a745bcad034eb7fac18ddcacb117f9b65bfbf0d90bc732068dbc862685e5a82f0333cb09889
+  data.tar.gz: 637c5087973fadabe1d98c4f5835fb01c0c7a83ec11996273d785ebda04d54cd48e4780f6be1608f832f153d0bba0253fa4e0470d25d71cc4e8a49a5eb8dbfd6

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

@@ -334,11 +334,14 @@ module Morpheus::Cli::ProvisioningHelper
     end
 
     # do not require version if a layout is passed
-    version_is_required = !!default_layout_value
-    #version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'optionSource' => 'instanceVersions', 'required' => true, 'skipSingleOption' => true, 'autoPickOption' => true, 'description' => 'Select which version of the instance type to be provisioned.', 'defaultValue' => default_version_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
-    version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'selectOptions' => available_versions, 'required' => version_is_required, 'skipSingleOption' => true, 'autoPickOption' => true, 'description' => 'Select which version of the instance type to be provisioned.', 'defaultValue' => default_version_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
-    default_layout_value = payload['instance']['layout'] ? payload['instance']['layout']['id'] : nil
-    layout_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'optionSource' => 'layoutsForCloud', 'required' => true, 'description' => 'Select which configuration of the instance type to be provisioned.', 'defaultValue' => default_layout_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], version: version_prompt['version']})
+    version_value = default_version_value
+    version_is_required = default_layout_value.nil?
+    if default_layout_value.nil? && options[:options]["layout"].nil? && options[:always_prompt] != true
+      #version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'optionSource' => 'instanceVersions', 'required' => true, 'skipSingleOption' => true, 'autoPickOption' => true, 'description' => 'Select which version of the instance type to be provisioned.', 'defaultValue' => default_version_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
+      version_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'type' => 'select', 'fieldLabel' => 'Version', 'selectOptions' => available_versions, 'required' => version_is_required, 'skipSingleOption' => true, 'autoPickOption' => true, 'description' => 'Select which version of the instance type to be provisioned.', 'defaultValue' => default_version_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
+      version_value = version_prompt['version']
+    end
+    layout_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'optionSource' => 'layoutsForCloud', 'required' => true, 'description' => 'Select which configuration of the instance type to be provisioned.', 'defaultValue' => default_layout_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], version: version_value})
     layout_id = layout_prompt['layout']
     layout = instance_type['instanceTypeLayouts'].find{ |lt| lt['id'] == layout_id.to_i}
     if !layout

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.25"
+    VERSION = "3.6.26"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.25
+  version: 3.6.26
 platform: ruby
 authors:
 - David Estes