morpheus-cli 5.2.4 → 5.3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3798eb711a94541135bbefd28bbf1b33db18460ab70d7caf4d6f1cde90dafed3
-  data.tar.gz: b24f15db530f004a00899a86d8c609ee5dc44e71ee7b69cc821e33f91070b4f1
+  metadata.gz: 537ea8ecb044cb316ca3c7610ff9d48d2cfdea448c37c2ce171d797143b9d5bb
+  data.tar.gz: e80110f66f9a28496f507bebc117fb7aa74f770f33f8aadb9078bf331b4099f7
 SHA512:
-  metadata.gz: 165402498f461633ca18f4fd273e27cc5dcf7fddfd219722912563ea1c318a4412b9f6c6f5a014382e14bac1bfa060ffb4a794b72182739e57c1299ce685e7d2
-  data.tar.gz: 2305c2c67c28e206c9507abda3a95b2e62dadb0a6e73e44fd4b79a4feaa40f40fe713e47619f0383a30dfca22828ff439446063e5e7417746b658b08ced63804
+  metadata.gz: 0fff28a9b02ccbff264efa449fd56455316af3263c990cc15f37eae658f45c44e47f5138c33428744d0b687850fa7a710f9fe7193ca753da82057c5570da1ab0
+  data.tar.gz: 7738424a32347e6e51970a7b4542accf527057f1634f4a798ec8e98cf0a908c92b5a14a0fda217dd2f94f2666c0d588f9935d5a0f2ab71b7dc78daa04b97563f

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 5.2.4
+RUN gem install morpheus-cli -v 5.3.0.3
 
 ENTRYPOINT ["morpheus"]

data/README.md

