facterdb 1.26.0 → 2.0.1

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,10 +1,41 @@
 param(
-  [array]$puppetAgentVersions = ('1.1.1','1.2.2','1.4.0'),
-  [string]$baseUrl = 'https://downloads.puppetlabs.com/windows',
+  [string]$puppetAgentVersionList = 'X:\versions.txt',
+  [string]$baseUrl = 'https://downloads.puppetlabs.com/windows/puppet{0}/puppet-agent-{1}-{2}.msi',
   [string]$fqdn = 'foo.example.com'
 )
 
-$PuppetInstallerPath = 'c:\vagrantshared\resources\installers'
+$ComputerName = "foo"
+$ComputerDomain = "example.com"
+
+Remove-ItemProperty -path "HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters" -name "Hostname"
+Remove-ItemProperty -path "HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters" -name "NV Hostname"
+Remove-ItemProperty -path "HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters" -name "Domain"
+
+Set-ItemProperty -path "HKLM:\SYSTEM\CurrentControlSet\Control\Computername\Computername" -name "Computername" -value $ComputerName
+Set-ItemProperty -path "HKLM:\SYSTEM\CurrentControlSet\Control\Computername\ActiveComputername" -name "Computername" -value $ComputerName
+Set-ItemProperty -path "HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters" -name "Hostname" -value $ComputerName
+Set-ItemProperty -path "HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters" -name "NV Hostname" -value  $ComputerName
+Set-ItemProperty -path "HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters" -Name Domain -Value $ComputerDomain
+Set-ItemProperty -path "HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters" -Name DhcpDomain -Value $ComputerDomain
+
+# This doesn't work even though net use does???
+#New-SmbMapping -LocalPath 'X:' -RemotePath '\\VBOXSVR\vagrant'
+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())
@@ -14,21 +45,29 @@ if (! ($currentPrincipal.IsInRole([Security.Principal.WindowsBuiltInRole]::Admin
 }
 
 # Create our tmp dir if it's not found
-if (!(Test-Path $PuppetInstallerPath)) {
-  Write-Host "Creating folder `'$PuppetInstallerPath`'"
-  $null = New-Item -Path "$PuppetInstallerPath" -ItemType Directory
+if (!(Test-Path $WorkingDirectory)) {
+  Write-Host "Creating folder `'$WorkingDirectory`'"
+  $null = New-Item -Path "$WorkingDirectory" -ItemType Directory
 }
 
 # Install each puppet version & collect facts.
 foreach ($pupAgentVer in $puppetAgentVersions) {
-  $agentUrl = "$baseUrl/puppet-agent-$pupAgentVer-x64.msi"
-  $agentInstaller = Join-Path $PuppetInstallerPath "puppet-agent-$pupAgentVer-x64.msi"
+  write-Host "Generating facts with `'$pupAgentVer`'"
+
+  $agentUrl = $baseUrl -f $pupAgentVer[0], $pupAgentVer, "x64"
+  $agentName = "puppet-agent-{1}-{2}.msi" -f $pupAgentVer[0], $pupAgentVer, "x64"
+  $agentLogNameI = "puppet-{1}-install.log" -f $pupAgentVer[0], $pupAgentVer, "x64"
+  $agentLogNameU = "puppet-{1}-uninstall.log" -f $pupAgentVer[0], $pupAgentVer, "x64"
+  $agentInstaller = Join-Path $WorkingDirectory $agentName
+  $agentLogPathI = Join-Path $WorkingDirectory $agentLogNameI
+  $agentLogPathU = Join-Path $WorkingDirectory $agentLogNameU
 
   write-Host "Downloading `'$agentUrl`' to `'$agentInstaller`'"
   (New-Object Net.WebClient).DownloadFile("$agentUrl", "$agentInstaller")
 
-  #Install the actual agent, and 
-  $install_args = @("/qn", "/norestart", "/i", "$agentInstaller", "PUPPET_AGENT_CERTNAME=$fqdn")
+  #Install the actual agent
+  $install_args = @("/l*v $agentLogPathI", "/qn", "/norestart", "/i", "$agentInstaller", "PUPPET_AGENT_CERTNAME=$fqdn")
+  $uninstall_args = @("/l*v $agentLogPathU", "/qn", "/norestart", "/x", "$agentInstaller")
   Write-Host "Installing Puppet. running msiexec.exe $install_args"
   $agentProcess = Start-Process -FilePath msiexec.exe -ArgumentList $install_args -Wait -PassThru
   if ($agentProcess.ExitCode -ne 0) {
@@ -49,12 +88,24 @@ foreach ($pupAgentVer in $puppetAgentVersions) {
   # the domain name will fallback to the hypervisor's domain.
   $env:FACTER_fqdn = $fqdn
 
-  $facterArgs = @("-j")
-  $facterProcess = Start-Process -FilePath $facterBin -ArgumentList $facterArgs -Wait -PassThru -RedirectStandardOutput "C:\vagrant\$facterVer\$Os-$Osmaj-$Hw.facts"
+  $facterArgs = @("-j", "-p", "--show-legacy")
+  $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."
     Exit 1
   }
+
+  # dos2unix:  `n in Powershell is a LF character
+  ((Get-Content "X:\$facterVer\$Os-$Osmaj-$Hw.facts") -join "`n") + "`n" | Set-Content -NoNewline "X:\$facterVer\$Os-$Osmaj-$Hw.facts"
+
   Write-Host "Facts collected for $Os-$Osmaj-$Hw with facter $facterVer"
-}
 
+  Write-Host "Uninstalling Puppet. running msiexec.exe $uninstall_args"
+  $agentProcess = Start-Process -FilePath msiexec.exe -ArgumentList $uninstall_args -Wait -PassThru
+  if ($agentProcess.ExitCode -ne 0) {
+    Write-Host "Installer failed."
+    Exit 1
+  }
+  Write-Host "Puppet Agent $pupAgentVer successfully uninstalled."
+
+}

data/lib/facterdb/version.rb

@@ -1,5 +1,5 @@
 module FacterDB
   module Version
-    STRING = '1.26.0'
+    STRING = '2.0.1'
   end
 end

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
@@ -243,11 +243,11 @@ describe FacterDB do
     end
 
     context 'when matching a specific facter version' do
-      let(:facter_version) { '2.4.0' }
+      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(/\A2\.4/)))
+          expect(result).to all(include(facterversion: match(/^4\.0/)))
         end
       end
 

data/spec/facts_spec.rb

@@ -80,9 +80,18 @@ describe 'Default Facts' do
         expect(content['facterversion']).to have_facter_version(facter_dir_path, filepath)
       end
 
+      # when facts are generated with distro facter or rubygems facter the augeas bindings might be missing
+      # we need to ensure they exist
+      it 'contains the augeas.version fact' do
+        if content['kernel'] == 'Linux'
+          expect(content['augeas']['version']).to not_be_nil.and not_be_empty
+        end
+      end
+
       it 'contains newer networking facts hash' do
         if Gem::Version.new(content['facterversion']) >= Gem::Version.new('3.0.0')
           expect(content['networking']['ip']).to not_be_nil.and not_be_empty
+          expect(content['networking']['ip6']).to not_be_nil.and not_be_empty
           expect(content['networking']['hostname']).to eq('foo')
           expect(content['networking']['domain']).to eq('example.com')
           expect(content['networking']['fqdn']).to eq('foo.example.com')
@@ -108,27 +117,6 @@ describe 'Default Facts' do
         expect(content['systemd_version']).to be_nil
         expect(content['systemd_internal_services']).to be_nil
       end
-
-      it 'contains a legacy hostname, domain and fqdn fact' do
-        expect(content['hostname']).to eq('foo')
-        expect(content['fqdn']).to eq('foo.example.com')
-        expect(content['domain']).to eq('example.com')
-      end
-
-      it 'contains the legacy osfamily fact' do
-        expect(content['osfamily']).not_to be_nil
-      end
-
-      it 'contains the legacy operatingsystem fact' do
-        expect(content['operatingsystem']).not_to be_nil
-      end
-
-      # the fact got introduced in 1.5.5 and is confined to kernel=linux
-      # https://github.com/puppetlabs/facter/blob/1.6.0/lib/facter/selinux.rb
-      # f94abfccfd6687a88f62703e4005c28ec04467a1 from facter
-      it 'contains the legacy selinux fact' do
-        expect(content['selinux']).not_to be_nil if content['kernel'] == 'Linux'
-      end
     end
   end
 end