morpheus-cli 3.6.24 → 3.6.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d79e052f4783588f17ce7a97a26b04c974fd5ed06c43177fcececad2c9c58b1
-  data.tar.gz: 0440f108209b955081e05ec0512296910bd4c364afded4cc816100d6ac4867a0
+  metadata.gz: d5d560e8e83081efac41b0771522d543965ad22b5ad58391961f08c1f90a3696
+  data.tar.gz: 2a257d25fb63d46f2124c78eebfc8769a3de2b7e6329e48a6d12368f49ca6251
 SHA512:
-  metadata.gz: 2968f363d3ead95dcd556f47e2769ab7f32d33056eef9e61ace8abd91c9c46e41d8e59274160f3e5885935a7110c401a7634069e8de8aeac041928007fe797f2
-  data.tar.gz: aa78c0182612ab3b894b7c8f93805b8e4f029a5bda249bdfeaa9f09f6b12f36393b05be455053e60e67eb3b540b5ef5b4d28d0695c6143516fba8787749e1b3d
+  metadata.gz: 7e9c4bb406ef1254080c48039036475d6561f94e965b889f96de523afbfc2ca724f170f7109cb84db1bdb8b268c1b978e4041ab2c49c875907b2fa7ac027fff5
+  data.tar.gz: dd8377ea9e349bcaa9dedf0339f344e5f11c763d310861c81f9bef83b45f8a9a430204ea30d84cd8e1795d11393e21f8f2e4d55a18f4808cbfeeeebbc0b67f3e

data/lib/morpheus/cli/apps.rb

@@ -239,7 +239,7 @@ class Morpheus::Cli::Apps
         else
           blueprint = find_blueprint_by_name_or_id(blueprint_id)
           if blueprint.nil?
-            print_red_alert "Blueprint not found by name or id '#{blueprint_id}'"
+            #print_red_alert "Blueprint not found by name or id '#{blueprint_id}'"
             return 1
           end
         end
@@ -371,9 +371,9 @@ class Morpheus::Cli::Apps
                       instance_prompt_options[:cloud] = cloud ? cloud['name'] : nil
                       instance_prompt_options[:default_cloud] = cloud ? cloud['name'] : nil
                       instance_prompt_options[:no_prompt] = options[:no_prompt]
-                      instance_prompt_options[:always_prompt] = options[:no_prompt] != true # options[:always_prompt]
+                      #instance_prompt_options[:always_prompt] = options[:no_prompt] != true # options[:always_prompt]
                       instance_prompt_options[:options] = scoped_instance_config # meh, actually need to make these default values instead..
-                      instance_prompt_options[:options][:always_prompt] = instance_prompt_options[:no_prompt] != true
+                      #instance_prompt_options[:options][:always_prompt] = instance_prompt_options[:no_prompt] != true
                       instance_prompt_options[:options][:no_prompt] = instance_prompt_options[:no_prompt]
 
                       # also allow arbritrary options passed as tierName.instanceIndex like Web.0.instance.layout.id=75

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

@@ -289,6 +289,7 @@ module Morpheus::Cli::ProvisioningHelper
       arbitrary_options.delete('cloud')
       arbitrary_options.delete('type')
       arbitrary_options.delete('name')
+      arbitrary_options.delete('version')
       arbitrary_options.delete('layout')
       arbitrary_options.delete('servicePlan')
       arbitrary_options.delete('description')
@@ -314,7 +315,28 @@ module Morpheus::Cli::ProvisioningHelper
 
     # Version and Layout
 
-    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.'}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})
+    available_versions = options_interface.options_for_source('instanceVersions',{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id']})['data']
+    default_version_value = payload['instance']['version'] ? payload['instance']['version'] : payload['version']
+    default_layout_value = payload['instance']['layout'] ? payload['instance']['layout']['id'] : nil
+    # JD: version is always nil because it is not stored in the blueprint or config !!
+    # so for now, infer the version from the layout
+    # requires api 3.6.2 to get "layouts" from /options/versions
+    if default_layout_value && default_version_value.to_s.empty?
+      available_versions.each do |available_version|
+        if available_version["layouts"]
+          selected_layout = available_version["layouts"].find {|it| it["value"].to_s == default_layout_value.to_s || it["id"].to_s == default_layout_value.to_s || it["code"].to_s == default_layout_value.to_s }
+          if selected_layout
+            default_version_value = available_version["value"]
+            break
+          end
+        end
+      end
+    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']})
     layout_id = layout_prompt['layout']
@@ -511,11 +533,11 @@ 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, 'skipSingleOption' => true, 'description' => 'Choose a storage type.', 'defaultValue' => 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
     end
-    volume['storageType'] = storage_type_id
 
     # sometimes the user chooses sizeId from a list of size options (AccountPrice) and other times it is free form
     root_custom_size_options = []

data/lib/morpheus/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.24
+  version: 3.6.25
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler