morpheus-cli 5.2.2 → 5.3.0.1

data/lib/morpheus/cli/invoices_command.rb

@@ -33,7 +33,6 @@ class Morpheus::Cli::InvoicesCommand
         options[:show_estimates] = true
         # options[:show_costs] = true
         options[:show_prices] = true
-        # options[:show_raw_data] = true
       end
       opts.on('--dates', "Display Ref Start, Ref End, etc.") do |val|
         options[:show_dates] = true
@@ -117,9 +116,6 @@ class Morpheus::Cli::InvoicesCommand
           options[:tags][k] << (v || '')
         end
       end
-      opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
-        options[:show_raw_data] = true
-      end
       opts.on('--totals', "View total costs and prices for all the invoices found.") do |val|
         params['includeTotals'] = true
         options[:show_invoice_totals] = true
@@ -144,36 +140,35 @@ class Morpheus::Cli::InvoicesCommand
     # construct params
     params.merge!(parse_list_options(options))
     if options[:clouds]
-      cloud_ids = parse_cloud_id_list(options[:clouds])
+      cloud_ids = parse_cloud_id_list(options[:clouds], {}, false, true)
       return 1, "clouds not found for #{options[:clouds]}" if cloud_ids.nil?
       params['zoneId'] = cloud_ids
     end
     if options[:groups]
-      group_ids = parse_group_id_list(options[:groups])
+      group_ids = parse_group_id_list(options[:groups], {}, false, true)
       return 1, "groups not found for #{options[:groups]}" if group_ids.nil?
       params['siteId'] = group_ids
     end
     if options[:instances]
-      instance_ids = parse_instance_id_list(options[:instances])
+      instance_ids = parse_instance_id_list(options[:instances], {}, false, true)
       return 1, "instances not found for #{options[:instances]}" if instance_ids.nil?
       params['instanceId'] = instance_ids
     end
     if options[:servers]
-      server_ids = parse_server_id_list(options[:servers])
+      server_ids = parse_server_id_list(options[:servers], {}, false, true)
       return 1, "servers not found for #{options[:servers]}" if server_ids.nil?
       params['serverId'] = server_ids
     end
     if options[:users]
-      user_ids = parse_user_id_list(options[:users])
+      user_ids = parse_user_id_list(options[:users], {}, false, true)
       return 1, "users not found for #{options[:users]}" if user_ids.nil?
       params['userId'] = user_ids
     end
     if options[:projects]
-      project_ids = parse_project_id_list(options[:projects])
+      project_ids = parse_project_id_list(options[:projects], {}, false, true)
       return 1, "projects not found for #{options[:projects]}" if project_ids.nil?
       params['projectId'] = project_ids
     end
-    params['rawData'] = true if options[:show_raw_data]
     params['refId'] = ref_ids unless ref_ids.empty?
     if options[:tags] && !options[:tags].empty?
       options[:tags].each do |k,v|
