morpheus-cli 4.2.11 → 4.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c05a0d047f94e91857345c03ab934d64eef1b23620acf24b38057eba3d92cbcb
-  data.tar.gz: 17a33813d17587e8686ef3ad1cbec018ef1e18049be40184aa76573d60eba469
+  metadata.gz: 5e122acdb8c77d80c4d352581e33ee8e8a7d7caf6e631fda4645e8f5854f8c6e
+  data.tar.gz: 67d82f25c0fd463098d96183f0301ee22f3538bd6d6043c77132ae12fa5c3324
 SHA512:
-  metadata.gz: 8450675f6ce45f28e42b3919ac5e6c65f210fde6deb14671a78eef72b0b7d6f0d0d008a108fc0af56a45af3e4485788bd6d91697ab544e868974df73d9ea4c54
-  data.tar.gz: b0f5a5f626de331115ca8863b8e60305ec66ba34bfd6762697778f084bf7553618e37613e755c4ddc8cea425d8241faece71bbcf6a2a9483b94a7b1c0712c495
+  metadata.gz: 84efcd68bc06c45125654bc2279894cb5e1d7ef484f63015185fdedbdcdef57c48179cababa63128fd978416109229e08dc267ee0094c74fb16824f4450a4306
+  data.tar.gz: 8326f9f6dc94b22cb3e0df8ce18155bbadf67e5256301d9ad0df07803c99e4eaccfe36eabcde0b8ec9461f226dd3beea5c0584c30bb5146937dbf70c59e7b75b

data/Dockerfile

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

data/lib/morpheus/cli/invoices_command.rb

@@ -119,6 +119,10 @@ class Morpheus::Cli::InvoicesCommand
       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
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List invoices."
     end
@@ -128,50 +132,48 @@ class Morpheus::Cli::InvoicesCommand
     if args.count > 0
       options[:phrase] = args.join(" ")
     end
-    begin
-      # construct params
-      params.merge!(parse_list_options(options))
-      if options[:clouds]
-        cloud_ids = parse_cloud_id_list(options[:clouds])
-        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])
-        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])
-        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])
-        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])
-        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])
-        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?
-      @invoices_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @invoices_interface.dry.list(params)
-        return
-      end
-      json_response = @invoices_interface.list(params)
-      render_result = render_with_format(json_response, options, 'invoices')
-      return 0 if render_result
-      invoices = json_response['invoices']
+    # construct params
+    params.merge!(parse_list_options(options))
+    if options[:clouds]
+      cloud_ids = parse_cloud_id_list(options[:clouds])
+      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])
+      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])
+      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])
+      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])
+      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])
+      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?
+    @invoices_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @invoices_interface.dry.list(params)
+      return
+    end
+    json_response = @invoices_interface.list(params)
+    invoices = json_response['invoices']
+    render_response(json_response, options, 'invoices') do
       title = "Morpheus Invoices"
       subtitles = []
       if params['startDate']
@@ -263,11 +265,35 @@ class Morpheus::Cli::InvoicesCommand
         end
         print as_pretty_table(invoices, columns, options)
         print_results_pagination(json_response, {:label => "invoice", :n_label => "invoices"})
