facterdb 2.1.0 → 3.1.0

data/facts/4.7/windows-2022-x86_64.facts

@@ -1,10 +1,5 @@
 {
   "aio_agent_version": "8.6.0",
-  "architecture": "x64",
-  "dhcp_servers": {
-    "Ethernet": "10.0.2.2",
-    "system": "10.0.2.2"
-  },
   "dmi": {
     "manufacturer": "innotek GmbH",
     "product": {
@@ -13,38 +8,24 @@
       "uuid": "F2FE13B6-2E77-4300-B709-3654FF7B6063"
     }
   },
-  "domain": "example.com",
   "env_windows_installdir": "C:\\Program Files\\Puppet Labs\\Puppet",
   "facterversion": "4.7.0",
   "fips_enabled": false,
-  "fqdn": "foo.example.com",
-  "hardwareisa": "x64",
-  "hardwaremodel": "x86_64",
-  "hostname": "foo",
   "hypervisors": {
     "virtualbox": {
       "revision": "161095",
       "version": "7.0.14"
     }
   },
-  "id": "FOO\\vagrant",
   "identity": {
     "privileged": true,
     "user": "FOO\\vagrant"
   },
-  "interfaces": "Ethernet",
-  "ipaddress": "10.0.2.15",
-  "ipaddress6": "fe80::8d97:e947:bec7:8686",
-  "ipaddress6_Ethernet": "fe80::8d97:e947:bec7:8686",
-  "ipaddress_Ethernet": "10.0.2.15",
   "is_virtual": true,
   "kernel": "windows",
   "kernelmajversion": "10.0",
   "kernelrelease": "10.0.20348",
   "kernelversion": "10.0.20348",
-  "macaddress": "08:00:27:E7:59:F0",
-  "macaddress_Ethernet": "08:00:27:E7:59:F0",
-  "manufacturer": "innotek GmbH",
   "memory": {
     "system": {
       "available": "957.90 MiB",
@@ -56,19 +37,6 @@
       "used_bytes": 1125953536
     }
   },
-  "memoryfree": "957.90 MiB",
-  "memoryfree_mb": 957.8984375,
-  "memorysize": "1.98 GiB",
-  "memorysize_mb": 2031.69140625,
-  "mtu_Ethernet": 1500,
-  "netmask": "255.255.255.0",
-  "netmask6": "ffff:ffff:ffff:ffff::",
-  "netmask6_Ethernet": "ffff:ffff:ffff:ffff::",
-  "netmask_Ethernet": "255.255.255.0",
-  "network": "10.0.2.0",
-  "network6": "fe80::",
-  "network6_Ethernet": "fe80::",
-  "network_Ethernet": "10.0.2.0",
   "networking": {
     "dhcp": "10.0.2.2",
     "domain": "example.com",
@@ -114,9 +82,6 @@
     "primary": "Ethernet",
     "scope6": "link"
   },
-  "operatingsystem": "windows",
-  "operatingsystemmajrelease": "2022",
-  "operatingsystemrelease": "2022",
   "os": {
     "architecture": "x64",
     "family": "windows",
@@ -135,11 +100,7 @@
       "system32": "C:\\Windows\\system32"
     }
   },
-  "osfamily": "windows",
   "path": "C:\\Program Files\\Puppet Labs\\Puppet\\puppet\\bin;C:\\Program Files\\Puppet Labs\\Puppet\\bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\Program Files\\OpenSSH-Win64;C:\\Users\\vagrant\\AppData\\Local\\Microsoft\\WindowsApps",
-  "physicalprocessorcount": 1,
-  "processor0": "Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz",
-  "processorcount": 2,
   "processors": {
     "cores": 2,
     "count": 2,
@@ -150,19 +111,13 @@
     "physicalcount": 1,
     "threads": 1
   },
-  "productname": "VirtualBox",
   "puppetversion": "8.6.0",
   "ruby": {
     "platform": "x64-mingw32",
     "sitedir": "C:/Program Files/Puppet Labs/Puppet/puppet/lib/ruby/site_ruby/3.2.0",
     "version": "3.2.3"
   },
-  "rubyplatform": "x64-mingw32",
-  "rubysitedir": "C:/Program Files/Puppet Labs/Puppet/puppet/lib/ruby/site_ruby/3.2.0",
-  "rubyversion": "3.2.3",
-  "scope6": "link",
   "scope6_Ethernet": "link",