@@ -271,7 +266,7 @@ class Morpheus::Cli::InvoicesCommand
         columns += [
           {"ESTIMATE" => lambda {|it| format_boolean(it['estimate']) } },
           {"ACTIVE" => lambda {|it| format_boolean(it['active']) } },
-          {"ITEMS" => lambda {|it| it['lineItems'].size rescue '' } },
+          {"ITEMS" => lambda {|it| (it['lineItemCount'] ? it['lineItemCount'] : it['lineItems'].size) rescue '' } },
           {"TAGS" => lambda {|it| (it['metadata'] || it['tags']) ? (it['metadata'] || it['tags']).collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' } },
         ]
         if show_projects
@@ -291,9 +286,6 @@ class Morpheus::Cli::InvoicesCommand
           {"CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } },
           {"UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } },
         ]
-        if options[:show_raw_data]
-          columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
-        end
         unless options[:totals_only]
           print as_pretty_table(invoices, columns, options)
           print_results_pagination(json_response, {:label => "invoice", :n_label => "invoices"})
@@ -361,7 +353,6 @@ class Morpheus::Cli::InvoicesCommand
         options[:show_estimates] = true
         # options[:show_costs] = true
         options[:show_prices] = true
-        # options[:show_raw_data] = true
         options[:max_line_items] = 10000
       end
       opts.on('--prices', '--prices', "Display prices: Total, Compute, Storage, Network, Extra" ) do
@@ -370,13 +361,6 @@ class Morpheus::Cli::InvoicesCommand
       opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Storage, Network, Extra" ) do
         options[:show_estimates] = true
       end
-      opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
-        options[:show_raw_data] = true
-      end
-      opts.on('--pretty-raw-data', '--raw-data', "Display Raw Data that is a bit more pretty") do |val|
-        options[:show_raw_data] = true
-        options[:pretty_json] = true
-      end
       opts.on('--no-line-items', '--no-line-items', "Do not display line items.") do |val|
         options[:hide_line_items] = true
       end
@@ -401,9 +385,6 @@ EOT
 
   def _get(id, options)
     params = {}
-    if options[:show_raw_data]
-      params['rawData'] = true
-    end
     begin
       @invoices_interface.setopts(options)
       if options[:dry_run]
@@ -412,6 +393,9 @@ EOT
       end
       json_response = @invoices_interface.get(id, params)
       invoice = json_response['invoice']
+      if options[:hide_line_items]
+        json_response['invoice'].delete('lineItems') rescue nil
+      end
       render_result = render_with_format(json_response, options, 'invoice')
       return 0 if render_result
 
@@ -437,7 +421,7 @@ EOT
         "End" => lambda {|it| format_date(it['endDate']) },
         "Ref Start" => lambda {|it| format_dt(it['refStart']) },
         "Ref End" => lambda {|it| format_dt(it['refEnd']) },
-        "Items" => lambda {|it| it['lineItems'].size rescue '' },
+        "Items" => lambda {|it| (it['lineItemCount'] ? it['lineItemCount'] : it['lineItems'].size) rescue '' },
         "Tags" => lambda {|it| (it['metadata'] || it['tags']) ? (it['metadata'] || it['tags']).collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
         "Project ID" => lambda {|it| it['project'] ? it['project']['id'] : '' },
         "Project Name" => lambda {|it| it['project'] ? it['project']['name'] : '' },
@@ -523,9 +507,6 @@ EOT
           {"CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } },
           {"UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } }
         ]
-        if options[:show_raw_data]
-          line_items_columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
-        end
         print_h2 "Line Items"
         #max_line_items = options[:max_line_items] ? options[:max_line_items].to_i : 5
         paged_line_items = line_items #.first(max_line_items)
@@ -578,10 +559,7 @@ EOT
       end
       print as_pretty_table(cost_rows, cost_columns, options)
 
-      if options[:show_raw_data]
-        print_h2 "Raw Data"
-        puts as_json(invoice['rawData'], {pretty_json:false}.merge(options))
-      end
+      
 
       print reset,"\n"
       return 0
@@ -658,37 +636,20 @@ Update an invoice.
     params = {}
     payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[--daily] [--costing] [--current] [-c CLOUD]")
-      opts.on( '--daily', "Refresh Daily Invoices" ) do
-        payload[:daily] = true
-      end
-      opts.on( '--costing', "Refresh Costing Data" ) do
-        payload[:costing] = true
-      end
-      opts.on( '--current', "Collect the most up to date costing data." ) do
-        payload[:current] = true
-      end
-      opts.on( '--date DATE', String, "Date to collect costing for. By default the cost data is collected for the end of the previous period." ) do |val|
-        payload[:date] = val.to_s
-      end
-      opts.on( '-c', '--cloud CLOUD', "Specify cloud(s) to refresh costing for." ) do |val|
+      opts.banner = subcommand_usage("[-c CLOUD]")
+      opts.on( '-c', '--clouds CLOUD', "Specify clouds to refresh costing for." ) do |val|
         payload[:clouds] ||= []
         payload[:clouds] << val
       end
-      opts.on( '--all', "Refresh costing for all clouds." ) do
+      opts.on( '--all', "Refresh costing for all clouds. This can be used instead of --clouds" ) do
         payload[:all] = true
       end
-      # opts.on( '-f', '--force', "Force Refresh" ) do
-      #   query_params[:force] = 'true'
-      # end
+      opts.on( '--date DATE', String, "Date to collect costing for. By default the cost data is collected for the end of the previous job interval (hour or day)." ) do |val|
+        payload[:date] = val.to_s
+      end
       build_standard_update_options(opts, options, [:query, :auto_confirm])
       opts.footer = <<-EOT
-Refresh invoices.
-By default, nothing is changed.
-Include --daily to regenerate invoice records.
-Include --costing to refresh actual costing data.
-Include --current to refresh costing data for the actual current time.
-To get the latest invoice costing data, include --daily --costing --current --all 
+Refresh invoice costing data for the specified clouds.
 EOT
     end
     optparse.parse!(args)
@@ -699,17 +660,11 @@ EOT
       payload = options[:payload]
     end
     payload.deep_merge!(parse_passed_options(options))
-    # --clouds
+    # --clouds lookup ID for name
     if payload[:clouds]
-      payload[:clouds] = parse_id_list(payload[:clouds]).collect {|cloud_id|
-        if cloud_id.to_s =~ /\A\d{1,}\Z/
-          cloud_id
-        else
-          cloud = find_cloud_option(cloud_id)
-          return 1 if cloud.nil?
-          cloud['id']
-        end
-      }
+      cloud_ids = parse_cloud_id_list(payload[:clouds], {}, false, true)
+      return 1, "clouds not found for #{payload[:clouds]}" if cloud_ids.nil?
+      payload[:clouds] = cloud_ids
     end
     # are you sure?
     unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to refresh invoices?")
@@ -740,7 +695,6 @@ EOT
         options[:show_actual_costs] = true
         options[:show_costs] = true
         options[:show_prices] = true
-        # options[:show_raw_data] = true
       end
       # opts.on('--actuals', '--actuals', "Display all actual costs: Compute, Storage, Network, Extra" ) do
       #   options[:show_actual_costs] = true
@@ -829,9 +783,6 @@ EOT
           options[:tags][k] << (v || '')
         end
       end
-      opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
-        options[:show_raw_data] = true
-      end
       opts.on('--totals', "View total costs and prices for all the invoices found.") do |val|
         params['includeTotals'] = true
         options[:show_invoice_totals] = true
@@ -857,36 +808,35 @@ EOT
     # construct params
     params.merge!(parse_list_options(options))
     if options[:clouds]
-      cloud_ids = parse_cloud_id_list(options[:clouds])
+      cloud_ids = parse_cloud_id_list(options[:clouds], {}, false, true)
       return 1, "clouds not found for #{options[:clouds]}" if cloud_ids.nil?
       params['zoneId'] = cloud_ids
     end
     if options[:groups]
-      group_ids = parse_group_id_list(options[:groups])
+      group_ids = parse_group_id_list(options[:groups], {}, false, true)
       return 1, "groups not found for #{options[:groups]}" if group_ids.nil?
       params['siteId'] = group_ids
     end
     if options[:instances]
-      instance_ids = parse_instance_id_list(options[:instances])
+      instance_ids = parse_instance_id_list(options[:instances], {}, false, true)
       return 1, "instances not found for #{options[:instances]}" if instance_ids.nil?
       params['instanceId'] = instance_ids
     end
     if options[:servers]
-      server_ids = parse_server_id_list(options[:servers])
+      server_ids = parse_server_id_list(options[:servers], {}, false, true)
       return 1, "servers not found for #{options[:servers]}" if server_ids.nil?
       params['serverId'] = server_ids
     end
     if options[:users]
-      user_ids = parse_user_id_list(options[:users])
+      user_ids = parse_user_id_list(options[:users], {}, false, true)
       return 1, "users not found for #{options[:users]}" if user_ids.nil?
       params['userId'] = user_ids
     end
     if options[:projects]
-      project_ids = parse_project_id_list(options[:projects])
+      project_ids = parse_project_id_list(options[:projects], {}, false, true)
       return 1, "projects not found for #{options[:projects]}" if project_ids.nil?
       params['projectId'] = project_ids
     end
-    params['rawData'] = true if options[:show_raw_data]
     params['refId'] = ref_ids unless ref_ids.empty?
     if options[:tags] && !options[:tags].empty?
       options[:tags].each do |k,v|
@@ -944,9 +894,6 @@ EOT
           "UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) }
         ]
 
-        if options[:show_raw_data]
-          columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
-        end
         # if options[:show_invoice_totals]
         #   line_item_totals = json_response['lineItemTotals']
         #   if line_item_totals
@@ -995,13 +942,6 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
-      opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
-        options[:show_raw_data] = true
-      end
-      opts.on('--pretty-raw-data', '--raw-data', "Display Raw Data that is a bit more pretty") do |val|
-        options[:show_raw_data] = true
-        options[:pretty_json] = true
-      end
       opts.on('--sigdig DIGITS', "Significant digits when rounding cost values for display as currency. Default is 2. eg. $3.50") do |val|
         options[:sigdig] = val.to_i
       end
@@ -1023,9 +963,6 @@ EOT
 
   def _get_line_item(id, options)
     params = {}
-    if options[:show_raw_data]
-      params['rawData'] = true
-    end
     @invoice_line_items_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @invoice_line_items_interface.dry.get(id, params)
@@ -1063,11 +1000,6 @@ EOT
       }
       print_description_list(description_cols, line_item, options)
       
-      if options[:show_raw_data]
-        print_h2 "Raw Data"
-        puts as_json(line_item['rawData'], {pretty_json:false}.merge(options))
-      end
-
       print reset,"\n"
     end
     return 0, nil

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

@@ -720,6 +720,7 @@ module Morpheus::Cli::PrintHelper
       columns.each do |column_def|
         # r << column_def.display_method.respond_to?(:call) ? column_def.display_method.call(row_data) : get_object_value(row_data, column_def.display_method)
         value = column_def.display_method.call(row_data)        
+        value = JSON.fast_generate(value) if value.is_a?(Hash) || value.is_a?(Array)
         row << value
       end
       rows << row
@@ -802,6 +803,7 @@ module Morpheus::Cli::PrintHelper
           columns.each do |column_def|
             # r << column_def.display_method.respond_to?(:call) ? column_def.display_method.call(row_data) : get_object_value(row_data, column_def.display_method)
             value = column_def.display_method.call(row_data)        
+            value = JSON.fast_generate(value) if value.is_a?(Hash) || value.is_a?(Array)
             row << value
           end
           rows << row
@@ -879,6 +881,7 @@ module Morpheus::Cli::PrintHelper
       label = label.upcase if ALL_LABELS_UPCASE
       # value = get_object_value(obj, column_def.display_method)
       value = column_def.display_method.call(obj)
+      value = JSON.fast_generate(value) if value.is_a?(Hash) || value.is_a?(Array)
       if label.size > max_label_width
         max_label_width = label.size
       end

data/lib/morpheus/cli/projects_command.rb

@@ -42,7 +42,7 @@ class Morpheus::Cli::Projects
       opts.on('--owners [LIST]', Array, "Owner, comma separated list of usernames or IDs.") do |list|
         owner_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
-      build_standard_get_options(opts, options)
+      build_standard_list_options(opts, options)
       opts.footer = <<-EOT
 List projects.
 EOT

data/lib/morpheus/cli/remote.rb

@@ -1276,7 +1276,8 @@ EOT
 
   def format_remote_details(appliance, options={})
     columns = {
-      "Name" => :name,
+      #"Name" => :name,
+      "Name" => lambda {|it| it[:name].to_s },
       #"Name" => lambda {|it| it[:active] ? "#{it[:name]} #{bold}(current)#{reset}#{cyan}" : it[:name] },
       "URL" => lambda {|it| it[:url] || it[:host] },
       #"Status" => lambda {|it| format_appliance_status(it, cyan) },

data/lib/morpheus/cli/service_plans_command.rb

@@ -427,7 +427,10 @@ class Morpheus::Cli::ServicePlanCommand
         # permissions
         if !options[:no_prompt]
           perms = prompt_permissions(options, ['plans', 'groupDefaults'])
-          params['visibility'] = perms.delete('resourcePool')['visibility']
+          if perms['resourcePool'] && !perms['resourcePool']['visibility'].nil?
+            params['visibility'] = perms['resourcePool']['visibility']
+          end
+          perms.delete('resourcePool')
           params['permissions'] = perms
         end
         payload = {'servicePlan' => params}

data/lib/morpheus/cli/user_sources_command.rb

@@ -6,6 +6,7 @@ class Morpheus::Cli::UserSourcesCommand
   include Morpheus::Cli::AccountsHelper
 
   set_command_name :'user-sources'
+  set_command_description "View and manage user identity sources"
 
   register_subcommands :list, :get, :add, :update, :remove
   register_subcommands :activate, :deactivate
@@ -43,49 +44,32 @@ class Morpheus::Cli::UserSourcesCommand
         account_id = val
       end
       opts.add_hidden_option('-a, --account') if opts.is_a?(Morpheus::Cli::OptionParser)
-      # opts.on('--technology VALUE', String, "Filter by technology") do |val|
-      #   params['provisionType'] = val
-      # end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "List user sources."
+      build_standard_list_options(opts, options)
+      opts.footer = "List identity sources."
     end
     optparse.parse!(args)
     connect(options)
-    # instance is required right now.
-    # account_id = args[0] if !account_id
+    # verify_args!(args:args, optparse:optparse, count:0)
     if args.count > 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
-      return 1
+      options[:phrase] = args.join(" ")
     end
-    begin
-      # construct payload
-      if account_id
-        account = find_account_by_name_or_id(account_id)
-        return 1 if account.nil?
-        account_id = account['id']
-      end
-      
-      params.merge!(parse_list_options(options))
-      @user_sources_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @user_sources_interface.dry.list(account_id, params)
-        return
-      end
-
-      json_response = @user_sources_interface.list(account_id, params)
-      if options[:json]
-        puts as_json(json_response, options, "userSources")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response['userSources'], options)
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "userSources")
-        return 0
+    if account_id
+      account = find_account_by_name_or_id(account_id)
+      if account.nil?
+        return 1, "Tenant not found for '#{account_id}'"
       end
-      user_sources = json_response['userSources']
-      title = "Morpheus User Sources"
+      account_id = account['id']
+    end
+    params.merge!(parse_list_options(options))
+    @user_sources_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @user_sources_interface.dry.list(account_id, params)
+      return 0, nil
+    end
+    json_response = @user_sources_interface.list(account_id, params)
+    render_response(json_response, options, "userSources") do
+      user_sources = json_response["userSources"]
+      title = "Morpheus Identity Sources"
       subtitles = []
       if account
         subtitles << "Tenant: #{account['name']}".strip
@@ -93,82 +77,77 @@ class Morpheus::Cli::UserSourcesCommand
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if user_sources.empty?
-        if account
-          print cyan,"No user sources found for account #{account['name']}.",reset,"\n"
-        else
-          print cyan,"No user sources found.",reset,"\n"
-        end
+        print cyan,"No identity sources found.",reset,"\n"
       else
         print_user_sources_table(user_sources, options)
-        print_results_pagination(json_response, {:label => "user source", :n_label => "user sources"})
+        print_results_pagination(json_response)
       end
       print reset,"\n"
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
+    return 0, nil
+    
   end
 
   def get(args)
-    options = {}
     params = {}
+    options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "Get details about an user source." + "\n" +
-                    "[name] is required. This is the name or id of an user source."
+      # opts.on( '-c', '--config', "Display raw config only. Default is YAML. Combine with -j for JSON instead." ) do
+      #   options[:show_config] = true
+      # end
+      # opts.on('--no-config', "Do not display Config YAML." ) do
+      #   options[:no_config] = true
+      # end
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+Get details about an identity source.
+[name] is required. This is the name or id of an identity source.
+EOT
     end
     optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
-    if args.count != 1
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
-      return 1
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, params, options)
     end
+  end
+
+  def _get(user_source_id, params, options)
     account_id = nil
     account = nil
-    user_source_id = args[0]
     # account_id = args[0]
     # account = find_account_by_name_or_id(account_id)
     # exit 1 if account.nil?
     # account_id = account['id']
     # user_source_id = args[1]
-    begin
-      @user_sources_interface.setopts(options)
-      if options[:dry_run]
-        if user_source_id.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @user_sources_interface.dry.get(account_id, user_source_id.to_i)
-        else
-          print_dry_run @user_sources_interface.dry.list(account_id, {name:user_source_id})
-        end
-        return
-      end
-      user_source = find_user_source_by_name_or_id(account_id, user_source_id)
-      if user_source.nil?
-        return 1
-      end
-      # fetch by id to get config too
-      json_response = nil
+    
+    @user_sources_interface.setopts(options)
+    if options[:dry_run]
       if user_source_id.to_s =~ /\A\d{1,}\Z/
-        json_response = {'userSource' => user_source}
+        print_dry_run @user_sources_interface.dry.get(account_id, user_source_id.to_i)
       else
-        json_response = @user_sources_interface.get(account_id, user_source['id'])
-        user_source = json_response['userSource']
+        print_dry_run @user_sources_interface.dry.list(account_id, {name:user_source_id})
       end
+      return
+    end
+    user_source = find_user_source_by_name_or_id(account_id, user_source_id)
+    if user_source.nil?
+      return 1
+    end
+    # fetch by id to get config too
+    json_response = nil
+    if user_source_id.to_s =~ /\A\d{1,}\Z/
+      json_response = {'userSource' => user_source}
+    else
+      json_response = @user_sources_interface.get(account_id, user_source['id'])
+      user_source = json_response['userSource']
+    end
       
-      #user_source = json_response['userSource']
-      if options[:json]
-        puts as_json(json_response, options, "userSource")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "userSource")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv([json_response['userSource']], options)
-        return 0
-      end
-
-      print_h1 "User Source Details"
+    #user_source = json_response['userSource']
+    render_response(json_response, options, "userSource") do
+      print_h1 "Identity Source Details"
       print cyan
       description_cols = {
         "ID" => lambda {|it| it['id'] },
@@ -187,7 +166,7 @@ class Morpheus::Cli::UserSourcesCommand
 
       # show config settings...
       user_source_config = user_source['config']
-      print_h2 "User Source Config (#{user_source['type']})"
+      print_h2 "Configuration"
       if user_source_config
         columns = user_source_config.keys #.sort
         print_description_list(columns, user_source_config)
@@ -208,15 +187,27 @@ class Morpheus::Cli::UserSourcesCommand
           {"SOURCE ROLE FQN" => lambda {|it| it['sourceRoleFqn'] } },
         ]
         print as_pretty_table(role_mappings, role_mapping_columns)
