morpheus-cli 4.1.4 → 4.1.5

data/lib/morpheus/cli/apps.rb

@@ -1007,6 +1007,7 @@ class Morpheus::Cli::Apps
       params = {}
       params.merge!(parse_list_options(options))
       params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      params['order'] = params['direction'] unless params['direction'].nil? # old api version expects order instead of direction
       @logs_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @logs_interface.dry.container_logs(containers, params)
@@ -1027,7 +1028,7 @@ class Morpheus::Cli::Apps
       if logs['data'].empty?
         puts "#{cyan}No logs found.#{reset}"
       else
-        logs['data'].reverse.each do |log_entry|
+        logs['data'].each do |log_entry|
           log_level = ''
           case log_entry['level']
           when 'INFO'
@@ -1503,7 +1504,7 @@ class Morpheus::Cli::Apps
                     "[app] is required. This is the name or id of an app. Supports 1-N [app] arguments."
     end
     optparse.parse!(args)
-    if args.count != 1
+    if args.count < 1
       raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
     connect(options)
@@ -1793,7 +1794,7 @@ class Morpheus::Cli::Apps
   end
 
   def find_app_by_name(name)
-    app_results = @apps_interface.get({name: name})
+    app_results = @apps_interface.list({name: name})
     if app_results['apps'].empty?
       print_red_alert "App not found by name #{name}"
       exit 1

data/lib/morpheus/cli/archives_command.rb

@@ -1822,27 +1822,6 @@ class Morpheus::Cli::ArchivesCommand
     return archive_file
   end
 
-  # def find_group_by_name(name)
-  #   group_results = @groups_interface.get(name)
-  #   if group_results['groups'].empty?
-  #     print_red_alert "Group not found by name #{name}"
-  #     return nil
-  #   end
-  #   return group_results['groups'][0]
-  # end
-
-  # def find_cloud_by_name(group_id, name)
-  #   option_results = @options_interface.options_for_source('clouds',{groupId: group_id})
-  #   match = option_results['data'].find { |grp| grp['value'].to_s == name.to_s || grp['name'].downcase == name.downcase}
-  #   if match.nil?
-  #     print_red_alert "Cloud not found by name #{name}"
-  #     return nil
-  #   else
-  #     return match['value']
-  #   end
-  # end
-
-
   def format_archive_bucket_full_status(archive_bucket, return_color=cyan)
     out = ""
     if archive_bucket['lastResult']

data/lib/morpheus/cli/blueprints_command.rb

@@ -880,7 +880,7 @@ class Morpheus::Cli::BlueprintsCommand
       opts.footer = "Update a blueprint, removing a specified instance config." + "\n" +
                     "[id] is required. This is the name or id of a blueprint." + "\n" +
                     "[tier] is required. This is the name of the tier." + "\n" +
-                    "[instance] is required. This is the instance identifier, which may be the type, the name, or the index (starting with 0." + "\n" +
+                    "[instance] is required. This is the instance identifier, which may be the type, the name, or the index starting with 0." + "\n" +
                     "The config scope is specified with the -g GROUP, -c CLOUD and -e ENV. The -g and -c options are required."
     end
     optparse.parse!(args)
@@ -1063,7 +1063,7 @@ class Morpheus::Cli::BlueprintsCommand
       opts.footer = "Update a blueprint, removing a specified instance." + "\n" +
                     "[id] is required. This is the name or id of a blueprint." + "\n" +
                     "[tier] is required. This is the name of the tier." + "\n" +
-                    "[instance] is required. This is the instance identifier, which may be the type, the name, or the index (starting with 0."
+                    "[instance] is required. This is the instance identifier, which may be the type, the name, or the index starting with 0."
     end
     
     optparse.parse!(args)

data/lib/morpheus/cli/cli_command.rb

@@ -34,14 +34,14 @@ module Morpheus
         @my_terminal ||= Morpheus::Terminal.instance
       end
 
