facter 4.6.0 → 4.7.0

data/lib/facter/resolvers/freebsd/swap_memory.rb

@@ -15,7 +15,7 @@ module Facter
 
           def read_swap_memory(fact_name)
             output = Facter::Core::Execution.execute('swapinfo -k', logger: log)
-            data = output.split("\n")[1..].map { |line| line.split(/\s+/) }
+            data = output.split("\n")[1..-1].map { |line| line.split(/\s+/) }
 
             unless data.empty?
               @fact_list[:total_bytes]     = kilobytes_to_bytes(data.map { |line| line[1].to_i }.inject(:+))

data/lib/facter/resolvers/networking.rb

@@ -44,7 +44,7 @@ module Facter
 
         def parse_interfaces_response(response)
           parsed_interfaces_data = {}
-          interfaces_data = Hash[*response.split(/^([A-Za-z0-9_.]+): /)[1..]]
+          interfaces_data = Hash[*response.split(/^([A-Za-z0-9_.]+): /)[1..-1]]
 
           interfaces_data.each do |interface_name, raw_data|
             parsed_interface_data = {}

data/lib/facter/resolvers/openbsd/dhcp.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative '../networking'
+
+module Facter
+  module Resolvers
+    module Openbsd
+      class Dhcp < Facter::Resolvers::Networking
+        init_resolver
+        class << self
+          def extract_dhcp(interface_name, raw_data, parsed_interface_data)
+            return unless raw_data.match?(/status:\s+active/)
+
+            result = Facter::Core::Execution.execute("dhcpleasectl -l #{interface_name}", logger: log)
+            parsed_interface_data[:dhcp] = extract_values(result, /\sdhcp server (\S+)/).first unless result.empty?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/openbsd/dmi.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Openbsd
+      class DmiBios < BaseResolver
+        init_resolver
+
+        class << self
+          private
+
+          def post_resolve(fact_name, _options)
+            @fact_list.fetch(fact_name) { read_facts(fact_name) }
+          end
+
+          CTL_HW = 6
+          HW_VENDOR = 14
+          HW_PRODUCT = 15
+          HW_VERSION = 16
+          HW_SERIALNO = 17
+          HW_UUID = 18
+
+          def read_facts(fact_name)
+            require 'facter/resolvers/bsd/ffi/ffi_helper'
+
+            @fact_list[:bios_vendor]  = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_VENDOR])
+            @fact_list[:bios_version] = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_VERSION])
+
+            @fact_list[:product_name]   = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_PRODUCT])
+            @fact_list[:product_serial] = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_SERIALNO])
+            @fact_list[:product_uuid]   = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_UUID])
+
+            @fact_list[:sys_vendor] = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_VENDOR])
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/openbsd/mountpoints.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Openbsd
+      class Mountpoints < BaseResolver
+        init_resolver
+
+        BLOCK_SIZE = 512
+
+        class << self
+          private
+
+          def post_resolve(fact_name, _options)
+            @fact_list.fetch(fact_name) { read_mount(fact_name) }
+          end
+
+          def read_mount(fact_name)
+            @fact_list[:mountpoints] = {}
+            output = Facter::Core::Execution.execute('mount', logger: log)
+            output.split("\n").map do |line|
+              add_mount_points_fact(line)
+            end
+
+            retrieve_sizes_for_mounts
+            @fact_list[fact_name]
+          end
+
+          def add_mount_points_fact(line)
+            elem = line.split("\s")
+            options = elem.drop(5)
+            options.each { |option| option.tr!('(),', '') }
+            @fact_list[:mountpoints][elem[2]] = { device: elem[0], filesystem: elem[4],
+                                                  options: options }
+          end
+
+          def retrieve_sizes_for_mounts
+            output = Facter::Core::Execution.execute('df -P', logger: log)
+            output.split("\n").drop(1).map do |line|
+              next if line.match?(/-\s+-\s+-/)
+
+              mount_info = line.split("\s")
+              mount_info[3] = translate_to_bytes(mount_info[3])
+              mount_info[2] = translate_to_bytes(mount_info[2])
+              mount_info[1] = translate_to_bytes(mount_info[1])
+              compute_sizes(mount_info)
+            end
+          end
+
+          def translate_to_bytes(strin_size)
+            strin_size.to_i * BLOCK_SIZE
+          end
+
+          def compute_sizes(info)
+            available_bytes = info[3]
+            used_bytes = info[2]
+            size_bytes = info[1]
+            @fact_list[:mountpoints][info.last].merge!(
+              capacity: Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used_bytes, size_bytes),
+              available_bytes: available_bytes,
+              used_bytes: used_bytes,
+              size_bytes: size_bytes,
+              available: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(available_bytes),
+              used: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(used_bytes),
+              size: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(size_bytes)
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/openbsd/virtual.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Openbsd
+      class Virtual < BaseResolver
+        init_resolver
+
+        class << self
+          # :model
+
+          VM_GUEST_SYSCTL_NAMES = {
+            'VMM' => 'vmm',
+            'vServer' => 'vserver',
+            'oracle' => 'virtualbox',
+            'xen' => 'xenu',
+            'none' => nil
+          }.freeze
+
+          private
+
+          def post_resolve(fact_name, _options)
+            @fact_list.fetch(fact_name) { read_facts(fact_name) }
+          end
+
+          CTL_HW = 6
+          HW_PRODUCT = 15
+
+          def read_facts(fact_name)
+            require 'facter/resolvers/bsd/ffi/ffi_helper'
+
+            vm = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_PRODUCT])
+            vm = if VM_GUEST_SYSCTL_NAMES.key?(vm)
+                   VM_GUEST_SYSCTL_NAMES[vm]
+                 else
+                   'physical'
+                 end
+            @fact_list[:vm] = vm
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/partitions.rb

