morpheus-cli 5.2.0 → 5.2.4.1

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},
@@ -459,17 +460,58 @@ class Morpheus::Cli::Instances
       options[:instance_name] = args[0]
     end
 
-    # use active group by default
-    options[:group] ||= @active_group_id
-    options[:select_datastore] = true
-    options[:name_required] = true
     begin
       payload = nil
       if options[:payload]
         payload = options[:payload]
         # support -O OPTION switch on top of --payload
         payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        # obviously should support every option that prompt supports on top of -- payload as well
+        # group, cloud and type for now
+        # todo: also support :layout, service_plan, :resource_pool, etc.
+        group = nil
+        if options[:group]
+          group = find_group_by_name_or_id_for_provisioning(options[:group])
+          if group.nil?
+            return 1, "group not found by #{options[:group]}"
+          end
+          #payload["siteId"] = group["id"]
+          payload.deep_merge!({"instance" => {"site" => {"id" => group["id"]} } })
+        end
+        if options[:cloud]
+          group_id = group ? group["id"] : ((payload["instance"] && payload["instance"]["site"].is_a?(Hash)) ? payload["instance"]["site"]["id"] : nil)
+          cloud = find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud])
+          if cloud.nil?
+            return 1, "cloud not found by #{options[:cloud]}"
+          end
+          payload["zoneId"] = cloud["id"]
+          payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
+        end
+        if options[:cloud]
+          group_id = group ? group["id"] : ((payload["instance"] && payload["instance"]["site"].is_a?(Hash)) ? payload["instance"]["site"]["id"] : nil)
+          cloud = find_cloud_by_name_or_id_for_provisioning(group_id, options[:cloud])
+          if cloud.nil?
+            return 1, "cloud not found by #{options[:cloud]}"
+          end
+          payload["zoneId"] = cloud["id"]
+          payload.deep_merge!({"instance" => {"cloud" => cloud["name"] } })
+        end
+        if options[:instance_type_code]
+          # should just use find_instance_type_by_name_or_id
+          # note that the api actually will match name name or code
+          instance_type = (options[:instance_type_code].to_s =~ /\A\d{1,}\Z/) ? find_instance_type_by_id(options[:instance_type_code]) : find_instance_type_by_code(options[:instance_type_code])
+          if instance_type.nil?
+            return 1, "instance type not found by #{options[:cloud]}"
+          end
+          payload.deep_merge!({"instance" => {"type" => instance_type["code"] } })
+          payload.deep_merge!({"instance" => {"instanceType" => {"code" => instance_type["code"]} } })
+        end
+
       else
+        # use active group by default
+        options[:group] ||= @active_group_id
+        options[:select_datastore] = true
+        options[:name_required] = true
         # prompt for all the instance configuration options
         # this provisioning helper method handles all (most) of the parsing and prompting
         # and it relies on the method to exit non-zero on error, like a bad CLOUD or TYPE value
@@ -562,16 +604,17 @@ class Morpheus::Cli::Instances
       opts.on('--group GROUP', String, "Group Name or ID") do |val|
         options[:group] = val
       end
