facter 4.0.20 → 4.0.21

data/lib/facts/{el → linux}/puppet_version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     class PuppetVersion
       FACT_NAME = 'puppetversion'
 

data/lib/facts/{sles → linux}/ruby/platform.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Ruby
       class Platform
         FACT_NAME = 'ruby.platform'

data/lib/facts/{sles → linux}/ruby/sitedir.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Ruby
       class Sitedir
         FACT_NAME = 'ruby.sitedir'

data/lib/facts/{sles → linux}/ruby/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module Ruby
       class Version
         FACT_NAME = 'ruby.version'

data/lib/facts/linux/scope6_interfaces.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Facts
+  module Linux
+    class Scope6Interfaces
+      FACT_NAME = 'scope6_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        resolved_facts = []
+        scope6_interfaces = {}
+        interfaces = Facter::Resolvers::NetworkingLinux.resolve(:interfaces)
+        primary = Facter::Resolvers::NetworkingLinux.resolve(:primary_interface)
+        interfaces&.each do |interface_name, info|
+          scope6_interfaces["scope6_#{interface_name}"] = info[:scope6] if info[:scope6]
+        end
+
+        scope6_interfaces.each { |fact, value| resolved_facts << Facter::ResolvedFact.new(fact, value, :legacy) }
+        if interfaces && primary
+          resolved_facts << Facter::ResolvedFact.new('scope6', interfaces[primary][:scope6], :legacy)
+        end
+        resolved_facts
+      end
+    end
+  end
+end

data/lib/facts/{el → linux}/ssh.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     class Ssh
       FACT_NAME = 'ssh'
 

data/lib/facts/{sles → linux}/sshalgorithmkey.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     class Sshalgorithmkey
       FACT_NAME = 'ssh.*key'
       TYPE = :legacy

data/lib/facts/{el → linux}/sshfp_algorithm.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     class SshfpAlgorithm
       FACT_NAME = 'sshfp_.*'
       TYPE = :legacy

data/lib/facts/{sles → linux}/system_uptime/days.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module Sles
+  module Linux
     module SystemUptime
       class Days
         FACT_NAME = 'system_uptime.days'

data/lib/facts/{el → linux}/system_uptime/hours.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     module SystemUptime
       class Hours
         FACT_NAME = 'system_uptime.hours'

data/lib/facts/{el → linux}/system_uptime/seconds.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     module SystemUptime
       class Seconds
         FACT_NAME = 'system_uptime.seconds'

data/lib/facts/{el → linux}/system_uptime/uptime.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     module SystemUptime
       class Uptime
         FACT_NAME = 'system_uptime.uptime'

data/lib/facts/{el → linux}/timezone.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Linux
     class Timezone
       FACT_NAME = 'timezone'
 

data/lib/facts/{el → rhel}/os/distro/codename.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Rhel
     module Os
       module Distro
         class Codename

data/lib/facts/{el → rhel}/os/distro/description.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Rhel
     module Os
       module Distro
         class Description

data/lib/facts/{el → rhel}/os/distro/id.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Rhel
     module Os
       module Distro
         class Id

data/lib/facts/{el → rhel}/os/distro/release.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Rhel
     module Os
       module Distro
         class Release

data/lib/facts/{el → rhel}/os/family.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Rhel
     module Os
       class Family
         FACT_NAME = 'os.family'

data/lib/facts/{el → rhel}/os/name.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Facts
-  module El
+  module Rhel
     module Os
       class Name
         FACT_NAME = 'os.name'

data/lib/facts/rhel/os/release.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Facts
+  module Rhel
+    module Os
+      class Release
+        FACT_NAME = 'os.release'
+        ALIASES = %w[operatingsystemmajrelease operatingsystemrelease].freeze
+
+        def call_the_resolver
+          version = determine_release_version
+
+          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 determine_release_version
+          version = Facter::Resolvers::OsRelease.resolve(:version_id)
+          version ||= Facter::Resolvers::RedHatRelease.resolve(:version)
+
+          return unless version
+
+          versions = version.split('.')
+          fact_value = {}
+          fact_value['full'] = version
+          fact_value['major'] = versions[0]
+          fact_value['minor'] = versions[1].gsub(/^0([1-9])/, '\1') if versions[1]
+          fact_value
+        end
+      end
+    end
+  end
+end