+
+        if options[:show_invoice_totals]
+          invoice_totals = json_response['invoiceTotals']
+          if invoice_totals
+            print_h2 "Invoice Totals"
+            invoice_totals_columns = {
+              "# Invoices" => lambda {|it| format_number(json_response['meta']['total']) rescue '' },
+              "Total Price" => lambda {|it| format_money(it['actualTotalPrice']) },
+              "Total Cost" => lambda {|it| format_money(it['actualTotalCost']) },
+              "Running Price" => lambda {|it| format_money(it['actualRunningPrice']) },
+              "Running Cost" => lambda {|it| format_money(it['actualRunningCost']) },
+              # "Invoice Total Price" => lambda {|it| format_money(it['invoiceTotalPrice']) },
+              # "Invoice Total Cost" => lambda {|it| format_money(it['invoiceTotalCost']) },
+              # "Invoice Running Price" => lambda {|it| format_money(it['invoiceRunningPrice']) },
+              # "Invoice Running Cost" => lambda {|it| format_money(it['invoiceRunningCost']) },
+              # "Estimated Total Price" => lambda {|it| format_money(it['estimatedTotalPrice']) },
+              # "Estimated Total Cost" => lambda {|it| format_money(it['estimatedTotalCost']) },
+              # "Compute Price" => lambda {|it| format_money(it['computePrice']) },
+              # "Compute Cost" => lambda {|it| format_money(it['computeCost']) },
+            }
+            print_description_list(invoice_totals_columns, invoice_totals)
+          else
+            print "\n"
+            print yellow, "No invoice totals data", reset, "\n"
+          end
+        end
       end
       print reset,"\n"
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
+      return 0, nil
     end
   end
   
@@ -280,6 +306,7 @@ class Morpheus::Cli::InvoicesCommand
         # options[:show_costs] = true
         options[:show_prices] = true
         options[:show_raw_data] = true
+        options[:max_line_items] = 10000
       end
       opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Memory, Storage, etc." ) do
         options[:show_estimates] = true
@@ -287,6 +314,13 @@ class Morpheus::Cli::InvoicesCommand
       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('-m', '--max-line-items NUMBER', "Maximum number of line items to display. Default is 5.") do |val|
+        options[:max_line_items] = val.to_i
+      end
       opts.on('--no-line-items', '--no-line-items', "Do not display line items.") do |val|
         options[:hide_line_items] = true
       end
@@ -435,7 +469,7 @@ EOT
 
       if options[:show_raw_data]
         print_h2 "Raw Data"
-        puts invoice['rawData']
+        puts as_json(invoice['rawData'], {pretty_json:false}.merge(options))
       end
       
       # Line Items
@@ -443,7 +477,7 @@ EOT
       if line_items && line_items.size > 0 && options[:hide_line_items] != true
 
         line_items_columns = [
-          {"INVOICE ID" => lambda {|it| it['invoiceId'] } },
+          {"ID" => lambda {|it| it['id'] } },
           {"TYPE" => lambda {|it| format_invoice_ref_type(it) } },
           {"REF ID" => lambda {|it| it['refId'] } },
           {"REF NAME" => lambda {|it| it['refName'] } },
@@ -463,12 +497,14 @@ EOT
         ]
 
         if options[:show_raw_data]
-          columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
+          line_items_columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
         end
 
         print_h2 "Line Items"
-        print as_pretty_table(line_items, line_items_columns, options)
-        print_results_pagination({total: line_items.size, size: line_items.size})
+        max_line_items = options[:max_line_items] ? options[:max_line_items].to_i : 5
+        paged_line_items = line_items.first(max_line_items)
+        print as_pretty_table(paged_line_items, line_items_columns, options)
+        print_results_pagination({total: line_items.size, size: paged_line_items.size}, {:label => "line item", :n_label => "line items"})
       end
 
       print reset,"\n"
@@ -577,6 +613,10 @@ EOT
       # opts.on('--prices', '--prices', "Display prices: Total, Compute, Memory, Storage, etc." ) do
       #   options[:show_prices] = true
       # end
