morpheus-cli 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8864c6fde23535cdf51e56b3bc94a8cb33c5a0d3fbe5f1a81e9ca9b16481b2b8
-  data.tar.gz: 747c7097e26216cb0e088f289b789f9b3e2b8e71563457b831069aa27e66aa71
+  metadata.gz: b6cc9570fd3a41bf3c6ec4fb5b5ab5801171554a630eb269af90dcc6672fe141
+  data.tar.gz: 63150328a3155ed9ba99d57963be4e16eab3e54934eff64f94070b4fbf485c40
 SHA512:
-  metadata.gz: 94cfd0a6625753fd42090fe83bdedc08826fb19486135c2d89bc2f449314bc53b053f3e86210d3ab6c5c35add845fc303d9dbfe4fb13a27b324dde927f6b05bb
-  data.tar.gz: 492eed20dd75f0a10fc53275a6bd5b5044ea5286d26f8bd37c3736c4893a69488e1c4f6aaabfbc289dd5fd8a2229f3b5b947f1872dd0dc57c84063a001a20412
+  metadata.gz: 7d2375caf166551c16c460bf0b1cae7e2b672534c9a29a784408e2eac9e4fc336e01d93685ce5e0572933285a9e4766bc304314f8abfb2d62b700e09b9190f14
+  data.tar.gz: f30d57bcf10c3b3cb976329ec94a4ffff39f66da33ceffab25a7ab5246f921070f41547fe2b9c5f77de8e8814fc2ca8bf66855f93cf390044eac2fa76ba83ff3

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 7.0.1
+RUN gem install morpheus-cli -v 7.0.2
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -998,6 +998,11 @@ class Morpheus::APIClient
     Morpheus::NetworkFloatingIpsInterface.new(common_interface_options).setopts(@options)
   end
   
+  def email_templates
+    Morpheus::EmailTemplatesInterface.new(common_interface_options).setopts(@options)
+  end
+
+
   def rest(endpoint)
     Morpheus::RestInterface.new(common_interface_options).setopts(@options.merge({base_path: "#{@base_url}/api/#{endpoint}"}))
   end

data/lib/morpheus/api/email_templates_interface.rb

@@ -0,0 +1,53 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::EmailTemplatesInterface < Morpheus::APIClient
+
+  def list(params={})
+    url = "#{@base_url}/api/email-templates"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def get(id, params={})
+    url = "#{@base_url}/api/email-templates/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    if params.is_a?(Hash)
+      headers[:params].merge!(params)
+    elsif params.is_a?(Numeric)
+      url = "#{base_path}/#{params}"
+    elsif params.is_a?(String)
+      headers[:params]['name'] = params
+    end
+    execute(method: :get, url: url, headers: headers)
+  end
+
+
+  def update(id, payload)
+    url = "#{@base_url}/api/email-templates/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
+
+  def create(options)
+    url = "#{@base_url}/api/email-templates"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def template_types(params={})
+    url = "#{@base_url}/api/email-templates/types"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def destroy(id, params={})
+    url = "#{@base_url}/api/email-templates/#{id}"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :delete, url: url, headers: headers)
+  end
+
+end

data/lib/morpheus/cli/commands/budgets_command.rb

@@ -132,6 +132,7 @@ class Morpheus::Cli::BudgetsCommand
         "Scope" => lambda {|it| format_budget_scope(it) },
         "Period" => lambda {|it| it['year'] },
         "Interval" => lambda {|it| it['interval'].to_s.capitalize },
+        "Forecast Model" => lambda {|it| it['forecastType'] ? it['forecastType']['name'] : '' },
         # the UI doesn't consider timezone, so uhh do it this hacky way for now.
         "Start Date" => lambda {|it| 
           if it['timezone'] == 'UTC'
@@ -173,6 +174,7 @@ class Morpheus::Cli::BudgetsCommand
           }
           budget_row = {label:"Budget"}
           actual_row = {label:"Actual"}
+          forecast_row = {label:"Forecast"}
           multi_year = false
           if budget['startDate'] && budget['endDate'] && parse_time(budget['startDate']).year != parse_time(budget['endDate']).year
             multi_year = true
@@ -192,8 +194,18 @@ class Morpheus::Cli::BudgetsCommand
               budget_row[interval_key] = "#{cyan}#{format_money(budget_cost, currency)}#{cyan}"
               actual_row[interval_key] = "#{cyan}#{format_money(actual_cost, currency)}#{cyan}"
             end
+            forecast_cost = it["forecast"] ? it["forecast"].to_f : 0
+            forecast_over_budget = forecast_cost > 0 && forecast_cost > budget_cost
+            if forecast_over_budget
+              forecast_row[interval_key] = "#{red}#{format_money(forecast_cost, currency)}#{cyan}"
+            else
+              forecast_row[interval_key] = "#{cyan}#{format_money(forecast_cost, currency)}#{cyan}"
+            end
           end
           chart_data = [budget_row, actual_row]
+          if budget['stats']['intervals'].find { |it| it['forecast'] && it['forecast'] != 0 }
+            chart_data << forecast_row
+          end
           print as_pretty_table(chart_data, budget_summary_columns, options)
           print reset,"\n"
         rescue => ex
@@ -575,26 +587,27 @@ EOT
 
   def add_budget_option_types
     [
-      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 1},
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text'},
       # {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'defaultValue' => true},
-      {'fieldName' => 'scope', 'fieldLabel' => 'Scope', 'code' => 'budget.scope', 'type' => 'select', 'selectOptions' => [{'name'=>'Account','value'=>'account'},{'name'=>'Tenant','value'=>'tenant'},{'name'=>'Cloud','value'=>'cloud'},{'name'=>'Group','value'=>'group'},{'name'=>'User','value'=>'user'}], 'defaultValue' => 'account', 'required' => true, 'displayOrder' => 3},
+      {'fieldName' => 'scope', 'fieldLabel' => 'Scope', 'code' => 'budget.scope', 'type' => 'select', 'selectOptions' => [{'name'=>'Account','value'=>'account'},{'name'=>'Tenant','value'=>'tenant'},{'name'=>'Cloud','value'=>'cloud'},{'name'=>'Group','value'=>'group'},{'name'=>'User','value'=>'user'}], 'defaultValue' => 'account', 'required' => true},
       {'fieldName' => 'tenant', 'fieldLabel' => 'Tenant', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params| 
         @options_interface.options_for_source("tenants", {})['data']
-      }, 'required' => true, 'dependsOnCode' => 'budget.scope:tenant', 'displayOrder' => 4},
+      }, 'required' => true, 'dependsOnCode' => 'budget.scope:tenant'},
       {'fieldName' => 'user', 'fieldLabel' => 'User', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params|
         @options_interface.options_for_source("users", {})['data']
-      }, 'required' => true, 'dependsOnCode' => 'budget.scope:user', 'displayOrder' => 5},
+      }, 'required' => true, 'dependsOnCode' => 'budget.scope:user'},
       {'fieldName' => 'group', 'fieldLabel' => 'Group', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params| 
         @options_interface.options_for_source("groups", {})['data']
-      }, 'required' => true, 'dependsOnCode' => 'budget.scope:group', 'displayOrder' => 6},
+      }, 'required' => true, 'dependsOnCode' => 'budget.scope:group'},
       {'fieldName' => 'cloud', 'fieldLabel' => 'Cloud', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params| 
         @options_interface.options_for_source("clouds", {})['data']
-      }, 'required' => true, 'dependsOnCode' => 'budget.scope:cloud', 'displayOrder' => 7},
-      {'fieldName' => 'year', 'fieldLabel' => 'Period', 'code' => 'budget.year', 'type' => 'text', 'required' => true, 'defaultValue' => Time.now.year, 'description' => "The period (year) the budget applies, YYYY or 'custom' to enter Start Date and End Date manually", 'displayOrder' => 8},
-      {'fieldName' => 'startDate', 'fieldLabel' => 'Start Date', 'type' => 'text', 'required' => true, 'description' => 'The Start Date for custom period budget eg. 2021-01-01', 'dependsOnCode' => 'budget.year:custom', 'displayOrder' => 9},
-      {'fieldName' => 'endDate', 'fieldLabel' => 'End Date', 'type' => 'text', 'required' => true, 'description' => 'The End Date for custom period budget eg. 2023-12-31 (must be 1, 2 or 3 years from Start Date)', 'dependsOnCode' => 'budget.year:custom', 'displayOrder' => 10},
-      {'fieldName' => 'interval', 'fieldLabel' => 'Interval', 'type' => 'select', 'selectOptions' => [{'name'=>'Year','value'=>'year'},{'name'=>'Quarter','value'=>'quarter'},{'name'=>'Month','value'=>'month'}], 'defaultValue' => 'year', 'required' => true, 'description' => 'The budget interval, determines cost amounts: "year", "quarter" or "month"', 'displayOrder' => 11}
+      }, 'required' => true, 'dependsOnCode' => 'budget.scope:cloud'},
+      {'fieldName' => 'year', 'fieldLabel' => 'Period', 'code' => 'budget.year', 'type' => 'text', 'required' => true, 'defaultValue' => Time.now.year, 'description' => "The period (year) the budget applies, YYYY or 'custom' to enter Start Date and End Date manually"},
+      {'fieldName' => 'startDate', 'fieldLabel' => 'Start Date', 'type' => 'text', 'required' => true, 'description' => 'The Start Date for custom period budget eg. 2021-01-01', 'dependsOnCode' => 'budget.year:custom'},
+      {'fieldName' => 'endDate', 'fieldLabel' => 'End Date', 'type' => 'text', 'required' => true, 'description' => 'The End Date for custom period budget eg. 2023-12-31 (must be 1, 2 or 3 years from Start Date)', 'dependsOnCode' => 'budget.year:custom'},
+      {'fieldName' => 'interval', 'fieldLabel' => 'Interval', 'type' => 'select', 'selectOptions' => [{'name'=>'Year','value'=>'year'},{'name'=>'Quarter','value'=>'quarter'},{'name'=>'Month','value'=>'month'}], 'defaultValue' => 'year', 'required' => true, 'description' => 'The budget interval, determines cost amounts: "year", "quarter" or "month"'},
+      {'fieldName' => 'forecastType.id', 'fieldLabel' => 'Forecast Model', 'type' => 'select', 'optionSource' => 'forecastTypes', 'description' => 'The budget forcecast model type, determines projected cost calculations.'},
     ]
   end
 

data/lib/morpheus/cli/commands/clusters.rb

@@ -4277,26 +4277,24 @@ class Morpheus::Cli::Clusters
 
     if provision_type && provision_type['hasZonePools']
       # Resource pool
-      if !['resourcePoolId', 'resourceGroup', 'vpc'].find { |it| cloud['config'][it] && cloud['config'][it].length > 0 }
-        resource_pool_id = nil
-        resource_pool = options[:resourcePool] ? find_cloud_resource_pool_by_name_or_id(cloud['id'], options[:resourcePool]) : nil
+      resource_pool_id = nil
+      resource_pool = options[:resourcePool] ? find_cloud_resource_pool_by_name_or_id(cloud['id'], options[:resourcePool]) : nil
 
-        if !resource_pool
-          resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group['id'], zoneId: cloud['id']}.merge(service_plan ? {planId: service_plan['id']} : {}))['data'].reject { |it| it['id'].nil? && it['name'].nil? }
+      if !resource_pool
+        resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group['id'], zoneId: cloud['id']}.merge(service_plan ? {planId: service_plan['id']} : {}))['data'].reject { |it| it['id'].nil? && it['name'].nil? }
 
-          if resource_pool_options.empty?
-            print_red_alert "Cloud #{cloud['name']} has no available resource pools"
-            exit 1
-          elsif resource_pool_options.count > 1 && !options[:no_prompt]
-            resource_pool_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'resourcePool', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'selectOptions' => resource_pool_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Select resource pool.'}],options[:options],api_client, {})['resourcePool']
-          else
-            resource_pool_id = resource_pool_options.first['id']
-          end
-          if resource_pool_id.to_s["poolGroup-"]
-            resource_pool = @resource_pool_groups_interface.get(resource_pool_id)['resourcePoolGroup'] 
-          else 
-            resource_pool = @cloud_resource_pools_interface.get(cloud['id'], resource_pool_id)['resourcePool']
-          end
+        if resource_pool_options.empty?
+          print_red_alert "Cloud #{cloud['name']} has no available resource pools"
+          exit 1
+        elsif resource_pool_options.count > 1 && !options[:no_prompt]
+          resource_pool_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'resourcePool', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'selectOptions' => resource_pool_options, 'required' => true, 'skipSingleOption' => true, 'description' => 'Select resource pool.'}],options[:options],api_client, {})['resourcePool']
+        else
+          resource_pool_id = resource_pool_options.first['id']
+        end
+        if resource_pool_id.to_s["poolGroup-"]
+          resource_pool = @resource_pool_groups_interface.get(resource_pool_id)['resourcePoolGroup']
+        else
+          resource_pool = @cloud_resource_pools_interface.get(cloud['id'], resource_pool_id)['resourcePool']
         end
       end
     end

data/lib/morpheus/cli/commands/email_templates_command.rb

@@ -0,0 +1,373 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::EmailTemplates
+  include Morpheus::Cli::CliCommand
+
+  register_subcommands :list, :get, :add, :update, :remove, :execute
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @email_templates_interface = @api_client.email_templates
+  end
+
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def list(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[search]")
+
+      build_standard_list_options(opts, options)
+      opts.footer = "List email templates."
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    params.merge!(parse_list_options(options))
+    @email_templates_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @email_templates.dry.list(params)
+      return
+    end
+
+    json_response = @email_templates_interface.list(params)
+    templates = json_response['emailTemplates']
+    render_response(json_response, options, 'templates') do
+      title = "Morpheus Email Templates"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      if templates.empty?
+        print cyan,"No templates found.",reset,"\n"
+      else
+        print cyan
+        print_templates_table(templates, options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+    end
+    if templates.empty?
+      return 1, "no templates found"
+    else
+      return 0, nil
+    end
+  end
+
+  def get(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[emailTemplate]")
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+Get details about a specific email template.
+[emailTemplate] is required. This is the name or id of an emailTemplate.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:1)
+    connect(options)
+    parse_options(options, params)
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, params, options)
+    end
+  end
+
+  def _get(id, params, options)
+    if id.to_s !~ /\A\d{1,}\Z/
+      record = find_by_name_or_id('emailTemplate', id)
+      if record.nil?
+        return 1, "EmailTemplate not found for '#{id}'"
+      end
+      id = record['id']
+    end
+    options[:params] = params # parse_options(options, params)
+    options.delete(:payload)
+    execute_api(@email_templates_interface, :get, [id], options, 'emailTemplate') do |json_response|
+      email_template = json_response['emailTemplate']
+      print_h1 "EmailTemplate Details", [], options
+      print cyan
+      columns = email_template_column_definitions
+      print_description_list(columns, email_template, options)
+      print reset,"\n"
+    end
+  end
+
+  def add(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[name]")
+      opts.on("--type [TEXT]", String, "Type") do |val|
+        options[:type] = val.to_s
+      end
+      opts.on( '--template [TEXT]', "Template" ) do |val|
+        options[:template] = val.to_s
+      end
+      opts.on('--accounts LIST', Array, "Tenant accounts, comma separated list of account IDs") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          options[:accounts] = []
+        else
+          options[:accounts] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Create an email template.\n" +
+                    "[name] is required. This is the name of the new template."
+    end
+
+    optparse.parse!(args)
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-2 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+
+    begin
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of --payload
+        payload['emailTemplate'] ||= {}
+        if options[:options]
+          payload['emailTemplate'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+        end
+
+        if options[:type]
+          payload['emailTemplate']['type'] = options[:type]
+        end
+
+        if options[:template]
+          payload['emailTemplate']['template'] = options[:template]
+        end
+
+        if options[:accounts]
+          payload['emailTemplate']['accounts'] = options[:accounts]
+        end
+
+      else
+        payload = {'emailTemplate' => {}}
+       
+        # Template Type
+        template_type_id = nil
+        template_type = options[:type] ? find_template_type_by_name_or_id(options[:type]) : nil
+
+        if template_type
+          template_type_id = template_type['id']
+        else
+          available_template_types = template_types_for_dropdown
+
+          if available_template_types.empty?
+            print_red_alert "A template type is required"
+            exit 1
+          elsif available_template_types.count > 1 && !options[:no_prompt]
+            template_type_code = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'templateType', 'type' => 'select', 'fieldLabel' => 'Template Type', 'selectOptions' => template_types_for_dropdown, 'required' => true, 'description' => 'Select Template Type.'}],options[:options],@api_client,{})
+            template_type_code = template_type_code["templateType"]
+          else
+            template_type_code = available_template_types.first['code']
+          end
+          #template_type = get_template_types.find { |ct| ct['code'] == template_type_code }
+        end
+
+        payload['emailTemplate']['code'] = template_type_code
+        payload['emailTemplate']['template'] = Morpheus::Cli::OptionTypes.file_content_prompt({'fieldName' => 'source', 'fieldLabel' => 'File Content', 'type' => 'file-content', 'required' => true}, {'source' => {'source' => 'local'}}, nil, {})['content']
+        # Tenants
+        if options[:accounts]
+            payload['emailTemplate']['accounts'] = options[:accounts]
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'accounts', 'fieldLabel' => 'Tenants', 'type' => 'text', 'required' => false, 'description' => 'Tenant accounts, comma separated list of account IDs'}], options)
+            payload['emailTemplate']['accounts'] = v_prompt['accounts']
+          end
+
+      end
+      @email_templates_interface.setopts(options)
+      if options[:dry_run]
+         print_dry_run @email_templates_interface.dry.create(payload)
+         return
+      end
+      json_response = @email_templates_interface.create(payload)
+      if options[:json]
+         print JSON.pretty_generate(json_response)
+         print "\n"
+      elsif json_response['success']
+         get_args = [json_response["emailTemplate"]["id"]] + (options[:remote] ? ["-r",options[:remote]] : []) + (options[:refresh_interval] ? ['--refresh', options[:refresh_interval].to_s] : [])
+         get(get_args)
+      else
+         print_rest_errors(json_response, options)
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[emailTemplate] --template")
+      opts.on("--template TEMPLATE", String, "Updates Email Template") do |val|
+        options[:template] = val.to_s
+      end
+      opts.on('--accounts LIST', Array, "Tenant accounts, comma separated list of account IDs") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          options[:accounts] = []
+        else
+          options[:accounts] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Update an Email Template.\n" +
+                    "[emailTemplate] is required. This is the name or id of an existing email template."
+    end
+
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+
+    begin
+      payload = nil
+      email_template = nil
+
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of --payload
+        if options[:options]
+          payload['emailTemplate'] ||= {}
+          payload['emailTemplate'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+        end
+
+        if !payload['emailTemplate'].empty?
+          email_template = find_by_name_or_id('emailTemplate', payload['emailTemplate']['id'] || payload['emailTemplate']['name'])
+        end
+      else
+        email_template = find_by_name_or_id('emailTemplate', args[0])
+        template_payload = {}
+        if options[:template]
+          template_payload['template'] = options[:template]
+        end
+        if options[:accounts]
+          template_payload['accounts'] = options[:accounts]
+        end
+
+        payload = {"emailTemplate" => template_payload}
+      end
+
+      if !email_template
+        print_red_alert "No templates available for update"
+        exit 1
+      end
+
+      if payload.empty?
+        print_green_success "Nothing to update"
+        exit 1
+      end
+
+      @email_templates_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @email_templates_interface.dry.update(email_template['id'], payload)
+        return
+      end
+      json_response = @email_templates_interface.update(email_template['id'], payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      elsif json_response['success']
+        get_args = [json_response["emailTemplate"]["id"]] + (options[:remote] ? ["-r",options[:remote]] : []) + (options[:refresh_interval] ? ['--refresh', options[:refresh_interval].to_s] : [])
+        get(get_args)
+      else
+        print_rest_errors(json_response, options)
+      end
+    end
+  end
+
+  def remove(args)
+    options = {}
+    query_params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[emailTemplate]")
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+      opts.footer = "Delete an email template.\n" +
+                    "[emailTemplate] is required. This is the id of an existing email template.\n" +
+                    "Note: You cannot remove System Templates, only those that you own/created."
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+
+    begin
+      email_template = find_by_name_or_id('emailTemplate', args[0])
+
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the email template '#{email_template['name']}'?", options)
+        return 9, "aborted command"
+      end
+      @email_templates_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @email_templates_interface.dry.destroy(email_template['id'], query_params)
+        return
+      end
+      json_response = @email_templates_interface.destroy(email_template['id'], query_params)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      elsif !options[:quiet]
+        msg = "Email Template #{email_template['name']} is being removed..."
+        if json_response['msg'] != nil && json_response['msg'] != ''
+          msg = json_response['msg']
+        end
+        print_green_success msg
+        
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+
+
+  def print_templates_table(templates, opts={})
+    columns = [
+      {"ID" => lambda {|it| it['id'] } },
+      {"Name" => lambda {|it| it['name'] } },
+      {"Owner" => lambda {|it| it['owner']['name'] || 'System'} },
+      {"Tenants" => lambda {|it| it['accounts'].collect {|a| a['name'] }.join(', ') rescue it['owner'] ? 'Global' : ''} }
+
+      # {"UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } },
+    ]
+    if opts[:include_fields]
+      columns = opts[:include_fields]
+    end
+    print as_pretty_table(templates, columns, opts)
+  end
+
+  def email_template_column_definitions()
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Owner" => lambda {|it| it['owner']['name'] || 'System' },
+      "Template" => lambda {|it| it['template'] rescue '' },
+      "Tenants" => lambda {|it| it['accounts'].collect {|a| a['name'] }.join(', ') rescue it['owner'] ? 'Global' : ''}
+    }
+  end
+
+  def template_types_for_dropdown
+    get_template_types.collect {|it| {'name' => it['name'], 'code' => it['value'], 'value' => it['value']} }
+  end
+
+  def get_template_types(refresh=false)
+    if !@template_types || refresh
+      @template_types = @email_templates_interface.template_types()['types']
+    end
+    @template_types
+  end
+end

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

@@ -362,7 +362,7 @@ module Morpheus::Cli::PrintHelper
         end
       end
     end
-    if payload && !payload.empty?
+    if payload #&& !payload.empty?
       out <<  + ' \\' + "\n"
       if headers && headers['Content-Type'] == 'application/json'
         if payload.is_a?(String)
@@ -386,7 +386,7 @@ module Morpheus::Cli::PrintHelper
           # pretty_size = Filesize.from("#{payload.size} B").pretty.strip
           pretty_size = "#{payload.size} B"
           # print "File: #{payload.path} (#{payload.size} bytes)"
-          out << "  -d @#{payload.path}"
+          out << "  --data-binary @#{payload.path}"
         elsif payload.is_a?(String)
           out << "  -d '#{payload}'"
         elsif payload.respond_to?(:map)

data/lib/morpheus/cli/option_types.rb

@@ -1256,6 +1256,7 @@ module Morpheus
           file_params = passed_file_params
         end
         is_required = option_type['required']
+
         if file_params['source']
           file_params['sourceType'] = file_params.delete('source')
         end
@@ -1482,9 +1483,13 @@ module Morpheus
       end
 
       def self.sort_option_types(option_types)
-        option_types.select {|it| (it['fieldGroup'] || 'default').casecmp?('default')}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i} +
-        option_types.reject {|it| ['default', 'advanced'].include?((it['fieldGroup'] || 'default').downcase)}.sort{|a,b| a['displayOrder'] <=> b['displayOrder']}.group_by{|it| it['fieldGroup']}.values.collect { |it| it.sort{|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}}.flatten +
-        option_types.select {|it| 'advanced'.casecmp?(it['fieldGroup'])}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}
+        if option_types.find {|it| it['fieldGroup'] || it['displayOrder'] }
+          option_types.select {|it| (it['fieldGroup'] || 'default').casecmp?('default')}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i} +
+          option_types.reject {|it| ['default', 'advanced'].include?((it['fieldGroup'] || 'default').downcase)}.sort{|a,b| a['displayOrder'] <=> b['displayOrder']}.group_by{|it| it['fieldGroup']}.values.collect { |it| it.sort{|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}}.flatten +
+          option_types.select {|it| 'advanced'.casecmp?(it['fieldGroup'])}.sort {|a,b| a['displayOrder'].to_i <=> b['displayOrder'].to_i}
+        else
+          option_types
+        end
       end
 
       def self.display_select_options(opt, select_options = [], paging = nil)

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "7.0.1"
+    VERSION = "7.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -229,6 +229,7 @@ files:
 - lib/morpheus/api/datastores_interface.rb
 - lib/morpheus/api/deploy_interface.rb
 - lib/morpheus/api/deployments_interface.rb
+- lib/morpheus/api/email_templates_interface.rb
 - lib/morpheus/api/environments_interface.rb
 - lib/morpheus/api/execute_schedules_interface.rb
 - lib/morpheus/api/execution_request_interface.rb
@@ -414,6 +415,7 @@ files:
 - lib/morpheus/cli/commands/echo_command.rb
 - lib/morpheus/cli/commands/edit_profile_command.rb
 - lib/morpheus/cli/commands/edit_rc_command.rb
+- lib/morpheus/cli/commands/email_templates_command.rb
 - lib/morpheus/cli/commands/environments_command.rb
 - lib/morpheus/cli/commands/execute_schedules_command.rb
 - lib/morpheus/cli/commands/execution_request_command.rb