morpheus-cli 5.5.3 → 5.5.3.2

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

@@ -294,7 +294,7 @@ EOT
       if records.nil? || records.empty?
         print cyan,"No #{rest_label_plural.downcase} found.",reset,"\n"
       else
-        print as_pretty_table(records, rest_list_column_definitions(options).upcase_keys!, options)
+        print as_pretty_table(records, rest_list_column_definitions(options.merge({:parent_record => parent_record})).upcase_keys!, options)
         print_results_pagination(json_response) if json_response['meta']
       end
       print reset,"\n"
@@ -318,17 +318,15 @@ EOT
     verify_args!(args:args, optparse:optparse, min:2)
     connect(options)
     parse_get_options!(args.count > 1 ? args[1..-1] : [], options, params)
-    parent_id = args[0]
+    _get(args[0], args[1..-1].join(" "), params, options)
+  end
+
+  def _get(parent_id, id, params, options)
     parent_record = rest_parent_find_by_name_or_id(parent_id)
     if parent_record.nil?
       return 1, "#{rest_parent_label} not found for '#{parent_id}"
     end
     parent_id = parent_record['id']
-    id = args[1..-1].join(" ")
-    _get(parent_id, id, params, options)
-  end
-
-  def _get(parent_id, id, params, options)
     if id !~ /\A\d{1,}\Z/
       record = rest_find_by_name_or_id(parent_id, id)
       if record.nil?
@@ -342,7 +340,7 @@ EOT
       return
     end
     json_response = rest_interface.get(parent_id, id, params)
-    render_response_for_get(json_response, options)
+    render_response_for_get(json_response, options.merge({:parent_record => parent_record}))
     return 0, nil
   end
 
@@ -357,14 +355,19 @@ EOT
         print_h2 "Option Types", options
         print format_option_types_table(record['optionTypes'], options, rest_object_key)
       end
+      render_response_details_for_get(record, options)
       print reset,"\n"
     end
   end
 
+  def render_response_details_for_get(record, options)
+    # override for custom details
+  end
+
   def add(args)
     parent_id, parent_record = nil, nil
     record_type_id = nil
-    options = {}
+    options = {:options => {:context_map => rest_option_context_map}}
     option_types = respond_to?("add_#{rest_key}_option_types", true) ? send("add_#{rest_key}_option_types") : []
     advanced_option_types = respond_to?("add_#{rest_key}_advanced_option_types", true) ? send("add_#{rest_key}_advanced_option_types") : []
     type_option_type = option_types.find {|it| it['fieldName'] == 'type'} 
@@ -473,7 +476,7 @@ EOT
       end
       if my_option_types && !my_option_types.empty?
         # remove redundant fieldContext
-        my_option_types.each do |option_type| 
+        my_option_types.each do |option_type|
           if option_type['fieldContext'] == rest_object_key
             option_type['fieldContext'] = nil
           end
@@ -491,6 +494,26 @@ EOT
         v_prompt.booleanize! # 'on' => true
         record_payload.deep_merge!(v_prompt)
       end
+      if respond_to?("#{rest_key}_add_prompt", true)
+        record_payload = send("#{rest_key}_add_prompt", record_payload, record_type, parent_record, options)
+      end
+      # permissions
+      if rest_perms_config[:enabled]
+        if rest_perms_config[:version] == 2
+          perms = prompt_permissions_v2(options.deep_merge(rest_perms_config[:options] || {}), rest_perms_config[:excludes] || [])
+        else
+          perms = prompt_permissions(options.deep_merge(rest_perms_config[:options] || {}), rest_perms_config[:excludes] || [])
+        end
+        unless rest_perms_config[:name].nil?
+          perms.transform_keys! {|k| k == 'resourcePermissions' ? rest_perms_config[:name] : k}
+        end
+        unless rest_perms_config[:context].nil?
+          perms_context = {}
+          perms_context[rest_perms_config[:context]] = perms
+          perms = perms_context
+        end
+        record_payload.merge!(perms)
+      end
       payload[rest_object_key] = record_payload
     end
     rest_interface.setopts(options)
@@ -502,8 +525,8 @@ EOT
     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)
+        print_green_success "Added #{rest_label.downcase} #{record.nil? ? json_response['id'] : record['name'] || record['id']}"
+        return _get(parent_id, record.nil? ? json_response['id'] : record['id'], {}, options)
       end
     else
       print red

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"
+    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/lib/morpheus/ext/string.rb

@@ -1,16 +1,17 @@
 class String
   
   def pluralize
+    # hacky version of this until we want to depend on ActiveSupport
     value = self.dup
     if value == ""
       value
     elsif value[-1].chr == "y"
       value[0..-2] + "ies"
     elsif value[-1].chr == "s"
-      if value[-2..-1] == "es"
-        value
-      else
+      if value[-2..-1] == "ss"
         value + "es"
+      else
+        value
       end
     else
       value + "s"
@@ -18,13 +19,14 @@ class String
   end
 
   def singularize
+    # hacky version of this until we want to depend on ActiveSupport
     value = self.dup
     if value == ""
       value
     elsif value.size > 3 && value[-3..-1] == "ies"
       value[0..-4] + "y"
     elsif value.size > 2 && value[-3..-1] == "ses"
-      value[0..-3]
+      value[0..-2]
     elsif value[-1] == "s"
       value[0..-2]
     else