+      opts.on('--invoice-id ID', String, "Filter by Invoice ID") do |val|
+        params['invoiceId'] ||= []
+        params['invoiceId'] << val
+      end
       opts.on('--type TYPE', String, "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
         if val.to_s.downcase == 'cloud' || val.to_s.downcase == 'zone'
           params['refType'] = 'ComputeZone'
@@ -654,6 +694,10 @@ EOT
       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
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List invoice line items."
     end
@@ -722,6 +766,7 @@ EOT
         # current_date = Time.now
         # current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
         columns = [
+          {"ID" => lambda {|it| it['id'] } },
           {"INVOICE ID" => lambda {|it| it['invoiceId'] } },
           {"TYPE" => lambda {|it| format_invoice_ref_type(it) } },
           {"REF ID" => lambda {|it| it['refId'] } },
@@ -744,8 +789,36 @@ EOT
         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
+            totals_row = line_item_totals.clone
+            totals_row['id'] = 'TOTAL:'
+            #totals_row['usageCategory'] = 'TOTAL:'
+            line_items = line_items + [totals_row]
+          end
+        end
         print as_pretty_table(line_items, columns, options)
         print_results_pagination(json_response, {:label => "line item", :n_label => "line items"})
+
+        # if options[:show_invoice_totals]
+        #   line_item_totals = json_response['lineItemTotals']
+        #   if line_item_totals
+        #     print_h2 "Line Items Totals"
+        #     invoice_totals_columns = {
+        #       "# Line Items" => lambda {|it| format_number(json_response['meta']['total']) rescue '' },
+        #       "Cost" => lambda {|it| format_money(it['itemCost']) },
+        #       "Price" => lambda {|it| format_money(it['itemPrice']) },
+        #       "Tax" => lambda {|it| format_money(it['itemTax']) },
+        #       "Usage" => lambda {|it| it['itemUsage'] },
+        #     }
+        #     print_description_list(invoice_totals_columns, line_item_totals)
+        #   else
+        #     print "\n"
+        #     print yellow, "No line item totals data", reset, "\n"
+        #   end
+        # end
+
       end
       print reset,"\n"
     end
@@ -763,6 +836,10 @@ EOT
       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
       build_standard_get_options(opts, options)
       opts.footer = "Get details about a specific invoice line item."
       opts.footer = <<-EOT
@@ -775,7 +852,7 @@ EOT
     connect(options)
     id_list = parse_id_list(args)
     return run_command_for_each_arg(id_list) do |arg|
-      _get(arg, options)
+      _get_line_item(arg, options)
     end
   end
 
@@ -815,6 +892,12 @@ EOT
         "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
       }
       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/provisioning_helper.rb

@@ -259,6 +259,17 @@ module Morpheus::Cli::ProvisioningHelper
     end
   end
 
+  ## resources
+
+  # todo: crud and /api/options for resources
+
+  def parse_resource_id_list(id_list)
+    parse_id_list(id_list).collect do |resource_id|
+      #find_resource_by_name_or_id(resource_id)['id']
+      resource_id
+    end
+  end
+
   ## apps
 
   def find_app_by_id(id)
@@ -1697,7 +1708,7 @@ module Morpheus::Cli::ProvisioningHelper
     while add_another_metadata do
       field_context = "metadata#{metadata_index}"
       metadata = {}
-      metadata['id'] = nil
+      #metadata['id'] = nil
       metadata_label = metadata_index == 0 ? "Metadata Tag" : "Metadata Tag [#{metadata_index+1}]"
       v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "#{metadata_label} Name", 'required' => true, 'description' => 'Metadata Tag Name.', 'defaultValue' => metadata['name']}], options[:options])
       # todo: metadata.type ?

data/lib/morpheus/cli/projects_command.rb

@@ -7,11 +7,8 @@ class Morpheus::Cli::Projects
   # include Morpheus::Cli::InfrastructureHelper
   # include Morpheus::Cli::AccountsHelper
 
-  register_subcommands :list, :get, :add, :update, :remove,
-                       # :add_tags, :remove_tags,
-                       #:add_instance, :remove_instance
-                       #:add_host, :remove_host
-  
+  register_subcommands :list, :get, :add, :update, :remove
+
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @projects_interface = @api_client.projects
@@ -27,7 +24,7 @@ class Morpheus::Cli::Projects
   def list(args)
     params = {}
     options = {}
