facterdb 1.27.0 → 3.0.0

data/facts/get_facts.sh

@@ -2,6 +2,20 @@
 
 export PATH=/opt/puppetlabs/bin:$PATH
 
+# ensure IPv6 is always enabled, some boxes disable it by default, e.g. Fedora and RedHat
+sysctl -w net.ipv6.conf.all.disable_ipv6=0
+
+puppetAgentVersionList='/vagrant/versions.txt'
+if test ! -f $puppetAgentVersionList; then
+  echo 'Missing version list' >&2
+  exit 1
+fi
+puppet8_agent_versions=$(grep --only-matching --perl-regexp '^\d+\.\d+\.\d+' $puppetAgentVersionList)
+if test -z "$puppet8_agent_versions"; then
+  echo 'Version list is empty' >&2
+  exit 1
+fi
+
 apt_install() {
     DEBIAN_FRONTEND=noninteractive \
         apt-get --option Dpkg::Options::="--force-confdef" \
@@ -42,39 +56,18 @@ elif test -f '/etc/os-release' && grep -q 'Amazon' '/etc/os-release'; then
 else
   osfamily=$(uname)
 fi
-puppet7_agent_versions='7.9.0 7.10.0 7.11.0 7.12.0 7.12.1. 7.13.1 7.14.0 7.15.0 7.16.0 7.17.0 7.18.0 7.19.0 7.20.0 7.21.0 7.23.0 7.24.0 7.25.0 7.26.0 7.27.0 7.28.0 7.29.0 7.29.1 7.30.0'
-puppet8_agent_versions='8.0.0 8.1.0 8.2.0 8.3.1 8.4.0 8.5.0 8.5.1 8.6.0'
 case "${osfamily}" in
 'RedHat')
   . /etc/os-release
   if [[ $ID == fedora ]]; then
     distcode=fedora
+    dnf -y install facter ruby ruby-devel wget make gcc net-tools augeas
+  elif [[ $ID == ol ]]; then
+    distcode=el
+    dnf -y groupinstall 'Development Tools'
   else
     distcode=el
   fi
-  yum -y install "https://yum.puppetlabs.com/puppet6-release-${distcode}-${operatingsystemmajrelease}.noarch.rpm"
-  if [[ "${?}" == 0 ]]; then
-    for puppet_agent_version in 6.25.0 6.27.1; do
-      if yum install -y puppet-agent-${puppet_agent_version}; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    yum remove -y puppet6-release
-  fi
-  wget "http://yum.puppetlabs.com/puppet7-release-el-${operatingsystemmajrelease}.noarch.rpm" -O /tmp/puppet7-release.rpm
-  if test -f /tmp/puppet7-release.rpm; then
-    rpm -ivh /tmp/puppet7-release.rpm
-    for puppet_agent_version in $puppet7_agent_versions; do
-      if yum install -y puppet-agent-${puppet_agent_version}; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    yum remove -y puppet7-release
-  fi
   wget "http://yum.puppetlabs.com/puppet8-release-el-${operatingsystemmajrelease}.noarch.rpm" -O /tmp/puppet8-release.rpm
   if test -f /tmp/puppet8-release.rpm; then
     rpm -ivh /tmp/puppet8-release.rpm
@@ -82,46 +75,15 @@ case "${osfamily}" in
       if yum install -y puppet-agent-${puppet_agent_version}; then
         output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter os.name | tr '[:upper:]' '[:lower:]')-$(facter os.release.major)-$(facter os.hardware).facts"
         mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
+        facter --puppet --json | tee ${output_file}
       fi
     done
     yum remove -y puppet8-release
   fi
   ;;
 'Debian')
