Add regexp support to builddir

Author: kpaulisse

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

@@ -163,9 +163,12 @@ def install_fact_file(logger, options)
 
         if options[:fact_override].is_a?(Array)
           options[:fact_override].each do |override|
-            old_value = facts.fact(override.key)
-            facts.override(override.key, override.value)
-            logger.debug("Override #{override.key} from #{old_value.inspect} to #{override.value.inspect}")
+            keys = override.key.is_a?(Regexp) ? facts.matching(override.key) : [override.key]
+            keys.each do |key|
+              old_value = facts.fact(key)
+              facts.override(key, override.value)
+              logger.debug("Override #{key} from #{old_value.inspect} to #{override.value.inspect}")
+            end
           end
         end
 

spec/octocatalog-diff/tests/catalog-util/builddir_spec.rb

@@ -616,6 +616,35 @@
         expect(factobj['values']['fizz']).to eq('buzz')
         expect(factobj['values']['jsontest']).to eq('foo' => 'bar')
       end
+
+      it 'should handle regular expressions in fact overrides' do
+        overrides_raw = %w(/dd+/=10.30.50.70 fizz=buzz jsontest=(json){"foo":"bar"} /asdflk/=true)
+        overrides = overrides_raw.map { |x| OctocatalogDiff::API::V1::Override.create_from_input(x) }
+        options = {
+          basedir: OctocatalogDiff::Spec.fixture_path('repos/default'),
+          fact_file: OctocatalogDiff::Spec.fixture_path('facts/valid-facts.yaml'),
+          fact_override: overrides,
+          facts_terminus: 'yaml',
+          node: 'rspec-node.github.net'
+        }
+        logger, _logger_str = OctocatalogDiff::Spec.setup_logger
+        testobj = OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
+        fact_file = File.join(testobj.tempdir, 'var/yaml/facts/rspec-node.github.net.yaml')
+        expect(File.file?(fact_file)).to eq(true)
+
+        yaml_content = File.read(fact_file).split(/\n/)
+        expect(yaml_content[0]).to eq('--- !ruby/object:Puppet::Node::Facts')
+
+        yaml_content[0] = '---' # To avoid need for puppet gem
+        factobj = YAML.load(yaml_content.join("\n"))
+        expect(factobj).to be_a_kind_of(Hash)
+        expect(factobj['name']).to eq('rspec-node.github.net')
+        expect(factobj['values']).to be_a_kind_of(Hash)
+        expect(factobj['values']['clientcert']).to eq('rspec-node.github.net')
+        expect(factobj['values']['ipaddress']).to eq('10.30.50.70')
+        expect(factobj['values']['fizz']).to eq('buzz')
+        expect(factobj['values']['jsontest']).to eq('foo' => 'bar')
+      end
     end
 
     context 'with invalid options' do