facter 4.0.43 → 4.0.44

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

@@ -37,6 +37,8 @@ module Facter
 
             output = exec_smbios(param[0])
             facts = param[1]
+            return unless output
+
             facts.each do |name, regx|
               @fact_list[name] = output.match(/#{regx}/)&.captures&.first
             end

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

@@ -9,7 +9,6 @@ module Facter
       class Networking < BaseResolver
         @log = Facter::Log.new(self)
         @fact_list ||= {}
-        @interfaces = {}
 
         class << self
           private

data/lib/facter/resolvers/solaris/os_release.rb

@@ -5,8 +5,9 @@ module Facter
     module Solaris
       class OsRelease < BaseResolver
         @fact_list ||= {}
-        @os_version_regex_patterns = ['Solaris \d+ \d+/\d+ s(\d+)[sx]?_u(\d+)wos_',
-                                      'Solaris (\d+)[.](\d+)', 'Solaris (\d+)']
+        OS_VERSION_REGEX_PATTERNS = ['Solaris \d+ \d+/\d+ s(\d+)[sx]?_u(\d+)wos_',
+                                     'Solaris (\d+)[.](\d+)', 'Solaris (\d+)'].freeze
+
         class << self
           private
 
@@ -18,7 +19,7 @@ module Facter
             result = Util::FileHelper.safe_read('/etc/release', nil)
             return @fact_list[fact_name] = nil if result.nil?
 
-            @os_version_regex_patterns.each do |os_version_regex|
+            OS_VERSION_REGEX_PATTERNS.each do |os_version_regex|
               major, minor = search_for_os_version(/#{os_version_regex}/, result)
               next unless major || minor
 

data/lib/facter/resolvers/ssh_resolver.rb

@@ -5,8 +5,8 @@ module Facter
     class SshResolver < BaseResolver
       @log = Facter::Log.new(self)
       @fact_list ||= {}
-      @file_names = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub]
-      @file_paths = %w[/etc/ssh /usr/local/etc/ssh /etc /usr/local/etc /etc/opt/ssh]
+      FILE_NAMES = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub].freeze
+      FILE_PATHS = %w[/etc/ssh /usr/local/etc/ssh /etc /usr/local/etc /etc/opt/ssh].freeze
       class << self
         private
 
@@ -16,10 +16,10 @@ module Facter
 
         def retrieve_info(fact_name)
           ssh_list = []
-          @file_paths.each do |file_path|
+          FILE_PATHS.each do |file_path|
             next unless File.directory?(file_path)
 
-            @file_names.each do |file_name|
+            FILE_NAMES.each do |file_name|
               file_content = Util::FileHelper.safe_read(File.join(file_path, file_name), nil)
               next unless file_content
 

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.43
+  version: 4.0.44
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -180,6 +180,7 @@ extra_rdoc_files: []
 files:
 - bin/facter
 - lib/facter.rb
+- lib/facter/config.rb
 - lib/facter/custom_facts/core/aggregate.rb
 - lib/facter/custom_facts/core/directed_graph.rb
 - lib/facter/custom_facts/core/execution.rb
@@ -205,7 +206,6 @@ files:
 - lib/facter/custom_facts/util/unix_root.rb
 - lib/facter/custom_facts/util/values.rb
 - lib/facter/custom_facts/util/windows_root.rb
-- lib/facter/fact_groups.conf
 - lib/facter/facts/aix/aio_agent_version.rb
 - lib/facter/facts/aix/augeas/version.rb
 - lib/facter/facts/aix/disks.rb
@@ -854,7 +854,6 @@ files:
 - lib/facter/models/loaded_fact.rb
 - lib/facter/models/resolved_fact.rb
 - lib/facter/models/searched_fact.rb
-- lib/facter/os_hierarchy.json
 - lib/facter/patches/sysfilesystem/sys/statvfs.rb
 - lib/facter/resolvers/aio_agent_version.rb
 - lib/facter/resolvers/aix/architecture_resolver.rb

data/lib/facter/fact_groups.conf

