Implement more robust handling of facts-terminus == facter

Author: Kevin Paulisse

lib/octocatalog-diff/catalog-util/builddir.rb

@@ -42,6 +42,7 @@ def initialize(options = {}, logger = nil)
         @enc = nil
         @fact_file = nil
         @node = options[:node]
+        @facts_terminus = options.fetch(:facts_terminus, 'yaml')
 
         create_structure
         install_directory_symlink(logger, options[:basedir])
@@ -54,7 +55,7 @@ def initialize(options = {}, logger = nil)
         unless options[:hiera_config].nil?
           install_hiera_config(logger, options[:hiera_config], options[:hiera_path_strip])
         end
-        @fact_file = install_fact_file(logger, options) unless options.fetch(:facts_terminus, 'yaml') != 'yaml'
+        @fact_file = install_fact_file(logger, options) if @facts_terminus == 'yaml'
         @enc = install_enc(logger) unless options[:enc].nil? && options[:pe_enc_url].nil?
         install_ssl(logger, options) if options[:puppetdb_ssl_ca] || options[:puppetdb_ssl_client_cert]
       end
@@ -98,7 +99,7 @@ def install_routes_yaml(logger)
         routes_hash = {
           'master' => {
             'facts' => {
-              'terminus' => 'yaml',
+              'terminus' => @facts_terminus,
               'cache' => 'yaml'
             },
             'catalog' => {
@@ -113,8 +114,8 @@ def install_routes_yaml(logger)
       # Install the fact file in temporary directory
       # @param options [Hash] Options
       def install_fact_file(logger, options)
-        unless options[:facts_terminus].nil? || options[:facts_terminus] == 'yaml'
-          raise ArgumentError, "Called install_fact_file but :facts_terminus = #{options[:facts_terminus]}"
+        unless @facts_terminus == 'yaml'
+          raise ArgumentError, "Called install_fact_file but :facts_terminus = #{@facts_terminus}"
         end
         unless options[:node].is_a?(String) && !options[:node].empty?
           raise ArgumentError, 'Called install_fact_file without node, or with an empty node'

lib/octocatalog-diff/catalog/computed.rb

@@ -44,6 +44,7 @@ def initialize(options)
         @puppet_command = options[:puppet_command]
         @retries = nil
         @builddir = nil
+        @facts_terminus = options.fetch(:facts_terminus, 'yaml')
 
         # Pass through the input for other access
         @opts = options
@@ -52,10 +53,12 @@ def initialize(options)
 
       # Actually build the catalog (populate @error_message, @catalog, @catalog_json)
       def build(logger = Logger.new(StringIO.new))
-        facts_obj = OctocatalogDiff::CatalogUtil::Facts.new(@opts, logger)
-        logger.debug "Start retrieving facts for #{@node} from #{self.class}"
-        @opts[:facts] = facts_obj.facts
-        logger.debug "Success retrieving facts for #{@node} from #{self.class}"
+        if @facts_terminus != 'facter'
+          facts_obj = OctocatalogDiff::CatalogUtil::Facts.new(@opts, logger)
+          logger.debug "Start retrieving facts for #{@node} from #{self.class}"
+          @opts[:facts] = facts_obj.facts
+          logger.debug "Success retrieving facts for #{@node} from #{self.class}"
+        end
         build_catalog(logger)
       end