morpheus-cli 5.4.5.1 → 5.5.1.1

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

@@ -0,0 +1,103 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::ScaleThresholds
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+
+  set_command_name :'scale-thresholds'
+  set_command_description "View and manage scale thresholds."
+  register_subcommands :list, :get, :add, :update, :remove
+
+  # using convention matching /scale-thresholds now
+
+  # RestCommand settings
+  #set_rest_interface_name :thresholds
+  # register_interfaces :thresholds
+  # set_rest_interface_name :thresholds
+  
+  # set_rest_name :threshold
+  # set_rest_label "Scale Threshold"
+  # set_rest_label_plural "Scale Thresholds"
+
+  protected
+
+  # def threshold_object_key
+  #   'scaleThreshold'
+  # end
+
+  # def threshold_list_key
+  #   'scaleThresholds'
+  # end
+
+  # def threshold_label
+  #   'Scale Threshold'
+  # end
+
+  # def threshold_label_plural
+  #   'Scale Thresholds'
+  # end
+
+  def scale_threshold_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "CPU" => lambda {|it| it['cpuEnabled'] ? "✔" : '' },
+      "Memory" => lambda {|it| it['memoryEnabled'] ? "✔" : '' },
+      "Disk" => lambda {|it| it['diskEnabled'] ? "✔" : '' },
+    }
+  end
+
+  def scale_threshold_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Auto Upscale" => lambda {|it| format_boolean(it['autoUp']) },
+      "Auto Downscale" => lambda {|it| format_boolean(it['autoDown']) },
+      "Min Count" => lambda {|it| it['minCount'] },
+      "Max Count" => lambda {|it| it['maxCount'] },
+      "Enable CPU Threshold" => lambda {|it| format_boolean(it['cpuEnabled']) },
+      "Min CPU" => lambda {|it| it['minCpu'] },
+      "Max CPU" => lambda {|it| it['maxCpu'] },
+      "Enable Memory Threshold" => lambda {|it| format_boolean(it['memoryEnabled']) },
+      "Min Memory" => lambda {|it| it['minMemory'] },
+      "Max Memory" => lambda {|it| it['maxMemory'] },
+      "Enable Disk Threshold" => lambda {|it| format_boolean(it['diskEnabled']) },
+      "Min Disk" => lambda {|it| it['minDisk'] },
+      "Max Disk" => lambda {|it| it['maxDisk'] },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+    }
+  end
+
+  def add_scale_threshold_option_types()
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 10},
+      {'fieldName' => 'autoUp', 'fieldLabel' => 'Auto Upscale', 'type' => 'checkbox', 'required' => true, 'defaultValue' => false, 'displayOrder' => 30},
+      {'fieldName' => 'autoDown', 'fieldLabel' => 'Auto Downscale', 'type' => 'checkbox', 'required' => true, 'defaultValue' => false, 'displayOrder' => 40},
+      {'fieldName' => 'minCount', 'fieldLabel' => 'Min Count', 'type' => 'number', 'required' => true, 'defaultValue' => 1, 'displayOrder' => 41},
+      {'fieldName' => 'maxCount', 'fieldLabel' => 'Max Count', 'type' => 'number', 'required' => true, 'defaultValue' => 2, 'displayOrder' => 42},
+      {'fieldName' => 'cpuEnabled', 'fieldLabel' => 'Enable CPU Threshold', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'displayOrder' => 50},
+      {'fieldName' => 'minCpu', 'fieldLabel' => 'Min CPU', 'type' => 'number', 'required' => false, 'defaultValue' => 0, 'displayOrder' => 60},
+      {'fieldName' => 'maxCpu', 'fieldLabel' => 'Max CPU', 'type' => 'number', 'required' => false, 'defaultValue' => 0, 'displayOrder' => 70},
+      {'fieldName' => 'memoryEnabled', 'fieldLabel' => 'Enable Memory Threshold', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'displayOrder' => 80},
+      {'fieldName' => 'minMemory', 'fieldLabel' => 'Min Memory', 'type' => 'number', 'required' => false, 'defaultValue' => 0, 'displayOrder' => 90},
+      {'fieldName' => 'maxMemory', 'fieldLabel' => 'Max Memory', 'type' => 'number', 'required' => false, 'defaultValue' => 0, 'displayOrder' => 100},
+      {'fieldName' => 'diskEnabled', 'fieldLabel' => 'Enable Disk Threshold', 'type' => 'checkbox', 'required' => false, 'defaultValue' => false, 'displayOrder' => 110},
+      {'fieldName' => 'minDisk', 'fieldLabel' => 'Min Disk', 'type' => 'number', 'required' => false, 'defaultValue' => 0, 'displayOrder' => 120},
+      {'fieldName' => 'maxDisk', 'fieldLabel' => 'Max Disk', 'type' => 'number', 'required' => false, 'defaultValue' => 0, 'displayOrder' => 130},
+    ]
+  end
+
+  def add_scale_threshold_advanced_option_types()
+    []
+  end
+
+  def update_scale_threshold_option_types()
+    add_scale_threshold_option_types.collect {|it| it.delete('required'); it.delete('defaultValue'); it.delete('dependsOnCode'); it }
+  end
+
+  def update_scale_threshold_advanced_option_types()
+    add_scale_threshold_advanced_option_types.collect {|it| it.delete('required'); it.delete('defaultValue'); it.delete('dependsOnCode'); it }
+  end
+
+end

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