@@ -1,308 +0,0 @@
-{
-	"EC2": [
-		"ec2_metadata",
-		"ec2_userdata"
-	],
-	"GCE": [
-		"gce"
-	],
-	"augeas": [
-		"augeas",
-		"augeasversion"
-	],
-	"desktop management interface": [
-		"dmi",
-		"bios_vendor",
-		"bios_version",
-		"bios_release_date",
-		"boardassettag",
-		"boardmanufacturer",
-		"boardproductname",
-		"boardserialnumber",
-		"chassisassettag",
-		"manufacturer",
-		"productname",
-		"serialnumber",
-		"uuid",
-		"chassistype"
-	],
-	"file system": [
-		"mountpoints",
-		"filesystems",
-		"partitions"
-	],
-	"hypervisors": [
-		"hypervisors"
-	],
-	"id": [
-		"id",
-		"gid",
-		"identity"
-	],
-	"kernel": [
-		"kernel",
-		"kernelversion",
-		"kernelrelease",
-		"kernelmajversion"
-	],
-	"load_average": [
-		"load_averages"
-	],
-	"memory": [
-		"memory",
-		"memoryfree",
-		"memoryfree_mb",
-		"memorysize",
-		"memorysize_mb",
-		"swapfree",
-		"swapfree_mb",
-		"swapsize",
-		"swapsize_mb",
-		"swapencrypted"
-	],
-	"networking": [
-		"networking",
-		"hostname",
-		"ipaddress",
-		"ipaddress6",
-		"netmask",
-		"netmask6",
-		"network",
-		"network6",
-		"macaddress",
-		"interfaces",
-		"domain",
-		"fqdn",
-		"dhcp_servers"
-	],
-	"operating system": [
-		"os",
-		"operatingsystem",
-		"osfamily",
-		"operatingsystemrelease",
-		"operatingsystemmajrelease",
-		"hardwaremodel",
-		"architecture",
-		"lsbdistid",
-		"lsbdistrelease",
-		"lsbdistcodename",
-		"lsbdistdescription",
-		"lsbmajdistrelease",
-		"lsbminordistrelease",
-		"lsbrelease",
-		"macosx_buildversion",
-		"macosx_productname",
-		"macosx_productversion",
-		"macosx_productversion_major",
-		"macosx_productversion_minor",
-		"windows_edition_id",
-		"windows_installation_type",
-		"windows_product_name",
-		"windows_release_id",
-		"system32",
-		"selinux",
-		"selinux_enforced",
-		"selinux_policyversion",
-		"selinux_current_mode",
-		"selinux_config_mode",
-		"selinux_config_policy"
-	],
-	"path": [
-		"path"
-	],
-	"processor": [
-		"processors",
-		"processorcount",
-		"physicalprocessorcount",
-		"hardwareisa"
-	],
-	"ssh": [
-		"ssh",
-		"sshdsakey",
-		"sshrsakey",
-		"sshecdsakey",
-		"sshed25519key",
-		"sshfp_dsa",
-		"sshfp_rsa",
-		"sshfp_ecdsa",
-		"sshfp_ed25519"
-	],
-	"system profiler": [
-		"system_profiler",
-		"sp_boot_mode",
-		"sp_boot_rom_version",
-		"sp_boot_volume",
-		"sp_cpu_type",
-		"sp_current_processor_speed",
-		"sp_kernel_version",
-		"sp_l2_cache_core",
-		"sp_l3_cache",
-		"sp_local_host_name",
-		"sp_machine_model",
-		"sp_machine_name",
-		"sp_number_processors",
-		"sp_os_version",
-		"sp_packages",
-		"sp_physical_memory",
-		"sp_platform_uuid",
-		"sp_secure_vm",
-		"sp_serial_number",
-		"sp_smc_version_system",
-		"sp_uptime",
-		"sp_user_name"
-	],
-	"timezone": [
-		"timezone"
-	],
-	"uptime": [
-		"system_uptime",
-		"uptime",
-		"uptime_days",
-		"uptime_hours",
-		"uptime_seconds"
-	],
-	"virtualization": [
-		"virtual",
-		"is_virtual",
-		"cloud"
-	],
-	"legacy": [
-		"architecture",
-		"augeasversion",
-		"bios_release_date",
-		"bios_vendor",
-		"bios_version",
-		"blockdevice_*_model",
-		"blockdevice_*_size",
-		"blockdevice_*_vendor",
-		"blockdevices",
-		"boardassettag",
-		"boardmanufacturer",
-		"boardproductname",
-		"boardserialnumber",
-		"chassisassettag",
-		"chassistype",
-		"dhcp_servers",
-		"domain",
-		"fqdn",
-		"gid",
-		"hardwareisa",
-		"hardwaremodel",
-		"hostname",
-		"id",
-		"interfaces",
-		"ipaddress",
-		"ipaddress_.*",
-		"ipaddress_*",
-		"ipaddress6",
-		"ipaddress6_.*",
-		"ipaddress6_*",
-		"ldom_*",
-		"lsbdistcodename",
-		"lsbdistdescription",
-		"lsbdistid",
-		"lsbdistrelease",
-		"lsbmajdistrelease",
-		"lsbminordistrelease",
-		"lsbrelease",
-		"macaddress",
-		"macaddress_.*",
-		"macaddress_*",
-		"macosx_buildversion",
-		"macosx_productname",
-		"macosx_productversion",
-		"macosx_productversion_major",
-		"macosx_productversion_minor",
-		"manufacturer",
-		"memoryfree",
-		"memoryfree_mb",
-		"memorysize",
-		"memorysize_mb",
-		"mtu_.*",
-		"mtu_*",
-		"netmask",
-		"netmask_.*",
-		"netmask_*",
-		"netmask6",
-		"netmask6_.*",
-		"netmask6_*",
-		"network",
-		"network_.*",
-		"network_*",
-		"network6",
-		"network6_.*",
-		"network6_*",
-		"operatingsystem",
-		"operatingsystemmajrelease",
-		"operatingsystemrelease",
-		"osfamily",
-		"physicalprocessorcount",
-		"processor.*",
-		"processor*",
-		"processorcount",
-		"productname",
-		"rubyplatform",
-		"rubysitedir",
-		"rubyversion",
-		"scope6",
-		"scope6_.*",
-		"selinux",
-		"selinux_config_mode",
-		"selinux_config_policy",
-		"selinux_current_mode",
-		"selinux_enforced",
-		"selinux_policyversion",
-		"serialnumber",
-		"sp_*",
-		"sp_boot_mode",
-		"sp_boot_rom_version",
-		"sp_boot_volume",
-		"sp_cpu_type",
-		"sp_current_processor_speed",
-		"sp_kernel_version",
-		"sp_l2_cache_core",
-		"sp_l3_cache",
-		"sp_local_host_name",
-		"sp_machine_model",
-		"sp_machine_name",
-		"sp_number_processors",
-		"sp_os_version",
-		"sp_packages",
-		"sp_physical_memory",
-		"sp_platform_uuid",
-		"sp_secure_vm",
-		"sp_serial_number",
-		"sp_smc_version_system",
-		"sp_uptime",
-		"sp_user_name",
-		"ssh.*key",
-		"ssh*key",
-		"sshfp_.*",
-		"sshfp_*",
-		"swapencrypted",
-		"swapfree",
-		"swapfree_mb",
-		"swapsize",
-		"swapsize_mb",
-		"system32",
-		"uptime",
-		"uptime_days",
-		"uptime_hours",
-		"uptime_seconds",
-		"uuid",
-		"windows_edition_id",
-		"windows_installation_type",
-		"windows_product_name",
-		"windows_release_id",
-		"xendomains",
-		"zone_*_brand",
-		"zone_*_id",
-		"zone_*_iptype",
-		"zone_*_name",
-		"zone_*_path",
-		"zone_*_status",
-		"zone_*_uuid",
-		"zonename",
-		"zones"
-	]
-}

data/lib/facter/os_hierarchy.json

@@ -1,36 +0,0 @@
-[
-  {
-    "Linux": [
-      {
-        "Debian": [
-          "Elementary",
-          "Ubuntu",
-          "Raspbian"
-        ]
-      },
-      {
-        "Rhel": [
-          "Fedora",
-          "Amzn",
-          "Centos",
-          "Ol",
-          "Scientific"
-        ]
-      },
-      {
-        "Sles": [
-          "Opensuse"
-        ]
-      }
-    ]
-  },
-  {
-    "Bsd": [
-      "Freebsd"
-    ]
-  },
-  "Solaris",
-  "Macosx",
-  "Windows",
-  "Aix"
-]