-    instance_ids, server_ids, cloud_ids = nil, nil, nil
+    instance_ids, server_ids, cloud_ids, resource_ids, owner_ids = nil, nil, nil, nil, nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on('--instances [LIST]', Array, "Filter by Instance, comma separated list of instance names or IDs.") do |list|
@@ -39,9 +36,12 @@ class Morpheus::Cli::Projects
       opts.on('--clouds [LIST]', Array, "Filter by Cloud, comma separated list of cloud (zone) names or IDs.") do |list|
         cloud_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
-      # opts.on('--owner [LIST]', Array, "Owner, comma separated list of usernames or IDs.") do |list|
-      #   params['ownerId'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
-      # end
+      opts.on('--resources [LIST]', Array, "Filter by Resources, comma separated list of resource IDs.") do |list|
+        resource_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
+      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)
       opts.footer = <<-EOT
 List projects.
@@ -56,6 +56,8 @@ EOT
     # todo server and cloud, missing parse_server_id_list() too
     params['serverId'] = parse_server_id_list(server_ids) if server_ids
     params['cloudId'] = parse_cloud_id_list(cloud_ids) if cloud_ids
+    params['resourceId'] = parse_resource_id_list(resource_ids) if resource_ids
+    params['ownerId'] = parse_user_id_list(owner_ids) if owner_ids
     @projects_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @projects_interface.dry.list(params)
@@ -79,6 +81,7 @@ EOT
           {"INSTANCES" => lambda {|it| it['instances'].size rescue '' } },
           {"SERVERS" => lambda {|it| it['servers'].size rescue '' } },
           {"CLOUDS" => lambda {|it| it['clouds'].size rescue '' } },
