morpheus-cli 5.5.3.1 → 6.0.0

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
         
@@ -1123,6 +1126,14 @@ EOT
       opts.on('--releaseEIPs [true|false]', String, "Release EIPs. Default is on. Applies to Amazon only.") do |val|
         params[:releaseEIPs] = ['true','on','1',''].include?(val.to_s.downcase)
       end
+      opts.on('--release-ips [on|off]', ['on','off'], "Release Floating IPs. Default is on. Applies to certain types only.") do |val|
+        params[:releaseFloatingIps] = ['true','on','1',''].include?(val.to_s.downcase)
+        params[:releaseEIPs] = params[:releaseFloatingIps] # old parameter before 6.0
+      end
+      opts.on('--releaseEIPs [on|off]', ['on','off'], "Alias for Release Floating IPs") do |val|
+        params[:releaseFloatingIps] = ['true','on','1',''].include?(val.to_s.downcase)
+        params[:releaseEIPs] = params[:releaseFloatingIps] # old parameter before 6.0
+      end
       opts.on( '-f', '--force', "Force Delete" ) do
         params[:force] = true
       end
@@ -1471,4 +1482,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/commands/tasks.rb

@@ -902,7 +902,7 @@ class Morpheus::Cli::Tasks
       opts.on(nil, '--no-refresh', "Do not refresh" ) do
         options[:no_refresh] = true
       end
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      build_standard_post_options(opts, options)
     end
     optparse.parse!(args)
     if args.count != 1

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

@@ -593,7 +593,7 @@ class Morpheus::Cli::Workflows
       opts.on(nil, '--no-refresh', "Do not refresh" ) do
         options[:no_refresh] = true
       end
-      build_common_options(opts, options, [:payload, :options, :json, :dry_run, :remote])
+      build_standard_post_options(opts, options)
     end
     optparse.parse!(args)
     if args.count != 1

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/mixins/infrastructure_helper.rb

@@ -39,6 +39,18 @@ module Morpheus::Cli::InfrastructureHelper
     @network_groups_interface
   end
 
+  def resource_pool_groups_interface
+    # @api_client.resource_pool_groups
+    raise "#{self.class} has not defined @resource_pool_groups_interface" if @resource_pool_groups_interface.nil?
+    @resource_pool_groups_interface
+  end
+
+  def resource_pools_interface
+    # @api_client.resource_pool_groups
+    raise "#{self.class} has not defined @cloud_resource_pools_interface" if @cloud_resource_pools_interface.nil?
+    @cloud_resource_pools_interface
+  end
+
   def network_types_interface
     # @api_client.network_types
     raise "#{self.class} has not defined @network_types_interface" if @network_types_interface.nil?
@@ -343,6 +355,86 @@ module Morpheus::Cli::InfrastructureHelper
     end
   end
 
+  def find_resource_pool_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_resource_pool_by_id(val)
+    else
+      return find_resource_pool_by_name(val)
+    end
+  end
+
+  def find_resource_pool_by_id(id)
+    begin
+      json_response = resource_pools_interface.get_without_cloud(id.to_i)
+      return json_response['resourcePool']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Resource Pool not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_resource_pool_by_name(name)
+    json_response = resource_pools_interface.list_without_cloud({name: name.to_s})
+    resource_pools = json_response['resourcePools']
+    if resource_pools.empty?
+      print_red_alert "Resource Pool not found by name #{name}"
+      return nil
+    elsif resource_pools.size > 1
+      print_red_alert "#{resource_pools.size} resource pools found by name #{name}"
+      rows = resource_pools.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      return resource_pools[0]
+    end
+  end
+
+  def find_resource_pool_group_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_resource_pool_group_by_id(val)
+    else
+      return find_resource_pool_group_by_name(val)
+    end
+  end
+
+  def find_resource_pool_group_by_id(id)
+    begin
+      json_response = resource_pool_groups_interface.get(id.to_i)
+      return json_response['resourcePoolGroup']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Resource Pool Group not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_resource_pool_group_by_name(name)
+    json_response = resource_pool_groups_interface.list({name: name.to_s})
+    resource_pool_groups = json_response['resourcePoolGroups']
+    if resource_pool_groups.empty?
+      print_red_alert "Resource Pool Group not found by name #{name}"
+      return nil
+    elsif resource_pool_groups.size > 1
+      print_red_alert "#{resource_pool_groups.size} resource pool groups found by name #{name}"
+      rows = resource_pool_groups.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      return resource_pool_groups[0]
+    end
+  end
+
   def prompt_for_network(network_id, options={}, required=true, field_name='network', field_label='Network')
     # Prompt for a Network, text input that searches by name or id
     network = nil
