facter 4.2.12 → 4.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '098fd60710cceb1a13598b4a2bc95e407ef3b196ca050f54c86af4f53055ec89'
-  data.tar.gz: 4203dae20b429320376bb4b8302bf9e549104c30781ebd19b023625be2d351dc
+  metadata.gz: deba395892bb9b2ded975e2c3a1ea31668e63a0e4229fcf77a2f711cfc1bb9ef
+  data.tar.gz: 73d37ac458df2e0d19a48000b7340bb63eb54b184a6cb564c461257e05a3a893
 SHA512:
-  metadata.gz: cf7bc0aee205b9cffca4e422e55449f033132d0552df44185c216fda3a87f3278e7ad14bb9f602db8812009db965f48503a0d7e227a4929b7b84d16c70fd2c9f
-  data.tar.gz: 0d1c7af1a8d5244d8504dd50f95485a519249cd0ac2a7715e62fea18e16557a076e215756e5f1b4783aae9069a269bda3e2843f106e34b83a0db313bfc2db0af
+  metadata.gz: acccf421fa6ed4b819120e8b8baf643188871216ade1c7484cf01ec4f19b93e397d55e3338f776de35d04120ed86dfcd6ca12318965819d023ff55fb7ad0e515
+  data.tar.gz: b31c2ea4220672766d4f4a3a3c615105395b2680fec1c60449b506b398345d4f8678dd9ef88a89ab1956ceb395bd225f9a4695cb6fe4c54d943464d3b943a01f

data/lib/facter/config.rb

@@ -39,7 +39,8 @@ module Facter
             'Photon',
             'Slackware',
             'Mageia',
