facter 4.0.34 → 4.0.39

data/lib/facter/facts/aix/disks.rb

@@ -4,13 +4,28 @@ module Facts
   module Aix
     class Disks
       FACT_NAME = 'disks'
+      ALIASES = %w[blockdevices blockdevice_.*_size'].freeze
 
       def call_the_resolver
+        facts = []
         disks = Facter::Resolvers::Aix::Disks.resolve(:disks)
 
-        disks = disks&.empty? ? nil : disks
+        return Facter::ResolvedFact.new(FACT_NAME, nil) if disks.nil? || disks.empty?
 
-        Facter::ResolvedFact.new(FACT_NAME, disks)
+        blockdevices = disks.keys.join(',')
+        facts.push(Facter::ResolvedFact.new(FACT_NAME, disks))
+        facts.push(Facter::ResolvedFact.new('blockdevices', blockdevices, :legacy))
+        add_legacy_facts(disks, facts)
+
+        facts
+      end
+
+      private
+
+      def add_legacy_facts(disks, facts)
+        disks.each do |disk_name, disk_info|
+          facts.push(Facter::ResolvedFact.new("blockdevice_#{disk_name}_size", disk_info[:size_bytes].to_s, :legacy))
+        end
       end
     end
   end

data/lib/facter/facts/aix/kernel.rb

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'kernel'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::OsLevel.resolve(:kernel)
+        fact_value = Facter::Resolvers::Aix::OsLevel.resolve(:kernel)
 
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end

data/lib/facter/facts/aix/kernelmajversion.rb

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'kernelmajversion'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::OsLevel.resolve(:build)
+        fact_value = Facter::Resolvers::Aix::OsLevel.resolve(:build)
         kernelmajversion = fact_value.split('-')[0]
 
         Facter::ResolvedFact.new(FACT_NAME, kernelmajversion)

data/lib/facter/facts/aix/kernelrelease.rb

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'kernelrelease'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::OsLevel.resolve(:build).strip
+        fact_value = Facter::Resolvers::Aix::OsLevel.resolve(:build).strip
 
         Facter::ResolvedFact.new(FACT_NAME, fact_value)
       end

data/lib/facter/facts/aix/kernelversion.rb

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'kernelversion'
 
       def call_the_resolver
-        fact_value = Facter::Resolvers::OsLevel.resolve(:build)
+        fact_value = Facter::Resolvers::Aix::OsLevel.resolve(:build)
         kernelversion = fact_value.split('-')[0]
 
         Facter::ResolvedFact.new(FACT_NAME, kernelversion)

data/lib/facter/facts/aix/networking/scope6.rb

@@ -5,11 +5,13 @@ module Facts
     module Networking
       class Scope6
         FACT_NAME = 'networking.scope6'
+        ALIASES = 'scope6'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Aix::Networking.resolve(:scope6)
 
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+           Facter::ResolvedFact.new('scope6', fact_value, :legacy)]
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Facts
         ALIASES = %w[operatingsystemmajrelease operatingsystemrelease].freeze
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::OsLevel.resolve(:build)
+          fact_value = Facter::Resolvers::Aix::OsLevel.resolve(:build)
           major = fact_value.split('-')[0]
 
           [Facter::ResolvedFact.new(FACT_NAME, full: fact_value.strip, major: major),

data/lib/facter/facts/aix/scope6_interfaces.rb

@@ -9,7 +9,6 @@ module Facts
       def call_the_resolver
         resolved_facts = []
         interfaces = Facter::Resolvers::Aix::Networking.resolve(:interfaces)
-        scope6 = Facter::Resolvers::Aix::Networking.resolve(:scope6)
 
         interfaces&.each do |interface_name, info|
           if info[:scope6]
@@ -17,7 +16,6 @@ module Facts
           end
         end
 
-        resolved_facts << Facter::ResolvedFact.new('scope6', scope6, :legacy) if scope6
         resolved_facts
       end
     end

data/lib/facter/facts/aix/serialnumber.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    class Serialnumber
+      FACT_NAME = 'serialnumber'
+      TYPE = :legacy
+
+      def call_the_resolver
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+
+      private
+
+      def fact_value
+        Facter::Resolvers::Aix::Serialnumber.resolve(:serialnumber)
+      end
+    end
+  end
+end

data/lib/facter/facts/aix/ssh.rb

@@ -12,7 +12,7 @@ module Facts
       private
 
       def fact_value
-        resolver_data.map! { |el| create_ssh_fact(el) }.inject(:merge!)
+        resolver_data.map { |el| create_ssh_fact(el) }.inject(:merge)
       end
 
       def resolver_data
@@ -20,6 +20,8 @@ module Facts
       end
 
       def create_ssh_fact(ssh)
+        return {} unless ssh
+
         { ssh.name.to_sym => {
           fingerprints: {
             sha1: ssh.fingerprint.sha1,

data/lib/facter/facts/aix/sshalgorithmkey.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    class Sshalgorithmkey
+      FACT_NAME = 'ssh.*key'
+      TYPE = :legacy
+
+      def call_the_resolver
+        facts = []
+        result = Facter::Resolvers::SshResolver.resolve(:ssh)
+        result.each { |ssh| facts << Facter::ResolvedFact.new("ssh#{ssh.name.to_sym}key", ssh.key, :legacy) }
+        facts
+      end
+    end
+  end
+end

data/lib/facter/facts/aix/sshfp_algorithm.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Aix
+    class SshfpAlgorithm
+      FACT_NAME = 'sshfp_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        facts = []
+        result = Facter::Resolvers::SshResolver.resolve(:ssh)
+        result.each do |ssh|
+          facts << Facter::ResolvedFact.new("sshfp_#{ssh.name.to_sym}",
+                                            "#{ssh.fingerprint.sha1}\n#{ssh.fingerprint.sha256}", :legacy)
+        end
+        facts
+      end
+    end
+  end
+end

data/lib/facter/facts/debian/os/distro/release.rb

@@ -6,11 +6,16 @@ module Facts
       module Distro
         class Release
           FACT_NAME = 'os.distro.release'
+          ALIASES = %w[lsbdistrelease lsbmajdistrelease lsbminordistrelease].freeze
 
           def call_the_resolver
             fact_value = determine_release_for_os
+            return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
 
-            Facter::ResolvedFact.new(FACT_NAME, fact_value)
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+             Facter::ResolvedFact.new(ALIASES[0], fact_value['full'], :legacy),
+             Facter::ResolvedFact.new(ALIASES[1], fact_value['major'], :legacy),
+             Facter::ResolvedFact.new(ALIASES[2], fact_value['minor'], :legacy)]
           end
 
           private

data/lib/facter/facts/freebsd/augeas/version.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Augeas
+      class Version
+        FACT_NAME = 'augeas.version'
+        ALIASES = 'augeasversion'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Augeas.resolve(:augeas_version)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+           Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    class Facterversion
+      FACT_NAME = 'facterversion'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Facterversion.resolve(:facterversion)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/identity/gid.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Identity
+      class Gid
+        FACT_NAME = 'identity.gid'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::PosxIdentity.resolve(:gid)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/{solaris/solaris_zones/current.rb → freebsd/identity/group.rb}

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 module Facts
-  module Solaris
-    module SolarisZones
-      class Current
-        FACT_NAME = 'solaris_zones.current'
-        ALIASES = 'zonename'
+  module Freebsd
+    module Identity
+      class Group
+        FACT_NAME = 'identity.group'
+        ALIASES = 'gid'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::SolarisZoneName.resolve(:current_zone_name)
+          fact_value = Facter::Resolvers::PosxIdentity.resolve(:group)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/freebsd/identity/privileged.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Identity
+      class Privileged
+        FACT_NAME = 'identity.privileged'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::PosxIdentity.resolve(:privileged)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/identity/uid.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Identity
+      class Uid
+        FACT_NAME = 'identity.uid'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::PosxIdentity.resolve(:uid)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/freebsd/identity/user.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    module Identity
+      class User
+        FACT_NAME = 'identity.user'
+        ALIASES = 'id'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::PosxIdentity.resolve(:user)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    class Kernel
+      FACT_NAME = 'kernel'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Uname.resolve(:kernelname)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    class Kernelrelease
+      FACT_NAME = 'kernelrelease'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Uname.resolve(:kernelrelease)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Freebsd
+    class Mountpoints
+      FACT_NAME = 'mountpoints'
+
+      def call_the_resolver
+        mountpoints = Facter::Resolvers::Mountpoints.resolve(FACT_NAME.to_sym)
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless mountpoints
+
+        fact = {}
+        mountpoints.each do |mnt|
+          fact[mnt[:path].to_sym] = mnt.reject { |k| k == :path }
+        end
+
+        Facter::ResolvedFact.new(FACT_NAME, fact)
+      end
+    end
+  end
+end

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

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

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

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

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

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