-      # set the terminal this is running this command.
+      # set the terminal running this command.
       # @param term [MorpheusTerminal] the terminal this command is assigned to
       # @return the Terminal this command is being executed inside of
       def my_terminal=(term)
-        if !t.is_a?(Morpheus::Terminal)
-          raise "CliCommand #{self.class} terminal= expects object of type Terminal and instead got a #{t.class}"
+        if !term.is_a?(Morpheus::Terminal)
+          raise "CliCommand (#{self.class}) my_terminal= expects object of type Terminal and instead got a #{term.class}"
         end
-        @my_terminal = t
+        @my_terminal = term
       end
 
 
@@ -363,8 +363,14 @@ module Morpheus
               options[:phrase] = phrase
             end
 
-            opts.on( '-S', '--sort ORDER', "Sort Order" ) do |v|
-              options[:sort] = v
+            opts.on( '-S', '--sort ORDER', "Sort Order. DIRECTION may be included as \"ORDER [asc|desc]\"." ) do |v|
+              v_parts = v.to_s.split(" ")
+              if v_parts.size > 1
+                options[:sort] = v_parts[0]
+                options[:direction] = (v_parts[1].strip == "desc") ? "desc" : "asc"
+              else
+                options[:sort] = v
+              end
             end
 
             opts.on( '-D', '--desc', "Reverse Sort Order" ) do |v|
@@ -772,8 +778,16 @@ module Morpheus
           end
           cmd_results << cur_result
         end
-        failed_cmd = cmd_results.find {|cmd_result| cmd_result == false || (cmd_result.is_a?(Integer) && cmd_result != 0) }
-        return failed_cmd ? failed_cmd : 0
+        # find a bad result and return it
+        cmd_results = cmd_results.collect do |cmd_result| 
+          if cmd_result.is_a?(Array)
+            cmd_result
+          else
+            [cmd_result, nil]
+          end
+        end
+        failed_result = cmd_results.find {|cmd_result| cmd_result[0] == false || (cmd_result[0].is_a?(Integer) && cmd_result[0] != 0) }
+        return failed_result ? failed_result : cmd_results.last
       end
 
       # This supports the simple remote option eg. `instances add --remote "qa"`
@@ -927,6 +941,16 @@ module Morpheus
         return subtitles
       end
 
+      def parse_payload(options={})
+        payload = nil
+        if options[:payload]
+          payload = options[:payload]
+          # support -O OPTION switch on top of --payload
+          payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        end
+        payload
+      end
+
       # basic rendering for options :json, :yaml, :csv, :fields, and :outfile
       # returns the string rendered, or nil if nothing was rendered.
       def render_with_format(json_response, options, object_key=nil)

data/lib/morpheus/cli/clouds.rb

@@ -64,11 +64,11 @@ class Morpheus::Cli::Clouds
       params.merge!(parse_list_options(options))
       @clouds_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @clouds_interface.dry.get(params)
+        print_dry_run @clouds_interface.dry.list(params)
         return 0
       end
 
-      json_response = @clouds_interface.get(params)
+      json_response = @clouds_interface.list(params)
       if options[:json]
         puts as_json(json_response, options, "zones")
         return 0
@@ -117,10 +117,10 @@ class Morpheus::Cli::Clouds
       params.merge!(parse_list_options(options))
       @clouds_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @clouds_interface.dry.get(params)
+        print_dry_run @clouds_interface.dry.list(params)
         return
       end
-      json_response = @clouds_interface.get(params)
+      json_response = @clouds_interface.list(params)
       # print number only
       if json_response['meta'] && json_response['meta']['total']
         print cyan, json_response['meta']['total'], reset, "\n"
@@ -160,16 +160,11 @@ class Morpheus::Cli::Clouds
         if arg.to_s =~ /\A\d{1,}\Z/
           print_dry_run @clouds_interface.dry.get(arg.to_i)
         else