-  apt_install curl file
-  curl "https://apt.puppetlabs.com/puppet6-release-${lsbdistcodename}.deb" -o /tmp/puppet6-release.deb
-  # apt.puppetlabs.com returns an html document if the requested deb doesn't exist and /tmp/puppet6-release.deb will be an html doc
-  if test "$?" -eq 0 -a -f /tmp/puppet6-release.deb && [[ "$(file -b /tmp/puppet6-release.deb)" =~ "Debian binary package".* ]] ; then
-    dpkg --install /tmp/puppet6-release.deb
-    apt-get update
-    # as of 2023-04-27 older 6.x series aren't available (i.e. facter 3.12)
-    # the trailing dot is so that 6.4.* is the match so we get the last in the 6.4 series and not 6.40
-    for puppet_agent_version in 6.4. 6.28.; do
-      if apt_install puppet-agent=${puppet_agent_version}*; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    apt-get -y remove --purge puppet6-release
-  fi
   # libaugeas-dev is needed when we generate facts via the facter gem. Otherwise augeas.version fact is missing
   apt_install curl file libaugeas-dev
-  curl "https://apt.puppetlabs.com/puppet7-release-${lsbdistcodename}.deb" -o /tmp/puppet7-release.deb
-  # apt.puppetlabs.com returns an html document if the requested deb doesn't exist and /tmp/puppet6-release.deb will be an html doc
-  if test "$?" -eq 0 -a -f /tmp/puppet7-release.deb && [[ "$(file -b /tmp/puppet7-release.deb)" =~ "Debian binary package".* ]] ; then
-    dpkg --install /tmp/puppet7-release.deb
-    apt-get update
-    for puppet_agent_version in $puppet7_agent_versions; do
-      if apt_install puppet-agent=${puppet_agent_version}*; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    apt-get -y remove --purge puppet7-release
-  fi
   curl "https://apt.puppetlabs.com/puppet8-release-${lsbdistcodename}.deb" -o /tmp/puppet8-release.deb
   # apt.puppetlabs.com returns an html document if the requested deb doesn't exist and /tmp/puppet6-release.deb will be an html doc
   if test "$?" -eq 0 -a -f /tmp/puppet8-release.deb && [[ "$(file -b /tmp/puppet8-release.deb)" =~ "Debian binary package".* ]] ; then
@@ -131,7 +93,7 @@ case "${osfamily}" in
       if apt_install puppet-agent=${puppet_agent_version}*; then
         output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter os.name | tr '[:upper:]' '[:lower:]')-$(facter os.release.major)-$(facter os.hardware).facts"
         mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
+        facter --puppet --json | tee ${output_file}
       fi
     done
     apt-get -y remove --purge puppet8-release
@@ -139,14 +101,13 @@ case "${osfamily}" in
   # libc6-dev needed to build the ffi gem
   apt_install make gcc libgmp-dev libc6-dev
 
-
   # There are no puppet-agent packages for $releasename yet, so generate a Facter 3.x
   # fact set from the official Debian package.
   if [[ "hirsute" =~ ${lsbdistcodename} || "impish" =~ ${lsbdistcodename} || "jammy" =~ ${lsbdistcodename} || "kinetic" =~ ${lsbdistcodename} ]]; then
     apt_install ruby rubygems ruby-dev puppet facter
     output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
     mkdir -p $(dirname ${output_file})
-    facter --show-legacy -p -j | tee ${output_file}
+    facter --puppet --json | tee ${output_file}
   fi
   ;;
 'FreeBSD')
@@ -163,7 +124,7 @@ case "${osfamily}" in
     [ "${hardwaremodel}" = 'amd64' ] && hardwaremodel=x86_64
     output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-${hardwaremodel}.facts"
     mkdir -p $(dirname ${output_file})
-    [ ! -f ${output_file} ] && facter --show-legacy -p -j | tee ${output_file}
+    [ ! -f ${output_file} ] && facter --puppet --json | tee ${output_file}
   done
   ;;
 'OpenBSD')
@@ -172,7 +133,7 @@ case "${osfamily}" in
   # Vagrant box should already have puppet & facter installed
   output_file="/vagrant/$(facter --version | cut -d. -f1-2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemrelease)-${hardwaremodel}.facts"
   mkdir -p $(dirname ${output_file})
-  [ ! -f ${output_file} ] && facter --show-legacy -p -j | tee ${output_file}
+  [ ! -f ${output_file} ] && facter --puppet --json | tee ${output_file}
   ;;
 'Suse')
   # install deps that we need later for gem based setup
