facter 4.6.1 → 4.7.0

data/lib/facter/facts/openbsd/networking/ip6.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Ip6
+        FACT_NAME = 'networking.ip6'
+        ALIASES = 'ipaddress6'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Networking.resolve(:ip6)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/networking/mac.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Mac
+        FACT_NAME = 'networking.mac'
+        ALIASES = 'macaddress'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Networking.resolve(:mac)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/networking/mtu.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Mtu
+        FACT_NAME = 'networking.mtu'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Networking.resolve(:mtu)
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/networking/netmask.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Netmask
+        FACT_NAME = 'networking.netmask'
+        ALIASES = 'netmask'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Networking.resolve(:netmask)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/networking/netmask6.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Netmask6
+        FACT_NAME = 'networking.netmask6'
+        ALIASES = 'netmask6'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Networking.resolve(:netmask6)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/networking/network.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Network
+        FACT_NAME = 'networking.network'
+        ALIASES = 'network'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Networking.resolve(:network)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/networking/network6.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Network6
+        FACT_NAME = 'networking.network6'
+        ALIASES = 'network6'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Networking.resolve(:network6)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/networking/primary.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Primary
+        FACT_NAME = 'networking.primary'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Networking.resolve(:primary_interface)
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Networking
+      class Scope6
+        FACT_NAME = 'networking.scope6'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Networking.resolve(:scope6)
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/os/architecture.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Os
+      class Architecture
+        FACT_NAME = 'os.architecture'
+        ALIASES = 'architecture'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uname.resolve(:machine)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/os/hardware.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Os
+      class Hardware
+        FACT_NAME = 'os.hardware'
+        ALIASES = 'hardwaremodel'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uname.resolve(:machine)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/os/name.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Os
+      class Name
+        FACT_NAME = 'os.name'
+        ALIASES = 'operatingsystem'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uname.resolve(:kernelname)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Os
+      class Release
+        FACT_NAME = 'os.release'
+        ALIASES = %w[operatingsystemmajrelease operatingsystemrelease].freeze
+
+        def call_the_resolver
+          # From Freebsd
+          # Facter::ResolvedFact.new(ALIASES.last, installed_userland, :legacy)]
+
+          version = Facter::Resolvers::Uname.resolve(:kernelrelease)
+          major, minor = version.split('.')
+          [Facter::ResolvedFact.new(FACT_NAME, full: version, major: major, minor: minor),
+           Facter::ResolvedFact.new(ALIASES.first, major, :legacy),
+           Facter::ResolvedFact.new(ALIASES.last, version, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/path.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Path
+      FACT_NAME = 'path'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Path.resolve(:path)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/processors/isa.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Processors
+      class Isa
+        FACT_NAME = 'processors.isa'
+        ALIASES = 'hardwareisa'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uname.resolve(:processor)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/ruby/platform.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Ruby
+      class Platform
+        FACT_NAME = 'ruby.platform'
+        ALIASES = 'rubyplatform'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Ruby.resolve(:platform)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/ruby/sitedir.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Ruby
+      class Sitedir
+        FACT_NAME = 'ruby.sitedir'
+        ALIASES = 'rubysitedir'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Ruby.resolve(:sitedir)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/ruby/version.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module Ruby
+      class Version
+        FACT_NAME = 'ruby.version'
+        ALIASES = 'rubyversion'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Ruby.resolve(:version)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Ssh
+      FACT_NAME = 'ssh'
+
+      def call_the_resolver
+        result = Facter::Resolvers::Ssh.resolve(:ssh)
+        ssh_facts = {}
+        result.each { |ssh| ssh_facts.merge!(create_ssh_fact(ssh)) }
+        Facter::ResolvedFact.new(FACT_NAME, ssh_facts)
+      end
+
+      private
+
+      def create_ssh_fact(ssh)
+        { ssh.name.to_sym =>
+              { fingerprints: { sha1: ssh.fingerprint.sha1,
+                                sha256: ssh.fingerprint.sha256 },
+                key: ssh.key,
+                type: ssh.type } }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Sshalgorithmkey
+      FACT_NAME = 'ssh.*key'
+      TYPE = :legacy
+
+      def call_the_resolver
+        facts = []
+        result = Facter::Resolvers::Ssh.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/openbsd/sshfp_algorithm.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class SshfpAlgorithm
+      FACT_NAME = 'sshfp_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        facts = []
+        result = Facter::Resolvers::Ssh.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/openbsd/system_uptime/days.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module SystemUptime
+      class Days
+        FACT_NAME = 'system_uptime.days'
+        ALIASES = 'uptime_days'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uptime.resolve(:days)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/system_uptime/hours.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module SystemUptime
+      class Hours
+        FACT_NAME = 'system_uptime.hours'
+        ALIASES = 'uptime_hours'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uptime.resolve(:hours)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/system_uptime/seconds.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module SystemUptime
+      class Seconds
+        FACT_NAME = 'system_uptime.seconds'
+        ALIASES = 'uptime_seconds'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uptime.resolve(:seconds)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/system_uptime/uptime.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    module SystemUptime
+      class Uptime
+        FACT_NAME = 'system_uptime.uptime'
+        ALIASES = 'uptime'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uptime.resolve(:uptime)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/openbsd/timezone.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Timezone
+      FACT_NAME = 'timezone'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Timezone.resolve(:timezone)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facts
+  module Openbsd
+    class Virtual
+      FACT_NAME = 'virtual'
+
+      def call_the_resolver
+        fact_value = Facter::Util::Facts::Posix::VirtualDetector.platform
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/ldom.rb

@@ -54,7 +54,7 @@ module Facts
       def create_resolved_facts_list(fact_value)
         resolved_facts = [Facter::ResolvedFact.new(FACT_NAME, fact_value)]
         ALIASES.each do |fact_alias|
-          key = fact_alias.split('_')[1..].map!(&:to_sym)
+          key = fact_alias.split('_')[1..-1].map!(&:to_sym)
           resolved_facts << Facter::ResolvedFact.new(fact_alias, fact_value.dig(*key), :legacy)
         end
 

data/lib/facter/facts/windows/cloud/provider.rb

@@ -10,11 +10,14 @@ module Facts
           virtual = Facter::Resolvers::Windows::Virtualization.resolve(:virtual)
           provider = case virtual
                      when 'hyperv'
-                       'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?
+                       metadata = Facter::Resolvers::Az.resolve(:metadata)
+                       'azure' unless metadata.nil? || metadata.empty?
                      when 'kvm', 'xen'
-                       'aws' unless Facter::Resolvers::Ec2.resolve(:metadata).empty?
+                       metadata = Facter::Resolvers::Ec2.resolve(:metadata)
+                       'aws' unless metadata.nil? || metadata.empty?
                      when 'gce'
-                       'gce' unless Facter::Resolvers::Gce.resolve(:metadata).empty?
+                       metadata = Facter::Resolvers::Gce.resolve(:metadata)
+                       'gce' unless metadata.nil? || metadata.empty?
                      end
 
           Facter::ResolvedFact.new(FACT_NAME, provider)

data/lib/facter/framework/cli/cli.rb

@@ -113,7 +113,7 @@ module Facter
       negate_options = %w[block cache custom_facts external_facts]
 
       template = File.join(File.dirname(__FILE__), '..', '..', 'templates', 'man.erb')
-      erb = ERB.new(File.read(template), trim_mode: '-')
+      erb = ERB.new(File.read(template), nil, '-')
       erb.filename = template
       puts erb.result(binding)
     end
@@ -148,7 +148,7 @@ module Facter
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
       Facter::Options.init_from_cli(options)
 
-      block_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..].join
+      block_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
       block_groups.gsub!(/:\s*\n/, "\n")
 
       puts block_groups
@@ -160,7 +160,7 @@ module Facter
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
       Facter::Options.init_from_cli(options)
 
-      cache_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..].join
+      cache_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
       cache_groups.gsub!(/:\s*\n/, "\n")
 
       puts cache_groups

