morpheus-cli 5.5.3.1 → 5.5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a66b8b7fa9512d6f649a5c369b2a5da24efe9e551b48cce4fe551bc68f9f842
-  data.tar.gz: 285fb4339cbf1c2ea71539d1bff2e8bed75ec6be097cffdaeda751ed49b59b6b
+  metadata.gz: 4f25e2109b97f86a74285c68d93483095a810007259c98248f3764f047763826
+  data.tar.gz: 703c64d291cebb65e2457c38f43c2fb304881db0cf334c6b86cc3317afd2c543
 SHA512:
-  metadata.gz: 7fc26b54a4a2d2dfb83429e769acbc730a1f61ff1023468e49b17e056fdfc510d7f5cbb642d07cc76d26e46b1aa8cc7b631e8f658fe7f133c5c7c67301d026e6
-  data.tar.gz: c52f8eb39797f15a3ab811ff9f42557f879d9ef13269c633cee2f99cfce9ec2b51ab9f67ce8998ad68416b3cd94d5b5c44a642ea71167aeb93640e2baed65d82
+  metadata.gz: 5e1ca2c4b984cf3b4f27cd3f8348b8ce7155fac65be974962a4a3d543bc6ab35efca1e6e938f6c39617e71dab1d510d87a785a4952eb6c113bbc03a9d6d77173
+  data.tar.gz: 7e00d09edce06f1d099228770835254fde5110f38e4f033529acda0c060f433e55babc72eda319bc79035e5080110ae24b6c4f4eb6600049a99c64aa3699d988

data/Dockerfile

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

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

@@ -661,7 +661,8 @@ EOT
         it
       }
       if catalog_option_types && !catalog_option_types.empty?
-        config_prompt = Morpheus::Cli::OptionTypes.prompt(catalog_option_types, options[:options], @api_client, {})['config']
+        api_params = construct_catalog_api_params(catalog_item_type)
+        config_prompt = Morpheus::Cli::OptionTypes.prompt(catalog_option_types, options[:options], @api_client, api_params, options[:no_prompt], false, false, true)['config']
         payload[add_item_object_key].deep_merge!({'config' => config_prompt})
       end
       if workflow_context
@@ -999,11 +1000,13 @@ EOT
         catalog_option_types = catalog_item_type['optionTypes']
         # instead of config.customOptions just use config...
         catalog_option_types = catalog_option_types.collect {|it|
+          it['fieldContext'] = nil
           it['fieldContext'] = 'config'
           it
         }
         if catalog_option_types && !catalog_option_types.empty?
-          config_prompt = Morpheus::Cli::OptionTypes.prompt(catalog_option_types, options[:options], @api_client, {})['config']
+          api_params = construct_catalog_api_params(catalog_item_type)
+          config_prompt = Morpheus::Cli::OptionTypes.prompt(catalog_option_types, options[:options], @api_client, api_params, options[:no_prompt], false, false, true)['config']
           item_payload.deep_merge!({'config' => config_prompt})
         end
         
@@ -1471,4 +1474,35 @@ EOT
     out + return_color
   end
 
+  
+  def construct_catalog_api_params(record)
+    catalog_item_type_id = record['id'].to_i
+    api_params = {}
+    api_params['catalogItemType'] ||= {}
+    api_params['catalogItemType']['id'] = catalog_item_type_id
+    # Determine instance.type value
+    # the UI is injecting this parameter into the option source requests
+    # it is needed to populate api option lists eg. optionTypeClouds
+    # this should be fixed on the api side, so it automatically extracts this input from the config
+    begin
+      instance_type_code = nil
+      catalog_item_type = find_by_id(:catalog_item_type, catalog_item_type_id.to_i)
+      if catalog_item_type
+        if catalog_item_type['type'] == 'instance'
+          if catalog_item_type['config'] && catalog_item_type['config']['type']
+            instance_type_code = catalog_item_type['config']['type']
+          end
+        end
+      end
+      if instance_type_code
+        api_params['instance'] ||= {}
+        api_params['instance']['type'] = instance_type_code
+      end
+    rescue ::RestClient::Exception => e
+      # users may not have permission to this endpoint
+      # puts "Failed to load catalog item type"
+    end
+    return api_params
+  end
+
 end