@@ -183,48 +144,28 @@ case "${osfamily}" in
   else
     http_method='https'
   fi
-  if rpm -Uvh ${http_method}://yum.puppet.com/puppet6-release-sles-${operatingsystemmajrelease}.noarch.rpm; then
-    for puppet_agent_version in 6.25.0 6.27.1; do
-      if zypper --gpg-auto-import-keys --non-interactive install puppet-agent-${puppet_agent_version}; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    zypper --non-interactive remove puppet6-release
-  fi
-  if rpm -Uvh ${http_method}://yum.puppet.com/puppet7-release-sles-${operatingsystemmajrelease}.noarch.rpm; then
-    for puppet_agent_version in 7.5.0 7.6.1 7.12.0 7.24.0; do
-      if zypper --gpg-auto-import-keys --non-interactive install puppet-agent-${puppet_agent_version}; then
-        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-        mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
-      fi
-    done
-    zypper --non-interactive remove puppet7-release
-  fi
   if rpm -Uvh ${http_method}://yum.puppet.com/puppet8-release-sles-${operatingsystemmajrelease}.noarch.rpm; then
-    for puppet_agent_version in 8.0.0; do
+    for puppet_agent_version in $puppet8_agent_versions; do
       if zypper --gpg-auto-import-keys --non-interactive install puppet-agent-${puppet_agent_version}; then
         output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
         mkdir -p $(dirname ${output_file})
-        facter --show-legacy -p -j | tee ${output_file}
+        facter --puppet --json | tee ${output_file}
       fi
     done
     zypper --non-interactive remove puppet8-release
   fi
   ;;
 'Archlinux')
-  pacman -Syu --noconfirm ruby puppet ruby-bundler base-devel dnsutils facter
+  pacman --sync --refresh --sysupgrade --noconfirm ruby ruby-bundler base-devel dnsutils facter augeas
   output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter hardwaremodel).facts"
   mkdir -p $(dirname ${output_file})
-  facter --show-legacy -p -j | tee ${output_file}
+  facter --puppet --json | tee ${output_file}
   ;;
 'Gentoo')
-  emerge -vq1 dev-lang/ruby dev-ruby/bundler app-admin/puppet
+  emerge -vq1 dev-lang/ruby dev-ruby/bundler app-admin/puppet dev-ruby/facter sys-apps/dmidecode app-admin/augeas
   output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter hardwaremodel).facts"
   mkdir -p $(dirname ${output_file})
-  facter --show-legacy -p -j | tee ${output_file}
+  facter --puppet --json | tee ${output_file}
 esac
 
 # this lower section relies on the ruby version and facter version that came
@@ -243,7 +184,7 @@ gem install bundler --no-document --no-format-executable
 bundle config set path 'vendor/bundler'
 bundle install
 
-for version in 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0; do
+for version in 4.2.14 4.3.0 4.4.3 4.5.2 4.6.0 4.7.0; do
   FACTER_GEM_VERSION="~> ${version}" bundle update
   # sometimes all versions of facter are not possible, if the bundle update fails, skip the rest of the loop
   if [ $? -ne 0 ]; then
@@ -273,6 +214,6 @@ for version in 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0; do
   fi
   mkdir -p $(dirname $output_file)
   echo $version | grep -q -E '^1\.' &&
-    FACTER_GEM_VERSION="~> ${version}" bundle exec facter --show-legacy --json | bundle exec ruby -e 'require "json"; jj JSON.parse gets' | tee $output_file ||
-    FACTER_GEM_VERSION="~> ${version}" bundle exec facter --show-legacy --json | tee $output_file
+    FACTER_GEM_VERSION="~> ${version}" bundle exec facter --json | bundle exec ruby -e 'require "json"; jj JSON.parse gets' | tee $output_file ||
+    FACTER_GEM_VERSION="~> ${version}" bundle exec facter --json | tee $output_file
 done

data/facts/versions.txt