-  "serialnumber": "0",
   "ssh": {
     "dsa": {
       "fingerprints": {
@@ -197,15 +152,6 @@
       "type": "ssh-rsa"
     }
   },
-  "sshdsakey": "AAAAB3NzaC1kc3MAAACBAOmczeAhgWVjwzCJYyJ38DOE98Xiaw45rmEULqbq6c2iy9YgTEp2DRl/AmOQNosKg1+e/DtrHgqWdIHQplipyOCd6wbJ131Z3PgmMcJqy4XAyhZcaa2wkHdUic0P+7qD1HengkIgquuizJzPKnX1klM2e1QgUeuXZT/ULRW9vI8NAAAAFQD/jjjBCL+7QwI+8iQYAKtp5rW/dwAAAIEAsVXIkqYxA9PgeklIXuchjvTsIAnzFeixSa5p51xCTDBll91QEFX3OtzK3Vp2puJDXBvwymuPnBCaW31AepDnWv4m3YmFWd3s6ZIp8qPbi1UfhkoIH11gwcz4kQT5h6gBbA717d+1DAAw9W6174Ju1dKdoqg86ZNtA5QfgBZ06xwAAACBANZ1rECCGE2HVWbxDBHf6mAv5yoBRNUbPWQ3DYM5qLdYhqPCFmcRdaxIjOtCuqutviphOYEdEWY//jR86GkPGJZeK5Sg6+ol0eZTDNox933GeNuuLTg57F77ODTfeEpYgPNTlklG+MI/V0xjpgiaN+aqfyCmPUh6X0m+epYNXLIJ",
-  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKdzf7SfxY+LVZayjebjV98AK/c7sFT6rOvVu1pKJyaAGKJvERyVlay9aUOo5EZbGqud61jYpLXrAlGuOQZyWeg=",
-  "sshed25519key": "AAAAC3NzaC1lZDI1NTE5AAAAIPOwOYrxf49nywRDLItAiMup1peRQkpfykjDknfisRzq",
-  "sshfp_dsa": "SSHFP 2 1 2cbf142ec3e5298f32eb0fcccf139ce09d42e534\nSSHFP 2 2 7c39b6025bf87f7828dac9370dc4374061fa9b643e1fdcaf86ba55cea66b831a",
-  "sshfp_ecdsa": "SSHFP 3 1 3bd1e5d4b841b0150d1d9d1ae1e926c0f8c01baf\nSSHFP 3 2 f49774b85c325c1b3a03ca07d43b59bc0483c1bed307e1e0eda8146a7f8a32d3",
-  "sshfp_ed25519": "SSHFP 4 1 d90c588d7e89b743439d6bbde8cbf68de80f554c\nSSHFP 4 2 4a3633cdbef6f2e3d7aebacb4cd127890cdb0d05a8fffa36047a2da574008117",
-  "sshfp_rsa": "SSHFP 1 1 c9f7a8861f449e575242f99981ed7580d609f86c\nSSHFP 1 2 5f9ff10646bb92e2f762c650f1f4486331b2848960ab8519031f1fdf1bd92d19",
-  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABgQDQfE6HJW1DZInpdu3xQG1ok0bY+IK2Jhfk3kGd087eE8nuzm1O0JLe5A9elSLCe1I63MTxadw/ZI48DiAnd4q8MckaqU2bE7ycfO1N6KLvBIZ6bmlWR+XpW/0rxLD3aP/lvuu7R731PdgfH5APDyyqYLVdPI1JdvfopJf/55gJqjdZkNE4S5OGUqXEuiwPYL56OgNntwqvoRDvOLQ8DDPNlcz/PGR0tIxhakUM7cPhkBYSZWvTnoJQCJcyx9OE7li9dH0ZnfQ2wezm0cro2Nh3enRN0yeHZ69CvWMoMbotxlKDdM0Gyn7rEvP/9JVr9Mll9UjqO8qbFJYc4E0QjmMQNrEjH9d+F8JsavMh9azZ9f4X2vY83A658RnbweJIscITmIeqPiyyoWLDDJ5XniatYTfpMXKk5SpkvRf7l/LzywK0NsCRioOppOw+mxHcsuDgPYiCmkLq7LYbC6FMZc/PtqpA+UNnxxTsnOfTtIfSyrkIo+LdBPcpxtkiBCZ5AFU=",
-  "system32": "C:\\Windows\\system32",
   "system_uptime": {
     "days": 0,
     "hours": 0,
@@ -213,15 +159,5 @@
     "uptime": "0:06 hours"
   },
   "timezone": "Coordinated Universal Time",
-  "uptime": "0:06 hours",
-  "uptime_days": 0,
-  "uptime_hours": 0,
-  "uptime_seconds": 376,
-  "uuid": "F2FE13B6-2E77-4300-B709-3654FF7B6063",
-  "virtual": "virtualbox",
-  "windows_display_version": "21H2",
-  "windows_edition_id": "ServerStandardEval",
-  "windows_installation_type": "Server Core",
-  "windows_product_name": "Windows Server 2022 Standard Evaluation",
-  "windows_release_id": "21H2"
+  "virtual": "virtualbox"
 }