-      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
-        options[:metadata] = val
+      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('--metadata LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
-        options[:metadata] = val
+      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.add_hidden_option('--metadata')
-      opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
-        # todo switch this from 'tags' to 'labels'
-        params['tags'] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+      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('--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('--power-schedule-type ID', String, "Power Schedule Type ID") do |val|
         params['powerScheduleType'] = val == "null" ? nil : val
@@ -627,32 +670,17 @@ class Morpheus::Cli::Instances
         payload['instance']['site'] = {'id' => group['id']}
       end
       # metadata tags
-      # if options[:options]['metadata'].is_a?(Array) && !options[:metadata]
-      #   options[:metadata] = options[:options]['metadata']
-      # end
-      if options[:metadata]
-        metadata = []
-        if options[:metadata] == "[]" || options[:metadata] == "null"
-          payload['instance']['metadata'] = []
-        elsif options[:metadata].is_a?(Array)
-          payload['instance']['metadata'] = options[:metadata]
-        else
-          # parse string into format name:value, name:value
-          # merge IDs from current metadata
-          # todo: should allow quoted semicolons..
-          metadata_list = options[:metadata].split(",").select {|it| !it.to_s.empty? }
-          metadata_list = metadata_list.collect do |it|
-            metadata_pair = it.split(":")
-            if metadata_pair.size == 1 && it.include?("=")
-              metadata_pair = it.split("=")
-            end
-            row = {}
-            row['name'] = metadata_pair[0].to_s.strip
-            row['value'] = metadata_pair[1].to_s.strip
-            row
-          end
-          payload['instance']['metadata'] = metadata_list
-        end
+      if options[:tags]
+        # api version 4.2.5 and later supports tags, older versions expect metadata
+        # todo: use tags instead like everywhere else
+        # payload['instance']['tags'] = parse_metadata(options[:tags])
+        payload['instance']['metadata'] = parse_metadata(options[:tags])
+      end
+      if options[:add_tags]
+        payload['instance']['addTags'] = parse_metadata(options[:add_tags])
+      end
+      if options[:remove_tags]
+        payload['instance']['removeTags'] = parse_metadata(options[:remove_tags])
       end
       if payload['instance'].empty? && params.empty? && options[:owner].nil?
         raise_command_error "Specify at least one option to update.\n#{optparse}"
@@ -1256,11 +1284,14 @@ class Morpheus::Cli::Instances
       # metadata tags used to be returned as metadata and are now returned as tags
       # the problem is tags is what we used to call Labels (keywords)
       # the api will change to tags and labels, so handle the old format as long as metadata is returned.
-      tags, labels = nil, nil
-      if instance.key?('metadata')
-        tags, labels = instance['metadata'], instance['tags']
+      labels = nil
+      tags = nil
+      if instance.key?('labels')
+        labels = instance['labels']
+        tags = instance['tags']
       else
-        tags, labels = instance['tags'], instance['labels']
+        labels = instance['tags']
+        tags = instance['metadata']
       end
       # containers are fetched via separate api call
       containers = nil
@@ -1302,7 +1333,7 @@ class Morpheus::Cli::Instances
         # "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         # "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Environment" => 'instanceContext',
-        "Labels" => lambda {|it| it['tags'] ? it['tags'].join(',') : '' },
+        "Labels" => lambda {|it| labels ? labels.join(',') : '' },
         "Tags" => lambda {|it| tags ? tags.collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
         "Owner" => lambda {|it| 
           if it['owner']
@@ -1320,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?
@@ -1329,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)
 
@@ -3020,7 +3053,8 @@ EOT
           snapshot_column_definitions = {
             "ID" => lambda {|it| it['id'] },
             "Name" => lambda {|it| it['name'] },
-            "Description" => lambda {|it| it['snapshotType'] ? (it['snapshotType']['name'] || it['snapshotType']['code']) : '' },
+            "Description" => lambda {|it| it['description'] },
+            # "Type" => lambda {|it| it['snapshotType'] },
             "Date Created" => lambda {|it| format_local_dt(it['snapshotCreated']) },
             "Status" => lambda {|it| format_snapshot_status(it) }
           }
@@ -3857,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
@@ -173,7 +169,6 @@ class Morpheus::Cli::InvoicesCommand
       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,8 +266,8 @@ 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 '' } },
-          {"TAGS" => lambda {|it| it['metadata'] ? it['metadata'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' } },
+          {"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
           columns += [
@@ -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,8 +421,8 @@ 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 '' },
-        "Tags" => lambda {|it| it['metadata'] ? it['metadata'].collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
+        "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'] : '' },
         "Project Tags" => lambda {|it| it['project'] ? format_metadata(it['project']['tags']) : '' },
@@ -454,7 +438,8 @@ EOT
         description_cols.delete("Project Name")
         description_cols.delete("Project Tags")
       end
-      if invoice['metadata'].nil? || invoice['metadata'].empty?
+      tags = (invoice['metadata'] || invoice['tags'])
+      if tags.nil? || tags.empty?
         description_cols.delete("Tags")
       end
       if !['ComputeServer','Instance','Container'].include?(invoice['refType'])
@@ -522,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)
@@ -577,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
@@ -590,6 +569,68 @@ EOT
     end
   end
 
+  def update(args)
+    options = {}
+    params = {}
+    payload = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      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('--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('--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
+      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
+    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 = {}
@@ -677,7 +718,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
@@ -766,9 +806,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
@@ -823,7 +860,6 @@ EOT
       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|
@@ -881,9 +917,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
@@ -932,13 +965,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
@@ -960,9 +986,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)
@@ -1000,11 +1023,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