openfact 5.5.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f26137d8edd6e4ee63eafce742b117cbe4fa5637fb877e402a4c0469e369a4b6
-  data.tar.gz: 8ddbaa241b7d72991746c2df6c461007369ec26af34aaef8934b96ccf1725f1f
+  metadata.gz: 3fdc83613216713995aacb8bef6ea8008a3b8b9277b0610b287018f383b55e10
+  data.tar.gz: 20ece7058ec2e2a7a7cdbc1c1bcf1e7ba6a26a5a41176585fa6db78eff408e6d
 SHA512:
-  metadata.gz: 853e4f31ae21f5e0a5c0b9e53116e813308deaadf26e0bc15671fd0d8f3220481155879e70780f75501a58b7ec3982eb5639e310271c0a64a48a905a7e58160c
-  data.tar.gz: 21a1a34a393c03be04e1d0f82ce0b2ccc07231c728cbd3066496d59b34fd554e076f78fdd8fa46e21258c482670105d1e968e7a67269bb33400664d7b869e15e
+  metadata.gz: fe067a98010b19cd04111185910c812ed6bdc88043472d3ee0dfdaf2f007a3be6e8ac7b7ed0a15aba113be462af88680b38224b420721b538349e1b44a92b7e8
+  data.tar.gz: 6f9cde5ea04f05113f0fcd0efb338e758f637f8e10aa46253cf8980a5c2e1b881d037ef0742e43dd21bfba43998296ff1aca5f63f1f19c43c0856d134e0ac53f

data/lib/facter/resolvers/linux/containers.rb

@@ -52,6 +52,8 @@ module Facter
               vm = 'podman'
             when 'crio'
               vm = 'crio'
+            when 'oci'
+              vm = 'oci'
             when 'zone'
               return nil
             when 'systemd-nspawn'

data/lib/facter/resolvers/networking.rb

@@ -49,8 +49,12 @@ module Facter
           interfaces_data.each do |interface_name, raw_data|
             parsed_interface_data = {}
 
+            extract_flags(raw_data, parsed_interface_data)
+            extract_rdomain(raw_data, parsed_interface_data)
             extract_mtu(raw_data, parsed_interface_data)
             extract_mac(raw_data, parsed_interface_data)
+            extract_description(raw_data, parsed_interface_data)
+            extract_groups(raw_data, parsed_interface_data)
             extract_dhcp(interface_name, raw_data, parsed_interface_data)
             extract_ip_data(raw_data, parsed_interface_data)
 
@@ -59,11 +63,31 @@ module Facter
           @fact_list[:interfaces] = parsed_interfaces_data unless parsed_interfaces_data.empty?
         end
 
+        def extract_flags(raw_data, parsed_interface_data)
+          flags = raw_data.match(/flags=\h+<(.+)>/)&.captures&.first
+          parsed_interface_data[:flags] = flags.split(',') unless flags.nil?
+        end
+
+        def extract_rdomain(raw_data, parsed_interface_data)
+          rdomain = raw_data.match(/rdomain\s+(\d+)/)&.captures&.first&.to_i
+          parsed_interface_data[:rdomain] = rdomain unless rdomain.nil?
+        end
+
         def extract_mtu(raw_data, parsed_interface_data)
           mtu = raw_data.match(/mtu\s+(\d+)/)&.captures&.first&.to_i
           parsed_interface_data[:mtu] = mtu unless mtu.nil?
         end
 
+        def extract_description(raw_data, parsed_interface_data)
+          description = raw_data.match(/description:\s+(.+)/)&.captures&.first
+          parsed_interface_data[:description] = description unless description.nil?
+        end
+
+        def extract_groups(raw_data, parsed_interface_data)
+          groups = raw_data.match(/groups:\s+(.+)/)&.captures&.first
+          parsed_interface_data[:groups] = groups.split("\s") unless groups.nil?
+        end
+
         def extract_mac(raw_data, parsed_interface_data)
           mac = raw_data.match(/(?:ether|lladdr)\s+((?:\w?\w:){5}\w?\w)|(?:infiniband)\s+((?:\w?\w:){19}\w?\w)/)
                         &.captures&.compact&.first

data/lib/facter/resolvers/openbsd/mountpoints.rb

@@ -17,7 +17,7 @@ module Facter
 
           def read_mount(fact_name)
             @fact_list[:mountpoints] = {}
-            output = Facter::Core::Execution.execute('mount', logger: log)
+            output = Facter::Core::Execution.execute('mount -v', logger: log)
             output.split("\n").map do |line|
               add_mount_points_fact(line)
             end
@@ -27,11 +27,21 @@ module Facter
           end
 
           def add_mount_points_fact(line)
-            (elem, _, options) = line.partition("\s(")
-            elem = elem.split("\s")
-            options = options.chop!.split(",\s")
-            @fact_list[:mountpoints][elem[2]] = { device: elem[0], filesystem: elem[4],
-                                                  options: options }
+            (*tokens, options) = line.split(/\s*\(|\)\s*/, 0)
+
+            if tokens.length == 3
+              (device, duid, tokens) = tokens
+            else
+              (device, tokens) = tokens[0].split("\s", 2)
+            end
+            (_on, path, _type, filesystem) = tokens.split("\s")
+
+            @fact_list[:mountpoints][path] = {
+              device: device,
+              duid: duid,
+              filesystem: filesystem,
+              options: options.split(",\s")
+            }.compact
           end
 
           def retrieve_sizes_for_mounts

data/lib/facter/resolvers/os_release.rb

@@ -49,7 +49,7 @@ module Facter
 
           pairs = []
           content.each do |line|
-            pairs << line.strip.delete('"').split('=', 2) unless line.start_with?('#')
+            pairs << line.strip.delete(%q('")).split('=', 2) unless line.start_with?('#')
           end
 
           pairs

data/lib/facter/resolvers/uname.rb

@@ -35,6 +35,10 @@ module Facter
             @fact_list[:kernelrelease],
             @fact_list[:kernelname],
             @fact_list[:kernelversion] = uname_results.map(&:strip)
+            # uutils/coreutils uname does not implement -p and returns "unknown".
+            # Fall back to -m (machine), which is the procedure suggested by the
+            # uutils/coreutils developers.
+            @fact_list[:processor] = @fact_list[:machine] if @fact_list[:processor] == 'unknown'
           else
             log.warn('Request to uname returned no output. Uname related facts are not populated.')
           end

data/lib/facter/templates/man.erb

@@ -32,6 +32,7 @@ Many of the command line options can also be set via the HOCON config file. This
 .Bl -tag
 .It /etc/puppetlabs/facter/facter.conf
 A HOCON config file that can be used to specify directories for custom and external facts, set various command line options, and specify facts to block. See example below for details, or visit the [GitHub README](https://github.com/puppetlabs/puppetlabs-hocon#overview).
+.El
 .Sh EXAMPLES
 Display all facts:
 .Bd -literal -offset indent

data/lib/facter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openfact
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.6.1
 platform: ruby
 authors:
 - OpenVox Project
@@ -1293,16 +1293,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '5.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: OpenFact, a system inventory tool
 test_files: []