@@ -1,12 +1,12 @@
+<img src="https://morpheusdata.com/wp-content/uploads/2020/04/morpheus-logo-v2.svg" width="200px">
+
 # Morpheus CLI
 
 - Website: https://www.morpheusdata.com/
 - Guide: [Morpheus CLI Wiki](https://github.com/gomorpheus/morpheus-cli/wiki)
-- Docs: [Morpheus Documentation](https://docs.morpheusdata.com)
+- Docs: [Morpheus CLI Documentation](https://clidocs.morpheusdata.com)
 - Support: [Morpheus Support](https://support.morpheusdata.com)
 
-<img src="https://www.morpheusdata.com/wp-content/uploads/2018/06/cropped-morpheus_highres.png" width="600px">
-
 This library is a Ruby gem that provides a command line interface for interacting with the Morpheus Data appliance. The features provided include provisioning clusters, hosts, and containers, deploying and monitoring applications, automating tasks, and much more.
 
 ## Installation

data/lib/morpheus/cli/activity_command.rb

@@ -22,6 +22,9 @@ class Morpheus::Cli::ActivityCommand
     params, options = {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on('-a', '--details', "Display more details object id, full date and time, etc." ) do
+        options[:details] = true
+      end
       opts.on('-t','--type TYPE', "Activity Type eg. Provisioning, Admin") do |val|
         options[:type] ||= []
         options[:type] << val
@@ -115,20 +118,20 @@ EOT
           # {"SEVERITY" => lambda {|record| format_activity_severity(record['severity']) } },
           {"TYPE" => lambda {|record| record['activityType'] } },
           {"NAME" => lambda {|record| record['name'] } },
-          {"RESOURCE" => lambda {|record| "#{record['objectType']} #{record['objectId']}" } },
+          options[:details] ? {"RESOURCE" => lambda {|record| "#{record['objectType']} #{record['objectId']}" } } : nil,
           {"MESSAGE" => lambda {|record| record['message'] || '' } },
           {"USER" => lambda {|record| record['user'] ? record['user']['username'] : record['userName'] } },
           #{"DATE" => lambda {|record| "#{format_duration_ago(record['ts'] || record['timestamp'])}" } },
           {"DATE" => lambda {|record| 
-            # show full time if searching for custom timerange, otherwise the default is to show relative time
-            if params['start'] || params['end'] || params['timeframe']
+            # show full time if searching for custom timerange or --details, otherwise the default is to show relative time
+            if params['start'] || params['end'] || params['timeframe'] || options[:details]
               "#{format_local_dt(record['ts'] || record['timestamp'])}"
             else
               "#{format_duration_ago(record['ts'] || record['timestamp'])}"
             end
 
           } },
-        ]
+        ].compact
         print as_pretty_table(activity, columns, options)
         print_results_pagination(json_response)
       end

data/lib/morpheus/cli/backup_jobs_command.rb

@@ -10,7 +10,7 @@ class Morpheus::Cli::BackupJobsCommand
 
   set_command_name :'backup-jobs'
 
-  register_subcommands :list, :get, :add, :update, :remove, :run
+  register_subcommands :list, :get #, :add, :update, :remove, :run
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)

data/lib/morpheus/cli/backups_command.rb

@@ -10,7 +10,7 @@ class Morpheus::Cli::BackupsCommand
   
   set_command_name :'backups'
 
-  register_subcommands :list, :get, :add, :update, :remove, :run, :restore
+  register_subcommands :list, :get #, :add, :update, :remove, :run, :restore
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -82,8 +82,7 @@ EOT
     end
   end
 
-  def _get(id, options)
-    params = {}
+  def _get(id, params, options)
     @backups_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @backups_interface.dry.get(id, params)

data/lib/morpheus/cli/cli_command.rb

@@ -466,11 +466,16 @@ module Morpheus
 
           when :list
             opts.on( '-m', '--max MAX', "Max Results" ) do |val|
-              max = val.to_i
-              if max <= 0
-                raise ::OptionParser::InvalidArgument.new("must be a positive integer")
+              # api supports max=-1 for all at the moment..
+              if val.to_s == "all" || val.to_s == "-1"
+                options[:max] = "-1"
+              else
+                max = val.to_i
+                if max <= 0
+                  raise ::OptionParser::InvalidArgument.new("must be a positive integer")
+                end
+                options[:max] = max
               end
-              options[:max] = max
             end
 
             opts.on( '-o', '--offset OFFSET', "Offset Results" ) do |val|
@@ -486,12 +491,17 @@ module Morpheus
             end
 
             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
+              if v.to_s.include?(",")
+                # sorting on multiple properties, just pass it as is, newer api supports multiple fields
                 options[:sort] = v
+              else
+                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
             end
 

data/lib/morpheus/cli/clusters.rb

@@ -934,6 +934,9 @@ class Morpheus::Cli::Clusters
         end
       else
         payload = {"permissions" => prompt_permissions(options.merge({:available_plans => namespace_service_plans}))}
+        # if payload["permissions"] && payload["permissions"]["resourcePool"]
+        #   payload["permissions"].delete("resourcePool")
+        # end
       end
 
       @clusters_interface.setopts(options)
@@ -3897,8 +3900,8 @@ class Morpheus::Cli::Clusters
     perms = prompt_permissions(options.merge({:available_plans => namespace_service_plans}))
     if perms['resourcePool'] && !perms['resourcePool']['visibility'].nil?
       rtn['visibility'] = perms['resourcePool']['visibility']
-      perms.delete('resourcePool')
     end
+    perms.delete('resourcePool')
     rtn['permissions'] = perms
     rtn
   end

data/lib/morpheus/cli/commands/standard/history_command.rb

@@ -14,14 +14,14 @@ class Morpheus::Cli::HistoryCommand
   # AND start logging every terminal command, not just shell...
   def handle(args)
     options = {show_pagination:false}
-    optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = "Usage: morpheus #{command_name} [search]"
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = "Usage: #{prog_name} #{command_name} [search]"
       # -n is a hidden alias for -m
       opts.on( '-n', '--max-commands MAX', "Alias for -m, --max option." ) do |val|
         options[:max] = val
       end
       opts.add_hidden_option('-n')
-      opts.on( '-p', '--pagination', "Display pagination and count info eg. Viewing 1-M of N" ) do
+      opts.on( '-p', '--pagination', "Display pagination and count info eg. Viewing 1-25 of 42" ) do
         options[:show_pagination] = true
       end
       opts.on( nil, '--flush', "Flush history, purges entire shell history file." ) do
@@ -38,10 +38,9 @@ Examples:
     history "instances list"
     history --flush
 
-The most recently executed commands are seen by default.  Use --reverse to see the oldest commands.
+The most recently executed commands are seen by default.  Use --desc to see the oldest commands.
 EOT
     end
-    raw_cmd = "#{command_name} #{args.join(' ')}"
     optparse.parse!(args)
     # verify_args!(args:args, count: 0, optparse:optparse)
     if args.count > 0

data/lib/morpheus/cli/dashboard_command.rb

@@ -272,20 +272,20 @@ This includes instance and backup counts, favorite instances, monitoring and rec
           # {"SEVERITY" => lambda {|record| format_activity_severity(record['severity']) } },
           {"TYPE" => lambda {|record| record['activityType'] } },
           {"NAME" => lambda {|record| record['name'] } },
-          {"RESOURCE" => lambda {|record| "#{record['objectType']} #{record['objectId']}" } },
+          options[:details] ? {"RESOURCE" => lambda {|record| "#{record['objectType']} #{record['objectId']}" } } : nil,
           {"MESSAGE" => lambda {|record| record['message'] || '' } },
           {"USER" => lambda {|record| record['user'] ? record['user']['username'] : record['userName'] } },
           #{"DATE" => lambda {|record| "#{format_duration_ago(record['ts'] || record['timestamp'])}" } },
           {"DATE" => lambda {|record| 
             # show full time if searching for custom timerange, otherwise the default is to show relative time
-            if params['start'] || params['end'] || params['timeframe']
+            if params['start'] || params['end'] || params['timeframe'] || options[:details]
               "#{format_local_dt(record['ts'] || record['timestamp'])}"
             else
               "#{format_duration_ago(record['ts'] || record['timestamp'])}"
             end
 
           } },
-        ]
+        ].compact
         print as_pretty_table(activity, columns, options)
         # print_results_pagination(json_response)
         # print reset,"\n"

