facterdb 1.25.0 → 1.27.0

data/facts/get_facts.sh

@@ -42,7 +42,8 @@ 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
@@ -65,7 +66,7 @@ case "${osfamily}" in
   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 7.5.0 7.6.1 7.17.0 7.24.0; do
+    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})
@@ -77,7 +78,7 @@ case "${osfamily}" in
   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
-    for puppet_agent_version in 8.0.0; do
+    for puppet_agent_version in $puppet8_agent_versions; do
       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})
@@ -105,12 +106,14 @@ case "${osfamily}" in
     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 7.5.0 7.6.1 7.12.0 7.24.0; do
+    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})
@@ -124,7 +127,7 @@ case "${osfamily}" in
   if test "$?" -eq 0 -a -f /tmp/puppet8-release.deb && [[ "$(file -b /tmp/puppet8-release.deb)" =~ "Debian binary package".* ]] ; then
     dpkg --install /tmp/puppet8-release.deb
     apt-get update
-    for puppet_agent_version in 8.0.0; do
+    for puppet_agent_version in $puppet8_agent_versions; do
       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})
@@ -136,12 +139,6 @@ case "${osfamily}" in
   # libc6-dev needed to build the ffi gem
   apt_install make gcc libgmp-dev libc6-dev
 
-  # puppetlabs repos/packages not yet available on bookworm https://puppet.atlassian.net/browse/PA-4995
-  # simply install puppet-agent that comes with the distro
-  if [[ "bookworm" =~ ${lsbdistcodename} ]]; then
-    apt_install ruby rubygems ruby-dev
-    facter --show-legacy -p -j | tee ${output_file}
-  fi
 
   # There are no puppet-agent packages for $releasename yet, so generate a Facter 3.x
   # fact set from the official Debian package.
@@ -242,12 +239,9 @@ hardwaremodel=$(facter hardwaremodel)
 
 PATH=/opt/puppetlabs/puppet/bin:$PATH
 
-if [ "$(ruby -e 'puts Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.3")')" = "true" ]; then
-    gem install bundler --no-document --no-format-executable
-else
-    gem install bundler --version '~> 1.0' --no-ri --no-rdoc --no-format-executable
-fi
-bundle install --path vendor/bundler
+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
   FACTER_GEM_VERSION="~> ${version}" bundle update

data/facts/windows_get_facts.ps1

@@ -1,10 +1,29 @@
 param(
-  [array]$puppetAgentVersions = ('1.1.1','1.2.2','1.4.0'),
-  [string]$baseUrl = 'https://downloads.puppetlabs.com/windows',
+  [array]$puppetAgentVersions = ('7.24.0','8.0.0','8.5.1','8.6.0'),
+  [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\'
 
 # Make sure we have enough privs to install the things.
 $currentPrincipal = New-Object Security.Principal.WindowsPrincipal([Security.Principal.WindowsIdentity]::GetCurrent())
@@ -14,21 +33,28 @@ 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"
+
+  $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 +75,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.25.0'
+    STRING = '1.27.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facterdb
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.27.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-14 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -1364,6 +1364,7 @@ files:
 - facts/3.14/redhat-6-x86_64.facts
 - facts/3.14/redhat-7-x86_64.facts
 - facts/3.14/redhat-8-x86_64.facts
+- facts/3.14/redhat-9-x86_64.facts
 - facts/3.14/rocky-8-x86_64.facts
 - facts/3.14/rocky-9-x86_64.facts
 - facts/3.14/scientific-6-x86_64.facts
@@ -1958,12 +1959,38 @@ files:
 - facts/4.5/ubuntu-18.04-x86_64.facts
 - facts/4.5/ubuntu-20.04-x86_64.facts
 - facts/4.5/ubuntu-22.04-x86_64.facts
+- facts/4.6/almalinux-8-x86_64.facts
+- facts/4.6/almalinux-9-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
 - facts/4.6/redhat-8-x86_64.facts
 - facts/4.6/redhat-9-x86_64.facts
+- facts/4.6/rocky-9-x86_64.facts
+- facts/4.6/ubuntu-22.04-x86_64.facts
+- facts/4.6/windows-10-x86_64.facts
+- facts/4.6/windows-11-x86_64.facts
+- facts/4.6/windows-2019-x86_64.facts
+- facts/4.6/windows-2022-x86_64.facts
+- facts/4.7/almalinux-8-x86_64.facts
+- facts/4.7/almalinux-9-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
 - facts/4.7/openbsd-7-x86_64.facts
+- facts/4.7/redhat-8-x86_64.facts
+- facts/4.7/redhat-9-x86_64.facts
+- facts/4.7/rocky-9-x86_64.facts
+- facts/4.7/ubuntu-22.04-x86_64.facts
+- facts/4.7/windows-10-x86_64.facts
+- facts/4.7/windows-11-x86_64.facts
+- facts/4.7/windows-2019-x86_64.facts
+- facts/4.7/windows-2022-x86_64.facts
 - facts/Gemfile
+- facts/README.md
 - facts/Vagrantfile
-- facts/Windows_README.md
 - facts/get_facts.sh
 - facts/windows_get_facts.ps1
 - facts/windows_packer/2012r2core.json

data/facts/Windows_README.md

@@ -1,11 +0,0 @@
-At the time of writing there are not suitable publicly available windows server
-vagrant boxes that can be used to generate the facts.
-
-In order to make fact collection reproducible, I have included packer templates
-so boxes can be rebuilt.
-
-run `packer build <file>.json`
-followed by `vagrant add <boxname> <boxfile>`
-
-Once the box is added a simple `vagrant up <windows_os_name>` will collect all the facts in the same manner as the unix based hosts.
-