morpheus-cli 5.2.1 → 5.3.0

data/lib/morpheus/cli/hosts.rb

@@ -117,6 +117,12 @@ class Morpheus::Cli::Hosts
       opts.on( '--tenant TENANT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
+      opts.on('--labels label',String, "Filter by labels (keywords).") do |val|
+        val.split(",").each do |k|
+          options[:labels] ||= []
+          options[:labels] << k.strip
+        end
+      end
       opts.on('--tags Name=Value',String, "Filter by tags.") do |val|
         val.split(",").each do |value_pair|
           k,v = value_pair.strip.split("=")
@@ -186,6 +192,7 @@ class Morpheus::Cli::Hosts
           params['clusterId'] = cluster['id']
         end
       end
+      params['labels'] = options[:labels] if options[:labels]
       if options[:tags] && !options[:tags].empty?
         options[:tags].each do |k,v|
           params['tags.' + k] = v
@@ -542,6 +549,7 @@ class Morpheus::Cli::Hosts
         "Name" => 'name',
         "Hostname" => 'hostname',
         "Description" => 'description',
+        "Labels" => lambda {|it| it['labels'] ? it['labels'].join(',') : '' },
         "Tags" => lambda {|it| tags ? format_metadata(tags) : '' },
         "Owner" => lambda {|it| it['owner'] ? it['owner']['username'] : '' },
         "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
@@ -566,6 +574,7 @@ class Morpheus::Cli::Hosts
       # server_columns.delete("Tenant") if multi_tenant != true
       server_columns.delete("Cost") if server['hourlyCost'].to_f == 0
       server_columns.delete("Price") if server['hourlyPrice'].to_f == 0 || server['hourlyPrice'] == server['hourlyCost']
+      server_columns.delete("Labels") if server['labels'].nil? || server['labels'].empty?
       server_columns.delete("Tags") if tags.nil? || tags.empty?
 
       print_description_list(server_columns, server)
@@ -993,6 +1002,9 @@ class Morpheus::Cli::Hosts
       opts.on('--power-schedule-type ID', String, "Power Schedule Type ID") do |val|
         params['powerScheduleType'] = val == "null" ? nil : val
       end
+      opts.on('--labels [LIST]', String, "Labels (keywords) in the format 'foo, bar'") do |val|
+        params['labels'] = val.to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+      end
       opts.on('--tags LIST', String, "Tags in the format 'name:value, name:value'. This will add and remove tags.") do |val|
         options[:tags] = val
       end

data/lib/morpheus/cli/instances.rb

@@ -19,6 +19,7 @@ class Morpheus::Cli::Instances
                        :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}, 
                        :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :stop_service, :start_service, :restart_service, 
                        :backup, :backups, :resize, :clone, :envs, :setenv, :delenv, 
+                       :lock, :unlock, :clone_image,
                        :security_groups, :apply_security_groups, :run_workflow, :import_snapshot, :snapshot, :snapshots,
                        :console, :status_check, {:containers => :list_containers}, 
                        :scaling, {:'scaling-update' => :scaling_update},
@@ -603,8 +604,8 @@ class Morpheus::Cli::Instances
       opts.on('--group GROUP', String, "Group Name or ID") do |val|
         options[:group] = val
       end
-      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
-        params['labels'] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+      opts.on('--labels [LIST]', String, "Labels (keywords) in the format 'foo, bar'") do |val|
+        params['labels'] = val.to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
       end
       opts.on('--tags LIST', String, "Tags in the format 'name:value, name:value'. This will add and remove tags.") do |val|
         options[:tags] = val
@@ -1350,6 +1351,7 @@ class Morpheus::Cli::Instances
         "Shutdown Date" => lambda {|it| it['shutdownDate'] ? format_local_dt(it['shutdownDate']) : '' },
         "Nodes" => lambda {|it| it['containers'] ? it['containers'].count : 0 },
         "Connection" => lambda {|it| format_instance_connection_string(it) },
+        "Locked" => lambda {|it| format_boolean(it['locked']) },
         "Status" => lambda {|it| format_instance_status(it) }
       }
       description_cols.delete("Labels") if labels.nil? || labels.empty?
@@ -1359,6 +1361,7 @@ class Morpheus::Cli::Instances
       description_cols.delete("Shutdown Date") if instance['shutdownDate'].nil?
       description_cols["Removal Date"] = lambda {|it| format_local_dt(it['removalDate'])} if instance['status'] == 'pendingRemoval'
       description_cols.delete("Last Deployment") if instance['lastDeploy'].nil?
+      description_cols.delete("Locked") if instance['locked'] != true
       #description_cols.delete("Environment") if instance['instanceContext'].nil?
       print_description_list(description_cols, instance)
 
@@ -3888,6 +3891,117 @@ EOT
     return 0
   end
 