data/facts/Vagrantfile

@@ -72,38 +72,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision 'shell', path: 'get_facts.sh'
     host.vm.provision 'shell', inline: '/sbin/shutdown -h now'
   end
-  config.vm.define 'centos-7-x86_64', autostart: false do |host|
-    host.vm.box = 'centos/7'
-    host.vm.network :private_network, ip: '10.0.0.2'
-    host.vm.synced_folder '.', '/vagrant', nfs: true, nfs_udp: false
-    host.vm.provision 'shell', inline: 'yum -y install ruby-devel gcc wget net-tools'
-    host.vm.provision 'file', source: 'Gemfile', destination: 'Gemfile'
-    host.vm.provision 'shell', path: 'get_facts.sh'
-    host.vm.provision 'shell', inline: '/sbin/shutdown -h now'
-  end
-  config.vm.define 'centos-8-x86_64', autostart: false do |host|
-    host.vm.box = 'centos/8'
-    host.vm.synced_folder '.', '/vagrant'
-    host.vm.provision 'shell', inline: 'dnf -y install wget make gcc net-tools'
-    host.vm.provision 'file', source: 'Gemfile', destination: 'Gemfile'
-    host.vm.provision 'shell', path: 'get_facts.sh'
-    host.vm.provision 'shell', inline: '/sbin/shutdown -h now'
-    host.vbguest.auto_update = true
-  end
-  # images are at https://cloud.centos.org/centos/8-stream/x86_64/images/
-  # (check for version updates periodically)
-  # facts land as centos-8-x86_64.facts
-  config.vm.define 'centos-stream8-x86_64', autostart: false do |host|
-    host.vm.box = 'centos/stream8'
-    host.vm.box_url = 'https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-Vagrant-8-20240513.0.x86_64.vagrant-virtualbox.box'
-    host.vm.synced_folder '.', '/vagrant'
-    host.vm.provision 'shell', inline: 'dnf -y install wget make gcc net-tools'
-    host.vm.provision 'file', source: 'Gemfile', destination: 'Gemfile'
-    host.vm.provision 'shell', path: 'get_facts.sh'
-    # commented to allow manual retrieval of facts
-    # host.vm.provision 'shell', inline: '/sbin/shutdown -h now'
-    host.vbguest.auto_update = true
-  end
   # images are at https://cloud.centos.org/centos/9-stream/x86_64/images/
   # can be imported with `vagrant box add --name centos/stream9 $url` you can also
   # use the host.vm.box_url below

data/facts/get_facts.sh

@@ -75,7 +75,7 @@ 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
@@ -93,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
@@ -107,7 +107,7 @@ case "${osfamily}" in
     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')
@@ -124,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')
@@ -133,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
@@ -149,7 +149,7 @@ case "${osfamily}" in
       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
@@ -159,13 +159,13 @@ case "${osfamily}" in
   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 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
@@ -214,6 +214,6 @@ for version in 4.2.14 4.3.0 4.4.3 4.5.2 4.6.0 4.7.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/windows_get_facts.ps1

@@ -88,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 = '2.1.0'
+    STRING = '3.1.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)

data/spec/facter_db_spec.rb

@@ -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) { '4.0.52' }
-
-      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(/^4\.0/)))
-        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
@@ -349,19 +264,19 @@ describe FacterDB do
     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

data/spec/facts_spec.rb