@@ -0,0 +1,16 @@
+# This is a list of all Puppet Agent versions to use to collect facts
+# Each line can have a single string which is a version number or can be a comment
+# Version information from Facter release notes: https://www.puppet.com/docs/puppet/8/release_notes_facter.htm
+# FacterDB only cares about the x.y, and drops .z - Please keep versions in order by Facter version
+
+# Facter 4.7.0 - Released April 2024 and shipped with Puppet 8.6.0.
+8.6.0
+
+# Facter 4.6.1 - Released March 2024 and shipped with Puppet 8.5.1.
+8.5.1
+
+# Facter 4.5.2 - Released January 2023 and shipped with Puppet 8.4.0.
+8.4.0
+
+# Facter 4.4.2 - Released August 2023 and shipped with Puppet 8.2.0.
+8.2.0

data/facts/windows_get_facts.ps1

@@ -1,5 +1,5 @@
 param(
-  [array]$puppetAgentVersions = ('7.24.0','8.0.0','8.5.1','8.6.0'),
+  [string]$puppetAgentVersionList = 'X:\versions.txt',
   [string]$baseUrl = 'https://downloads.puppetlabs.com/windows/puppet{0}/puppet-agent-{1}-{2}.msi',
   [string]$fqdn = 'foo.example.com'
 )
@@ -25,6 +25,18 @@ net use X: \\VBOXSVR\vagrant
 $VagrantDataPath = 'X:\'
 $WorkingDirectory = 'C:\vagrant_working_directory\'
 