+      else
+        print cyan,"No role mappings found for this identity source.","\n",reset
+      end
+      
+      provider_settings = user_source['providerSettings']
+      if provider_settings && !provider_settings.empty?
+        print_h2 "Provider Settings"
+        print_description_list({
+          "Entity ID" => lambda {|it| it['entityId'] },
+          "ACS URL" => lambda {|it| it['acsUrl'] }
+        }, provider_settings)
+        print_h2 "SP Metadata"
+        print cyan
+        print provider_settings['spMetadata']
         print "\n",reset
       else
-        print cyan,"No role mappings found for this user source.","\n",reset
+        # print cyan,"No provider settings found.","\n",reset
       end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
+      print "\n",reset
     end
+    return 0, nil
   end
 
   def add(args)
@@ -229,17 +220,17 @@ class Morpheus::Cli::UserSourcesCommand
     default_role_id = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[account] [name]")
-      opts.on( '--tenant TENANT', String, "Tenant Name or ID the user source will belong to, default is your own." ) do |val|
+      opts.on( '--tenant TENANT', String, "Tenant Name or ID the identity source will belong to, default is your own." ) do |val|
         account_id = val
       end
-      opts.on( '-a', '--account ACCOUNT', "Tenant Name or ID the user source will belong to, default is your own." ) do |val|
+      opts.on( '-a', '--account ACCOUNT', "Tenant Name or ID the identity source will belong to, default is your own." ) do |val|
         account_id = val
       end
       opts.add_hidden_option('-a, --account') if opts.is_a?(Morpheus::Cli::OptionParser)