@@ -98,8 +98,8 @@ describe 'Default Facts' do
         end
       end
 
-      it 'contains the legacy ipaddress fact' do
-        expect(content['ipaddress']).to not_be_nil.and not_be_empty
+      it 'does not contains the legacy ipaddress fact' do
+        expect(content['ipaddress']).to be_nil
       end
 
       it 'contains no facts from puppetlabs/stdlib' do
@@ -110,6 +110,25 @@ describe 'Default Facts' do
         expect(content['puppet_server']).to be_nil
         expect(content['pe_version']).to be_nil
         expect(content['package_provider']).to be_nil
+        expect(content['is_pe']).to be_nil
+        expect(content['pe_major_version']).to be_nil
+        expect(content['pe_minor_version']).to be_nil
+        expect(content['pe_patch_version']).to be_nil
+      end
+
+      it 'contains no facts from puppetlabs/puppet_agent' do
+        expect(content['env_temp_variable']).to be_nil
+        expect(content['puppet_agent_appdata']).to be_nil
+        expect(content['puppet_agent_pid']).to be_nil
+        expect(content['puppet_runmode']).to be_nil
+        expect(content['puppet_ssldir']).to be_nil
+        expect(content['puppet_digest_algorithm']).to be_nil
+        expect(content['puppet_config']).to be_nil
+        expect(content['puppet_stringify_facts']).to be_nil
+        expect(content['puppet_sslpaths']).to be_nil
+        expect(content['puppet_master_server']).to be_nil
+        expect(content['puppet_confdir']).to be_nil
+        expect(content['puppet_client_datadir']).to be_nil
       end
 
       it 'contains no facts from puppet/systemd' do
@@ -125,6 +144,42 @@ describe 'Default Facts' do
         expect(content['os']['name']).to not_be_nil.and not_be_empty
         expect(content['os']['hardware']).to not_be_nil.and not_be_empty
       end
+
+      it 'does not contain a legacy hostname, domain and fqdn fact' do
+        expect(content['hostname']).to be_nil
+        expect(content['fqdn']).to be_nil
+        expect(content['domain']).to be_nil
+      end
+
+      it 'does not contain the legacy osfamily fact' do
+        expect(content['osfamily']).to be_nil
+      end
+
+      it 'does not contain the legacy operatingsystem fact' do
+        expect(content['operatingsystem']).to be_nil
+      end
+
+      # those facts aren't default in Open Source Puppet/Facter core
+      it 'does not contain the PE facts' do
+        expect(content['pe_patch']).to be_nil
+        expect(content['puppet_inventory_metadata']).to be_nil
+      end
+
+      it 'does not contain random facts from known modules' do
+        expect(content['selinux_python_command']).to be_nil
+        expect(content['mysql_server_id']).to be_nil
+        expect(content['stage']).to be_nil
+        expect(content['virt_libvirt']).to be_nil
+        expect(content['function_number']).to be_nil
+        expect(content['classification']).to be_nil
+        expect(content['who2bug']).to be_nil
+        expect(content['prometheus_alert_manager_running']).to be_nil
+        expect(content['docker_home_dirs']).to be_nil
+        expect(content['aio_agent_build']).to be_nil
+        expect(content['python2_version']).to be_nil
+        expect(content['python_version']).to be_nil
+        expect(content['puppet_agent_pid']).to be_nil
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facterdb
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-08 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -111,6 +111,7 @@ email:
 - voxpupuli@groups.io
 executables:
 - facterdb
+- legacy-facts-striper
 extensions: []
 extra_rdoc_files: []
 files:
@@ -130,6 +131,7 @@ files:
 - README.md
 - Rakefile
 - bin/facterdb
+- bin/legacy-facts-striper
 - database/list_arch_os_facter.md
 - database/list_facter_os_arch.md
 - database/list_os_arch_facter.md
@@ -152,15 +154,12 @@ files:
 - facterdb.gemspec
 - facts/4.0/almalinux-8-x86_64.facts
 - facts/4.0/almalinux-9-x86_64.facts
-- facts/4.0/centos-7-x86_64.facts
-- facts/4.0/centos-8-x86_64.facts
 - facts/4.0/debian-11-x86_64.facts
 - facts/4.0/freebsd-11-x86_64.facts
 - facts/4.0/freebsd-12-x86_64.facts
 - facts/4.0/freebsd-13-x86_64.facts
 - facts/4.0/opensuse-15-x86_64.facts
 - facts/4.0/oraclelinux-7-x86_64.facts
