morpheus-cli 5.3.2 → 5.3.2.1

data/lib/morpheus/cli/option_types.rb

@@ -94,46 +94,37 @@ module Morpheus
           end
 
           if !visible_option_check_value.to_s.empty?
-            # support formats code=value or code:value OR code:(value|value2|value3)
-            # OR fieldContext.fieldName=value
-            parts = visible_option_check_value.include?("=") ? visible_option_check_value.split("=") : visible_option_check_value.split(":")
-            depends_on_code = parts[0]
-            depends_on_value = parts[1].to_s.strip
-            depends_on_values = []
-            if depends_on_value.size > 0
-              # strip parenthesis
-              if depends_on_value[0] && depends_on_value[0].chr == "("
-                depends_on_value = depends_on_value[1..-1]
-              end
-              depends_on_value.chomp(")")
-              depends_on_values = depends_on_value.split("|").collect { |it| it.strip }
-            end
-            depends_on_option_type = option_types.find {|it| it["code"] == depends_on_code }
-            if !depends_on_option_type
-              depends_on_option_type = option_types.find {|it| 
-                (it['fieldContext'] ? "#{it['fieldContext']}.#{it['fieldName']}" : it['fieldName']) == depends_on_code
-              }
+            match_type = 'any'
+
+            if visible_option_check_value.include?('::')
+              match_type = 'all' if visible_option_check_value.start_with?('matchAll')
+              visible_option_check_value = visible_option_check_value[visible_option_check_value.index('::') + 2..-1]
             end
-            if depends_on_option_type
-              # dependent option type has a different value
-              depends_on_field_key = depends_on_option_type['fieldContext'].nil? || depends_on_option_type['fieldContext'].empty? ? "#{depends_on_option_type['fieldName']}" : "#{depends_on_option_type['fieldContext']}.#{depends_on_option_type['fieldName']}"
-              found_dep_value = get_object_value(results, depends_on_field_key) || get_object_value(options, depends_on_field_key)
-
-              if depends_on_values.size > 0
-                # must be in the specified values
-                # todo: uhh this actually needs to change to parse regex
-                if !depends_on_values.include?(found_dep_value)
-                  next
-                end
-              else
-                # no value found
-                if found_dep_value.to_s.empty?
-                  next
+
+            found_dep_value = match_type == 'all' ? true : false
+            visible_option_check_value.split(',').each do |value|
+              parts = value.split(':')
+              depends_on_code = parts[0]
+              depends_on_value = parts.count > 1 ? parts[1].to_s.strip : '.'
+              depends_on_option_type = option_types.find {|it| it["code"] == depends_on_code }
+              if !depends_on_option_type
+                depends_on_option_type = option_types.find {|it|
+                  (it['fieldContext'] ? "#{it['fieldContext']}.#{it['fieldName']}" : it['fieldName']) == depends_on_code
+                }
+              end
+
+              if depends_on_option_type
+                depends_on_field_key = depends_on_option_type['fieldContext'].nil? || depends_on_option_type['fieldContext'].empty? ? "#{depends_on_option_type['fieldName']}" : "#{depends_on_option_type['fieldContext']}.#{depends_on_option_type['fieldName']}"
+                field_value = get_object_value(results, depends_on_field_key) || get_object_value(options, depends_on_field_key)
+
+                if !field_value.nil? && field_value.match?(depends_on_value)
+                  found_dep_value = true if match_type != 'all'
+                else
+                  found_dep_value = false if match_type == 'all'
                 end
               end
-            else
-              # could not find the dependent option type, proceed and prompt
             end
+            next if !found_dep_value
           end
 
           cur_namespace = options
@@ -283,10 +274,9 @@ module Morpheus
 
           if option_type['type'] == 'multiSelect'
             value = [value] if !value.nil? && !value.is_a?(Array)
-            parent_context_map[parent_ns] = value
-          else
-            context_map[field_name] = value
+            # parent_context_map[parent_ns] = value
           end
+          context_map[field_name] = value
         end
         results
       end

data/lib/morpheus/cli/tenants_command.rb

@@ -248,41 +248,39 @@ EOT
 
 
   def remove(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:auto_confirm, :json, :remote, :dry_run])
+      opts.banner = subcommand_usage("[tenant]")
+      opts.on('--remove-resources [on|off]', ['on','off'], "Remove Infrastructure. Default is off.") do |val|
+        params[:removeResources] = val.nil? ? 'on' : val
+      end
+      build_standard_remove_options(opts, options)
+      opts.footer = <<-EOT
+Delete a tenant.
+[tenant] is required. This is the name or id of a tenant.
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, count:1)
+    optparse.parse!(args)
     connect(options)
     begin
       # allow finding by ID since name is not unique!
       account = find_account_by_name_or_id(args[0])