+  def clone_image(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance]")
+      opts.on( '--name VALUE', String, "Image Name (Template Name). Default is server name + timestamp" ) do |val|
+        options[:options]['templateName'] = val
+      end
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Clone to image (template) for an instance
+[instance] is required. This is the name or id of an instance
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    instance = find_instance_by_name_or_id(args[0])
+    return 1 if instance.nil?
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
+    else
+      payload.deep_merge!(parse_passed_options(options))
+      if payload['templateName'].nil?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'templateName', 'type' => 'text', 'fieldLabel' => 'Image Name', 'description' => 'Choose a name for the new image template. Default is the server name + timestamp'}], options[:options])
+        if v_prompt['templateName'].to_s != ''
+          payload['templateName'] = v_prompt['templateName']
+        end
+      end
+    end
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.clone_image(instance['id'], payload)
+      return
+    end
+    json_response = @instances_interface.clone_image(instance['id'], payload)
+    render_response(json_response, options) do
+      print_green_success "Clone Image initiated."
+    end
+    return 0, nil
+  end
+
+  def lock(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance]")
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Lock an instance
+[instance] is required. This is the name or id of an instance
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    instance = find_instance_by_name_or_id(args[0])
+    return 1 if instance.nil?
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
+    else
+      payload.deep_merge!(parse_passed_options(options))
+    end
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.lock(instance['id'], payload)
+      return
+    end
+    json_response = @instances_interface.lock(instance['id'], payload)
+    render_response(json_response, options) do
+      print_green_success "Locked instance #{instance['name']}"
+    end
+    return 0, nil
+  end
+
+  def unlock(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance]")
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Unlock an instance
+[instance] is required. This is the name or id of an instance
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    instance = find_instance_by_name_or_id(args[0])
+    return 1 if instance.nil?
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
+    else
+      payload.deep_merge!(parse_passed_options(options))
+    end
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.unlock(instance['id'], payload)
+      return
+    end
+    json_response = @instances_interface.unlock(instance['id'], payload)
+    render_response(json_response, options) do
+      print_green_success "Unlocked instance #{instance['name']}"
+    end
+    return 0, nil
+  end
+
 private
 
   def find_zone_by_name_or_id(group_id, val)

data/lib/morpheus/cli/invoices_command.rb

@@ -8,7 +8,7 @@ class Morpheus::Cli::InvoicesCommand
 
   set_command_name :'invoices'
 
-  register_subcommands :list, :get, :refresh,
+  register_subcommands :list, :get, :update, :refresh,
                        :list_line_items, :get_line_item
   
   def connect(opts)
@@ -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
@@ -591,42 +569,87 @@ EOT
     end
   end
 
-  def refresh(args)
+  def update(args)
     options = {}
     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
+      opts.banner = subcommand_usage("[invoice] [options]")
+      opts.on('--tags LIST', String, "Tags in the format 'name:value, name:value'. This will add and remove tags.") do |val|
+        options[:tags] = val
       end
-      opts.on( '--costing', "Refresh Costing Data" ) do
-        payload[:costing] = true
+      opts.on('--add-tags TAGS', String, "Add Tags in the format 'name:value, name:value'. This will only add/update tags.") do |val|
+        options[:add_tags] = val
       end
-      opts.on( '--current', "Collect the most up to date costing data." ) do
-        payload[:current] = true
+      opts.on('--remove-tags TAGS', String, "Remove Tags in the format 'name, name:value'. This removes tags, the :value component is optional and must match if passed.") do |val|
+        options[:remove_tags] = val
       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
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Update an invoice.
+[invoice] is required. This is the id of an invoice.
+      EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    json_response = @invoices_interface.get(args[0])
+    invoice = json_response['invoice']
+
+    invoice_payload = parse_passed_options(options)
+    if options[:tags]
+      invoice_payload['tags'] = parse_metadata(options[:tags])
+    end
+    if options[:add_tags]
+      invoice_payload['addTags'] = parse_metadata(options[:add_tags])
+    end
+    if options[:remove_tags]
+      invoice_payload['removeTags'] = parse_metadata(options[:remove_tags])
+    end
+
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'invoice' => invoice_payload})
+    else
+      payload.deep_merge!({'invoice' => invoice_payload})
+      if invoice_payload.empty?
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
       end
-      opts.on( '-c', '--cloud CLOUD', "Specify cloud(s) to refresh costing for." ) do |val|
+    end
+    @invoices_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @invoices_interface.dry.update(invoice['id'], payload)
+      return
+    end
+    json_response = @invoices_interface.update(invoice['id'], payload)
+    invoice = json_response['invoice']
+    render_response(json_response, options, 'invoice') do
+      print_green_success "Updated invoice #{invoice['id']}"
+      return _get(invoice["id"], options)
+    end
+    return 0, nil
+  end
+
+  def refresh(args)
+    options = {}
+    params = {}
+    payload = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      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)
@@ -637,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?")
@@ -678,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
@@ -767,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
@@ -795,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|
@@ -882,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
@@ -933,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
@@ -961,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)
@@ -1001,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