morpheus-cli 5.4.4 → 5.4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e88f25d69ce8a6c1038899e3671c69a31266607d3370b2c4a20d3fa74d76dc42
-  data.tar.gz: '08ccc023d2cc5908a7a8f9a8a3cde3ec9cd11e08b85e53b1732aecc0e38ab166'
+  metadata.gz: e7982ab3b4bcc7849f28a571df308c6bc8d588fbb5748b29f1b2589cb92fbf64
+  data.tar.gz: 49d643efdf4b181a7a4ba35325159fd33edb4c5330c4de6a0e136184a5f4a0fa
 SHA512:
-  metadata.gz: 1a21ebb4f7b58cbd5aede974f4bb298a19a02c4aad9f92fbe0c149d5cde3a80dfdf141fbf7aca66ce9cf1c2fc9a4495f51e3c6fcea9ee7458a4153ed3c6bb1d9
-  data.tar.gz: f9412dd77a1c90346133832363ac8d756b0f4576b4a3102024552dba4c63d566430b57a3b53395080f928b88b5354f446bdc3bb9df6d1351b5994419ca884623
+  metadata.gz: a4f3f440b1b50e57d8de2a6f85f33f626be9c055da36df2574b1cc951cbab7a8ba632ff83da1c618a322c06ece0002f4c889ee5c4157cee8d3aea1c876de213c
+  data.tar.gz: 3a3ce759067f652d0e3552e92d53c92e931dfa3122fc857cc7a889212fb197e5417bfd275e4853b83fc08404ed950bff0fcf73cc28cdc55667d32ea7404ca467

data/Dockerfile

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

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

@@ -4403,9 +4403,20 @@ EOT
       #if instance['layout']['provisionTypeCode'] == 'vmware'
       if provision_type && provision_type["hasFolders"]
         if payload['zoneFolder'].nil?
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'zoneFolder', 'type' => 'select', 'optionSource' => 'vmwareFolders', 'fieldLabel' => 'Folder', 'description' => "Folder externalId or '/' to use the root folder", 'required' => true}], options[:options], @api_client, {siteId: instance['group']['id'], zoneId: instance['cloud']['id']})
-          if v_prompt['zoneFolder'].to_s != ''
-            payload['zoneFolder'] = v_prompt['zoneFolder']
+          # vmwareFolders moved from /api/options/vmwareFolders to /api/options/vmware/vmwareFolders
+          folder_prompt = nil
+          begin
+            folder_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'zoneFolder', 'type' => 'select', 'optionSource' => 'vmwareFolders', 'optionSourceType' => 'vmware', 'fieldLabel' => 'Folder', 'description' => "Folder externalId or '/' to use the root folder", 'required' => true}], options[:options], @api_client, {siteId: instance['group']['id'], zoneId: instance['cloud']['id']})
+          rescue RestClient::Exception => e
+            Morpheus::Logging::DarkPrinter.puts "Failed to load folder options" if Morpheus::Logging.debug?
+            begin
+              folder_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'zoneFolder', 'type' => 'select', 'optionSource' => 'vmwareFolders', 'fieldLabel' => 'Folder', 'description' => "Folder externalId or '/' to use the root folder", 'required' => true}], options[:options], @api_client, {siteId: instance['group']['id'], zoneId: instance['cloud']['id']})
+            rescue RestClient::Exception => e2
+              Morpheus::Logging::DarkPrinter.puts "Failed to load folder options from alternative endpoint too" if Morpheus::Logging.debug?
+            end
+          end
+          if folder_prompt && folder_prompt['zoneFolder'].to_s != ''
+            payload['zoneFolder'] = folder_prompt['zoneFolder']
           end
         end
       end

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

@@ -495,10 +495,16 @@ EOT
       return
     end
     json_response = rest_interface.create(parent_id, payload)
-    render_response(json_response, options, rest_object_key) do
-      record = json_response[rest_object_key]
-      print_green_success "Added #{rest_label.downcase} #{record['name'] || record['id']}"
-      return _get(parent_id, record["id"], {}, options)
+    if json_response['success']
+      render_response(json_response, options, rest_object_key) do
+        record = json_response[rest_object_key]
+        print_green_success "Added #{rest_label.downcase} #{record['name'] || record['id']}"
+        return _get(parent_id, record["id"], {}, options)
+      end
+    else
+      print red
+      print json_response['msg']
+      print "\n"
     end
     return 0, nil
   end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.4.4"
+    VERSION = "5.4.4.1"
   end
 end

metadata

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