data/lib/facts/ubuntu/os/distro/release.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ubuntu
+    module Os
+      module Distro
+        class Release
+          FACT_NAME = 'os.distro.release'
+
+          def call_the_resolver
+            fact_value = determine_release_for_os
+
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          end
+
+          private
+
+          def determine_release_for_os
+            release = Facter::Resolvers::OsRelease.resolve(:version_id)
+            return unless release
+
+            {
+              'full' => release,
+              'major' => release
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facts/ubuntu/os/release.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ubuntu
+    module Os
+      class Release
+        FACT_NAME = 'os.release'
+        ALIASES = %w[operatingsystemmajrelease operatingsystemrelease].freeze
+
+        def call_the_resolver
+          version = Facter::Resolvers::OsRelease.resolve(:version_id)
+
+          [Facter::ResolvedFact.new(FACT_NAME, full: version, major: version),
+           Facter::ResolvedFact.new(ALIASES.first, version, :legacy),
+           Facter::ResolvedFact.new(ALIASES.last, version, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facts/windows/dhcp_servers.rb

@@ -7,14 +7,17 @@ module Facts
 
       def call_the_resolver
         fact_value = construct_addresses_hash
-        Facter::ResolvedFact.new(FACT_NAME, fact_value.empty? ? nil : fact_value, :legacy)
+        fact_value = !fact_value || fact_value.empty? ? nil : fact_value
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
       end
 
       private
 
       def construct_addresses_hash
-        servers = { system: Facter::Resolvers::Networking.resolve(:dhcp) }
         interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        return unless interfaces
+
+        servers = { system: Facter::Resolvers::Networking.resolve(:dhcp) }
         interfaces&.each { |interface_name, info| servers[interface_name] = info[:dhcp] if info[:dhcp] }
         servers
       end

data/lib/facts/windows/networking/primary.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.primary'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:primary)
+          fact_value = Facter::Resolvers::Networking.resolve(:primary_interface)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facts_utils/uptime_parser.rb

@@ -8,6 +8,8 @@ module Facter
     SECS_IN_AN_HOUR = 3_600
     SECS_IN_A_MINUTE = 60
 
+    @log = Facter::Log.new(self)
+
     class << self
       def uptime_seconds_unix
         uptime_proc_uptime || uptime_sysctl || uptime_executable
@@ -16,19 +18,20 @@ module Facter
       private
 
       def uptime_proc_uptime
-        output, _stderr, _status = Open3.capture3("/bin/cat #{uptime_file} 2>/dev/null")
+        output = Facter::Core::Execution.execute("/bin/cat #{uptime_file}", logger: @log)
 
         output.chomp.split(' ').first.to_i unless output.empty?
       end
 
       def uptime_sysctl
-        output, _stderr, _status = Open3.capture3("sysctl -n #{uptime_sysctl_variable} 2>/dev/null")
+        output = Facter::Core::Execution.execute("sysctl -n #{uptime_sysctl_variable}", logger: @log)
 
         compute_uptime(Time.at(output.match(/\d+/)[0].to_i)) unless output.empty?
       end
 
       def uptime_executable
-        output, _stderr, _status = Open3.capture3(uptime_executable_cmd + ' 2>/dev/null')
+        output = Facter::Core::Execution.execute(uptime_executable_cmd, logger: @log)
+
         return unless output
 
         up = 0

data/lib/framework/config/config_reader.rb

@@ -27,6 +27,10 @@ module Facter
         @conf['cli']
       end
 
+      def fact_groups
+        @conf['fact-groups']
+      end
+
       def refresh_config(config_path)
         @conf = File.readable?(config_path) ? Hocon.load(config_path) : {}
       end

data/lib/framework/config/fact_groups.rb

@@ -44,7 +44,8 @@ module Facter
     def load_groups
       config = ConfigReader.init(Options[:config])
       @block_list = config.block_list || {}
-      @groups_ttls = ConfigReader.init(Options[:config]).ttls || {}
+      @groups_ttls = config.ttls || {}
+      @groups.merge!(config.fact_groups) if config.fact_groups
     end
 
     def ttls_to_seconds(ttls)

data/lib/framework/core/cache_manager.rb

@@ -6,14 +6,11 @@ module Facter
       @groups = {}
       @log = Log.new(self)
       @fact_groups = Facter::FactGroups.new
-    end
-
-    def cache_dir
-      LegacyFacter::Util::Config.facts_cache_dir
+      @cache_dir = LegacyFacter::Util::Config.facts_cache_dir
     end
 
     def resolve_facts(searched_facts)
-      return searched_facts, [] if !File.directory?(cache_dir) || !Options[:cache]
+      return searched_facts, [] if !File.directory?(@cache_dir) || !Options[:cache]
 
       facts = []
       searched_facts.each do |fact|
@@ -48,7 +45,7 @@ module Facter
 
       return unless group_cached?(group_name)
 
-      return if check_ttls(group_name).zero?
+      return unless check_ttls?(group_name)
 
       data = read_group_json(group_name)
       return unless data
@@ -73,16 +70,16 @@ module Facter
     end
 
     def write_cache
-      unless File.directory?(cache_dir)
+      unless File.directory?(@cache_dir)
         require 'fileutils'
-        FileUtils.mkdir_p(cache_dir)
+        FileUtils.mkdir_p(@cache_dir)
       end
 
       @groups.each do |group_name, data|
-        next if check_ttls(group_name).zero?
+        next unless check_ttls?(group_name)
 
         @log.debug("caching values for #{group_name} facts")
-        cache_file_name = File.join(cache_dir, group_name)
+        cache_file_name = File.join(@cache_dir, group_name)
         File.write(cache_file_name, JSON.pretty_generate(data))
       end
     end
@@ -90,7 +87,7 @@ module Facter
     def read_group_json(group_name)
       return @groups[group_name] if @groups.key?(group_name)
 
-      cache_file_name = File.join(cache_dir, group_name)
+      cache_file_name = File.join(@cache_dir, group_name)
       data = nil
       file = Util::FileHelper.safe_read(cache_file_name)
       begin
@@ -107,24 +104,25 @@ module Facter
       cached
     end
 
-    def check_ttls(group_name)
+    def check_ttls?(group_name)
       ttls = @fact_groups.get_group_ttls(group_name)
-      return 0 unless ttls
+      return false unless ttls
 
-      cache_file_name = File.join(cache_dir, group_name)
-      return ttls unless File.readable?(cache_file_name)
+      cache_file_name = File.join(@cache_dir, group_name)
+      if File.readable?(cache_file_name)
+        file_time = File.mtime(cache_file_name)
+        expire_date = file_time + ttls
+        return true if expire_date > Time.now
 
-      file_time = File.mtime(cache_file_name)
-      expire_date = file_time + ttls
-      if expire_date < Time.now
         File.delete(cache_file_name)
-        return ttls
       end
-      expire_date.to_i
+
+      @log.debug("#{group_name} facts cache file expired/missing")
+      true
     end
 
     def delete_cache(group_name)
-      cache_file_name = File.join(cache_dir, group_name)
+      cache_file_name = File.join(@cache_dir, group_name)
       File.delete(cache_file_name) if File.readable?(cache_file_name)
     end
   end