morpheus-cli 5.5.1.1 → 5.5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a66201f045d6e88db90746058ce40000b064616975aae3d00c025069c51f20d7
-  data.tar.gz: de2b69e5a52ca31f7bde8d573428853a765668b2d08ba8eaca1cdbe6743ecf0a
+  metadata.gz: b35a61596cfb1709bbc0290c6c194b738946ddb86b1457c09482c71a8608c05c
+  data.tar.gz: c2c6390094be8c54ec544adf3555f079c313d8888580ca70fa25ff50f1537136
 SHA512:
-  metadata.gz: ebc460c1903caf068710ac2512e73fb88329045a49ff603904e875ff2a02cb6a4ec02b34195d9ee19c98ab8eefb6388357d8c43cb69a8ad92891322a085f1dd1
-  data.tar.gz: 60a297a75a29a6bb53a3944b81fa14a9f46c846173bf98472886bb86a5a13491c55da9600fa691d861ba20812546b5d57e891a61a3b4dcef9c922ed3b43a3f9b
+  metadata.gz: fb8d7e71681054121d47e5c9862cc616f0f55399230819dc4c8673aaba332ce7f6baa68187cb287eb2d94826a77eb547b2b7bd224bc29ba7d4b3940ee51e4301
+  data.tar.gz: e533c2fa486851fbc59a2de9d5246fb968539ead4d3ca676630f0114dfec1a1fe64d45d012568100f142d0a77a79051efb70bfe10dd82428a0874300d3e0575d

data/Dockerfile

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

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

@@ -987,7 +987,7 @@ class Morpheus::Cli::Clouds
     if cloud_type && cloud_type['optionTypes']
       if !cloud_type['optionTypes'].find {|opt| opt['type'] == 'credential'}
         tmp_option_types << {'fieldName' => 'type', 'fieldLabel' => 'Credentials', 'type' => 'credential', 'optionSource' => 'credentials', 'required' => true, 'defaultValue' => 'local', 'config' => {'credentialTypes' => ['username-password']}, 'displayOrder' => 7}
-        cloud_type['optionTypes'].select {|opt| ['username', 'password'].include?(opt['fieldName'])}.each {|opt| opt['localCredential'] = true}
+        cloud_type['optionTypes'].select {|opt| ['username', 'password', 'serviceUsername', 'servicePassword'].include?(opt['fieldName'])}.each {|opt| opt['localCredential'] = true}
       end
       # adjust displayOrder to put these at the end
       #tmp_option_types = tmp_option_types + cloud_type['optionTypes']

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

@@ -130,7 +130,8 @@ module Morpheus::Cli::InfrastructureHelper
   end
 
   def cloud_type_for_name(name)
-    return get_available_cloud_types(true, {'name' => name}).find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
+    types = get_available_cloud_types(true, {'name' => name})
+    return types.find { |z| z['code'].downcase == name.downcase} || types.find { |z| z['name'].downcase == name.downcase}
   end
 
 

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.5.1.1"
+    VERSION = "5.5.1.2"
   end
 end

metadata

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