+# Check if version list is available and load it
+if (!(Test-Path $puppetAgentVersionList)) {
+  Write-Host -ForegroundColor Red "Can't find Puppet Agent Version list."
+  Exit 1
+}
+
+$puppetAgentVersions = Select-String -Path $puppetAgentVersionList '^\d+\.\d+\.\d+' -AllMatches |  Foreach-Object {$_.Line}
+if ($puppetAgentVersions.Count -eq 0) {
+  Write-Host -ForegroundColor Red "Puppet Agent version list seems to be empty."
+  Exit 1
+}
+
 # Make sure we have enough privs to install the things.
 $currentPrincipal = New-Object Security.Principal.WindowsPrincipal([Security.Principal.WindowsIdentity]::GetCurrent())
 if (! ($currentPrincipal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator))) {
@@ -40,6 +52,7 @@ if (!(Test-Path $WorkingDirectory)) {
 
 # Install each puppet version & collect facts.
 foreach ($pupAgentVer in $puppetAgentVersions) {
+  write-Host "Generating facts with `'$pupAgentVer`'"
 
   $agentUrl = $baseUrl -f $pupAgentVer[0], $pupAgentVer, "x64"
   $agentName = "puppet-agent-{1}-{2}.msi" -f $pupAgentVer[0], $pupAgentVer, "x64"
@@ -75,7 +88,7 @@ foreach ($pupAgentVer in $puppetAgentVersions) {
   # the domain name will fallback to the hypervisor's domain.
   $env:FACTER_fqdn = $fqdn
 
-  $facterArgs = @("-j", "-p", "--show-legacy")
+  $facterArgs = @("--json", "--puppet")
   $facterProcess = Start-Process -FilePath $facterBin -ArgumentList $facterArgs -Wait -PassThru -RedirectStandardOutput "X:\$facterVer\$Os-$Osmaj-$Hw.facts"
   if ($facterProcess.ExitCode -ne 0) {
     Write-Host "Facter failed."

data/lib/facterdb/bin.rb

@@ -8,7 +8,7 @@ module FacterDB
     end
 
     def run
-      puts JSON.pretty_generate(FacterDB.get_os_facts('*', @args[0]))
+      puts JSON.pretty_generate(FacterDB.get_facts(@args[0]))
     end
   end
 end

data/lib/facterdb/version.rb

@@ -1,5 +1,5 @@
 module FacterDB
   module Version
-    STRING = '1.27.0'
+    STRING = '3.0.0'
   end
 end

data/lib/facterdb.rb

@@ -78,37 +78,6 @@ module FacterDB
     (external_fact_files + default_fact_files).uniq
   end
 
-  # @deprecated Use {.get_facts} instead.
-  def self.get_os_facts(facter_version = '*', filter = [])
-    if facter_version == '*'
-      if filter.is_a?(Array)
-        filter_str = filter.map { |f| f.map { |k, v| "#{k}=#{v}" }.join(' and ') }.join(' or ')
-      elsif filter.is_a?(Hash)
-        filter_str = filter.map { |k, v| "#{k}=#{v}" }.join(' and ')
-      elsif filter.is_a?(String)
-        filter_str = filter
-      else
-        raise 'filter must be either an Array a Hash or a String'
-      end
-    elsif filter.is_a?(Array)
-      filter_str = "facterversion=/^#{facter_version}/ and (#{filter.map do |f|
-                                                                f.map do |k, v|
-                                                                  "#{k}=#{v}"
-                                                                end.join(' and ')
-                                                              end.join(' or ')})"
-    elsif filter.is_a?(Hash)
-      filter_str = "facterversion=/^#{facter_version}/ and (#{filter.map { |k, v| "#{k}=#{v}" }.join(' and ')})"
-    elsif filter.is_a?(String)
-      filter_str = "facterversion=/^#{facter_version}/ and (#{filter})"
-    else
-      raise 'filter must be either an Array a Hash or a String'
-    end
-
-    warn "[DEPRECATION] `get_os_facts` is deprecated. Please use `get_facts(#{filter_str})` instead."
-
-    get_facts(filter_str)
-  end
-
   # @return [String] the string filter
   # @param filter [Object] The filter to convert to jgrep string
   def self.generate_filter_str(filter = nil)
@@ -137,13 +106,17 @@ module FacterDB
 
   # @return [Array[Hash[Symbol, Any]]] array of hashes of facts
   # @param filter [Object] The filter to convert to jgrep string
-  def self.get_facts(filter = nil, cache = true)
+  # @param symbolize_keys [Boolean]
+  #   Whether to symbolize the keys. Note this is only on the top level and not
+  #   on nested values.
+  def self.get_facts(filter = nil, cache = true, symbolize_keys: true)
     if cache && filter && filter == Thread.current[:facterdb_last_filter_seen]
       return Thread.current[:facterdb_last_facts_seen]
     end
 
     filter_str = generate_filter_str(filter)
-    result = JGrep.jgrep(database, filter_str).map { |hash| hash.map { |k, v| [k.to_sym, v] }.to_h }
+    result = JGrep.jgrep(database, filter_str)
+    result = result.map { |hash| hash.transform_keys(&:to_sym) } if symbolize_keys
     if cache
       Thread.current[:facterdb_last_filter_seen] = filter
       Thread.current[:facterdb_last_facts_seen] = result

data/spec/facter_db_spec.rb

@@ -15,10 +15,10 @@ describe FacterDB do
     end
   end
 
-  let(:facts_24_path)  { File.join(project_dir, 'facts', '2.4') }
-  let(:facts_24_count) { Dir.glob(File.join(facts_24_path, '*.facts')).count }
-  let(:facts_23_path)  { File.join(project_dir, 'facts', '2.3') }
-  let(:facts_23_count) { Dir.glob(File.join(facts_23_path, '*.facts')).count }
+  let(:facts_42_path)  { File.join(project_dir, 'facts', '4.2') }
+  let(:facts_42_count) { Dir.glob(File.join(facts_42_path, '*.facts')).count }
+  let(:facts_40_path)  { File.join(project_dir, 'facts', '4.0') }
+  let(:facts_40_count) { Dir.glob(File.join(facts_40_path, '*.facts')).count }
 
   describe '.use_defaultdb?' do
     subject { described_class.use_defaultdb? }
@@ -57,25 +57,25 @@ describe FacterDB do
 
     context 'when the FACTERDB_SEARCH_PATHS environment variable is set' do
       it 'supports a single path' do
-        ENV['FACTERDB_SEARCH_PATHS'] = facts_24_path
+        ENV['FACTERDB_SEARCH_PATHS'] = facts_42_path
 
-        expect(file_count).to eq(facts_24_count)
+        expect(file_count).to eq(facts_42_count)
       end
 
       it 'supports multiple paths delimited by the OS path separator' do
-        ENV['FACTERDB_SEARCH_PATHS'] = [facts_24_path, facts_23_path].join(File::PATH_SEPARATOR)
+        ENV['FACTERDB_SEARCH_PATHS'] = [facts_42_path, facts_40_path].join(File::PATH_SEPARATOR)
 
-        expect(file_count).to eq(facts_24_count + facts_23_count)
+        expect(file_count).to eq(facts_42_count + facts_40_count)
       end
 
       it 'ignores paths that are not a directory' do
-        ENV['FACTERDB_SEARCH_PATHS'] = [facts_24_path, non_directory_path].join(File::PATH_SEPARATOR)
+        ENV['FACTERDB_SEARCH_PATHS'] = [facts_42_path, non_directory_path].join(File::PATH_SEPARATOR)
 
         object = defined?(Warning) ? Warning : Kernel
         allow(object).to receive(:warn).and_call_original
         allow(object).to receive(:warn).with(a_string_matching(/is not a directory/))
 
-        expect(file_count).to eq(facts_24_count)
+        expect(file_count).to eq(facts_42_count)
       end
     end
 
@@ -84,30 +84,30 @@ describe FacterDB do
       subject(:file_count) { described_class.external_fact_files(fact_paths).count }
 
       context 'that is a single path' do
-        let(:fact_paths) { facts_24_path }
+        let(:fact_paths) { facts_42_path }
 
         it 'returns the paths to the fact sets in the specified path' do
-          expect(file_count).to eq(facts_24_count)
+          expect(file_count).to eq(facts_42_count)
         end
       end
 
       context 'that is multiple paths delimited by the OS path separator' do
-        let(:fact_paths) { [facts_24_path, facts_23_path].join(File::PATH_SEPARATOR) }
+        let(:fact_paths) { [facts_42_path, facts_40_path].join(File::PATH_SEPARATOR) }
 
         it 'returns the paths to the fact sets in all the specified paths' do
-          expect(file_count).to eq(facts_24_count + facts_23_count)
+          expect(file_count).to eq(facts_42_count + facts_40_count)
         end
       end
 
       context 'that contains a path that is not a directory' do
-        let(:fact_paths) { [facts_24_path, non_directory_path].join(File::PATH_SEPARATOR) }
+        let(:fact_paths) { [facts_42_path, non_directory_path].join(File::PATH_SEPARATOR) }
 
         it 'ignores the path that is not a directory' do
           object = defined?(Warning) ? Warning : Kernel
           allow(object).to receive(:warn).and_call_original
           allow(object).to receive(:warn).with(a_string_matching(/is not a directory/))
 
-          expect(file_count).to eq(facts_24_count)
+          expect(file_count).to eq(facts_42_count)
         end
       end
     end
@@ -123,7 +123,7 @@ describe FacterDB do
     context 'when FACTERDB_SKIP_DEFAULTDB environment variable is not set' do
       it 'returns the list of fact sets included in FacterDB' do
         # This test is a little naive but works
-        expect(default_fact_files.count).to be >= 1000
+        expect(default_fact_files.count).to be >= 192
       end
     end
 
@@ -148,7 +148,7 @@ describe FacterDB do
     end
 
     it 'returns the deduplicated combination of .default_fact_files and .external_fact_files' do
-      ENV['FACTERDB_SEARCH_PATHS'] = facts_24_path
+      ENV['FACTERDB_SEARCH_PATHS'] = facts_42_path
 
       expect(facterdb_fact_files.count).to eq(described_class.default_fact_files.count)
     end
@@ -197,91 +197,6 @@ describe FacterDB do
     end
   end
 
-  describe '.get_os_facts' do
-    subject(:result) { FacterDB.get_os_facts(facter_version, filter) }
-
-    before do
-      object = defined?(Warning) ? Warning : Kernel
-      allow(object).to receive(:warn).and_call_original
-      allow(object).to receive(:warn).with(a_string_matching(/`get_os_facts` is deprecated/))
-    end
-
-    context 'without parameters' do
-      subject(:result) { FacterDB.get_os_facts }
-
-      include_examples 'returns a result'
-    end
-
-    context 'when matching all Facter versions' do
-      let(:facter_version) { '*' }
-
-      context 'with an Array filter' do
-        let(:filter) { [{ osfamily: 'Debian' }] }
-
-        include_examples 'returns a result'
-      end
-
-      context 'with a Hash filter' do
-        let(:filter) { { osfamily: 'Debian' } }
-
-        include_examples 'returns a result'
-      end
-
-      context 'with a String filter' do
-        let(:filter) { 'osfamily=Debian' }
-
-        include_examples 'returns a result'
-      end
-
-      context 'with a filter of an unsupported type' do
-        let(:filter) { true }
-
-        it 'raises an error' do
-          expect { result }.to raise_error(/filter must be either/)
-        end
-      end
-    end
-
-    context 'when matching a specific facter version' do
-      let(:facter_version) { '2.4.0' }
-
-      shared_examples 'returns only the specified version' do
-        it 'only includes fact sets for the specified version' do
-          expect(result).to all(include(facterversion: match(/\A2\.4/)))
-        end
-      end
-
-      context 'with an Array filter' do
-        let(:filter) { [{ osfamily: 'Debian' }] }
-
-        include_examples 'returns a result'
-        include_examples 'returns only the specified version'
-      end
-
-      context 'with a Hash filter' do
-        let(:filter) { { osfamily: 'Debian' } }
-
-        include_examples 'returns a result'
-        include_examples 'returns only the specified version'
-      end
-
-      context 'with a String filter' do
-        let(:filter) { 'osfamily=Debian' }
-
-        include_examples 'returns a result'
-        include_examples 'returns only the specified version'
-      end
-
-      context 'with a filter of an unsupported type' do
-        let(:filter) { true }
-
-        it 'raises an error' do
-          expect { result }.to raise_error(/filter must be either/)
-        end
-      end
-    end
-  end
-
   describe '.valid_filters?' do
     it 'invalid and false' do
       expect(FacterDB.valid_filters?('and')).to be_falsey
@@ -302,11 +217,11 @@ describe FacterDB do
     end
 
     it 'with hash' do
-      expect(FacterDB.generate_filter_str({ osfamily: 'Debian' })).to eq('osfamily=Debian')
+      expect(FacterDB.generate_filter_str({ kernel: 'Linux' })).to eq('kernel=Linux')
     end
 
     it 'with Array' do
-      expect(FacterDB.generate_filter_str([osfamily: 'Debian'])).to eq('(osfamily=Debian)')
+      expect(FacterDB.generate_filter_str([kernel: 'Linux'])).to eq('(kernel=Linux)')
     end
 
     it 'empty' do
@@ -319,28 +234,49 @@ describe FacterDB do
   end
 
   describe '.get_facts' do
-    subject(:result) { FacterDB.get_facts(filter) }
+    subject(:result) { FacterDB.get_facts(filter, symbolize_keys: symbolize_keys) }
 
     let(:filter) { nil }
+    let(:symbolize_keys) { nil }
 
     context 'without parameters' do
       include_examples 'returns a result'
     end
 
+    context 'with stringified output' do
+      let(:symbolize_keys) { false }
+
+      it 'returns strings as keys in factsets' do
+        result.each do |factset|
+          expect(factset.keys).to all(be_an_instance_of(String))
+        end
+      end
+    end
+
+    context 'with symbolized output' do
+      let(:symbolize_keys) { true }
+
+      it 'returns strings as keys in factsets' do
+        result.each do |factset|
+          expect(factset.keys).to all(be_an_instance_of(Symbol))
+        end
+      end
+    end
+
     context 'with an Array filter' do
-      let(:filter) { [osfamily: 'Debian'] }
+      let(:filter) { [kernel: 'Linux'] }
 
       include_examples 'returns a result'
     end
 
     context 'with a Hash filter' do
-      let(:filter) { { osfamily: 'Debian' } }
+      let(:filter) { { kernel: 'Linux' } }
 
       include_examples 'returns a result'
     end
 
     context 'with a String filter' do
-      let(:filter) { 'osfamily=Debian' }
+      let(:filter) { 'kernel=Linux' }
 
       include_examples 'returns a result'
     end