morpheus-cli 5.3.2.1 → 5.3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e27f28e852866d25457815c852eec19a3f65bd3b0ae8a33d8e055d990f631e79
-  data.tar.gz: 5270f5c81e872491cbf9e1e59f33cf78bf233c152c1347fa61cb01c544073e34
+  metadata.gz: 727a18a73b2f9c5a7dbec90521cf690eccc5a36de5c90631b17ddc6e658befbf
+  data.tar.gz: 98faaa24be96fd839c85a9e3463881bb3f59ab10740244867a2290b880c83988
 SHA512:
-  metadata.gz: 172818b1030b243ebb2c9c7e316b0cefe173b5a198ff8184f7c0b7bce275954e80109b45c426530ef1587635199e6cc17dedc248011cc11626e2d0f5e8f3f1c1
-  data.tar.gz: 45bdeca37c208f7e7889bd9ab87b0012fea6623faf1b80628fef2ad0df55182388c8e1cd647f9fdd51628d48a4d6cca715e718bb655c8612683fe4ffc9ede3f8
+  metadata.gz: 654136bc313f445739d1665861e67831f95d5cddd138a9cf619f824cd78d2ce665f1332a0a09c73039850146adb30347830e935536331ab8941bd203b56d01c2
+  data.tar.gz: b63702230910bffae83a7784ad3385c92df5ef7df13b3cfb83d3cb59bb42e593f1a6dc6a2b65628aea928ced34772a8b7f45c7d6a33d2ae93eda22640e3695a3

data/Dockerfile

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

data/lib/morpheus/cli/instances.rb

@@ -2592,17 +2592,18 @@ class Morpheus::Cli::Instances
       cloud_id = instance['cloud']['id']
       layout_id = instance['layout']['id']
       plan_id = instance['plan']['id']
-    
+      current_plan_name = instance['plan']['name']
       # prompt for service plan
       service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, siteId: group_id, layoutId: layout_id})
       service_plans = service_plans_json["plans"]
       service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"]} } # already sorted
       service_plans_dropdown.each do |plan|
-        if plan['value'] && plan['value'].to_i == plan_id.to_i
-          plan['name'] = "#{plan['name']} (current)"
-        end
+        # if plan['value'] && plan['value'].to_i == plan_id.to_i
+        #   plan['name'] = "#{plan['name']} (current)"
+        #   current_plan_name = plan['name']
+        # end
       end
-      plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options])
+      plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'selectOptions' => service_plans_dropdown, 'required' => true, 'defaultValue' => current_plan_name, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options])
       service_plan = service_plans.find {|sp| sp["id"] == plan_prompt['servicePlan'].to_i }
       new_plan_id = service_plan["id"]
       #payload[:servicePlan] = new_plan_id # ew, this api uses servicePlanId instead
@@ -2622,7 +2623,8 @@ class Morpheus::Cli::Instances
       # for now, always do this
       payload["deleteOriginalVolumes"] = true
     end
-    
+    payload.delete("rootVolume")
+    (1..20).each {|i| payload.delete("dataVolume#{i}") }
     @instances_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @instances_interface.dry.resize(instance['id'], payload)

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

@@ -1331,7 +1331,7 @@ module Morpheus::Cli::ProvisioningHelper
             volume_action = 'keep'
           else
             action_options = [{'name' => 'Modify', 'value' => 'modify'}, {'name' => 'Keep', 'value' => 'keep'}, {'name' => 'Delete', 'value' => 'delete'}]
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'action', 'type' => 'select', 'fieldLabel' => "Modify/Keep/Delete volume '#{current_volume['name']}'", 'selectOptions' => action_options, 'required' => true, 'description' => 'Modify, Keep or Delete existing data volume?'}], options[:options])
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'action', 'type' => 'select', 'fieldLabel' => "Modify/Keep/Delete volume '#{current_volume['name']}'", 'selectOptions' => action_options, 'required' => true, 'defaultValue' => 'keep', 'description' => 'Modify, Keep or Delete existing data volume?'}], options[:options])
             volume_action = v_prompt[field_context]['action']
           end
 

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.3.2.1"
+    VERSION = "5.3.2.2"
   end
 end

metadata

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