-          print_dry_run @clouds_interface.dry.get({name:arg})
+          print_dry_run @clouds_interface.dry.list({name:arg})
         end
         return
       end
       cloud = find_cloud_by_name_or_id(arg)
-      #json_response = {'zone' => cloud}
-      # if options[:dry_run]
-      #   print_dry_run @clouds_interface.dry.get(cloud['id'])
-      #   return
-      # end
       @clouds_interface.setopts(options)
       json_response = @clouds_interface.get(cloud['id'])
       cloud = json_response['zone']
@@ -278,7 +273,7 @@ class Morpheus::Cli::Clouds
         else
           # print_red_alert "Group not found or specified!"
           # exit 1
-          groups_dropdown = @groups_interface.get({})['groups'].collect {|it| {'name' => it["name"], 'value' => it["id"]} }
+          groups_dropdown = @groups_interface.list({})['groups'].collect {|it| {'name' => it["name"], 'value' => it["id"]} }
           group_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'selectOptions' => groups_dropdown, 'required' => true, 'description' => 'Select Group.'}],options[:options],@api_client,{})
           group_id = group_prompt['group']
         end

data/lib/morpheus/cli/clusters.rb

@@ -24,6 +24,7 @@ class Morpheus::Cli::Clusters
   register_subcommands :list_pods, :remove_pod, :restart_pod
   register_subcommands :list_jobs, :remove_job
   register_subcommands :list_services, :remove_service
+  register_subcommands :list_datastores, :get_datastore, :update_datastore
   register_subcommands :update_permissions
   register_subcommands :api_config, :view_api_token, :view_kube_config
   register_subcommands :wiki, :update_wiki
@@ -409,7 +410,7 @@ class Morpheus::Cli::Clusters
         options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
       end
       opts.on('--workflow ID', String, "Workflow") do |val|
-        params['taskSetId'] = val.to_i
+        options['taskSetId'] = val.to_i
       end
       add_server_options(opts, options)
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
@@ -868,7 +869,7 @@ class Morpheus::Cli::Clusters
       if logs['data'].empty?
         puts "#{cyan}No logs found.#{reset}"
       else
-        logs['data'].reverse.each do |log_entry|
+        logs['data'].each do |log_entry|
           log_level = ''
           case log_entry['level']
           when 'INFO'
@@ -2494,6 +2495,203 @@ class Morpheus::Cli::Clusters
     end
   end
 
