morpheus-cli 5.5.1.1 → 5.5.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a66201f045d6e88db90746058ce40000b064616975aae3d00c025069c51f20d7
4
- data.tar.gz: de2b69e5a52ca31f7bde8d573428853a765668b2d08ba8eaca1cdbe6743ecf0a
3
+ metadata.gz: b35a61596cfb1709bbc0290c6c194b738946ddb86b1457c09482c71a8608c05c
4
+ data.tar.gz: c2c6390094be8c54ec544adf3555f079c313d8888580ca70fa25ff50f1537136
5
5
  SHA512:
6
- metadata.gz: ebc460c1903caf068710ac2512e73fb88329045a49ff603904e875ff2a02cb6a4ec02b34195d9ee19c98ab8eefb6388357d8c43cb69a8ad92891322a085f1dd1
7
- data.tar.gz: 60a297a75a29a6bb53a3944b81fa14a9f46c846173bf98472886bb86a5a13491c55da9600fa691d861ba20812546b5d57e891a61a3b4dcef9c922ed3b43a3f9b
6
+ metadata.gz: fb8d7e71681054121d47e5c9862cc616f0f55399230819dc4c8673aaba332ce7f6baa68187cb287eb2d94826a77eb547b2b7bd224bc29ba7d4b3940ee51e4301
7
+ data.tar.gz: e533c2fa486851fbc59a2de9d5246fb968539ead4d3ca676630f0114dfec1a1fe64d45d012568100f142d0a77a79051efb70bfe10dd82428a0874300d3e0575d
data/Dockerfile CHANGED
@@ -1,5 +1,5 @@
1
- FROM ruby:2.5.1
1
+ FROM ruby:2.7.5
2
2
 
3
- RUN gem install morpheus-cli -v 5.5.1.1
3
+ RUN gem install morpheus-cli -v 5.5.1.2
4
4
 
5
5
  ENTRYPOINT ["morpheus"]
@@ -987,7 +987,7 @@ class Morpheus::Cli::Clouds
987
987
  if cloud_type && cloud_type['optionTypes']
988
988
  if !cloud_type['optionTypes'].find {|opt| opt['type'] == 'credential'}
989
989
  tmp_option_types << {'fieldName' => 'type', 'fieldLabel' => 'Credentials', 'type' => 'credential', 'optionSource' => 'credentials', 'required' => true, 'defaultValue' => 'local', 'config' => {'credentialTypes' => ['username-password']}, 'displayOrder' => 7}
990
- cloud_type['optionTypes'].select {|opt| ['username', 'password'].include?(opt['fieldName'])}.each {|opt| opt['localCredential'] = true}
990
+ cloud_type['optionTypes'].select {|opt| ['username', 'password', 'serviceUsername', 'servicePassword'].include?(opt['fieldName'])}.each {|opt| opt['localCredential'] = true}
991
991
  end
992
992
  # adjust displayOrder to put these at the end
993
993
  #tmp_option_types = tmp_option_types + cloud_type['optionTypes']
@@ -130,7 +130,8 @@ module Morpheus::Cli::InfrastructureHelper
130
130
  end
131
131
 
132
132
  def cloud_type_for_name(name)
133
- return get_available_cloud_types(true, {'name' => name}).find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
133
+ types = get_available_cloud_types(true, {'name' => name})
134
+ return types.find { |z| z['code'].downcase == name.downcase} || types.find { |z| z['name'].downcase == name.downcase}
134
135
  end
135
136
 
136
137
 
@@ -1,6 +1,6 @@
1
1
 
2
2
  module Morpheus
3
3
  module Cli
4
- VERSION = "5.5.1.1"
4
+ VERSION = "5.5.1.2"
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: morpheus-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.5.1.1
4
+ version: 5.5.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Estes