@@ -112,9 +112,9 @@ module Facter
 
         def execute_and_extract_blkid_info
           stdout = Facter::Core::Execution.execute('blkid', logger: log)
-          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..]]
+          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..-1]]
           output_hash.each do |key, value|
-            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..]]
+            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..-1]]
           end
         end
 

data/lib/facter/resolvers/windows/product_release.rb

@@ -23,7 +23,7 @@ module Facter
         end
 
         def build_fact_list(reg)
-          reg.each do |name, value|
+          reg.each do |name, _type, value|
             case name
             when 'EditionID'
               @fact_list[:edition_id] = value

data/lib/facter/util/api_debugger.rb

@@ -34,9 +34,9 @@ module Facter
 
         options.split(',').each do |option|
           if option.start_with?('-')
-            exclude << option[1..].to_sym
+            exclude << option[1..-1].to_sym
           elsif option.start_with?('+')
-            print_caller << option[1..].to_sym
+            print_caller << option[1..-1].to_sym
           end
         end
 

data/lib/facter/util/facts/posix/virtual_detector.rb

@@ -8,7 +8,7 @@ module Facter
           class << self
             def platform
               @fact_value ||= # rubocop:disable Naming/MemoizedInstanceVariableName
-                check_docker_lxc || check_freebsd || check_gce || check_illumos_lx || \
+                check_docker_lxc || check_freebsd || check_openbsd || check_gce || check_illumos_lx || \
                 retrieve_from_virt_what || check_vmware || check_open_vz || check_vserver || \
                 check_xen || check_other_facts || check_lspci || 'physical'
             end
@@ -54,6 +54,12 @@ module Facter
               Facter::Resolvers::Freebsd::Virtual.resolve(:vm)
             end
 