@@ -2,6 +2,7 @@ require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::Tasks
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::JobsHelper
 
   register_subcommands :list, :get, :add, :update, :remove, :execute
   register_subcommands :'list-types' => :list_task_types
@@ -297,6 +298,9 @@ class Morpheus::Cli::Tasks
       opts.on('--execute-target VALUE', String, "Execute Target" ) do |val|
         options[:options]['executeTarget'] = val
       end
+      opts.on('--credential VALUE', String, "Credential ID or \"local\"" ) do |val|
+        options[:options]['credential'] = val
+      end
       opts.on('--target-host VALUE', String, "Target Host" ) do |val|
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['host'] = val
@@ -313,6 +317,10 @@ class Morpheus::Cli::Tasks
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['password'] = val
       end
+      opts.on('--target-ssh-key VALUE', String, "Target SSH Key" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['sshKey'] = val
+      end
       opts.on('--git-repo VALUE', String, "Git Repo ID" ) do |val|
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['localScriptGitId'] = val
@@ -521,17 +529,38 @@ class Morpheus::Cli::Tasks
             payload['task']['taskOptions'] ||= {}
             payload['task']['taskOptions']['port'] = v_prompt['taskOptions']['port']
           end
-          # Host
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => 'Username for remote execution'}], options[:options], @api_client)
-          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['username'].to_s.empty?
-            payload['task']['taskOptions'] ||= {}
-            payload['task']['taskOptions']['username'] = v_prompt['taskOptions']['username']
+          # Credentials
+          credential_code = "credential"
+          credential_option_type = {'code' => credential_code, 'fieldName' => credential_code, 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Enter an existing credential ID or choose "local"', 'defaultValue' => "local", 'required' => true}
+          supported_credential_types = ['username-keypair', 'username-password', 'username-password-keypair'].compact.flatten.join(",").split(",").collect {|it| it.strip }
+          credential_params = {"new" => false, "credentialTypes" => supported_credential_types}
+          credential_value = Morpheus::Cli::OptionTypes.select_prompt(credential_option_type, @api_client, credential_params, options[:no_prompt], options[:options][credential_code])
+          if !credential_value.to_s.empty?
+            if credential_value == "local"
+              payload['task'][credential_code] = {"type" => credential_value}
+            elsif credential_value.to_s =~ /\A\d{1,}\Z/
+              payload['task'][credential_code] = {"id" => credential_value.to_i}
+            end
           end
-          # Host
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => 'Password for remote execution'}], options[:options], @api_client)
-          if v_prompt['taskOptions'] && !v_prompt['taskOptions']['password'].to_s.empty?
-            payload['task']['taskOptions'] ||= {}
-            payload['task']['taskOptions']['password'] = v_prompt['taskOptions']['password']
+          if credential_value == "local"
+            # Username
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => 'Username for remote execution'}], options[:options], @api_client)
+            if v_prompt['taskOptions'] && !v_prompt['taskOptions']['username'].to_s.empty?
+              payload['task']['taskOptions'] ||= {}
+              payload['task']['taskOptions']['username'] = v_prompt['taskOptions']['username']
+            end
+            # Password
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => 'Password for remote execution'}], options[:options], @api_client)
+            if v_prompt['taskOptions'] && !v_prompt['taskOptions']['password'].to_s.empty?
+              payload['task']['taskOptions'] ||= {}
+              payload['task']['taskOptions']['password'] = v_prompt['taskOptions']['password']
+            end
+            # SSH Key
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'taskOptions', 'fieldName' => 'sshKey', 'fieldLabel' => 'Key', 'type' => 'select', 'optionSource' => 'keyPairs', 'description' => 'SSH Key for remote execution'}], options[:options], @api_client)
+            if v_prompt['taskOptions'] && !v_prompt['taskOptions']['sshKey'].to_s.empty?
+              payload['task']['taskOptions'] ||= {}
+              payload['task']['taskOptions']['sshKey'] = v_prompt['taskOptions']['sshKey']
+            end
           end
         end
 
