MuranoCLI 3.0.1 → 3.0.2

data/lib/MrMurano/commands/globals.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.22 /coding: utf-8
+# Last Modified: 2017.09.11 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -40,6 +40,22 @@ global_option('-n', '--dry', %(Do not run actions that make changes)) do
   $cfg['tool.verbose'] = true
 end
 
+global_option('--csv', %(Output as comma-separated values)) do
+  $cfg['tool.outformat'] = 'csv'
+end
+
+global_option('--json', %(Output as JSON)) do
+  $cfg['tool.outformat'] = 'json'
+end
+
+global_option('--yaml', %(Output as Yaml)) do
+  $cfg['tool.outformat'] = 'yaml'
+end
+
+global_option('--pp', %(Output using Ruby pretty-printer)) do
+  $cfg['tool.outformat'] = 'pp'
+end
+
 exclude_help = %(
 Except config values from the specified scope(s).
         SCOPES can be 1 scope or comma-separated list of

data/lib/MrMurano/commands/init.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.17 /coding: utf-8
+# Last Modified: 2017.09.11 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -181,12 +181,12 @@ command :init do |c|
       verbose: true,
     }
     # Get/Create Application ID
-    sol_opts[:match_sid] = options.application_id
+    sol_opts[:match_api_id] = options.application_id
     sol_opts[:match_name] = options.application_name
     sol_opts[:match_fuzzy] = options.application
     appl = solution_find_or_create(biz: biz, type: :application, **sol_opts)
     # Get/Create Product ID
-    sol_opts[:match_sid] = options.product_id
+    sol_opts[:match_api_id] = options.product_id
     sol_opts[:match_name] = options.product_name
     sol_opts[:match_fuzzy] = options.product
     prod = solution_find_or_create(biz: biz, type: :product, **sol_opts)

data/lib/MrMurano/commands/link.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.09.11 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -48,20 +48,20 @@ List the solutions that are linked.
     biz = MrMurano::Business.new
     products = biz.products
     MrMurano::Verbose.whirly_stop
-    pids = products.map(&:apiId)
+    pids = products.map(&:api_id)
 
     sol_opts = { biz: biz, type: :application }
-    sol_opts[:match_sid] = $cfg['application.id'] unless options.all
+    sol_opts[:match_api_id] = $cfg['application.id'] unless options.all
     appl = solution_find_or_create(**sol_opts)
 
     if !appl.nil?
       MrMurano::Verbose.whirly_msg('Fetching application services...')
-      sercfg = MrMurano::ServiceConfig.new(appl.sid)
+      sercfg = MrMurano::ServiceConfig.new(appl.api_id)
       #scfgs = sercfg.list('?select=service,id,solution_id,script_key,alias')
       scfgs = sercfg.list
       MrMurano::Verbose.whirly_stop
     else
-      sercfg = MrMurano::ServiceConfig.new(MrMurano::SolutionId::INVALID_SID)
+      sercfg = MrMurano::ServiceConfig.new(MrMurano::SolutionId::INVALID_API_ID)
       scfgs = []
     end
 
@@ -150,7 +150,7 @@ def link_solutions(sol_a, sol_b, options)
   warn_on_conflict = options[:warn_on_conflict] || false
   verbose = options[:verbose] || false
 
-  if sol_a.nil? || sol_a.sid.to_s.empty? || sol_b.nil? || sol_b.sid.to_s.empty?
+  if sol_a.nil? || sol_a.api_id.to_s.empty? || sol_b.nil? || sol_b.api_id.to_s.empty?
     msg = 'Missing Solution(s) (Applications or Products): Nothing to link'
     if warn_on_conflict
       sercfg.warning msg
@@ -172,9 +172,9 @@ def link_solutions(sol_a, sol_b, options)
 
   # Get services for solution to which being linked (application),
   # and look for linkee (product) service.
-  sercfg = MrMurano::ServiceConfig.new(sol_a.sid)
+  sercfg = MrMurano::ServiceConfig.new(sol_a.api_id)
   MrMurano::Verbose.whirly_msg 'Fetching services...'
-  scfgs = sercfg.search(sol_b.sid)
+  scfgs = sercfg.search(sol_b.api_id)
   svc_cfg_exists = scfgs.any?
   MrMurano::Verbose.whirly_stop
 