data/lib/morpheus/routes.rb

@@ -123,8 +123,8 @@ module Morpheus::Routes
     admin: {
       accounts: {}, # Tenants
       :'service-plans' => [
-        "#prices",
-        "#pricesets"
+        "#!prices",
+        "#!pricesets"
       ],
       roles: {},
       users: {},
@@ -132,7 +132,19 @@ module Morpheus::Routes
       integrations: {},
       policies: {},
       health: ["logs"],
-      settings: {},
+      settings: [
+        "#!appliance",
+        "#!whitelabel",
+        "provisioning",
+        "monitoring",
+        "backups",
+        "logs",
+        "#!guidance",
+        "environments",
+        "software-licenses",
+        "#!license",
+        "#!utilities"
+      ],
     },
     :'user-settings' => {}, # User Settings (Profile)
   } unless defined?(SITE_MAP)
@@ -161,14 +173,34 @@ module Morpheus::Routes
       # find the one with smallest match index
 
       # map well known aliases
-      case(path.underscore.singularize)
-      when "server","host","vm","virtual-machine"
+      case(path.dasherize.pluralize)
+      when "servers","hosts","vms","virtual-machines"
         # actually should be "/infrastructure/inventory" unless id is passed, show route uses /servers though
         path = "/infrastructure/servers"
-      when "compute"
+      when "computes", "inventories"
         path = "/infrastructure/inventory"
-      when "tenant"
+      when "tenants"
         path = "/admin/accounts"
+      when "appliance-settings"
+        path = "/admin/settings/#!appliance"
+      when "whitelabel-settings"
+        path = "/admin/settings/#!whitelabel"
+      when "provisioning-settings"
+        path = "/admin/settings/#!provisioning"
+      when "monitoring-settings","monitor-settings"
+        path = "/admin/settings/monitoring"
+      when "backup-settings"
+        path = "/admin/settings/backups"
+      when "log-settings"
+        path = "/admin/settings/logs"
+      when "guidance-settings"
+        path = "/admin/settings/#!guidance"
+      when "environments"
+        path = "/admin/settings/environments"
+      when "software-licenses"
+        path = "/admin/settings/software-licenses"
+      when "license"
+        path = "/admin/settings/#!license"
       end
       # dasherize path and attempt to match the plural first
       plural_path = path.pluralize

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
+  version: 5.5.3.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -235,6 +235,7 @@ files:
 - lib/morpheus/api/group_policies_interface.rb
 - lib/morpheus/api/groups_interface.rb
 - lib/morpheus/api/guidance_interface.rb
+- lib/morpheus/api/guidance_settings_interface.rb
 - lib/morpheus/api/health_interface.rb
 - lib/morpheus/api/image_builder_boot_scripts_interface.rb
 - lib/morpheus/api/image_builder_image_builds_interface.rb
@@ -273,6 +274,7 @@ files:
 - lib/morpheus/api/monitoring_groups_interface.rb
 - lib/morpheus/api/monitoring_incidents_interface.rb
 - lib/morpheus/api/monitoring_interface.rb
+- lib/morpheus/api/monitoring_settings_interface.rb
 - lib/morpheus/api/network_dhcp_relays_interface.rb
 - lib/morpheus/api/network_dhcp_servers_interface.rb
 - lib/morpheus/api/network_domain_records_interface.rb
@@ -286,6 +288,7 @@ files:
 - lib/morpheus/api/network_proxies_interface.rb
 - lib/morpheus/api/network_routers_interface.rb
 - lib/morpheus/api/network_security_servers_interface.rb
+- lib/morpheus/api/network_server_groups_interface.rb
 - lib/morpheus/api/network_servers_interface.rb
 - lib/morpheus/api/network_services_interface.rb
 - lib/morpheus/api/network_static_routes_interface.rb
@@ -406,6 +409,7 @@ files:
 - lib/morpheus/cli/commands/get_prompt_command.rb
 - lib/morpheus/cli/commands/groups.rb
 - lib/morpheus/cli/commands/guidance_command.rb
+- lib/morpheus/cli/commands/guidance_settings.rb
 - lib/morpheus/cli/commands/health_command.rb
 - lib/morpheus/cli/commands/history_command.rb
 - lib/morpheus/cli/commands/hosts.rb
@@ -445,6 +449,7 @@ files:
 - lib/morpheus/cli/commands/monitoring_contacts_command.rb
 - lib/morpheus/cli/commands/monitoring_groups_command.rb
 - lib/morpheus/cli/commands/monitoring_incidents_command.rb
+- lib/morpheus/cli/commands/monitoring_settings.rb
 - lib/morpheus/cli/commands/network_dhcp_relays_command.rb
 - lib/morpheus/cli/commands/network_dhcp_servers_command.rb
 - lib/morpheus/cli/commands/network_domains_command.rb
@@ -456,6 +461,7 @@ files:
 - lib/morpheus/cli/commands/network_pools_command.rb
 - lib/morpheus/cli/commands/network_proxies_command.rb
 - lib/morpheus/cli/commands/network_routers_command.rb
+- lib/morpheus/cli/commands/network_server_groups_command.rb
 - lib/morpheus/cli/commands/network_services_command.rb
 - lib/morpheus/cli/commands/network_static_routes_command.rb
 - lib/morpheus/cli/commands/network_transport_zones_command.rb