@@ -639,6 +668,9 @@ class Morpheus::Cli::Tasks
       opts.on('--execute-target VALUE', String, "Execute Target" ) do |val|
         options[:options]['executeTarget'] = val
       end
+      opts.on('--credential VALUE', String, "Credential ID or \"local\"" ) do |val|
+        options[:options]['credential'] = val
+      end
       opts.on('--target-host VALUE', String, "Target Host" ) do |val|
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['host'] = val
@@ -655,6 +687,10 @@ class Morpheus::Cli::Tasks
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['password'] = val
       end
+      opts.on('--target-ssh-key VALUE', String, "Target SSH Key" ) do |val|
+        options[:options]['taskOptions'] ||= {}
+        options[:options]['taskOptions']['sshKey'] = val
+      end
       opts.on('--git-repo VALUE', String, "Git Repo ID" ) do |val|
         options[:options]['taskOptions'] ||= {}
         options[:options]['taskOptions']['localScriptGitId'] = val
@@ -795,6 +831,7 @@ class Morpheus::Cli::Tasks
     instances = []
     server_ids = []
     servers = []
+    default_refresh_interval = 10
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[task] --instance [instance] [options]")
       opts.on('--instance INSTANCE', String, "Instance name or id to execute the task on. This option can be passed more than once.") do |val|
@@ -829,6 +866,12 @@ class Morpheus::Cli::Tasks
       opts.on('--config [TEXT]', String, "Custom config") do |val|
         params['customConfig'] = val.to_s
       end
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is complete. Default interval is #{default_refresh_interval} seconds.") do |val|
+        options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
+      end
+      opts.on(nil, '--no-refresh', "Do not refresh" ) do
+        options[:no_refresh] = true
+      end
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -901,10 +944,7 @@ class Morpheus::Cli::Tasks
         return
       end
       json_response = @tasks_interface.run(task['id'], payload)
-      if options[:json]
-        puts as_json(json_response, options)
-        return json_response['success'] ? 0 : 1
-      else
+      render_response(json_response, options) do
         target_desc = nil
         if instances.size() > 0
           target_desc = (instances.size() == 1) ? "instance #{instances[0]['name']}" : "#{instances.size()} instances"
@@ -916,17 +956,19 @@ class Morpheus::Cli::Tasks
         else
           print_green_success "Executing task #{task['name']}"
         end
-        # todo: refresh, use get processId and load process record isntead? err
         if json_response["jobExecution"] && json_response["jobExecution"]["id"]
-          get_args = [json_response["jobExecution"]["id"], "--details"] + (options[:remote] ? ["-r",options[:remote]] : [])
-          Morpheus::Logging::DarkPrinter.puts((['jobs', 'get-execution'] + get_args).join(' ')) if Morpheus::Logging.debug?
-          return ::Morpheus::Cli::JobsCommand.new.handle(['get-execution'] + get_args)
+          job_execution_id = json_response["jobExecution"]["id"]
+          if options[:no_refresh]
+            get_args = [json_response["jobExecution"]["id"], "--details"] + (options[:remote] ? ["-r",options[:remote]] : [])
+            Morpheus::Logging::DarkPrinter.puts((['jobs', 'get-execution'] + get_args).join(' ')) if Morpheus::Logging.debug?
+            ::Morpheus::Cli::JobsCommand.new.handle(['get-execution'] + get_args)
+          else
+            #Morpheus::Cli::JobsCommand.new.handle(["get-execution", job_execution_id, "--refresh", options[:refresh_interval].to_s]+ (options[:remote] ? ["-r",options[:remote]] : []))
+            job_execution_results = wait_for_job_execution(job_execution_id, options.merge({:details => true}))
+          end
         end