@@ -182,7 +182,7 @@ def link_solutions(sol_a, sol_b, options)
   unless svc_cfg_exists
     MrMurano::Verbose.whirly_msg 'Linking solutions...'
     # Call Murano.
-    _ret = sercfg.create(sol_b.sid, sol_b.name) do |request, http|
+    _ret = sercfg.create(sol_b.api_id, sol_b.name) do |request, http|
       response = http.request(request)
       MrMurano::Verbose.whirly_stop
       if response.is_a?(Net::HTTPSuccess)
@@ -208,8 +208,8 @@ def link_solutions(sol_a, sol_b, options)
 
   # Get event handlers for application, and look for product event handler.
   MrMurano::Verbose.whirly_msg 'Fetching handlers...'
-  evthlr = MrMurano::EventHandlerSolnApp.new(sol_a.sid)
-  hdlrs = evthlr.search(sol_b.sid)
+  evthlr = MrMurano::EventHandlerSolnApp.new(sol_a.api_id)
+  hdlrs = evthlr.search(sol_b.api_id)
   evt_hlr_exists = hdlrs.any?
   MrMurano::Verbose.whirly_stop
 
@@ -218,7 +218,7 @@ def link_solutions(sol_a, sol_b, options)
   unless evt_hlr_exists
     MrMurano::Verbose.whirly_msg 'Setting default event handler...'
     # Call Murano.
-    evthlr.default_event_script(sol_b.sid) do |request, http|
+    evthlr.default_event_script(sol_b.api_id) do |request, http|
       response = http.request(request)
       MrMurano::Verbose.whirly_stop
       if response.is_a?(Net::HTTPSuccess)
@@ -244,10 +244,10 @@ def link_solutions(sol_a, sol_b, options)
 end
 
 def unlink_solutions(sol_a, sol_b)
-  sercfg = MrMurano::ServiceConfig.new(sol_a.sid)
+  sercfg = MrMurano::ServiceConfig.new(sol_a.api_id)
   MrMurano::Verbose.whirly_msg 'Fetching services...'
   #scfgs = sercfg.list('?select=service,id,solution_id,script_key,alias')
-  scfgs = sercfg.search(sol_b.sid)
+  scfgs = sercfg.search(sol_b.api_id)
   MrMurano::Verbose.whirly_stop
 
   if scfgs.length > 1
@@ -272,8 +272,8 @@ def unlink_solutions(sol_a, sol_b)
   end
 
   MrMurano::Verbose.whirly_msg 'Fetching handlers...'
-  evthlr = MrMurano::EventHandlerSolnApp.new(sol_a.sid)
-  hdlrs = evthlr.search(sol_b.sid)
+  evthlr = MrMurano::EventHandlerSolnApp.new(sol_a.api_id)
+  hdlrs = evthlr.search(sol_b.api_id)
   #evt_hlr_exists = hdlrs.any?
   MrMurano::Verbose.whirly_stop
 

data/lib/MrMurano/commands/postgresql.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.09.11 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -10,7 +10,7 @@ require 'MrMurano/Solution-ServiceConfig'
 
 module MrMurano
   class Postgresql < ServiceConfig
-    def initialize(sid=nil)
+    def initialize(api_id=nil)
       # FIXME/2017-07-03: What soln types have PSQLs?
       @solntype = 'application.id'
       super

data/lib/MrMurano/commands/show.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.22 /coding: utf-8
+# Last Modified: 2017.09.11 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -39,7 +39,10 @@ Show readable information about the current configuration.
     unless selected_application_id.to_s.empty?
       MrMurano::Verbose.whirly_start('Fetching Applications...')
       biz.applications.each do |sol|
-        selected_application = sol if sol.apiId == selected_application_id
+        next unless sol.api_id == selected_application_id
+        #next unless [sol.api_id, sol.sid].include?(selected_application_id)
+        selected_application = sol
+        break
       end
       MrMurano::Verbose.whirly_stop
     end
@@ -49,7 +52,10 @@ Show readable information about the current configuration.
     unless selected_product_id.to_s.empty?
       MrMurano::Verbose.whirly_start('Fetching Products...')
       biz.products.each do |sol|