-            'Openwrt'
+            'Openwrt',
+            'Mariner'
           ]
         },
         {

data/lib/facter/custom_facts/util/loader.rb

@@ -59,9 +59,6 @@ module LegacyFacter
       # 2. ENV['FACTERLIB'] is split and used verbatim
       # 3. Entries from Facter.search_path are used verbatim
       #
-      # A warning will be generated for paths in Facter.search_path that are not
-      # absolute directories.
-      #
       # @api public
       # @return [Array<String>]
       def search_path
@@ -72,14 +69,8 @@ module LegacyFacter
           search_paths += @environment_vars['FACTERLIB'].split(File::PATH_SEPARATOR)
         end
 
-        search_paths.delete_if { |path| !valid_search_path?(path) }
-
         Facter::Options.custom_dir.each do |path|
-          if valid_search_path?(path)
-            search_paths << path
-          else
-            log.debug "Excluding #{path} from search path. Fact file paths must be an absolute directory"
-          end
+          search_paths << path
         end
 
         search_paths.delete_if { |path| !File.directory?(path) }
@@ -93,15 +84,6 @@ module LegacyFacter
         @log ||= Facter::Log.new(self)
       end
 
-      # Validate that the given path is valid, ie it is an absolute path.
-      #
-      # @api private
-      # @param path [String]
-      # @return [Boolean]
-      def valid_search_path?(path)
-        Pathname.new(path).absolute?
-      end
-
       # Load a file and record is paths to prevent duplicate loads.
       #
       # @api private

data/lib/facter/facts/freebsd/ec2_metadata.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    class Ec2Metadata
+      FACT_NAME = 'ec2_metadata'
+
+      def call_the_resolver
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws_hypervisors?
+
+        fact_value = Facter::Resolvers::Ec2.resolve(:metadata)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+      end
+
+      private
+
+      def aws_hypervisors?
+        Facter::Util::Facts::Posix::VirtualDetector.platform =~ /kvm|xen|aws/
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/ec2_userdata.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    class Ec2Userdata
+      FACT_NAME = 'ec2_userdata'
+
+      def call_the_resolver
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws_hypervisors?
+
+        fact_value = Facter::Resolvers::Ec2.resolve(:userdata)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+      end
+
+      private
+
+      def aws_hypervisors?
+        Facter::Util::Facts::Posix::VirtualDetector.platform =~ /kvm|xen|aws/
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/ipaddress6_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    class Ipaddress6Interfaces
+      FACT_NAME = 'ipaddress6_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("ipaddress6_#{interface_name}", info[:ip6], :legacy) if info[:ip6]
+        end
+
+        arr
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/ipaddress_interfaces.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    class IpaddressInterfaces
+      FACT_NAME = 'ipaddress_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        arr = []
+        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces&.each do |interface_name, info|
+          arr << Facter::ResolvedFact.new("ipaddress_#{interface_name}", info[:ip], :legacy) if info[:ip]
+        end
+
+        arr
+      end
+    end
+  end
+end

data/lib/facter/facts/mariner/os/release.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Facts
+  module Mariner
+    module Os
+      class Release
+        FACT_NAME = 'os.release'
+        ALIASES = %w[operatingsystemmajrelease operatingsystemrelease].freeze
+
+        def call_the_resolver
+          version = from_specific_file || from_os_release
+
+          return Facter::ResolvedFact.new(FACT_NAME, nil) unless version
+
+          [Facter::ResolvedFact.new(FACT_NAME, version),
+           Facter::ResolvedFact.new(ALIASES.first, version['major'], :legacy),
+           Facter::ResolvedFact.new(ALIASES.last, version['full'], :legacy)]
+        end
+
+        def from_specific_file
+          version = Facter::Resolvers::SpecificReleaseFile.resolve(:release,
+                                                                   { release_file: '/etc/mariner-release',
+                                                                     regex: /CBL\-Mariner ([0-9.]+)/ })
+          Facter::Util::Facts.release_hash_from_matchdata(version)
+        end
+
+        def from_os_release
+          version = Facter::Resolvers::OsRelease.resolve(:version_id)
+
+          Facter::Util::Facts.release_hash_from_string(version)
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/os_release.rb

@@ -85,6 +85,8 @@ module Facter
           @fact_list[:name] = if os_name.downcase.start_with?('red', 'oracle', 'arch', 'manjaro')
                                 os_name = os_name.split(' ')[0..1].join
                                 os_name
+                              elsif os_name.downcase.end_with?('mariner')
+                                os_name.split(' ')[-1].strip
                               else
                                 os_name.split(' ')[0].strip
                               end

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

@@ -137,10 +137,11 @@ module Facter
           end
 
           def retrieve_domain_from_registry
-            ::Win32::Registry::HKEY_LOCAL_MACHINE.open('SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters') do |rg|
-              rg.each do |name, _value|
-                @fact_list[:domain] = rg[name] if name == 'Domain'
-              end
+            ::Win32::Registry::HKEY_LOCAL_MACHINE.open(
+              'SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters'
+            ) do |key|
+              domain = key['Domain']
+              @fact_list[:domain] = domain if domain
             end
           rescue Win32::Registry::Error
             @log.debug('Could not read TCPIP Parameters from registry')

data/lib/facter/util/facts/facts_utils.rb

@@ -10,7 +10,7 @@ module Facter
 
       PHYSICAL_HYPERVISORS = %w[physical xen0 vmware_server vmware_workstation openvzhn vserver_host].freeze
       REDHAT_FAMILY = %w[redhat rhel fedora centos scientific ascendos cloudlinux psbm
-                         oraclelinux ovs oel amazon xenserver xcp-ng virtuozzo photon].freeze
+                         oraclelinux ovs oel amazon xenserver xcp-ng virtuozzo photon mariner].freeze
       DEBIAN_FAMILY = %w[debian ubuntu huaweios linuxmint devuan kde].freeze
       SUSE_FAMILY = %w[sles sled suse].freeze
       GENTOO_FAMILY = ['gentoo'].freeze

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.2.12
+  version: 4.2.13
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -349,12 +349,16 @@ files:
 - lib/facter/facts/freebsd/dmi/product/name.rb
 - lib/facter/facts/freebsd/dmi/product/serial_number.rb
 - lib/facter/facts/freebsd/dmi/product/uuid.rb
+- lib/facter/facts/freebsd/ec2_metadata.rb
+- lib/facter/facts/freebsd/ec2_userdata.rb
 - lib/facter/facts/freebsd/facterversion.rb
 - lib/facter/facts/freebsd/identity/gid.rb
 - lib/facter/facts/freebsd/identity/group.rb
 - lib/facter/facts/freebsd/identity/privileged.rb
 - lib/facter/facts/freebsd/identity/uid.rb
 - lib/facter/facts/freebsd/identity/user.rb
+- lib/facter/facts/freebsd/ipaddress6_interfaces.rb
+- lib/facter/facts/freebsd/ipaddress_interfaces.rb
 - lib/facter/facts/freebsd/is_virtual.rb
 - lib/facter/facts/freebsd/kernel.rb
 - lib/facter/facts/freebsd/kernelrelease.rb
@@ -656,6 +660,7 @@ files:
 - lib/facter/facts/macosx/timezone.rb
 - lib/facter/facts/macosx/virtual.rb
 - lib/facter/facts/mageia/os/release.rb
+- lib/facter/facts/mariner/os/release.rb
 - lib/facter/facts/meego/os/release.rb
 - lib/facter/facts/oel/os/release.rb
 - lib/facter/facts/ol/os/release.rb