-      opts.on('--type CODE', String, "User Source Type") do |val|
+      opts.on('--type CODE', String, "Identity Source Type") do |val|
         type_code = val
       end
-      opts.on('--name VALUE', String, "Name for this user source") do |val|
+      opts.on('--name VALUE', String, "Name for this identity source") do |val|
         params['name'] = val
       end
       opts.on('--description VALUE', String, "Description") do |val|
@@ -276,7 +267,7 @@ class Morpheus::Cli::UserSourcesCommand
       end
       #build_option_type_options(opts, options, add_user_source_option_types())
       build_standard_add_options(opts, options)
-      opts.footer = "Create a new user source." + "\n" +
+      opts.footer = "Create a new identity source." + "\n" +
                     "[account] is required. This is the name or id of an account."
     end
     optparse.parse!(args)
@@ -313,10 +304,10 @@ class Morpheus::Cli::UserSourcesCommand
       else
         payload.deep_merge!({'userSource' => parse_passed_options(options)})
         
-        # User Source Type
+        # Identity Source Type
         user_source_types = @user_sources_interface.list_types({userSelectable: true})['userSourceTypes']
         if user_source_types.empty?
-          print_red_alert "No available User Source Types found"
+          print_red_alert "No available Identity Source Types found"
           return 1
         end
         user_source_type = nil
