From 66d1e3ce945bf0237faad0d4db6618744cced5b7 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Sun, 16 Dec 2018 14:38:40 +0100
Subject: [PATCH] Refactor default fact loading

This gets rids of the default facts because our modules do not rely on
them.

More importantly it switches to using add_custom_fact so we don't break
the built in facts from rspec-puppet-facts.
---
 config_defaults.yml                   |  2 ++
 moduleroot/spec/default_facts.yml.erb | 13 -------------
 moduleroot/spec/spec_helper.rb.erb    | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 moduleroot/spec/default_facts.yml.erb

diff --git a/config_defaults.yml b/config_defaults.yml
index 4f59641f..3dde8b05 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -122,6 +122,8 @@ Rakefile:
   default_enabled_rake_targets:
   - 'metadata_lint'
   - 'release_checks'
+spec/default_facts.yml:
+  delete: true
 spec/classes/coverage_spec.rb:
   delete: true
 spec/acceptance/nodesets/centos-511-x64.yml:
diff --git a/moduleroot/spec/default_facts.yml.erb b/moduleroot/spec/default_facts.yml.erb
deleted file mode 100644
index 2f6698d5..00000000
--- a/moduleroot/spec/default_facts.yml.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is managed via modulesync
-# https://github.com/voxpupuli/modulesync
-# https://github.com/voxpupuli/modulesync_config
-#
-# use default_module_facts.yaml for module specific
-# facts.
-#
-# Hint if using with rspec-puppet-facts ("on_supported_os.each"):
-#   if a same named fact exists in facterdb it will be overridden.
----
-ipaddress: "172.16.254.254"
-is_pe: false
-macaddress: "AA:AA:AA:AA:AA:AA"
diff --git a/moduleroot/spec/spec_helper.rb.erb b/moduleroot/spec/spec_helper.rb.erb
index 81d0dca2..b8096f21 100644
--- a/moduleroot/spec/spec_helper.rb.erb
+++ b/moduleroot/spec/spec_helper.rb.erb
@@ -11,6 +11,15 @@ require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 include RspecPuppetFacts
 
+if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
+  facts = YAML.load(File.read(File.join(__dir__, 'default_module_facts.yml')))
+  if facts
+    facts.each do |name, value|
+      add_custom_fact name.to_sym, value
+    end
+  end
+end
+
 <% if @configs['augeasproviders'] -%>
 # Setup augeasproviders
 require 'pathname'
@@ -42,14 +51,10 @@ if Dir.exist?(File.expand_path('../../lib', __FILE__))
 end
 
 RSpec.configure do |c|
-  default_facts = {}
-  default_facts.merge!(YAML.load(File.read(File.expand_path('../default_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_facts.yml', __FILE__))
-  default_facts.merge!(YAML.load(File.read(File.expand_path('../default_module_facts.yml', __FILE__)))) if File.exist?(File.expand_path('../default_module_facts.yml', __FILE__))
-  c.default_facts = default_facts
   <%- if @configs['hiera_config'] -%>
   c.hiera_config = <%= @configs['hiera_config'] %>
-  <%- end -%>
 
+  <%- end -%>
   # Coverage generation
   c.after(:suite) do
     RSpec::Puppet::Coverage.report!