-        return json_response['success'] ? 0 : 1
       end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
+      return 0, nil
     end
   end
 

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

@@ -261,7 +261,7 @@ EOT
         end
       end
       
-      opts.on('--default-role ID', String, "Default Role ID") do |val|
+      opts.on('--default-role ID', String, "Default Role ID or Authority") do |val|
         default_role_id = val
       end
       #build_option_type_options(opts, options, add_user_source_option_types())
@@ -285,24 +285,62 @@ EOT
     
 
 
-      # find the account first, or just prompt for that too please.
-      if !account_id
-        print_error Morpheus::Terminal.angry_prompt
-        puts_error  "missing required argument [account]\n#{optparse}"
-        return 1
+      # # find the account first, or just prompt for that too please.
+      # if !account_id
+      #   print_error Morpheus::Terminal.angry_prompt
+      #   puts_error  "missing required argument [account]\n#{optparse}"
+      #   return 1
+      # end
+
+      # tenant is optional, it is expected in the url right now instead of in the payload...this sets both
+      account = nil
+      if account_id
+        options[:options]['tenant'] = account_id
       end
-      account = find_account_by_name_or_id(account_id)
-      return 1 if account.nil?
-      account_id = account['id']
+      account_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'tenant', 'fieldLabel' => 'Tenant', 'type' => 'select', 'optionSource' => 'tenants', 'required' => false, 'description' => 'Tenant'}], options[:options], @api_client)
+      if account_id
+        options[:options].delete('tenant')
+      end
+      account_id = account_prompt['tenant']
+      if !account_id.to_s.empty?
+        # reload tenant by id, sure why not..
+        account = find_account_by_name_or_id(account_id)
+        return 1 if account.nil?
+        account_id = account['id']
+      else
+        account_id = nil
+      end
+      
 
       # construct payload
       payload = {}
       if options[:payload]
         payload = options[:payload]
         payload.deep_merge!({'userSource' => parse_passed_options(options)})
+
+        # JD: should apply options on top of payload, but just do these two for now
+
+        # Tenant
+        if account
+          payload['userSource']['account'] = {'id' => account['id'] }
+        end
+
+        # Name
+        if params['name']
+          payload['userSource']['name'] = params['name']
+        end
+
       else
         payload.deep_merge!({'userSource' => parse_passed_options(options)})
         
+        # support old -O options
+        payload['userSource'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+
+        # Tenant
+        if account
+          payload['userSource']['account'] = {'id' => account['id'] }
+        end
+
         # Identity Source Type
         user_source_types = @user_sources_interface.list_types({userSelectable: true})['userSourceTypes']
         if user_source_types.empty?
@@ -338,16 +376,15 @@ EOT
         payload['userSource'].deep_merge!(v_prompt)
 
         # Default Account Role
-        # todo: a proper select
-        if !default_role_id
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'defaultAccountRole', 'fieldName' => 'id', 'type' => 'text', 'fieldLabel' => 'Default Account Role ID', 'required' => true}], options[:options])
-          if v_prompt['defaultAccountRole'] && v_prompt['defaultAccountRole']['id']
-            default_role_id = v_prompt['defaultAccountRole']['id']
-          end
-        end
+        # always prompt for role to lookup id from name
         if default_role_id
-          payload['userSource']['defaultAccountRole'] = {'id' => default_role_id }
+          options[:options]['defaultAccountRole'] = {'id' => default_role_id }
+        end
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => 'defaultAccountRole', 'fieldName' => 'id', 'type' => 'select', 'selectOptions' => get_available_role_options(account_id), 'fieldLabel' => 'Default Role', 'required' => false }], options[:options])
+        if v_prompt['defaultAccountRole'] && v_prompt['defaultAccountRole']['id']
+          default_role_id = v_prompt['defaultAccountRole']['id']
         end
+        payload['userSource']['defaultAccountRole'] = {'id' => default_role_id }
 
         # Allow Custom Mappings
         if !params['allowCustomMappings'].nil?