data/lib/facter/framework/core/file_loader.rb

@@ -650,6 +650,65 @@ os_hierarchy.each do |os|
     require_relative '../../facts/ol/os/distro/description'
     require_relative '../../facts/ol/os/distro/id'
 
+  when 'openbsd'
+    require_relative '../../facts/openbsd/augeas/version'
+    require_relative '../../facts/openbsd/ec2_metadata'
+    require_relative '../../facts/openbsd/ec2_userdata'
+    require_relative '../../facts/openbsd/facterversion'
+    require_relative '../../facts/openbsd/is_virtual'
+    require_relative '../../facts/openbsd/kernel'
+    require_relative '../../facts/openbsd/kernelrelease'
+    require_relative '../../facts/openbsd/mountpoints'
+    require_relative '../../facts/openbsd/path'
+    require_relative '../../facts/openbsd/ssh'
+    require_relative '../../facts/openbsd/sshalgorithmkey'
+    require_relative '../../facts/openbsd/sshfp_algorithm'
+    require_relative '../../facts/openbsd/timezone'
+    require_relative '../../facts/openbsd/virtual'
+    require_relative '../../facts/openbsd/dmi/bios/vendor'
+    require_relative '../../facts/openbsd/dmi/bios/version'
+    require_relative '../../facts/openbsd/dmi/manufacturer'
+    require_relative '../../facts/openbsd/dmi/product/name'
+    require_relative '../../facts/openbsd/dmi/product/serial_number'
+    require_relative '../../facts/openbsd/dmi/product/uuid'
+    require_relative '../../facts/openbsd/identity/group'
+    require_relative '../../facts/openbsd/identity/gid'
+    require_relative '../../facts/openbsd/identity/privileged'
+    require_relative '../../facts/openbsd/identity/uid'
+    require_relative '../../facts/openbsd/identity/user'
+    require_relative '../../facts/openbsd/networking/dhcp'
+    require_relative '../../facts/openbsd/networking/domain'
+    require_relative '../../facts/openbsd/networking/fqdn'
+    require_relative '../../facts/openbsd/networking/hostname'
+    require_relative '../../facts/openbsd/networking/interfaces'
+    require_relative '../../facts/openbsd/networking/ip'
+    require_relative '../../facts/openbsd/networking/ip6'
+    require_relative '../../facts/openbsd/networking/mac'
+    require_relative '../../facts/openbsd/networking/mtu'
+    require_relative '../../facts/openbsd/networking/netmask'
+    require_relative '../../facts/openbsd/networking/netmask6'
+    require_relative '../../facts/openbsd/networking/network'
+    require_relative '../../facts/openbsd/networking/network6'
+    require_relative '../../facts/openbsd/networking/primary'
+    require_relative '../../facts/openbsd/networking/scope6'
+    require_relative '../../facts/openbsd/os/architecture'
+    require_relative '../../facts/openbsd/os/hardware'
+    require_relative '../../facts/openbsd/os/name'
+    require_relative '../../facts/openbsd/os/release'
+    require_relative '../../facts/openbsd/processors/isa'
+    require_relative '../../facts/openbsd/ruby/platform'
+    require_relative '../../facts/openbsd/ruby/sitedir'
+    require_relative '../../facts/openbsd/ruby/version'
+    require_relative '../../facts/openbsd/system_uptime/days'
+    require_relative '../../facts/openbsd/system_uptime/hours'
+    require_relative '../../facts/openbsd/system_uptime/seconds'
+    require_relative '../../facts/openbsd/system_uptime/uptime'
+
+    require_relative '../../resolvers/openbsd/dhcp'
+    require_relative '../../resolvers/openbsd/dmi'
+    require_relative '../../resolvers/openbsd/mountpoints'
+    require_relative '../../resolvers/openbsd/virtual'
+
   when 'openwrt'
     require_relative '../../facts/openwrt/os/release'
 

data/lib/facter/framework/detector/os_detector.rb

@@ -26,6 +26,8 @@ class OsDetector
                    detect_distro
                  when /freebsd/
                    :freebsd
+                 when /openbsd/i
+                   :openbsd
                  when /bsd/
                    :bsd
                  when /solaris/

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

@@ -22,7 +22,7 @@ module Facter
 
             result.each_line do |line|
               if line.include?('value')
-                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..]
+                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..-1]
                 break
               end
             end