@@ -328,7 +319,7 @@ class Morpheus::Cli::UserSourcesCommand
         user_source_type = user_source_types.find { |it| it['type'] == type_code }
 
         if user_source_type.nil?
-          print_red_alert "User Source Type not found for '#{type_code}'"
+          print_red_alert "Identity Source Type not found for '#{type_code}'"
           return 1
         end
 
@@ -393,7 +384,7 @@ class Morpheus::Cli::UserSourcesCommand
         return 0
       end
       user_source = json_response['userSource']
-      print_green_success "Added User Source #{user_source['name']}"
+      print_green_success "Added Identity Source #{user_source['name']}"
       get([user_source['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       return 0
   end
@@ -406,7 +397,7 @@ class Morpheus::Cli::UserSourcesCommand
     role_mapping_names = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name] [options]")
-      opts.on('--name VALUE', String, "Name for this user source") do |val|
+      opts.on('--name VALUE', String, "Name for this identity source") do |val|
         params['name'] = val
       end
       opts.on('--description VALUE', String, "Description") do |val|
@@ -438,8 +429,8 @@ class Morpheus::Cli::UserSourcesCommand
         end
       end
       build_standard_update_options(opts, options)
-      opts.footer = "Update a user source." + "\n" +
-                    "[name] is required. This is the name or id of a user source."
+      opts.footer = "Update an identity source." + "\n" +
+                    "[name] is required. This is the name or id of an identity source."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -494,7 +485,7 @@ class Morpheus::Cli::UserSourcesCommand
         return
       end
 
-      print_green_success "Updated User Source #{params['name'] || user_source['name']}"
+      print_green_success "Updated Identity Source #{params['name'] || user_source['name']}"
       get([user_source['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -511,8 +502,8 @@ class Morpheus::Cli::UserSourcesCommand
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
-      opts.footer = "Activate a user source." + "\n" +
-                    "[name] is required. This is the name or id of a user source."
+      opts.footer = "Activate an identity source." + "\n" +
+                    "[name] is required. This is the name or id of an identity source."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -544,7 +535,7 @@ class Morpheus::Cli::UserSourcesCommand
         return
       end
 
-      print_green_success "Activated User Source #{user_source['name']}"
+      print_green_success "Activated Identity Source #{user_source['name']}"
       get([user_source['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -561,8 +552,8 @@ class Morpheus::Cli::UserSourcesCommand
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
-      opts.footer = "Deactivate a user source." + "\n" +
-                    "[name] is required. This is the name or id of a user source."
+      opts.footer = "Deactivate an identity source." + "\n" +
+                    "[name] is required. This is the name or id of an identity source."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -594,7 +585,7 @@ class Morpheus::Cli::UserSourcesCommand
         return
       end
 
-      print_green_success "Activated User Source #{user_source['name']}"
+      print_green_success "Activated Identity Source #{user_source['name']}"
       get([user_source['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -608,12 +599,12 @@ class Morpheus::Cli::UserSourcesCommand
     account_id = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      opts.on('--subdomain VALUE', String, "New subdomain for this user source") do |val|
+      opts.on('--subdomain VALUE', String, "New subdomain for this identity source") do |val|
         params['subdomain'] = (val == 'null') ? nil : val
       end
       build_common_options(opts, options, [:options, :json, :dry_run, :remote])
-      opts.footer = "Update subdomain for a user source." + "\n" +
-                    "[name] is required. This is the name or id of a user source."
+      opts.footer = "Update subdomain for an identity source." + "\n" +
+                    "[name] is required. This is the name or id of an identity source."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -645,8 +636,8 @@ class Morpheus::Cli::UserSourcesCommand
         puts JSON.pretty_generate(json_response)
         return
       end
-      # JD: uhh this updates the account too, it cannot be set per user source ...yet
-      print_green_success "Updated User Source #{user_source['name']} subdomain to '#{payload['subdomain']}'"
+      # JD: uhh this updates the account too, it cannot be set per identity source ...yet
+      print_green_success "Updated Identity Source #{user_source['name']} subdomain to '#{payload['subdomain']}'"
       get([user_source['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -672,7 +663,7 @@ class Morpheus::Cli::UserSourcesCommand
       user_source = find_user_source_by_name_or_id(nil, args[0])
       exit 1 if user_source.nil?
 
-      unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the user source #{user_source['name']}?", options)
+      unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the identity source #{user_source['name']}?", options)
         exit
       end
       @user_sources_interface.setopts(options)
@@ -687,7 +678,7 @@ class Morpheus::Cli::UserSourcesCommand
         return
       end
 
-      print_green_success "Removed User Source #{user_source['name']}"
+      print_green_success "Removed Identity Source #{user_source['name']}"
       #list([])
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -703,7 +694,7 @@ class Morpheus::Cli::UserSourcesCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "List user source types."
+      opts.footer = "List identity source types."
     end
     optparse.parse!(args)
     connect(options)
@@ -735,7 +726,7 @@ class Morpheus::Cli::UserSourcesCommand
         return 0
       end
       user_source_types = json_response['userSourceTypes']
-      title = "Morpheus User Source Types"
+      title = "Morpheus Identity Source Types"
       subtitles = []
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
@@ -760,7 +751,7 @@ class Morpheus::Cli::UserSourcesCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[type]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "Get details about a user source type." + "\n" +
+      opts.footer = "Get details about an identity source type." + "\n" +
                     "[type] is required. This is the type identifier."
     end
     optparse.parse!(args)
@@ -776,13 +767,6 @@ class Morpheus::Cli::UserSourcesCommand
     begin
       user_source_type_id = args[0]
       
-      # all_user_source_types = @user_sources_interface.dry.list_types({})['userSourceTypes']
-      # user_source_type = all_user_source_types.find {|it| it['type'] == user_source_type_id }
-      # if !user_source_type
-      #   print_red_alert "User Source Type not found by id '#{user_source_type_id}'"
-      #   return 1
-      # end
-
       # construct payload
       @user_sources_interface.setopts(options)
       if options[:dry_run]
@@ -801,7 +785,7 @@ class Morpheus::Cli::UserSourcesCommand
         puts records_as_csv([user_source_type], options)
         return 0
       end
-      title = "User Source Type"
+      title = "Identity Source Type"
       subtitles = []
       print_h1 title, subtitles
       print cyan
@@ -860,7 +844,7 @@ class Morpheus::Cli::UserSourcesCommand
       return json_response['userSource']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
-        print_red_alert "User Source not found by id #{id}"
+        print_red_alert "Identity Source not found by id #{id}"
       else
         raise e
       end
@@ -870,10 +854,10 @@ class Morpheus::Cli::UserSourcesCommand
   def find_user_source_by_name(account_id, name)
     user_sources = @user_sources_interface.list(account_id, {name: name.to_s})['userSources']
     if user_sources.empty?
-      print_red_alert "User Source not found by name #{name}"
+      print_red_alert "Identity Source not found by name #{name}"
       return nil
     elsif user_sources.size > 1
-      print_red_alert "#{user_sources.size} user sources found by name #{name}"
+      print_red_alert "#{user_sources.size} identity sources found by name #{name}"
       print_user_sources_table(user_sources, {color: red})
       print_red_alert "Try using ID instead"
       print reset,"\n"
@@ -979,7 +963,7 @@ class Morpheus::Cli::UserSourcesCommand
         {'fieldContext' => 'config', 'fieldName' => 'encryptionKey', 'type' => 'text', 'fieldLabel' => 'Encryption Key', 'required' => true, 'description' => ''},
       ]
     else
-      print "unknown user source type: #{type_code}"
+      print "unknown identity source type: #{type_code}"
       []
     end
   end