@@ -364,9 +401,6 @@ EOT
         if role_mapping_names
           payload['roleMappingNames'] = role_mapping_names
         end
-
-        # support old -O options
-        payload['userSource'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
         
 
       end
@@ -378,14 +412,12 @@ EOT
       # do it
       json_response = @user_sources_interface.create(account_id, payload)
       # print and return result
-      if options[:json]
-        puts as_json(json_response, options)
-        return 0
+      render_response(json_response, options, 'userSource') do
+        user_source = json_response['userSource']
+        print_green_success "Added Identity Source #{user_source['name']}"
+        _get(user_source['id'], {}, options)
       end
-      user_source = json_response['userSource']
-      print_green_success "Added Identity Source #{user_source['name']}"
-      get([user_source['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
-      return 0
+      return 0, nil
   end
 
   def update(args)
@@ -394,6 +426,7 @@ EOT
     account_id = nil
     role_mappings = nil
     role_mapping_names = nil
+    default_role_id = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name] [options]")
       opts.on('--name VALUE', String, "Name for this identity source") do |val|
@@ -427,6 +460,9 @@ EOT
           end
         end
       end
+      opts.on('--default-role ROLE', String, "Default Role ID or Authority") do |val|
+        default_role_id = val
+      end
       build_standard_update_options(opts, options)
       opts.footer = "Update an identity source." + "\n" +
                     "[name] is required. This is the name or id of an identity source."
@@ -470,22 +506,33 @@ EOT
           payload['roleMappingNames'] = role_mapping_names
         end
 
+        # Default Account Role
+        if default_role_id
+          if default_role_id == 'null'
+            payload['userSource']['defaultAccountRole'] = {'id' => nil }
+          else
+            # use no_prompt to convert name to id
+            options[:options]['defaultAccountRole'] = {'id' => default_role_id }
+            v_prompt = Morpheus::Cli::OptionTypes.no_prompt([{'fieldContext' => 'defaultAccountRole', 'fieldName' => 'id', 'type' => 'select', 'selectOptions' => get_available_role_options(user_source['account']['id']), 'fieldLabel' => 'Default Role', 'required' => false }], options[:options])
+            if v_prompt['defaultAccountRole'] && v_prompt['defaultAccountRole']['id']
+              default_role_id = v_prompt['defaultAccountRole']['id']
+            end
+            payload['userSource']['defaultAccountRole'] = {'id' => default_role_id }
+          end
+        end
       end
       @user_sources_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_sources_interface.dry.update(nil, user_source['id'], payload)
         return
       end
-      
       json_response = @user_sources_interface.update(nil, user_source['id'], payload)
-      
-      if options[:json]
-        puts JSON.pretty_generate(json_response)
-        return
+      render_response(json_response, options, 'userSource') do
+        user_source = json_response['userSource'] || user_source
+        print_green_success "Updated Identity Source #{user_source['name']}"
+        _get(user_source['id'], {}, options)
       end
-
-      print_green_success "Updated Identity Source #{params['name'] || user_source['name']}"
-      get([user_source['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      return 0, nil
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -941,10 +988,20 @@ EOT
       ]
     elsif type_code == 'saml'
       [
-        {'fieldContext' => 'config', 'fieldName' => 'url', 'type' => 'text', 'fieldLabel' => 'Login Redirect URL', 'required' => true, 'description' => ''},
-        {'fieldContext' => 'config', 'fieldName' => 'doNotIncludeSAMLRequest', 'type' => 'checkbox', 'fieldLabel' => 'Exclude SAMLRequest Parameter', 'required' => true, 'description' => 'Do not include SAMLRequest parameter', 'defaultValue' => false},
-        {'fieldContext' => 'config', 'fieldName' => 'logoutUrl', 'type' => 'text', 'fieldLabel' => 'Logout Post URL', 'required' => true, 'description' => ''},
-        {'fieldContext' => 'config', 'fieldName' => 'publicKey', 'type' => 'textarea', 'fieldLabel' => 'Signing Public Key', 'required' => true, 'description' => ''},
+        {'fieldContext' => 'config', 'fieldName' => 'url', 'type' => 'text', 'fieldLabel' => 'Login Redirect URL', 'required' => true, 'description' => '', 'fieldGroup' => 'SAML SSO Configuration', 'displayOrder' => 1},
+        {'fieldContext' => 'config', 'fieldName' => 'doNotIncludeSAMLRequest', 'type' => 'checkbox', 'fieldLabel' => 'Exclude SAMLRequest Parameter', 'required' => true, 'description' => 'Do not include SAMLRequest parameter', 'defaultValue' => false, 'fieldGroup' => 'SAML SSO Configuration', 'displayOrder' => 2},
+        {'fieldContext' => 'config', 'fieldName' => 'logoutUrl', 'type' => 'text', 'fieldLabel' => 'Logout Post URL', 'required' => true, 'description' => '', 'fieldGroup' => 'SAML SSO Configuration', 'displayOrder' => 3},
+        {'code' => 'saml.SAMLSignatureMode', 'fieldContext' => 'config', 'fieldName' => 'SAMLSignatureMode', 'type' => 'select', 'selectOptions' => [{'name' => 'No Signature', 'value' => 'NoSignature'},{'name' => 'Self Signed', 'value' => 'SelfSigned'},{'name' => 'Custom RSA Signature', 'value' => 'CustomSignature'}], 'fieldLabel' => 'SAML Request', 'required' => true, 'description' => '', 'fieldGroup' => 'SAML SSO Configuration', 'defaultValue' => 'NoSignature', 'displayOrder' => 4},
+        {'dependsOnCode' => 'saml.SAMLSignatureMode:CustomSignature', 'fieldContext' => 'config', 'fieldName' => 'request509Certificate', 'type' => 'textarea', 'fieldLabel' => 'X.509 Certificate', 'required' => false, 'description' => '', 'fieldGroup' => 'SAML SSO Configuration', 'displayOrder' => 5},
+        {'dependsOnCode' => 'saml.SAMLSignatureMode:CustomSignature', 'fieldContext' => 'config', 'fieldName' => 'requestPrivateKey', 'type' => 'textarea', 'fieldLabel' => 'RSA Private Key', 'required' => false, 'description' => '', 'fieldGroup' => 'SAML SSO Configuration', 'displayOrder' => 6},
+        {'code' => 'saml.doNotValidateSignature', 'fieldContext' => 'config', 'fieldName' => 'doNotValidateSignature', 'type' => 'select', 'selectOptions' => [{'name' => 'Do Not Validate Assertion Signature', 'value' => 'true'},{'name' => 'Validate Assertion Signature', 'value' => 'false'}], 'fieldLabel' => 'SAML Response', 'required' => true, 'description' => '', 'fieldGroup' => 'SAML SSO Configuration', 'defaultValue' => 'Do Not Validate Assertion Signature', 'displayOrder' => 7},
+        {'dependsOnCode' => 'saml.doNotValidateSignature:false', 'fieldContext' => 'config', 'fieldName' => 'publicKey', 'type' => 'textarea', 'fieldLabel' => 'Signing Public Key', 'required' => false, 'description' => '', 'fieldGroup' => 'SAML SSO Configuration', 'displayOrder' => 8},
+        {'fieldContext' => 'config', 'fieldName' => 'privateKey', 'type' => 'textarea', 'fieldLabel' => 'Encryption RSA Private Key', 'required' => false, 'description' => '', 'fieldGroup' => 'SAML SSO Configuration', 'displayOrder' => 9},
+        {'fieldContext' => 'config', 'fieldName' => 'givenNameAttribute', 'type' => 'text', 'fieldLabel' => 'Given Name Attribute Name', 'required' => false, 'description' => '', 'fieldGroup' => 'Assertion Attribute Mappings', 'displayOrder' => 10},
+        {'fieldContext' => 'config', 'fieldName' => 'surnameAttribute', 'type' => 'text', 'fieldLabel' => 'Surname Attribute Name', 'required' => false, 'description' => '', 'fieldGroup' => 'Assertion Attribute Mappings', 'displayOrder' => 11},
+        {'fieldContext' => 'config', 'fieldName' => 'roleAttributeName', 'type' => 'text', 'fieldLabel' => 'Role Attribute Name', 'required' => false, 'description' => '', 'fieldGroup' => 'Role Mappings', 'displayOrder' => 12},
+        {'fieldContext' => 'config', 'fieldName' => 'requiredAttributeValue', 'type' => 'text', 'fieldLabel' => 'Required Role Attribute Value', 'required' => false, 'description' => '', 'fieldGroup' => 'Role Mappings', 'displayOrder' => 13},
+        
       ]
     elsif type_code == 'customExternal'
       [
@@ -966,4 +1023,15 @@ EOT
       []
     end
   end
+
+  def get_available_role_options(account_id)
+    available_roles = @account_users_interface.available_roles(account_id)['roles']
+    # if available_roles.empty?
+    #   print_red_alert "No available roles found."
+    #   exit 1
+    # end
+    role_options = available_roles.collect {|role|
+      {'name' => role['authority'], 'value' => role['id']}
+    }
+  end
 end

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

@@ -172,8 +172,8 @@ class Morpheus::Cli::Users
         options[:include_personas_access] = true
         params['includeAccess'] = true
       end
-      opts.on('-i', '--include-none-access', "Include Items with 'None' Access in Access List") do
-        options[:display_none_access] = true
+      opts.on(nil, '--hide-none-access', "Hide records with 'none' access") do
+        options[:hide_none_access] = true
       end
       build_standard_get_options(opts, options, [:account])
       opts.footer = <<-EOT
@@ -245,11 +245,11 @@ EOT
         end
       else
         available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type',
-         'app_templates' => 'Blueprint', 'catalog_item_types' => 'Catalog Item Types', 'personas' => 'Personas'}
+         'app_templates' => 'Blueprint', 'catalog_item_types' => 'Catalog Item Type', 'personas' => 'Persona', 'vdi_pools' => 'VDI Pool', 'report_types' => 'Report Type'}
         available_field_options.each do |field, label|
           if !(field == 'sites' && is_tenant_account) && options["include_#{field}_access".to_sym]
             access = user['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]
-            access = access.reject {|it| it['access'] == 'none'} if !options[:display_none_access]
+            access = access.reject {|it| it['access'] == 'none'} if options[:hide_none_access]
 
             if field == "features"
               # print_h2 "Permissions", options
@@ -291,10 +291,10 @@ EOT
       opts.on('-g','--global', "Global (All Tenants). Find users across all tenants. Default is your own tenant only.") do
         options[:global] = true
       end
-      build_common_options(opts, options, [:account, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.on('-i', '--include-none-access', "Include Items with 'None' Access in Access List") do
-        options[:display_none_access] = true
+      opts.on('--hide-none-access', "Hide records with 'none' access") do
+        options[:hide_none_access] = true
       end
+      build_common_options(opts, options, [:account, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Display Access for a user." + "\n" +
                     "[user] is required. This is the username or id of a user."
     end
@@ -366,11 +366,11 @@ EOT
 
         print_h1 "User Permissions: #{user['username']}", options
 
-        available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type', 'app_templates' => 'Blueprint'}
+        available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type', 'app_templates' => 'Blueprint', 'catalog_item_types' => 'Catalog Item Type', 'vdi_pools' => 'VDI Pool', 'report_types' => 'Report Type','personas' => 'Persona'}
         available_field_options.each do |field, label|
           if !(field == 'sites' && is_tenant_account)
             access = json_response['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]
-            access = access.reject {|it| it['access'] == 'none'} if !options[:display_none_access]
+            access = access.reject {|it| it['access'] == 'none'} if options[:hide_none_access]
 
             print_h2 "#{label} Access", options
             print cyan
@@ -381,7 +381,7 @@ EOT
             if access.count > 0
               access.each {|it| it['access'] = format_access_string(it['access'], available_access_levels)}
 
-              if ['features', 'instance_types'].include?(field)
+              if ['features', 'instance_types', 'report_types'].include?(field)
                 print as_pretty_table(access, [:name, :code, :access], options)
               else
                 print as_pretty_table(access, [:name, :access], options)

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

@@ -74,6 +74,7 @@ EOT
           if id.to_s !~ /\A\d{1,}\Z/
             # assume the last part of path is the type
             record_type = path.split("/").last
+            record_type.sub!('#!', '')
             record = find_by_name(record_type, id)
             if record.nil?
               raise_command_error("[id] is invalid. No #{record_type} found for '#{id}'", args, optparse)