@@ -479,6 +571,62 @@ module Morpheus::Cli::InfrastructureHelper
     return {success:true, data: record_ids}
   end
 
+  def prompt_for_pools(params, options={}, api_client=nil, api_params={})
+    # Pools
+    pool_list = nil
+    pool_ids = nil
+    still_prompting = true
+    if params['pools'].nil?
+      still_prompting = true
+      while still_prompting do
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'pools', 'type' => 'text', 'fieldLabel' => 'Pools', 'required' => false, 'description' => 'Pools to include, comma separated list of names or IDs.'}], options[:options])
+        unless v_prompt['pools'].to_s.empty?
+          pool_list = v_prompt['pools'].split(",").collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+        pool_ids = []
+        bad_ids = []
+        if pool_list && pool_list.size > 0
+          pool_list.each do |it|
+            found_pool = nil
+            begin
+              found_pool = find_resource_pool_by_name_or_id(it) 
+            rescue SystemExit => cmdexit
+            end
+            if found_pool
+              pool_ids << found_pool['id']
+            else
+              bad_ids << it
+            end
+          end
+        end
+        still_prompting = bad_ids.empty? ? false : true
+      end
+    else
+      pool_list = params['pools']
+      still_prompting = false
+      pool_ids = []
+      bad_ids = []
+      if pool_list && pool_list.size > 0
+        pool_list.each do |it|
+          found_pool = nil
+          begin
+            found_pool = find_resource_pool_by_name_or_id(it)
+          rescue SystemExit => cmdexit
+          end
+          if found_pool
+            pool_ids << found_pool['id']
+          else
+            bad_ids << it
+          end
+        end
+      end
+      if !bad_ids.empty?
+        return {success:false, msg:"Pools not found: #{bad_ids}"}
+      end
+    end
+    return {success:true, data: pool_ids}
+  end
+
   def network_pool_server_list_column_definitions(options)
     {
       "ID" => 'id',

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
@@ -672,7 +678,7 @@ module Morpheus
               # print "Perhaps you meant one of these? #{ored_list(matched_options.collect {|i|i[value_field]}, 3)}\n"
               print "Try using value instead of name.\n"
               print "\n"
-              exit 1
+              #exit 1
             elsif matched_options.size == 1
               matched_option = matched_options[0]
             end
@@ -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 = "6.0.0"
   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/cli/doc_test.rb

@@ -28,7 +28,7 @@ class MorpheusTest::DocTest < MorpheusTest::TestCase
   def test_doc_get_unauthorized
     # authentication is NOT required for this api
     without_authentication do
-      assert_success("doc get -q")
+      assert_error("doc get -q")
     end
   end
 

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: 6.0.0
 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-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -280,6 +280,7 @@ files:
 - lib/morpheus/api/network_domain_records_interface.rb
 - lib/morpheus/api/network_domains_interface.rb
 - lib/morpheus/api/network_edge_clusters_interface.rb
+- lib/morpheus/api/network_floating_ips_interface.rb
 - lib/morpheus/api/network_groups_interface.rb
 - lib/morpheus/api/network_pool_ips_interface.rb
 - lib/morpheus/api/network_pool_server_types_interface.rb
@@ -313,6 +314,7 @@ files:
 - lib/morpheus/api/provisioning_settings_interface.rb
 - lib/morpheus/api/read_interface.rb
 - lib/morpheus/api/reports_interface.rb
+- lib/morpheus/api/resource_pool_groups_interface.rb
 - lib/morpheus/api/rest_interface.rb
 - lib/morpheus/api/roles_interface.rb
 - lib/morpheus/api/scale_thresholds_interface.rb
@@ -455,6 +457,7 @@ files:
 - lib/morpheus/cli/commands/network_domains_command.rb
 - lib/morpheus/cli/commands/network_edge_clusters_command.rb
 - lib/morpheus/cli/commands/network_firewalls_command.rb
+- lib/morpheus/cli/commands/network_floating_ips.rb
 - lib/morpheus/cli/commands/network_groups_command.rb
 - lib/morpheus/cli/commands/network_pool_server_types.rb
 - lib/morpheus/cli/commands/network_pool_servers_command.rb
@@ -483,6 +486,7 @@ files:
 - lib/morpheus/cli/commands/recent_activity_command.rb
 - lib/morpheus/cli/commands/remote.rb
 - lib/morpheus/cli/commands/reports_command.rb
+- lib/morpheus/cli/commands/resource_pool_groups_command.rb
 - lib/morpheus/cli/commands/rm_command.rb
 - lib/morpheus/cli/commands/roles.rb
 - lib/morpheus/cli/commands/scale_thresholds.rb