data/lib/morpheus/cli/credentials.rb

@@ -123,7 +123,8 @@ module Morpheus
               end
               if password.empty?
                 # readline is still echoing secret with 'NUL:'' so just use $stdin on windows for now
-                if Morpheus::Cli.windows?
+                # and some other environments? just use noecho unless running unit tests
+                if Morpheus::Cli.windows? || !Morpheus::Cli.testing?
                   print "Password: #{required_blue_prompt} "
                   # this should be my_terminal.stdin instead of STDIN and $stdin
                   password = $stdin.noecho(&:gets).chomp!

data/lib/morpheus/cli/option_types.rb

@@ -55,7 +55,7 @@ module Morpheus
         end
       end
 
-      def self.prompt(option_types, options={}, api_client=nil, api_params={}, no_prompt=false, paging_enabled=false, ignore_empty=false)
+      def self.prompt(option_types, options={}, api_client=nil, api_params={}, no_prompt=false, paging_enabled=false, ignore_empty=false, skip_sort = false)
         paging_enabled = false if Morpheus::Cli.windows?
         no_prompt = no_prompt || options[:no_prompt]
         results = {}
@@ -89,12 +89,18 @@ module Morpheus
         # puts "Options Prompt #{options}"
         # Sort options by default, group, advanced
         # add displayOrder if it's missing, so it doesn't end up using a random order
-        if !option_types.find {|it| it['displayOrder'] }
-          option_types.each_with_index {|it, i| it['displayOrder'] = i+1 }
-        end
+        # if !option_types.find {|it| it['displayOrder'] && it['displayOrder'] != 0 }
+        #   option_types.each_with_index {|it, i| it['displayOrder'] = i+1 }
+        # end
         cur_field_group = 'default'
         prompt_local_credentials = true
-        self.sort_option_types(option_types.reject {|it| it[:for_help_only]}).each do |option_type|
+        # reject help only options..
+        option_types.reject! {|it| it[:for_help_only]}
+        # sort options
+        if !skip_sort
+          option_types = self.sort_option_types(option_types)
+        end
+        option_types.each do |option_type|
           next if option_type['localCredential'] && !prompt_local_credentials
           context_map = results
           value = nil
@@ -998,8 +1004,9 @@ module Morpheus
       def self.password_prompt(option_type)
         value_found = false
         while !value_found do
-          # readline is still echoing secret with 'NUL:'' so just use $stdin on windows for now
-          if Morpheus::Cli.windows?
+          # readline is still echoing secret with 'NUL:'' so just use $stdin on windows 
+          # and some other environments? just use noecho unless running unit tests
+          if Morpheus::Cli.windows? || !Morpheus::Cli.testing?
             print "#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? (' (' + option_type['fieldAddOn'] + ') ') : '' }#{optional_label(option_type)}#{option_type['defaultValue'] ? ' ['+'************'+']' : ''}: "
             input = $stdin.noecho(&:gets).chomp!
           else

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.5.3.1"
+    VERSION = "5.5.3.2"
   end
 end

data/lib/morpheus/cli.rb

@@ -77,6 +77,19 @@ module Morpheus
       Dir[File.dirname(__FILE__)  + "/cli/commands/**/*.rb"].each {|file| load file }
     end
 
+    # hack needed for unit tests right now
+    @@testing = false unless defined?(@@testing)
+
+    # hack needed for unit tests right now
+    def self.enable_test_mode
+      @@testing = true
+    end
+
+    # hack needed for unit tests right now
+    def self.testing?
+      defined?(@@testing) && @@testing == true
+    end
+
     # require all CLI modules now (on require)
     load!
     

data/test/test_case.rb

@@ -5,6 +5,9 @@ require 'morpheus'
 require 'test_config'
 #require 'securerandom'
 
+# hack needed for unit tests right now
+Morpheus::Cli.enable_test_mode()
+
 module MorpheusTest
 
   # TestCase is the base class for all unit tests to provide standard behavior

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.5.3.1
+  version: 5.5.3.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler