MuranoCLI 3.2.0.beta.1 → 3.2.0.beta.5

data/lib/MrMurano/commands/service.rb

@@ -0,0 +1,572 @@
+# Copyright © 2016-2017 Exosite LLC. All Rights Reserved
+# License: PROPRIETARY. See LICENSE.txt.
+# frozen_string_literal: true
+
+# vim:tw=0:ts=2:sw=2:et:ai
+# Unauthorized copying of this file is strictly prohibited.
+
+require 'ostruct'
+require 'time'
+require 'MrMurano/makePretty'
+require 'MrMurano/verbosing'
+require 'MrMurano/Exchange'
+require 'MrMurano/ReCommander'
+require 'MrMurano/Solution-ServiceConfig'
+require 'MrMurano/SubCmdGroupContext'
+
+# *** A `service` command helper class.
+
+class ServiceConsolidator
+  include MrMurano::Verbose
+
+  def initialize(options)
+    @include_all = options.show_all
+    @abbrev_desc = options.abbrev_desc
+    @include_type = options.show_type
+    @exclude_added = options.hide_added
+    @exclude_avail = options.only_added
+  end
+
+  # SYNC_ME: See Yeti UI's removeServiceIconBlacklist.
+  SERVICE_BLACKLIST = {
+    asset: true,
+    device: true,
+    device2: true,
+    gateway: true,
+    products: true,
+  }.freeze
+
+  # NOTE:
+  #   svc_cfgs  is from /solution/<sid>/serviceconfig/
+  #   svc_defs  is from /solution/<sid>/service/
+  #   purchased is from /exchange/<bid>/purchased/
+  def reconcile_services(svc_cfgs, svc_defs, purchased)
+    # The 3 API calls have 3 distinct responses, which we transform into 1.
+    sol_services = {}
+    # Add Exchange purchases to the list first.
+    add_simplify_svc_exchange(sol_services, purchased)
+    # Next add Platforms services, and possibly update sol_services.
+    svc_standard = services_from_definitions(sol_services, svc_defs)
+    add_simplify_svc_definitions(sol_services, svc_standard)
+    # Combine the active service data with the Exchange and Platform lists.
+    services_combine_with_active(sol_services, svc_cfgs)
+  end
+
+  def add_simplify_svc_exchange(sol_services, elements)
+    elements.each do |elem|
+      svc_alias = elem[:element][:source][:name]
+      svc_meta = {
+        name: elem[:element][:name],
+        alias: svc_alias,
+        description: elem[:element][:description],
+        status: '',
+        state: '',
+        source: 'Exchange',
+      }
+      sol_services[svc_alias] = svc_meta
+      # (lb): Just curious:
+      if svc_meta[:approval] != 'approved'
+        debug %(Unexpected: Exchange element !approved: #{svc_meta})
+      end
+      debug %(Unexpected: Exchange element !active: #{svc_meta}) unless svc_meta[:active]
+    end
+  end
+
+  def add_simplify_svc_definitions(sol_services, svc_standard)
+    svc_standard.each do |defn|
+      svc_alias = defn[:alias]
+      svc_meta = {
+        name: defn[:name],
+        alias: svc_alias,
+        description: defn[:description],
+        status: '',
+        state: defn[:status],
+        source: 'Platform',
+      }
+      svc_meta[:state] = add_type(svc_meta[:state], defn[:type])
+      unless sol_services[svc_alias].nil?
+        warning %(Unexpectedly overwriting entry with /service/: #{svc_alias})
+      end
+      sol_services[svc_alias] = svc_meta
+    end
+  end
+
+  def add_simplify_svc_configuration(sol_services, scfg)
+    svc_alias = scfg[:service]
+    svc_meta = {
+      name: scfg[:name],
+      alias: svc_alias,
+      description: '',
+      status: scfg[:status],
+      state: '',
+      source: 'Solution',
+    }
+    svc_meta[:status] = add_type(svc_meta[:status], scfg[:type])
+    unless sol_services[svc_alias].nil?
+      warning %(Unexpectedly overwriting entry with /serviceconfig/: #{svc_alias})
+    end
+    sol_services[svc_alias] = svc_meta
+  end
+
+  def add_type(state, type)
+    return state if !@include_type || type.to_s.empty?
+    %(#{state} (#{type}))
+  end
+
+  def service_blacklisted?(svc_alias)
+    !@include_all && !SERVICE_BLACKLIST[svc_alias.to_sym].nil?
+  end
+
+  def services_from_definitions(sol_services, svc_defs)
+    svc_defs.select do |svc|
+      # (lb): Sanity checking.
+      # Check if service blacklisted/!!whitelisted.
+      if service_blacklisted?(svc[:alias])
+        sol_services.delete(svc[:alias])
+        next(false)
+      end
+      # Check if service (from Exchange) already in the list we are building.
+      sxch = sol_services[svc[:alias]]
+      # The /exchange/ and /service/ endpoints do not use same name or description,
+      # e.g., Exchange name might be "Websocket Service" and /service/ name might
+      # be "WebSocket Gateway Service".
+      unless sxch.nil?
+        if sxch[:description] != svc[:description]
+          if !@abbrev_desc
+            sxch[:description] += ' / ' + svc[:description]
+          elsif sxch[:description].to_s.empty?
+            sxch[:description] = svc[:description]
+          end
+        end
+        sxch[:state] = svc[:status]
+        sxch[:state] = add_type(sxch[:state], sxch[:type])
+        sxch[:source] = 'Platform/' + sxch[:source]
+        next(false)
+      end
+      true
+    end
+  end
+
+  def services_combine_with_active(sol_services, svc_cfgs)
+    # Fill in status for active services.
+    svc_cfgs.each do |svc|
+      # (lb): Sanity check. Just clarifying my understanding of APIs and data.
+      if svc[:service] != svc[:script_key] && svc[:type] != 'P'
+        debug("MISMATCH: :service != :scriptkey / #{svc}")
+      end
+      if @exclude_added || service_blacklisted?(svc[:service])
+        sol_services.delete(svc[:service])
+        next
+      end
+      # The :alias is <sid>_<service>.
+      # Did we learn about this service from Exchange or the Platform?
+      svc_meta = sol_services[svc[:service]]
+      if !svc_meta.nil?
+        # Check if 'available', meaning... not 'hidden'.
+        # Note that /service/ calls it :status, but so as not to conflict
+        # with attr from /seviceconfig/ of same name, we called it :state.
+        if !@include_all && svc_meta[:state] == 'hidden'
+          sol_services.delete(svc[:service])
+          next
+        end
+        warning('Status not null?') unless svc_meta[:status] == ''
+        svc_meta[:status] = svc[:status]
+        svc_meta[:source] = add_type(svc_meta[:source], svc[:type])
+        # The /serviceconfig/ is generally personalized for the solution, e.g.,
+        # /service/ might have name "Timer Service" but /serviceconfig/ will
+        # have "<App Name> Timer and Scheduling Service".
+        svc_meta[:name] = svc[:name] unless svc[:name].to_s.empty?
+      else
+        # Make sure the service is not blacklisted/!!whitelisted.
+        add_simplify_svc_configuration(sol_services, svc)
+      end
+    end
+    if @exclude_avail
+      sol_services.reject! { |_svc_alias, svc| svc[:status].to_s.empty? }
+    end
+    # This was a weird bit of plumbing. And now we're done.
+    sol_services.values
+  end
+end
+
+# *** The `service` command class.
+
+class ServiceCmd
+  include MrMurano::Verbose
+
+  def command_service(cmd)
+    cmd.syntax = %(murano service)
+    cmd.summary = %(About service)
+    cmd.description = %(
+      Commands for working with Solution Services.
+    ).strip
+    cmd.project_not_required = true
+    cmd.subcmdgrouphelp = true
+
+    cmd.action do |_args, _options|
+      ::Commander::UI.enable_paging unless $cfg['tool.no-page']
+      say MrMurano::SubCmdGroupHelp.new(cmd).get_help
+    end
+  end
+
+  # *** `service add` command and helpers.
+
+  def command_service_add(cmd)
+    cmd.syntax = %(murano service add [--options] <service-name>)
+    cmd.summary = %(Add a service to a solution)
+    cmd.description = %(
+      Add a service to a solution.
+    ).strip
+    cmd.project_not_required = true
+
+    # FIXME/2018-03-21: See comment under command_service_delete:
+    #   We need to add multi-solution support so by default this
+    #   command works on a single solution, rather than both the
+    #   application and product (unless user specifies sol'n --type).
+    cmd_add_solntype_pickers(cmd)
+
+    cmd.action do |args, options|
+      cmd.verify_arg_count!(args, 1, ['Missing argument: Service alias or ID'])
+      cmd_defaults_solntype_pickers(options)
+      alias_or_id = args[0]
+      solz = must_fetch_solutions!(options)
+      cmd_service_add_sol_services(alias_or_id, solz)
+    end
+  end
+
+  def cmd_service_add_sol_services(alias_or_id, solz)
+    solz.each do |sol|
+      fancy_alias = fancy_ticks(alias_or_id)
+      fancy_name = fancy_ticks(sol.name)
+      MrMurano::Verbose.whirly_start %(
+        Adding #{fancy_alias} serviceconfig to #{fancy_name}...
+      ).strip
+      suc = cmd_service_add_sol_service(alias_or_id, sol)
+      warning %(Unable to add service #{fancy_alias} to #{fancy_name}.) unless suc
+    end
+    MrMurano::Verbose.whirly_stop
+  end
+
+  def cmd_service_add_sol_service(alias_or_id, sol)
+    svc_cfg = MrMurano::ServiceConfig.new(sol)
+    svc_cfg.create(alias_or_id) do |request, http|
+      response = http.request(request)
+      cmd_service_add_blather_result(response, alias_or_id, sol)
+      case response
+      when Net::HTTPOK
+        true
+      when Net::HTTPConflict
+        true
+      when Net::HTTPPaymentRequired
+        false
+      else
+        svc_cfg.showHttpError(request, response)
+        false
+      end
+    end
+  end
+
+  def cmd_service_add_blather_result(response, alias_or_id, sol)
+    fancy_alias = fancy_ticks(alias_or_id)
+    fancy_name = fancy_ticks(sol.name)
+    case response
+    when Net::HTTPOK
+      verbose %(Added service #{fancy_alias} to #{fancy_name}.)
+    when Net::HTTPConflict
+      verbose %(Service #{fancy_alias} was already added to #{fancy_name}.)
+    when Net::HTTPPaymentRequired
+      warning %(Use exchange to add the service to your business first.)
+    else
+      warning %(Unexpected response: #{response})
+    end
+  end
+
+  # *** `service delete` command and helpers.
+
+  def command_service_delete(cmd)
+    cmd.syntax = %(murano service delete [--options] <service-name>)
+    cmd.summary = %(Delete service from solution)
+    cmd.description = %(
+      Delete service from solution.
+    ).strip
+    cmd.project_not_required = true
+
+    # Add flag: --type [application|product|all].
+    # FIXME/2018-03-21: The way the CLI works, it chooses all solutions
+    #   unless told otherwise; but we probably do not want to delete the
+    #   same service from all solutions! So we really need multi-solution
+    #   support! I.e., one solution active at a time, not 2!
+    cmd_add_solntype_pickers(cmd)
+
+    cmd.action do |args, options|
+      cmd.verify_arg_count!(args, 1, ['Missing argument: Service alias or ID'])
+      cmd_defaults_solntype_pickers(options)
+      alias_or_id = args[0]
+      solz = must_fetch_solutions!(options)
+      cmd_service_delete_sol_services(alias_or_id, solz)
+    end
+  end
+
+  def cmd_service_delete_sol_services(alias_or_id, solz)
+    solz.each do |sol|
+      fancy_alias = fancy_ticks(alias_or_id)
+      fancy_name = fancy_ticks(sol.name)
+      MrMurano::Verbose.whirly_start %(
+        Deleting #{fancy_alias} serviceconfig from #{fancy_name}...
+      ).strip
+      suc = cmd_service_delete_sol_service(alias_or_id, sol)
+      warning %(Service #{fancy_alias} not found for #{fancy_name}.) unless suc
+    end
+    MrMurano::Verbose.whirly_stop
+  end
+
+  def cmd_service_delete_sol_service(alias_or_id, sol)
+    svc_cfg = MrMurano::ServiceConfig.new(sol)
+    svc_cfg.remove(alias_or_id) do |request, http|
+      response = http.request(request)
+      cmd_service_delete_blather_result(response, alias_or_id, sol)
+      case response
+      when Net::HTTPNoContent
+        true
+      when Net::HTTPNotFound
+        false
+      else
+        svc_cfg.showHttpError(request, response)
+        false
+      end
+    end
+  end
+
+  def cmd_service_delete_blather_result(response, alias_or_id, sol)
+    fancy_alias = fancy_ticks(alias_or_id)
+    fancy_name = fancy_ticks(sol.name)
+    case response
+    when Net::HTTPNoContent
+      verbose %(Deleted service #{fancy_alias} from #{fancy_name}.)
+    when Net::HTTPNotFound
+      verbose %(Service #{fancy_alias} was already removed from #{fancy_name}.)
+    else
+      warning %(Unexpected response: #{response})
+    end
+  end
+
+  # *** `service get` command and helpers.
+
+  def command_service_get(cmd)
+    cmd.syntax = %(murano service get [--options] <service-name>)
+    cmd.summary = %(Get information about an added service)
+    cmd.description = %(
+      Get information about an added service.
+    ).strip
+    cmd.project_not_required = true
+
+    # Add flag: --type [application|product|all].
+    cmd_add_solntype_pickers(cmd)
+
+    cmd.action do |args, options|
+      cmd.verify_arg_count!(args, 1, ['Missing argument: Service alias or ID'])
+      cmd_defaults_solntype_pickers(options)
+      alias_or_id = args[0]
+      solz = must_fetch_solutions!(options)
+      sol_infos = cmd_service_get_sol_infos(alias_or_id, solz)
+      cmd_service_get_sol_info_report(sol_infos, solz.first)
+    end
+  end
+
+  def cmd_service_get_sol_infos(alias_or_id, solz)
+    sol_infos = []
+    solz.each do |sol|
+      MrMurano::Verbose.whirly_start %(
+        Fetching #{fancy_ticks(alias_or_id)} serviceconfig for #{fancy_ticks(sol.name)}...
+      ).strip
+      svc_info = cmd_service_get_sol_info(alias_or_id, sol)
+      svc_usage = svc_info['usage']
+      svc_usage = '<none reported>' if svc_usage.empty?
+      sol_infos += [[sol.sid, sol.name, svc_usage]]
+    end
+    MrMurano::Verbose.whirly_stop
+    sol_infos
+  end
+
+  def cmd_service_get_sol_info(alias_or_id, sol)
+    svc_cfg = MrMurano::ServiceConfig.new(sol)
+    svc_info = svc_cfg.info(alias_or_id) do |request, http|
+      response = http.request(request)
+      case response
+      when Net::HTTPSuccess
+        JSON.parse(response.body)
+      when Net::HTTPNotFound
+        # Info returns very basic info, e.g., { "usage": {} }
+        { 'usage' => '<no such service>' }
+      else
+        svc_cfg.showHttpError(request, response)
+        false
+      end
+    end
+    svc_info
+  end
+
+  def cmd_service_get_sol_info_report(sol_infos, any_sol)
+    headers = ['solution id', 'solution name', 'service usage']
+    any_sol.outf(sol_infos) do |dd, ios|
+      MrMurano::Verbose.tabularize(
+        { headers: headers, rows: dd },
+        ios
+      )
+    end
+  end
+
+  # *** `service list` command and helpers.
+
+  def cmd_service_fetch_solution_services(solz, purchased, options)
+    sol_svcs = []
+    MrMurano::Verbose.whirly_start('Fetching solution services...')
+    solz.each do |sol|
+      MrMurano::Verbose.whirly_start('Fetching solution serviceconfig list...')
+      # We could get everything without a query, e.g.,
+      #   svc_cfgs = sol.serviceconfig()
+      # but maybe it's faster to only ask for what we need.
+      svc_cfgs = sol.serviceconfig(
+        select: 'id,service,name,alias,status,type,script_key'
+      )
+
+      MrMurano::Verbose.whirly_start('Fetching solution service list...')
+      svc_defs = sol.service
+
+      MrMurano::Verbose.whirly_start('Assembling solution service list...')
+      svc_reducer = ServiceConsolidator.new(options)
+      sol_svcs += [
+        [
+          sol,
+          svc_reducer.reconcile_services(
+            svc_cfgs[:items],
+            svc_defs[:items],
+            purchased,
+          ),
+        ],
+      ]
+    end
+    MrMurano::Verbose.whirly_stop
+    sol_svcs
+  end
+
+  def sol_svc_rowify(dd, headers, width_avail)
+    rows = []
+    # Sort by status, then alias. (Yeti orders Exchange elements first.)
+    sorted = dd.sort do |lhs, rhs|
+      next(lhs[:status] <=> rhs[:status]) unless lhs[:status] == rhs[:status]
+      lhs[:alias] <=> rhs[:alias]
+    end
+    sorted.each do |svc_cfg|
+      row = headers.map do |key|
+        full = svc_cfg[key]
+        next(full) if full.to_s.empty?
+        # Apparently descriptions have unpredictable whitespace and HTML tags.
+        full = full.tr("\n", ' ')
+        next(full) if width_avail.nil? || key != :description
+        MrMurano::Pretties.split_text_on_whitespace(full, width_avail)
+      end
+      rows << row
+    end
+    rows
+  end
+
+  def cmd_service_output_solution_services(sols_and_svcs, options)
+    headers = %i[name alias status]
+    headers += [:id] if options.show_id
+    headers += [:state] if options.show_state
+    headers += [:source] if options.show_source
+    headers += [:description] if options.show_desc || options.abbrev_desc
+
+    sol_svcs = sols_and_svcs.map { |_sol, svcs| svcs.map { |svc| OpenStruct.new(svc) } }
+    width_avail = MrMurano::Pretties.width_last_column(headers, sol_svcs.flatten)
+    sols_and_svcs.each do |sol, sol_svc|
+      sol.outf(sol_svc) do |dd, ios|
+        ios.puts(sol.pretty_desc(add_type: true)) if options.header
+        rows = sol_svc_rowify(dd, headers, width_avail)
+        sol.tabularize(
+          { headers: headers, rows: rows },
+          ios
+        )
+      end
+    end
+  end
+
+  def command_service_list(cmd)
+    cmd.syntax = %(murano service list)
+    cmd.summary = %(List all services previously added to a solution)
+    cmd.description = %(
+      List all services previously added to a solution.
+    ).strip
+    cmd.project_not_required = true
+
+    # Add flag: --type [application|product|all].
+    cmd_add_solntype_pickers(cmd)
+
+    cmd.option(
+      '--[no-]header', %(Output solution descriptions (default: true))
+    )
+
+    cmd.option '--show-all', 'Show all services, including hidden'
+    cmd.option '--show-id', 'Show service IDs'
+    cmd.option '--show-type', 'Show service types (Core, Product, Application, External)'
+    cmd.option '--show-state', 'Show service definition status'
+    cmd.option '--show-source', 'Show service source'
+    cmd.option '--show-desc', 'Show service descriptions'
+    cmd.option '--abbrev-desc', 'Show abbreviated service descriptions'
+
+    cmd.option '--hide-added', 'Show only services available to add to Solution'
+    cmd.option '--only-added', 'Show only services already added to Solution'
+
+    cmd.action do |args, options|
+      cmd.verify_arg_count!(args)
+      options.default(
+        all: false,
+        header: true,
+        show_all: false,
+        show_id: false,
+        show_type: false,
+        show_state: false,
+        show_source: false,
+        show_desc: false,
+        abbrev_desc: false,
+        hide_added: false,
+        only_added: false,
+      )
+      cmd_defaults_solntype_pickers(options)
+
+      solz = must_fetch_solutions!(options)
+      # Prepare the list of purchased Exchange services.
+      biz_exg = MrMurano::Exchange.new
+      MrMurano::Verbose.whirly_start('Fetching Exchange purchases list...')
+      purchased = biz_exg.fetch_purchased(services_only: true)
+      sols_and_svcs = cmd_service_fetch_solution_services(solz, purchased, options)
+
+      cmd_service_output_solution_services(sols_and_svcs, options)
+    end
+  end
+end
+
+def wire_cmd_service
+  service_cmd = ServiceCmd.new
+
+  command(:service) { |cmd| service_cmd.command_service(cmd) }
+
+  command('service add') { |cmd| service_cmd.command_service_add(cmd) }
+  alias_command 'service create', 'service add'
+
+  command('service delete') { |cmd| service_cmd.command_service_delete(cmd) }
+  alias_command 'service remove', 'service delete'
+
+  command('service get') { |cmd| service_cmd.command_service_get(cmd) }
+
+  command('service list') { |cmd| service_cmd.command_service_list(cmd) }
+  alias_command 'services list', 'service list'
+  alias_command 'service list available', 'service list', '--hide-added'
+  alias_command 'service list all', 'service list', '--show-all'
+  alias_command 'service list full', 'service list', '--show-all', '--show-type', '--show-state', '--show-source', '--show-desc'
+  alias_command 'service status', 'service list', '--only-added'
+end
+
+wire_cmd_service
+

data/lib/MrMurano/commands/show.rb

@@ -6,9 +6,9 @@
 # Unauthorized copying of this file is strictly prohibited.
 
 require 'MrMurano/verbosing'
+require 'MrMurano/AccountBase'
 require 'MrMurano/Business'
 require 'MrMurano/ReCommander'
-require 'MrMurano/Solution'
 
 command :show do |c|
   c.syntax = %(murano show)
@@ -111,7 +111,7 @@ Show readable information about the current configuration.
       puts 'product ID not found in config'
     end
 
-    MrMurano::SolutionBase.warn_configfile_env_maybe if id_not_in_biz
+    MrMurano::AccountBase.warn_configfile_env_maybe if id_not_in_biz
   end
 end
 
@@ -126,7 +126,11 @@ Show readable information about the current configuration.
   c.action do |args, _options|
     c.verify_arg_count!(args)
     puts %(base: #{$cfg['location.base']})
-    $cfg['location'].each { |key, value| puts %(#{key}: #{$cfg['location.base']}/#{value}) }
+    $cfg['location'].keys.sort.each do |key|
+      next if key == 'base'
+      value = $cfg['location'][key]
+      puts %(#{key}: #{$cfg['location.base']}/#{value})
+    end
   end
 end
 

data/lib/MrMurano/commands/solution.rb

@@ -6,7 +6,7 @@
 # Unauthorized copying of this file is strictly prohibited.
 
 require 'MrMurano/verbosing'
-require 'MrMurano/Account'
+require 'MrMurano/Business'
 require 'MrMurano/ReCommander'
 require 'MrMurano/SubCmdGroupContext'
 require 'MrMurano/commands/business'
@@ -53,6 +53,7 @@ Create a new solution in the current business.
     if args.count.zero?
       sol = biz.solution_from_type!(options.type)
       name = solution_ask_for_name(sol)
+      next if name.nil?
       names = [name]
     else
       names = args

data/lib/MrMurano/commands/solution_picker.rb

@@ -5,10 +5,12 @@
 # vim:tw=0:ts=2:sw=2:et:ai
 # Unauthorized copying of this file is strictly prohibited.
 
+require 'rainbow'
 require 'MrMurano/verbosing'
 require 'MrMurano/Business'
 require 'MrMurano/Config'
 require 'MrMurano/Solution'
+require 'MrMurano/variegated/TruthyFalsey'
 
 MSG_SOLUTIONS_NONE_FOUND = 'No solutions found' unless defined? MSG_SOLUTIONS_NONE_FOUND
 
@@ -252,29 +254,32 @@ def solution_get_solutions(biz, type, api_id: nil, name: nil, fuzzy: nil)
   solz
 end
 
-def solution_ask_for_name(sol)
-  asking = true
-  while asking
-    solname = ask("Please enter the #{sol.type_name} name: ")
+def solution_ask_for_name(sol_model)
+  solname = ''
+  while solname == ''
+    solname = ask("Enter the #{sol_model.type_name} name [leave blank to skip]: ")
     puts ''
     if solname == ''
-      confirmed = ask("\nReally skip the #{sol.type_name}? [Y/n] ", true)
-      if confirmed
+      confirmed = ask(
+        Rainbow("Really skip the #{sol_model.type_name}").bright.underline + '? [Y/n] '
+      )
+      if confirmed == '' || TruthyFalsey.new(confirmed).truthy?
         puts ''
-        return '', '', false
+        solname = nil
       end
     else
-      #unless sol.name.match(sol.name_validate_regex) { say ... }
+      # Try setting the name on the dummy solution; warn if fails, and keep looping.
       begin
-        sol.set_name!(solname)
-        break
+        # Test sol.name_validate_regex.
+        sol_model.set_name!(solname)
       rescue MrMurano::ConfigError => _err
-        say(sol.name_validate_help)
+        say(sol_model.name_validate_help)
         # keep looping
+        solname = ''
       end
     end
   end
-  sol.name
+  solname
 rescue EOFError
   # E.g., the user pressed Ctrl-D.
   #   "error: The input stream is exhausted."
@@ -491,13 +496,24 @@ module MrMurano
       if solname.nil?
         #say "You do not have any #{type}s. Let's create one."
         if @verbose
-          say("This business does not have any #{Inflecto.pluralize(sol.type.to_s)}. Let's create one")
+          plural = Inflecto.pluralize(sol.type.to_s)
+          say("This business does not have any #{plural}. Let's create one")
           puts ''
         end
-        solution_ask_for_name(sol)
-      else
+        solname = solution_ask_for_name(sol)
+      end
+      return nil if solname.nil?
+
+      # The solution name, if we asked for it, will have been verified;
+      # otherwise, if supplied as --option but an invalid solution name,
+      # raise a fuss.
+      begin
         sol.set_name!(solname)
+      rescue MrMurano::ConfigError => _err
+        MrMurano::Verbose.error(sol.name_validate_help)
+        exit 1
       end
+
       # MAYBE/2017-07-20: Detect if Business is ADC enabled. If not,
       # creating a solution fails, e.g.,
       #   Request Failed: 409: [409] upgrade