-        selected_product = sol if sol.apiId == selected_product_id
+        next unless sol.api_id == selected_product_id
+        #next unless [sol.api_id, sol.sid].include?(selected_product_id)
+        selected_product = sol
+        break
       end
       MrMurano::Verbose.whirly_stop
     end
@@ -71,11 +77,11 @@ Show readable information about the current configuration.
 
     id_not_in_biz = false
 
-    # E.g., {:bizid=>"ABC", :type=>"application", :apiId=>"XXX", :sid=>"XXX",
+    # E.g., {:bizid=>"ABC", :type=>"application", :api_id=>"XXX", :sid=>"XXX",
     #        :name=>"ABC", :domain=>"ABC.apps.exosite.io" }
     if selected_application
       sol_info = %(application: https://#{selected_application.domain})
-      sol_info += %( <#{selected_application.sid}>) if options.ids
+      sol_info += %( <#{selected_application.api_id}>) if options.ids
       puts sol_info
     elsif selected_application_id
       #puts 'selected application not in business'
@@ -88,11 +94,11 @@ Show readable information about the current configuration.
       puts 'application ID not found in config'
     end
 
-    # E.g., {:bizid=>"ABC", :type=>"product", :apiId=>"XXX", :sid=>"XXX",
+    # E.g., {:bizid=>"ABC", :type=>"product", :api_id=>"XXX", :sid=>"XXX",
     #        :name=>"ABC", :domain=>"ABC.m2.exosite.io" }
     if selected_product
       sol_info = %(product: #{selected_product.name})
-      sol_info += %( <#{selected_product.sid}>) if options.ids
+      sol_info += %( <#{selected_product.api_id}>) if options.ids
       puts sol_info
     elsif selected_product_id
       #puts 'selected product not in business'

data/lib/MrMurano/commands/solution.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.09.11 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -68,11 +68,11 @@ Create a new solution in the current business.
 
     if options.save
       section = options.type.to_s
-      $cfg.set("#{section}.id", sol.sid)
+      $cfg.set("#{section}.id", sol.api_id)
       $cfg.set("#{section}.name", sol.name)
     end
 
-    biz.outf(sol.sid)
+    biz.outf(sol.api_id)
   end
 end
 alias_command 'create application', 'solution create', '--type', 'application'
@@ -157,7 +157,9 @@ def cmd_solution_del_get_names_and_ids!(biz, args, options)
   end
   solz = must_fetch_solutions!(options, args, biz)
   solz.each do |sol|
-    nmorids += [[sol.sid, "#{MrMurano::Verbose.fancy_ticks(sol.name)} <#{sol.sid}>", sol]]
+    nmorids += [
+      [sol.api_id, "#{MrMurano::Verbose.fancy_ticks(sol.name)} <#{sol.api_id}>", sol],
+    ]
   end
   nmorids
 end
@@ -217,7 +219,9 @@ def solution_delete(name_or_id, use_sol: nil, type: :all, yes: false)
     #   would return true if, say, sol.meta[:any_key] equaled name_or_id.)
     unless name_or_id.empty?
       solz.select! do |sol|
-        sol.sid == name_or_id || sol.name == name_or_id || sol.domain =~ /#{Regexp.escape(name_or_id)}\./i
+        sol.api_id == name_or_id \
+          || sol.name == name_or_id \
+          || sol.domain =~ /#{Regexp.escape(name_or_id)}\./i
       end
     end
     MrMurano::Verbose.whirly_stop
@@ -255,7 +259,7 @@ def solution_delete(name_or_id, use_sol: nil, type: :all, yes: false)
         n_deleted += 1
         # Clear the ID from the config.
         MrMurano::Config::CFG_SOLUTION_ID_KEYS.each do |keyn|
-          $cfg.set(keyn, nil) if $cfg[keyn] == sol.sid
+          $cfg.set(keyn, nil) if $cfg[keyn] == sol.api_id
         end
       end
     end
@@ -386,30 +390,32 @@ end
 
 def cmd_solution_output_solutions(biz, solz, options)
   if options.idonly
-    headers = %i[apiId]
-    solz = solz.map { |row| [row.apiId] }
+    headers = %i[api_id]
+    solz = solz.map { |row| [row.api_id] }
   elsif options.brief
-    #headers = %i[apiId domain]
-    #solz = solz.map { |row| [row.apiId, row.domain] }
-    headers = %i[apiId domain name]
-    solz = solz.map { |row| [row.apiId, row.domain, row.name] }
+    #headers = %i[api_id domain]
+    #solz = solz.map { |row| [row.api_id, row.domain] }
+    headers = %i[api_id sid domain name]
+    solz = solz.map { |row| [row.api_id, row.sid, row.domain, row.name] }
   else
     headers = (solz.first && solz.first.meta || {}).keys
-    headers.delete(:sid) if headers.include?(:apiId) && headers.include?(:sid)
+    #headers.delete(:sid) if headers.include?(:api_id) && headers.include?(:sid)
     headers.sort_by! do |hdr|
       case hdr
       when :bizid
         0
       when :type
         1
-      when :apiId
+      when :api_id
         2
-      when :domain
+      when :sid
         3
-      when :name
+      when :domain
         4
-      else
+      when :name
         5
+      else
+        6
       end
     end
     solz = solz.map { |row| headers.map { |hdr| row.meta[hdr] } }

data/lib/MrMurano/commands/solution_picker.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.09.11 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -99,18 +99,18 @@ def must_fetch_solutions!(options, args=[], biz=nil)
   if args.any?
     #raise 'Cannot use options.all and solution pickers' unless options.all.nil?
     flattened = args.map { |cell| cell.split(',') }.flatten
-    sid = []
+    api_id = []
     name = []
     fuzzy = []
     if options.id
-      sid = flattened
+      api_id = flattened
     elsif options.name
       name = flattened
     else
       fuzzy = flattened
     end
     solz += solution_get_solutions(
-      biz, options.type, sid: sid, name: name, fuzzy: fuzzy
+      biz, options.type, api_id: api_id, name: name, fuzzy: fuzzy
     )
   end
 
@@ -120,35 +120,35 @@ def must_fetch_solutions!(options, args=[], biz=nil)
     # MAYBE: DRY this code. Rather than copy-paste-find-replace block of code.
     #   See also: any_business_pickers?
     #
-    sid = []
+    api_id = []
     name = []
     fuzzy = []
     if options.application_id
-      sid = [options.application_id]
+      api_id = [options.application_id]
     elsif options.application_name
       name = [options.application_name]
     elsif options.application
       fuzzy = [options.application]
     end
-    if !sid.empty? || !name.empty? || !fuzzy.empty?
+    if !api_id.empty? || !name.empty? || !fuzzy.empty?
       solz += solution_get_solutions(
-        biz, :application, sid: sid, name: name, fuzzy: fuzzy
+        biz, :application, api_id: api_id, name: name, fuzzy: fuzzy
       )
     end
     #
-    sid = []
+    api_id = []
     name = []
     fuzzy = []
     if options.product_id
-      sid = [options.product_id]
+      api_id = [options.product_id]
     elsif options.product_name
       name = [options.product_name]
     elsif options.product
       fuzzy = [options.product]
     end
-    if !sid.empty? || !name.empty? || !fuzzy.empty?
+    if !api_id.empty? || !name.empty? || !fuzzy.empty?
       solz += solution_get_solutions(
-        biz, :product, sid: sid, name: name, fuzzy: fuzzy
+        biz, :product, api_id: api_id, name: name, fuzzy: fuzzy
       )
     end
     #
@@ -158,12 +158,12 @@ def must_fetch_solutions!(options, args=[], biz=nil)
     if !options.all
       if %i[all application].include?(options.type) && $cfg['application.id']
         solz += solution_get_solutions(
-          biz, :application, sid: $cfg['application.id']
+          biz, :application, api_id: $cfg['application.id']
         )
       end
       if %i[all product].include?(options.type) && $cfg['product.id']
         solz += solution_get_solutions(
-          biz, :product, sid: $cfg['product.id']
+          biz, :product, api_id: $cfg['product.id']
         )
       end
     else
@@ -173,10 +173,10 @@ def must_fetch_solutions!(options, args=[], biz=nil)
 
   culled = {}
   solz.select! do |sol|
-    if culled[sol.sid]
+    if culled[sol.api_id]
       false
     else
-      culled[sol.sid] = true
+      culled[sol.api_id] = true
       true
     end
   end
@@ -238,7 +238,7 @@ def any_product_pickers!(options)
   num_ways > 0
 end
 
-def solution_get_solutions(biz, type, sid: nil, name: nil, fuzzy: nil)
+def solution_get_solutions(biz, type, api_id: nil, name: nil, fuzzy: nil)
   if type == :all
     inflection = 'solutions'
   else
@@ -246,7 +246,7 @@ def solution_get_solutions(biz, type, sid: nil, name: nil, fuzzy: nil)
   end
   MrMurano::Verbose.whirly_start("Fetching #{inflection}...")
   solz = biz.solutions(
-    type: type, sid: sid, name: name, fuzzy: fuzzy, invalidate: false
+    type: type, api_id: api_id, name: name, fuzzy: fuzzy, invalidate: false
   )
   MrMurano::Verbose.whirly_stop
   solz
@@ -275,6 +275,11 @@ def solution_ask_for_name(sol)
     end
   end
   sol.name
+rescue EOFError
+  # E.g., the user pressed Ctrl-D.
+  #   "error: The input stream is exhausted."
+  MrMurano::Verbose.error('murano out!')
+  exit 2
 end
 
 # *** Interact with the user to identify the solution.
@@ -289,21 +294,21 @@ def get_two_solutions!(sol_a_id=nil, sol_b_id=nil, **options)
   app_srchs = []
   prd_srchs = []
 
-  #app_srchs += [[:application, :sid, sol_a_id]] unless sol_a_id.to_s.empty?
-  #prd_srchs += [[:product, :sid, sol_b_id]] unless sol_b_id.to_s.empty?
-  app_srchs += [[nil, :sid, sol_a_id]] unless sol_a_id.to_s.empty?
-  prd_srchs += [[nil, :sid, sol_b_id]] unless sol_b_id.to_s.empty?
+  #app_srchs += [[:application, :api_id, sol_a_id]] unless sol_a_id.to_s.empty?
+  #prd_srchs += [[:product, :api_id, sol_b_id]] unless sol_b_id.to_s.empty?
+  app_srchs += [[nil, :api_id, sol_a_id]] unless sol_a_id.to_s.empty?
+  prd_srchs += [[nil, :api_id, sol_b_id]] unless sol_b_id.to_s.empty?
 
   app_srchs += get_soln_searches(:application, options)
   prd_srchs += get_soln_searches(:product, options)
 
   if app_srchs.length.zero? && prd_srchs.length < 2
     # TEST/2017-08-16: Clear application.id and test.
-    app_srchs = [[:application, :sid, $cfg['application.id']]]
+    app_srchs = [[:application, :api_id, $cfg['application.id']]]
   end
   if prd_srchs.length.zero? && app_srchs.length < 2
     # TEST/2017-08-16: Clear product.id and test.
-    prd_srchs = [[:product, :sid, $cfg['product.id']]]
+    prd_srchs = [[:product, :api_id, $cfg['product.id']]]
   end
 
   sol_srchs = app_srchs + prd_srchs
@@ -318,8 +323,8 @@ def get_two_solutions!(sol_a_id=nil, sol_b_id=nil, **options)
   sol_srchs.each do |type, desc, value|
     sol_opts = {}
     case desc
-    when :sid
-      sol_opts[:match_sid] = value
+    when :api_id
+      sol_opts[:match_api_id] = value
     when :name
       sol_opts[:match_name] = value
     when :term
@@ -340,7 +345,7 @@ def get_soln_searches(sol_type, options)
   # E.g., :application_id
   if options["#{sol_type}_id".to_sym]
     app_ids = options["#{sol_type}_id".to_sym].split(',')
-    app_ids.each { |sid| sol_srchs += [[sol_type, :sid, sid]] }
+    app_ids.each { |api_id| sol_srchs += [[sol_type, :api_id, api_id]] }
   end
   # E.g., :application_name
   if options["#{sol_type}_name".to_sym]
@@ -374,7 +379,7 @@ module MrMurano
       ignore_cfg: false,
       verbose: false,
       match_enable: false,
-      match_sid: nil,
+      match_api_id: nil,
       match_name: nil,
       match_fuzzy: nil
     )
@@ -384,23 +389,23 @@ module MrMurano
       @ignore_cfg = ignore_cfg
       @verbose = verbose
       @match_enable = match_enable
-      @match_sid = match_sid
+      @match_api_id = match_api_id
       @match_name = match_name
       @match_fuzzy = match_fuzzy
-      @match_sid = nil if @match_sid.to_s.empty?
+      @match_api_id = nil if @match_api_id.to_s.empty?
       @match_name = nil if @match_name.to_s.empty?
       @match_fuzzy = nil if @match_fuzzy.to_s.empty?
-      @searching = @match_enable && (@match_sid || @match_name || @match_fuzzy)
+      @searching = @match_enable && (@match_api_id || @match_name || @match_fuzzy)
     end
 
     def find_or_create(model)
       # First, try to find the solution by solution ID.
-      sol = solution_find_by_sid(model)
+      sol = solution_find_by_api_id(model)
       # If not found, search existing solutions, and maybe ask user.
       if sol.nil?
         if @searching
           sol = solution_search_by_term(model)
-          sol = solution_create_new_solution(model) if sol.nil? && @create_ok && @match_sid.nil?
+          sol = solution_create_new_solution(model) if sol.nil? && @create_ok && @match_api_id.nil?
         else
           sol = solution_lookup_or_ask(model)
         end
@@ -408,26 +413,26 @@ module MrMurano
       # Finally, if asked, update the config.
       if @update_cfg && !sol.nil?
         # Update the config in memory and on disk/file.
-        $cfg.set(sol.cfg_key_id, sol.sid, :project)
+        $cfg.set(sol.cfg_key_id, sol.api_id, :project)
         $cfg.set(sol.cfg_key_name, sol.name, :project)
       end
       sol
     end
 
-    def solution_find_by_sid(sol)
+    def solution_find_by_api_id(sol)
       exists = false
       if @searching || @ignore_cfg
-        sol.sid = @match_sid || @match_fuzzy
+        sol.api_id = @match_api_id || @match_fuzzy
       else
         # Note that we verify the solution ID we find in the config,
         # since the user could've, e.g., deleted it via the web UI.
         # LATER: This only works so long as there's only one Product
         #  or one Application. Eventually we'll add support for more.
-        sol.sid = $cfg[sol.cfg_key_id].to_s
+        sol.api_id = $cfg[sol.cfg_key_id].to_s
         return sol if @skip_verify
       end
-      if sol.sid?
-        tried_sid = sol.sid
+      if sol.api_id?
+        tried_api_id = sol.api_id
         if @searching
           whirly_msg = "Searching #{sol.type_name} by ID..."
         else
@@ -435,12 +440,12 @@ module MrMurano
         end
         MrMurano::Verbose.whirly_start(whirly_msg)
         sol.info_safe
-        if sol.valid_sid
+        if sol.valid_api_id
           exists = true
           # Convert from Solution to proper subclass, perhaps.
           sol = solution_factory_reset(sol)
         else
-          sol.sid = nil
+          sol.api_id = nil
         end
         MrMurano::Verbose.whirly_stop
         # Spit out some messages, maybe.
@@ -449,8 +454,8 @@ module MrMurano
             say "Found #{sol.type_name} #{sol.pretty_desc}"
           elsif !@searching
             # The solution ID in the config was not found for this business.
-            tried_sid = MrMurano::Verbose.fancy_ticks(tried_sid)
-            say "The #{sol.type_name} ID #{tried_sid} from the config was not found"
+            tried_api_id = MrMurano::Verbose.fancy_ticks(tried_api_id)
+            say "The #{sol.type_name} ID #{tried_api_id} from the config was not found"
           end
           puts ''
         end
@@ -519,7 +524,7 @@ module MrMurano
 
     def solution_search_by_term(sol)
       solz = solution_get_solutions(
-        sol.biz, sol.type, sid: @match_sid, name: @match_name, fuzzy: @match_fuzzy
+        sol.biz, sol.type, api_id: @match_api_id, name: @match_name, fuzzy: @match_fuzzy
       )
       if solz.length > 1
         sol.error("More than one matching #{sol.type_name} found. Please be more specific")