+            def check_openbsd
+              return unless Object.const_defined?('Facter::Resolvers::Openbsd::Virtual')
+
+              Facter::Resolvers::Openbsd::Virtual.resolve(:vm)
+            end
+
             def check_other_facts
               bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)
               return 'kvm' if bios_vendor&.include?('Amazon EC2')

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.6.0' unless defined?(VERSION)
+  VERSION = '4.7.0' unless defined?(VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.7.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-23 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -64,42 +64,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.50'
+        version: '1.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.50'
+        version: '1.28'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.20'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
         version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ dependencies:
         version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.3'
 description: You can prove anything with facts!
 email:
 - team-nw@puppet.com
@@ -669,6 +669,64 @@ files:
 - lib/facter/facts/ol/os/distro/description.rb
 - lib/facter/facts/ol/os/distro/id.rb
 - lib/facter/facts/ol/os/release.rb
+- lib/facter/facts/openbsd/augeas/version.rb
+- lib/facter/facts/openbsd/dmi/bios/vendor.rb
+- lib/facter/facts/openbsd/dmi/bios/version.rb
+- lib/facter/facts/openbsd/dmi/manufacturer.rb
+- lib/facter/facts/openbsd/dmi/product/name.rb
+- lib/facter/facts/openbsd/dmi/product/serial_number.rb
+- lib/facter/facts/openbsd/dmi/product/uuid.rb
+- lib/facter/facts/openbsd/ec2_metadata.rb
+- lib/facter/facts/openbsd/ec2_userdata.rb
+- lib/facter/facts/openbsd/facterversion.rb
+- lib/facter/facts/openbsd/identity/gid.rb
+- lib/facter/facts/openbsd/identity/group.rb
+- lib/facter/facts/openbsd/identity/privileged.rb
+- lib/facter/facts/openbsd/identity/uid.rb
+- lib/facter/facts/openbsd/identity/user.rb
+- lib/facter/facts/openbsd/ipaddress6_interfaces.rb
+- lib/facter/facts/openbsd/ipaddress_interfaces.rb
+- lib/facter/facts/openbsd/is_virtual.rb
+- lib/facter/facts/openbsd/kernel.rb
+- lib/facter/facts/openbsd/kernelrelease.rb
+- lib/facter/facts/openbsd/mountpoints.rb
+- lib/facter/facts/openbsd/netmask6_interfaces.rb
+- lib/facter/facts/openbsd/netmask_interfaces.rb
+- lib/facter/facts/openbsd/network6_interfaces.rb
+- lib/facter/facts/openbsd/network_interfaces.rb
+- lib/facter/facts/openbsd/networking/dhcp.rb
+- lib/facter/facts/openbsd/networking/domain.rb
+- lib/facter/facts/openbsd/networking/fqdn.rb
+- lib/facter/facts/openbsd/networking/hostname.rb
+- lib/facter/facts/openbsd/networking/interfaces.rb
+- lib/facter/facts/openbsd/networking/ip.rb
+- lib/facter/facts/openbsd/networking/ip6.rb
+- lib/facter/facts/openbsd/networking/mac.rb
+- lib/facter/facts/openbsd/networking/mtu.rb
+- lib/facter/facts/openbsd/networking/netmask.rb
+- lib/facter/facts/openbsd/networking/netmask6.rb
+- lib/facter/facts/openbsd/networking/network.rb
+- lib/facter/facts/openbsd/networking/network6.rb
+- lib/facter/facts/openbsd/networking/primary.rb
+- lib/facter/facts/openbsd/networking/scope6.rb
+- lib/facter/facts/openbsd/os/architecture.rb
+- lib/facter/facts/openbsd/os/hardware.rb
+- lib/facter/facts/openbsd/os/name.rb
+- lib/facter/facts/openbsd/os/release.rb
+- lib/facter/facts/openbsd/path.rb
+- lib/facter/facts/openbsd/processors/isa.rb
+- lib/facter/facts/openbsd/ruby/platform.rb
+- lib/facter/facts/openbsd/ruby/sitedir.rb
+- lib/facter/facts/openbsd/ruby/version.rb
+- lib/facter/facts/openbsd/ssh.rb
+- lib/facter/facts/openbsd/sshalgorithmkey.rb
+- lib/facter/facts/openbsd/sshfp_algorithm.rb
+- lib/facter/facts/openbsd/system_uptime/days.rb
+- lib/facter/facts/openbsd/system_uptime/hours.rb
+- lib/facter/facts/openbsd/system_uptime/seconds.rb
+- lib/facter/facts/openbsd/system_uptime/uptime.rb
+- lib/facter/facts/openbsd/timezone.rb
+- lib/facter/facts/openbsd/virtual.rb
 - lib/facter/facts/openwrt/os/release.rb
 - lib/facter/facts/ovs/os/release.rb
 - lib/facter/facts/photon/os/release.rb
@@ -982,6 +1040,10 @@ files:
 - lib/facter/resolvers/mountpoints.rb
 - lib/facter/resolvers/networking.rb
 - lib/facter/resolvers/open_vz.rb
+- lib/facter/resolvers/openbsd/dhcp.rb
+- lib/facter/resolvers/openbsd/dmi.rb
+- lib/facter/resolvers/openbsd/mountpoints.rb
+- lib/facter/resolvers/openbsd/virtual.rb
 - lib/facter/resolvers/os_release.rb
 - lib/facter/resolvers/partitions.rb
 - lib/facter/resolvers/path.rb
@@ -1093,7 +1155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.5'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4.0'