data/lib/morpheus/cli/execution_request_command.rb

@@ -31,6 +31,10 @@ class Morpheus::Cli::ExecutionRequestCommand
     handle_subcommand(args)
   end
 
+  def default_refresh_interval
+    5
+  end
+
   def get(args)
     raw_args = args
     options = {}
@@ -134,7 +138,7 @@ class Morpheus::Cli::ExecutionRequestCommand
     options = {}
     params = {}
     script_content = nil
-    do_refresh = true
+    options[:refresh_until_finished] = true
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[options]")
       opts.on('--server ID', String, "Server ID") do |val|
@@ -161,8 +165,14 @@ class Morpheus::Cli::ExecutionRequestCommand
           exit 1
         end
       end
-      opts.on(nil, '--no-refresh', "Do not refresh until finished" ) do
-        do_refresh = false
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is finished. Default interval is #{default_refresh_interval} seconds.") do |val|
+        options[:refresh_until_finished] = true
+        if !val.to_s.empty?
+          options[:refresh_interval] = val.to_f
+        end
+      end
+      opts.on(nil, '--no-refresh', "Do not refresh. The default behavior is to refresh until finished." ) do
+        options[:refresh_until_finished] = false
       end
       #build_option_type_options(opts, options, add_user_source_option_types())
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
@@ -212,8 +222,8 @@ class Morpheus::Cli::ExecutionRequestCommand
       end
       execution_request = json_response['executionRequest']
       print_green_success "Executing request #{execution_request['uniqueId']}"
-      if do_refresh
-        get([execution_request['uniqueId'], "--refresh"] + (options[:remote] ? ["-r",options[:remote]] : []))
+      if options[:refresh_until_finished]
+        get([execution_request['uniqueId'], "--refresh", options[:refresh_interval] ? options[:refresh_interval].to_s : nil].compact + (options[:remote] ? ["-r",options[:remote]] : []))
       else
         get([execution_request['uniqueId']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end

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