-- facts/4.0/redhat-7-x86_64.facts
 - facts/4.0/redhat-8-x86_64.facts
 - facts/4.0/rocky-8-x86_64.facts
 - facts/4.0/rocky-9-x86_64.facts
@@ -172,8 +171,6 @@ files:
 - facts/4.0/ubuntu-21.10-x86_64.facts
 - facts/4.1/almalinux-8-x86_64.facts
 - facts/4.1/almalinux-9-x86_64.facts
-- facts/4.1/centos-7-x86_64.facts
-- facts/4.1/centos-8-x86_64.facts
 - facts/4.1/debian-11-x86_64.facts
 - facts/4.1/freebsd-11-x86_64.facts
 - facts/4.1/freebsd-12-x86_64.facts
@@ -190,8 +187,6 @@ files:
 - facts/4.2/almalinux-9-x86_64.facts
 - facts/4.2/amazon-2022-x86_64.facts
 - facts/4.2/archlinux-x86_64.facts
-- facts/4.2/centos-7-x86_64.facts
-- facts/4.2/centos-8-x86_64.facts
 - facts/4.2/centos-9-x86_64.facts
 - facts/4.2/darwin-20-x86_64.facts
 - facts/4.2/debian-11-x86_64.facts
@@ -210,7 +205,6 @@ files:
 - facts/4.2/oraclelinux-8-x86_64.facts
 - facts/4.2/oraclelinux-9-x86_64.facts
 - facts/4.2/popos-21.10-x86_64.facts
-- facts/4.2/redhat-7-x86_64.facts
 - facts/4.2/redhat-8-x86_64.facts
 - facts/4.2/redhat-9-x86_64.facts
 - facts/4.2/rocky-8-x86_64.facts
@@ -237,8 +231,6 @@ files:
 - facts/4.3/almalinux-8-x86_64.facts
 - facts/4.3/almalinux-9-x86_64.facts
 - facts/4.3/archlinux-x86_64.facts
-- facts/4.3/centos-7-x86_64.facts
-- facts/4.3/centos-8-x86_64.facts
 - facts/4.3/centos-9-x86_64.facts
 - facts/4.3/debian-11-x86_64.facts
 - facts/4.3/debian-12-i386.facts
@@ -273,8 +265,6 @@ files:
 - facts/4.4/almalinux-8-x86_64.facts
 - facts/4.4/almalinux-9-x86_64.facts
 - facts/4.4/archlinux-x86_64.facts
-- facts/4.4/centos-7-x86_64.facts
-- facts/4.4/centos-8-x86_64.facts
 - facts/4.4/centos-9-x86_64.facts
 - facts/4.4/debian-11-x86_64.facts
 - facts/4.4/debian-12-i386.facts
@@ -310,8 +300,6 @@ files:
 - facts/4.5/almalinux-9-x86_64.facts
 - facts/4.5/amazon-2-x86_64.facts
 - facts/4.5/archlinux-x86_64.facts
-- facts/4.5/centos-7-x86_64.facts
-- facts/4.5/centos-8-x86_64.facts
 - facts/4.5/centos-9-x86_64.facts
 - facts/4.5/debian-11-x86_64.facts
 - facts/4.5/debian-12-x86_64.facts
@@ -339,7 +327,6 @@ files:
 - facts/4.6/almalinux-8-x86_64.facts
 - facts/4.6/almalinux-9-x86_64.facts
 - facts/4.6/archlinux-x86_64.facts
-- facts/4.6/centos-8-x86_64.facts
 - facts/4.6/centos-9-x86_64.facts
 - facts/4.6/debian-11-x86_64.facts
 - facts/4.6/debian-12-x86_64.facts
@@ -362,7 +349,6 @@ files:
 - facts/4.7/almalinux-8-x86_64.facts
 - facts/4.7/almalinux-9-x86_64.facts
 - facts/4.7/archlinux-x86_64.facts
-- facts/4.7/centos-8-x86_64.facts
 - facts/4.7/centos-9-x86_64.facts
 - facts/4.7/debian-11-x86_64.facts
 - facts/4.7/debian-12-x86_64.facts
@@ -432,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: A Database of OS facts provided by Facter