+  def list_datastores(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cluster]")
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List datastores for a cluster.\n" +
+          "[cluster] is required. This is the name or id of an existing cluster."
+    end
+
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      cluster = find_cluster_by_name_or_id(args[0])
+      return 1 if cluster.nil?
+
+      params = {}
+      params.merge!(parse_list_options(options))
+      @clusters_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clusters_interface.dry.list_datastores(cluster['id'], params)
+        return
+      end
+      json_response = @clusters_interface.list_datastores(cluster['id'], params)
+
+      render_result = render_with_format(json_response, options, 'datastores')
+      return 0 if render_result
+
+      title = "Morpheus Cluster Datastores: #{cluster['name']}"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      datastores = json_response['datastores']
+      if datastores.empty?
+        print yellow,"No datastores found.",reset,"\n"
+      else
+        # more stuff to show here
+        rows = datastores.collect do |ds|
+          {
+              id: ds['id'],
+              name: ds['name'],
+              type: ds['type'],
+              capacity: format_bytes_short(ds['freeSpace']).strip,
+              online: format_boolean(ds['online']),
+              visibility: ds['visibility'].nil? ? '' : ds['visibility'].to_s.capitalize,
+              tenants: ds['tenants'].nil? ? '' : ds['tenants'].collect {|it| it['name']}.join(', ')
+          }
+        end
+        columns = [
+            :id, :name, :type, :capacity, :online, :visibility, :tenants
+        ]
+        print as_pretty_table(rows, columns, options)
+      end
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def get_datastore(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cluster] [datastore]")
+      build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about a cluster datastore.\n" +
+          "[cluster] is required. This is the name or id of an existing cluster.\n" +
+          "[datastore] is required. This is the name or id of an existing datastore."
+    end
+    optparse.parse!(args)
+    if args.count != 2
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      cluster = find_cluster_by_name_or_id(args[0])
+      return 1 if cluster.nil?
+      # this finds the namespace in the cluster api response, then fetches it by ID
+      datastore = find_datastore_by_name_or_id(cluster['id'], args[1])
+      if datastore.nil?
+        print_red_alert "Datastore not found for '#{args[1]}'"
+        exit 1
+      end
+      params = {}
+      params.merge!(parse_list_options(options))
+      @clusters_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clusters_interface.dry.get_datastore(cluster['id'], datastore['id'], params)
+        return
+      end
+      json_response = @clusters_interface.get_datastore(cluster['id'], datastore['id'], params)
+
+      render_result = render_with_format(json_response, options, 'datastore')
+      return 0 if render_result
+
+      print_h1 "Morpheus Cluster Datastore"
+      print cyan
+      description_cols = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Type" => 'type',
+          "Capacity" => lambda { |it| format_bytes_short(it['freeSpace']).strip },
+          "Online" => lambda { |it| format_boolean(it['online']) },
+          "Visibility" => lambda { |it| it['visibility'].nil? ? '' : it['visibility'].to_s.capitalize },
+          "Tenants" => lambda { |it| it['tenants'].nil? ? '' : it['tenants'].collect {|it| it['name']}.join(', ') },
+          "Cluster" => lambda { |it| cluster['name'] }
+      }
+      print_description_list(description_cols, datastore)
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update_datastore(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[cluster] [datastore] [options]")
+      opts.on('--active [on|off]', String, "Enable datastore") do |val|
+        options[:active] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      add_perms_options(opts, options, ['planAccess', 'groupAccessDefaults'])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Update a cluster datastore.\n" +
+          "[cluster] is required. This is the name or id of an existing cluster.\n" +
+          "[datastore] is required. This is the name or id of an existing datastore."
+    end
+
+    optparse.parse!(args)
+    if args.count != 2
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+
+    begin
+      cluster = find_cluster_by_name_or_id(args[0])
+      return 1 if cluster.nil?
+      datastore = find_datastore_by_name_or_id(cluster['id'], args[1])
+      if datastore.nil?
+        print_red_alert "Datastore not found by '#{args[1]}'"
+        exit 1
+      end
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of everything
+        if options[:options]
+          payload.deep_merge!({'datastore' => options[:options].reject {|k,v| k.is_a?(Symbol) }})
+        end
+      else
+        payload = {'datastore' => {}}
+        payload['datastore']['active'] = options[:active].nil? ? (Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'description' => 'Datastore Active', 'defaultValue' => true}], options[:options], @api_client))['active'] == 'on' : options[:active]
+
+        perms = prompt_permissions(options, datastore['owner']['id'] == current_user['accountId'] ? ['planAccess', 'groupAccessDefaults'] : ['planAccess', 'groupAccessDefaults', 'visibility', 'tenants'])
+        perms_payload = {}
+        perms_payload['resourcePermissions'] = perms['resourcePermissions'] if !perms['resourcePermissions'].nil?
+        perms_payload['tenantPermissions'] = perms['tenantPermissions'] if !perms['tenantPermissions'].nil?
+
+        payload['datastore']['permissions'] = perms_payload
+        payload['datastore']['visibility'] = perms['resourcePool']['visibility'] if !perms['resourcePool'].nil? && !perms['resourcePool']['visibility'].nil?
+
+        # support -O OPTION switch on top of everything
+        if options[:options]
+          payload.deep_merge!({'datastore' => options[:options].reject {|k,v| k.is_a?(Symbol) }})
+        end
+
+        if payload['datastore'].nil? || payload['datastore'].empty?
+          raise_command_error "Specify at least one option to update.\n#{optparse}"
+        end
+      end
+
+      @clusters_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clusters_interface.dry.update_datastore(cluster['id'], datastore['id'], payload)
+        return
+      end
+      json_response = @clusters_interface.update_datastore(cluster['id'], datastore['id'], payload)
+      if options[:json]
+        puts as_json(json_response)
+      elsif !options[:quiet]
+        datastore = json_response['datastore']
+        print_green_success "Updated datastore #{datastore['name']}"
+        #get_args = [cluster["id"], datastore["id"]] + (options[:remote] ? ["-r",options[:remote]] : [])
+        #get_namespace(get_args)
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   def api_config(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -3332,6 +3530,16 @@ class Morpheus::Cli::Clusters
     json_results['namespaces'].empty? ? nil : json_results['namespaces'][0]
   end
 
+  def find_datastore_by_name_or_id(cluster_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      params = {datastoreId: val.to_i}
+    else
+      params = {phrase: val}
+    end
+    json_results = @clusters_interface.list_datastores(cluster_id, params)
+    json_results['datastores'].empty? ? nil : json_results['datastores'][0]
+  end
+
   def find_job_by_name_or_id(cluster_id, val)
     if val.to_s =~ /\A\d{1,}\Z/
       params = {jobId: val.to_i}
@@ -3638,49 +3846,62 @@ class Morpheus::Cli::Clusters
     end
   end
 
-  def add_perms_options(opts, options)
-    opts.on('--group-access-all [on|off]', String, "Toggle Access for all groups.") do |val|
-      options[:groupAccessAll] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
-    end
-    opts.on('--group-access LIST', Array, "Group Access, comma separated list of group IDs.") do |list|
-      if list.size == 1 && list[0] == 'null' # hacky way to clear it
-        options[:groupAccessList] = []
-      else
-        options[:groupAccessList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+  def add_perms_options(opts, options, excludes = [])
+    if !excludes.include?('groupAccess')
+      opts.on('--group-access-all [on|off]', String, "Toggle Access for all groups.") do |val|
+        options[:groupAccessAll] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
-    end
-    opts.on('--group-defaults LIST', Array, "Group Default Selection, comma separated list of group IDs") do |list|
-      if list.size == 1 && list[0] == 'null' # hacky way to clear it
-        options[:groupDefaultsList] = []
-      else
-        options[:groupDefaultsList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      opts.on('--group-access LIST', Array, "Group Access, comma separated list of group IDs.") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          options[:groupAccessList] = []
+        else
+          options[:groupAccessList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
       end
-    end
-    opts.on('--plan-access-all [on|off]', String, "Toggle Access for all service plans.") do |val|
-      options[:planAccessAll] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
-    end
-    opts.on('--plan-access LIST', Array, "Service Plan Access, comma separated list of plan IDs.") do |list|
-      if list.size == 1 && list[0] == 'null' # hacky way to clear it
-        options[:planAccessList] = []
-      else
-        options[:planAccessList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      if !excludes.include?('groupAccessDefaults')
+        opts.on('--group-defaults LIST', Array, "Group Default Selection, comma separated list of group IDs") do |list|
+          if list.size == 1 && list[0] == 'null' # hacky way to clear it
+            options[:groupDefaultsList] = []
+          else
+            options[:groupDefaultsList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+          end
+        end
       end
     end
-    opts.on('--plan-defaults LIST', Array, "Plan Default Selection, comma separated list of plan IDs") do |list|
-      if list.size == 1 && list[0] == 'null' # hacky way to clear it
-        options[:planDefaultsList] = []
-      else
-        options[:planDefaultsList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+
+    if !excludes.include?('planAccess')
+      opts.on('--plan-access-all [on|off]', String, "Toggle Access for all service plans.") do |val|
+        options[:planAccessAll] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--plan-access LIST', Array, "Service Plan Access, comma separated list of plan IDs.") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          options[:planAccessList] = []
+        else
+          options[:planAccessList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      opts.on('--plan-defaults LIST', Array, "Plan Default Selection, comma separated list of plan IDs") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          options[:planDefaultsList] = []
+        else
+          options[:planDefaultsList] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
       end
     end
-    opts.on('--visibility [private|public]', String, "Visibility") do |val|
-      options[:visibility] = val
+
+    if !excludes.include?('visibility')
+      opts.on('--visibility [private|public]', String, "Visibility") do |val|
+        options[:visibility] = val
+      end
     end
-    opts.on('--tenants LIST', Array, "Tenant Access, comma separated list of account IDs") do |list|
-      if list.size == 1 && list[0] == 'null' # hacky way to clear it
-        options[:tenants] = []
-      else
-        options[:tenants] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+
+    if !excludes.include?('tenants')
+      opts.on('--tenants LIST', Array, "Tenant Access, comma separated list of account IDs") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          options[:tenants] = []
+        else
+          options[:tenants] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
       end
     end
   end
@@ -3748,49 +3969,52 @@ class Morpheus::Cli::Clusters
     rtn
   end
 
-  def prompt_permissions(options)
-    all_groups = false
-    group_access = []
-    all_plans = false
-    plan_access = []
+  def prompt_permissions(options, excludes = [])
+    all_groups = nil
+    group_access = nil
+    all_plans = nil
+    plan_access = nil
 
     # Group Access
-    if options[:groupAccessAll]
-      all_groups = true
-    end
+    if !excludes.include?('groupAccess')
+      if options[:groupAccessAll]
+        all_groups = true
+      end
 
-    if !options[:groupAccessList].empty?
-      group_access = options[:groupAccessList].collect {|site_id| {'id' => site_id.to_i}} || []
-    elsif !options[:no_prompt]
-      available_groups = get_available_groups
+      if !options[:groupAccessList].empty?
+        group_access = options[:groupAccessList].collect {|site_id| {'id' => site_id.to_i}} || []
+      elsif !options[:no_prompt]
+        available_groups = get_available_groups
 
-      if available_groups.empty?
-        #print_red_alert "No available groups"
-        #exit 1
-      elsif available_groups.count > 1
-        available_groups.unshift({"id" => '0', "name" => "All", "value" => "all"})
+        if available_groups.empty?
+          #print_red_alert "No available groups"
+          #exit 1
+        elsif available_groups.count > 1
+          available_groups.unshift({"id" => '0', "name" => "All", "value" => "all"})
 
-        # default to all
-        group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group Access', 'selectOptions' => available_groups, 'required' => false, 'description' => 'Add Group Access.'}], options[:options], @api_client, {})['group']
+          # default to all
+          group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group Access', 'selectOptions' => available_groups, 'required' => false, 'description' => 'Add Group Access.'}], options[:options], @api_client, {})['group']
 
-        if !group_id.nil?
-          if group_id == 'all'
-            all_groups = true
-          else
-            group_access = [{'id' => group_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_groups.find{|it| it['id'] == group_id}['name']}' as default?", {:default => false})}]
-          end
-          available_groups = available_groups.reject {|it| it['value'] == group_id}
+          if !group_id.nil?
+            if group_id == 'all'
+              all_groups = true
+            else
+              group_access = (excludes.include?('groupAccessDefaults') ? [{'id' => group_id}] : [{'id' => group_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_groups.find{|it| it['id'] == group_id}['name']}' as default?", {:default => false})}])
+            end
+            available_groups = available_groups.reject {|it| it['value'] == group_id}
 
-          while !group_id.nil? && !available_groups.empty? && Morpheus::Cli::OptionTypes.confirm("Add another group access?", {:default => false})
-            group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group Access', 'selectOptions' => available_groups, 'required' => false, 'description' => 'Add Group Access.'}], options[:options], @api_client, {})['group']
+            while !group_id.nil? && !available_groups.empty? && Morpheus::Cli::OptionTypes.confirm("Add another group access?", {:default => false})
+              group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group Access', 'selectOptions' => available_groups, 'required' => false, 'description' => 'Add Group Access.'}], options[:options], @api_client, {})['group']
 
-            if !group_id.nil?
-              if group_id == 'all'
-                all_groups = true
-              else
-                group_access << {'id' => group_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_groups.find{|it| it['id'] == group_id}['name']}' as default?", {:default => false})}
+              if !group_id.nil?
+                if group_id == 'all'
+                  all_groups = true
+                else
+                  group_access ||= []
+                  group_access << (excludes.include?('groupAccessDefaults') ? {'id' => group_id} : {'id' => group_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_groups.find{|it| it['id'] == group_id}['name']}' as default?", {:default => false})})
+                end
+                available_groups = available_groups.reject {|it| it['value'] == group_id}
               end
-              available_groups = available_groups.reject {|it| it['value'] == group_id}
             end
           end
         end
@@ -3798,43 +4022,46 @@ class Morpheus::Cli::Clusters
     end
 
     # Plan Access
-    if options[:planAccessAll]
-      all_plans = true
-    end
+    if !excludes.include?('planAccess')
+      if options[:planAccessAll]
+        all_plans = true
+      end
 
-    if !options[:planAccessList].empty?
-      plan_access = options[:planAccessList].collect {|plan_id| {'id' => plan_id.to_i}}
-    elsif !options[:no_prompt]
-      available_plans = namespace_service_plans.collect {|it| {'id' => it['id'], 'name' => it['name'], 'value' => it['id']} }
+      if !options[:planAccessList].empty?
+        plan_access = options[:planAccessList].collect {|plan_id| {'id' => plan_id.to_i}}
+      elsif !options[:no_prompt]
+        available_plans = namespace_service_plans.collect {|it| {'id' => it['id'], 'name' => it['name'], 'value' => it['id']} }
 
-      if available_plans.empty?
-        #print_red_alert "No available plans"
-        #exit 1
-      elsif !available_plans.empty? && !options[:no_prompt]
-        available_plans.unshift({"id" => '0', "name" => "All", "value" => "all"})
+        if available_plans.empty?
+          #print_red_alert "No available plans"
+          #exit 1
+        elsif !available_plans.empty? && !options[:no_prompt]
+          available_plans.unshift({"id" => '0', "name" => "All", "value" => "all"})
 
-        # default to all
-        plan_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Service Plan Access', 'selectOptions' => available_plans, 'required' => false, 'description' => 'Add Service Plan Access.'}], options[:options], @api_client, {})['plan']
+          # default to all
+          plan_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Service Plan Access', 'selectOptions' => available_plans, 'required' => false, 'description' => 'Add Service Plan Access.'}], options[:options], @api_client, {})['plan']
 
-        if !plan_id.nil?
-          if plan_id == 'all'
-            all_plans = true
-          else
-            plan_access = [{'id' => plan_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_plans.find{|it| it['id'] == plan_id}['name']}' as default?", {:default => false})}]
-          end
+          if !plan_id.nil?
+            if plan_id == 'all'
+              all_plans = true
+            else
+              plan_access = [{'id' => plan_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_plans.find{|it| it['id'] == plan_id}['name']}' as default?", {:default => false})}]
+            end
 
-          available_plans = available_plans.reject {|it| it['value'] == plan_id}
+            available_plans = available_plans.reject {|it| it['value'] == plan_id}
 
-          while !plan_id.nil? && !available_plans.empty? && Morpheus::Cli::OptionTypes.confirm("Add another service plan access?", {:default => false})
-            plan_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Service Plan Access', 'selectOptions' => available_plans, 'required' => false, 'description' => 'Add Service Plan Access.'}], options[:options], @api_client, {})['plan']
+            while !plan_id.nil? && !available_plans.empty? && Morpheus::Cli::OptionTypes.confirm("Add another service plan access?", {:default => false})
+              plan_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'plan', 'type' => 'select', 'fieldLabel' => 'Service Plan Access', 'selectOptions' => available_plans, 'required' => false, 'description' => 'Add Service Plan Access.'}], options[:options], @api_client, {})['plan']
 
-            if !plan_id.nil?
-              if plan_id == 'all'
-                all_plans = true
-              else
-                plan_access << {'id' => plan_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_plans.find{|it| it['id'] == plan_id}['name']}' as default?", {:default => false})}
+              if !plan_id.nil?
+                if plan_id == 'all'
+                  all_plans = true
+                else
+                  plan_access ||= []
+                  plan_access << {'id' => plan_id, 'default' => Morpheus::Cli::OptionTypes.confirm("Set '#{available_plans.find{|it| it['id'] == plan_id}['name']}' as default?", {:default => false})}
+                end
+                available_plans = available_plans.reject {|it| it['value'] == plan_id}
               end
-              available_plans = available_plans.reject {|it| it['value'] == plan_id}
             end
           end
         end
@@ -3842,10 +4069,10 @@ class Morpheus::Cli::Clusters
     end
 
     resource_perms = {}
-    resource_perms['all'] = true if all_groups
-    resource_perms['sites'] = group_access if !group_access.empty?
-    resource_perms['allPlans'] = true if all_plans
-    resource_perms['plans'] = plan_access if !plan_access.empty?
+    resource_perms['all'] = all_groups if !all_groups.nil?
+    resource_perms['sites'] = group_access if !group_access.nil?
+    resource_perms['allPlans'] = all_plans if !all_plans.nil?
+    resource_perms['plans'] = plan_access if !plan_access.nil?
 
     permissions = {'resourcePermissions' => resource_perms}
 
@@ -3859,24 +4086,26 @@ class Morpheus::Cli::Clusters
       permissions['resourcePool'] = {'visibility' => visibility}
 
       # Tenants
-      if !options[:tenants].nil?
-        accounts = options[:tenants].collect {|id| id.to_i}
-      elsif !options[:no_prompt]
-        account_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'account_id', 'type' => 'select', 'fieldLabel' => 'Add Tenant', 'selectOptions' => available_accounts, 'required' => false, 'description' => 'Add Tenant Permissions.'}], options[:options], @api_client, {})['account_id']
+      if !excludes.include?('tenants')
+        if !options[:tenants].nil?
+          accounts = options[:tenants].collect {|id| id.to_i}
+        elsif !options[:no_prompt]
+          account_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'account_id', 'type' => 'select', 'fieldLabel' => 'Add Tenant', 'selectOptions' => available_accounts, 'required' => false, 'description' => 'Add Tenant Permissions.'}], options[:options], @api_client, {})['account_id']
 
-        if !account_id.nil?
-          accounts << account_id
-          available_accounts = available_accounts.reject {|it| it['value'] == account_id}
+          if !account_id.nil?
+            accounts << account_id
+            available_accounts = available_accounts.reject {|it| it['value'] == account_id}
 
-          while !available_accounts.empty? && (account_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'account_id', 'type' => 'select', 'fieldLabel' => 'Add Another Tenant', 'selectOptions' => available_accounts, 'required' => false, 'description' => 'Add Tenant Permissions.'}], options[:options], @api_client, {})['account_id'])
-            if !account_id.nil?
-              accounts << account_id
-              available_accounts = available_accounts.reject {|it| it['value'] == account_id}
+            while !available_accounts.empty? && (account_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'account_id', 'type' => 'select', 'fieldLabel' => 'Add Another Tenant', 'selectOptions' => available_accounts, 'required' => false, 'description' => 'Add Tenant Permissions.'}], options[:options], @api_client, {})['account_id'])
+              if !account_id.nil?
+                accounts << account_id
+                available_accounts = available_accounts.reject {|it| it['value'] == account_id}
+              end
             end
           end
         end
+        permissions['tenantPermissions'] = {'accounts' => accounts}
       end
-      permissions['tenantPermissions'] = {'accounts' => accounts} if !accounts.empty?
     end
     permissions
   end