-      exit 1 if account.nil?
-      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the account #{account['name']}?")
-        exit
-      end
-      if options[:dry_run] && options[:json]
-        puts as_json(payload, options)
-        return 0
+      return 1, "tenant not found" if account.nil?
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the tenant #{account['name']}?")
+        return 9, "aborted command"
       end
       @accounts_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @accounts_interface.dry.destroy(account['id'])
+        print_dry_run @accounts_interface.dry.destroy(account['id'], params)
         return
       end
-      json_response = @accounts_interface.destroy(account['id'])
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      else
+      json_response = @accounts_interface.destroy(account['id'], params)
+      render_response(json_response, options) do
         print_green_success "Tenant #{account['name']} removed"
       end
-
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.3.2"
+    VERSION = "5.3.2.1"
   end
 end

data/lib/morpheus/ext/string.rb

@@ -0,0 +1,41 @@
+class String
+  
+  def pluralize
+    value = self
+    if value == ""
+      value
+    elsif value[-1].chr == "y"
+      value[0..-2] + "ies"
+    elsif value[-1].chr == "s"
+      if value[-2..-1] == "es"
+        value
+      else
+        value + "es"
+      end
+    else
+      value + "s"
+    end
+  end
+
+  def singularize
+    value = self
+    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]
+    elsif value[-1] == "s"
+      value[0..-2]
+    end
+  end
+
+  def dasherize
+    self.gsub(" ", "-").gsub("_", "-")
+  end
+
+  def underscoreize
+    self.gsub(" ", "_").gsub("-", "_")
+  end
+
+end

data/lib/morpheus/formatters.rb

@@ -472,3 +472,7 @@ def format_name_values(obj)
     ""
   end
 end
+
+def a_or_an(v)
+  v.to_s =~ /^[aeiou]/i ? "an" : "a"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.2.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -236,6 +236,9 @@ files:
 - lib/morpheus/api/library_spec_template_types_interface.rb
 - lib/morpheus/api/library_spec_templates_interface.rb
 - lib/morpheus/api/license_interface.rb
+- lib/morpheus/api/load_balancer_pools_interface.rb
+- lib/morpheus/api/load_balancer_types_interface.rb
+- lib/morpheus/api/load_balancer_virtual_servers_interface.rb
 - lib/morpheus/api/load_balancers_interface.rb
 - lib/morpheus/api/log_settings_interface.rb
 - lib/morpheus/api/logs_interface.rb
@@ -279,6 +282,8 @@ files:
 - lib/morpheus/api/rest_interface.rb
 - lib/morpheus/api/roles_interface.rb
 - lib/morpheus/api/search_interface.rb
+- lib/morpheus/api/secondary_read_interface.rb
+- lib/morpheus/api/secondary_rest_interface.rb
 - lib/morpheus/api/security_group_rules_interface.rb
 - lib/morpheus/api/security_groups_interface.rb
 - lib/morpheus/api/server_types_interface.rb
@@ -392,6 +397,7 @@ files:
 - lib/morpheus/cli/library_spec_templates_command.rb
 - lib/morpheus/cli/library_upgrades_command.rb
 - lib/morpheus/cli/license.rb
+- lib/morpheus/cli/load_balancer_types.rb
 - lib/morpheus/cli/load_balancers.rb
 - lib/morpheus/cli/log_settings_command.rb
 - lib/morpheus/cli/login.rb
@@ -402,6 +408,7 @@ files:
 - lib/morpheus/cli/mixins/deployments_helper.rb
 - lib/morpheus/cli/mixins/infrastructure_helper.rb
 - lib/morpheus/cli/mixins/library_helper.rb
+- lib/morpheus/cli/mixins/load_balancers_helper.rb
 - lib/morpheus/cli/mixins/logs_helper.rb
 - lib/morpheus/cli/mixins/monitoring_helper.rb
 - lib/morpheus/cli/mixins/operations_helper.rb
@@ -410,6 +417,7 @@ files:
 - lib/morpheus/cli/mixins/processes_helper.rb
 - lib/morpheus/cli/mixins/provisioning_helper.rb
 - lib/morpheus/cli/mixins/remote_helper.rb
+- lib/morpheus/cli/mixins/rest_command.rb
 - lib/morpheus/cli/mixins/vdi_helper.rb
 - lib/morpheus/cli/mixins/whoami_helper.rb
 - lib/morpheus/cli/monitoring_alerts_command.rb
@@ -473,6 +481,7 @@ files:
 - lib/morpheus/ext/hash.rb
 - lib/morpheus/ext/nil_class.rb
 - lib/morpheus/ext/rest_client.rb
+- lib/morpheus/ext/string.rb
 - lib/morpheus/formatters.rb
 - lib/morpheus/logging.rb
 - lib/morpheus/morpkg.rb