+          {"RESOURCES" => lambda {|it| it['resources'].size rescue '' } },
           {"OWNER" => lambda {|it| it['owner'] ? it['owner']['username'] : '' } },
           {"DATE CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } },
           {"LAST UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } },
@@ -98,10 +101,7 @@ EOT
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[workflow]")
-      opts.on('--no-content', "Do not display script content." ) do
-        options[:no_content] = true
-      end
+      opts.banner = subcommand_usage("[project]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = <<-EOT
 Get details about a project.
@@ -169,6 +169,14 @@ EOT
         print cyan
         print as_pretty_table(project_clouds, [:id, :name], options)
       end
+
+      project_resources = project["resources"] || project["accountResources"]
+      if project_resources && project_resources.size > 0
+        print_h2 "Resources"
+        print cyan
+        print as_pretty_table(project_resources, [:id, :name], options)
+      end
+
       print reset,"\n"
     end
     return 0, nil
@@ -177,7 +185,7 @@ EOT
   def add(args)
     exit_code, err = 0, nil
     params, options, payload = {}, {}, {}
-    project_name, description, metadata, instance_ids, server_ids, cloud_ids = nil, nil, nil, nil, nil, nil
+    project_name, description, metadata, instance_ids, server_ids, cloud_ids, resource_ids = nil, nil, nil, nil, nil, nil, nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on('--name NAME', String, "Project Name" ) do |val|
@@ -198,6 +206,9 @@ EOT
       opts.on('--clouds [LIST]', Array, "Clouds, comma separated list of cloud names or IDs.") do |list|
         cloud_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
+      opts.on('--resources [LIST]', Array, "Resources, comma separated list of resource IDs.") do |list|
+        resource_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
 Create a project.
@@ -228,11 +239,6 @@ EOT
         metadata = prompt_metadata(options)
         payload['project']['tags'] = metadata if metadata
       end
-      if instance_ids != nil
-        payload['project']['instances'] = parse_instance_id_list(instance_ids).collect { |it| {'id': it.to_i} }
-      else
-        # could prompt
-      end
       # --instances
       if instance_ids
         payload['project']['instances'] = parse_instance_id_list(instance_ids).collect { |it| {'id': it.to_i} }
@@ -245,6 +251,10 @@ EOT
       if cloud_ids
         payload['project']['clouds'] = parse_cloud_id_list(cloud_ids).collect { |it| {'id': it.to_i} }
       end
+      # --resources
+      if resource_ids
+        payload['project']['resources'] = parse_resource_id_list(resource_ids).collect { |it| {'id': it.to_i} }
+      end
     end
     @projects_interface.setopts(options)
     if options[:dry_run]
@@ -264,10 +274,11 @@ EOT
     exit_code, err = 0, nil
     params, options, payload = {}, {}, {}
     project_name, description, metadata, add_metadata, remove_metadata = nil, nil, nil, nil, nil
-    instance_ids, server_ids, cloud_ids = nil, nil, nil
+    instance_ids, server_ids, cloud_ids, resource_ids = nil, nil, nil, nil
     add_instance_ids, remove_instance_ids = nil, nil
     add_server_ids, remove_server_ids = nil, nil
     add_cloud_ids, remove_cloud_ids = nil, nil
+    add_resource_ids, remove_resource_ids = nil, nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[project] [options]")
       opts.on('--name NAME', String, "Project Name" ) do |val|
@@ -312,6 +323,15 @@ EOT
       opts.on('--remove-clouds LIST', Array, "Remove Clouds, comma separated list of cloud names or IDs to remove.") do |list|
         remove_cloud_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
       end
+      opts.on('--resources [LIST]', Array, "Resources, comma separated list of resource names or IDs.") do |list|
+        resource_ids = list ? list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq : []
+      end
+      opts.on('--add-resources LIST', Array, "Add Resources, comma separated list of resource names or IDs to add.") do |list|
+        add_resource_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
+      opts.on('--remove-resources LIST', Array, "Remove Resources, comma separated list of resource names or IDs to remove.") do |list|
+        remove_resource_ids = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+      end
       build_standard_update_options(opts, options)
       opts.footer = <<-EOT
 Update a project.
@@ -379,109 +399,19 @@ EOT
         return 1, "clouds not found" if remove_cloud_ids.nil?
         payload['project']['removeClouds'] = remove_cloud_ids.collect { |it| {'id': it.to_i} }
       end
-    end
-    @projects_interface.setopts(options)
-    if options[:dry_run]
-      print_dry_run @projects_interface.dry.update(project['id'], payload)
-      return
-    end
-    json_response = @projects_interface.update(project['id'], payload)
-    project = json_response['project']
-    render_response(json_response, options, 'project') do
-      print_green_success "Project #{project['name']} updated"
-      exit_code, err = get([project['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
-    end
-    return exit_code, err
-  end
-
-  def add_tags(args)
-    params = {}
-    options = {}
-    payload = {}
-    metadata = nil
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[project] [tag=value] [tag=value]")
-      opts.on('--tags TAGS', String, "Project Tags in the format 'name:value, name:value'. This will add/update project tags.") do |val|
-        metadata = val
+      # --resources
+      if resource_ids
+        payload['project']['resources'] = parse_resource_id_list(resource_ids).collect { |it| {'id': it.to_i} }
       end
-      build_standard_update_options(opts, options)
-      opts.footer = <<-EOT
-Add metadata tags to a project.
-[project] is required. This is the name or id of a project.
-[tag=value] is required. This is a metadata tag in the format name=value, 1-N may be passed.
-EOT
-    end
-    optparse.parse!(args)
-    verify_args!(args:args, optparse:optparse, min:1) # maybe min:2 instead ?
-    connect(options)
-    exit_code, err = 0, nil
-    if args.count > 1
-      metadata = args[1..-1].join(" ")
-    end
-    project = find_project_by_name_or_id(args[0])
-    return 1, "project not found by '#{args[0]}'" if project.nil?
-    # construct payload
-
-    if options[:payload]
-      payload = options[:payload]
-      payload.deep_merge!({'project' => parse_passed_options(options)})
-    else
-      payload['project'] = {}
-      payload.deep_merge!({'project' => parse_passed_options(options)})
-      if options[:metadata]
-        payload['project']['addTags'] = parse_metadata(metadata)
-      end
-    end
-    @projects_interface.setopts(options)
-    if options[:dry_run]
-      print_dry_run @projects_interface.dry.update(project['id'], payload)
-      return
-    end
-    json_response = @projects_interface.update(project['id'], payload)
-    project = json_response['project']
-    render_response(json_response, options, 'project') do
-      print_green_success "Project #{project['name']} updated"
-      exit_code, err = get([project['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
-    end
-    return exit_code, err
-  end
-
-  def remove_tags(args)
-    params = {}
-    options = {}
-    payload = {}
-    metadata = nil
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[project] [tags]")
-      opts.on('--tags TAGS', String, "Project Tags in the format 'name=value, name=value'. This will add/update project tags.") do |val|
-        metadata = val
+      if add_resource_ids
+        add_resource_ids = parse_resource_id_list(add_resource_ids)
+        return 1, "resources not found" if add_resource_ids.nil?
+        payload['project']['addResources'] = add_resource_ids.collect { |it| {'id': it.to_i} }
       end
-      build_standard_update_options(opts, options)
-      opts.footer = <<-EOT
-Remove metadata tags from a project.
-[project] is required. This is the name or id of a project.
-[tags] is required. This is a metadata tag in the format tag=value, tag2, tag3, 1-N may be passed, value is optional and must match if passed.
-EOT
-    end
-    optparse.parse!(args)
-    verify_args!(args:args, optparse:optparse, min:1) # maybe min:2 instead ?
-    connect(options)
-    exit_code, err = 0, nil
-    if args.count > 1
-      metadata = args[1..-1].join(" ")
-    end
-    project = find_project_by_name_or_id(args[0])
-    return 1, "project not found by '#{args[0]}'" if project.nil?
-    # construct payload
-
-    if options[:payload]
-      payload = options[:payload]
-      payload.deep_merge!({'project' => parse_passed_options(options)})
-    else
-      payload['project'] = {}
-      payload.deep_merge!({'project' => parse_passed_options(options)})
-      if metadata
-        payload['project']['removeTags'] = parse_metadata(metadata)
+      if remove_resource_ids
+        remove_resource_ids = parse_resource_id_list(remove_resource_ids)
+        return 1, "resources not found" if remove_resource_ids.nil?
+        payload['project']['removeResources'] = remove_resource_ids.collect { |it| {'id': it.to_i} }
       end
     end
     @projects_interface.setopts(options)

data/lib/morpheus/cli/users.rb

@@ -698,7 +698,7 @@ EOT
       {'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'required' => true, 'displayOrder' => 5},
       {'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true, 'displayOrder' => 6},
       {'fieldName' => 'role', 'fieldLabel' => 'Role', 'type' => 'text', 'description' => "Role names (comma separated)", 'displayOrder' => 7},
-      {'fieldName' => 'receiveNotifications', 'fieldLabel' => 'receiveNotifications', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 58},
+      {'fieldName' => 'receiveNotifications', 'fieldLabel' => 'Receive Notifications?', 'type' => 'checkbox', 'required' => false, 'defaultValue' => true, 'displayOrder' => 58},
       {'fieldName' => 'linuxUsername', 'fieldLabel' => 'Linux Username', 'type' => 'text', 'required' => false, 'displayOrder' => 9},
       # {'fieldName' => 'linuxPassword', 'fieldLabel' => 'Linux Password', 'type' => 'password', 'required' => false, 'displayOrder' => 10},
       {'fieldName' => 'windowsUsername', 'fieldLabel' => 'Windows Username', 'type' => 'text', 'required' => false, 'displayOrder' => 11},

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.11"
+    VERSION = "4.2.12"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.11
+  version: 4.2.12
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler