facter 3.12.1.cfacter.20181031 → 3.12.2.cfacter.20181217

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872a037b021fcff2969e6ef2574a23d1b1b2e8feece7fa0b4b418a18ab1a6193
-  data.tar.gz: 164693600bc4676addca957c74d0f8b973082fa2e17dce5bb44c67d8f3a33a4a
+  metadata.gz: 364520fb97a986c1682b878a85b491f6ab50c5da1ba5a74bf782636b7c29e890
+  data.tar.gz: 07c221de09300211796b4cdec443ca96486da6df7368687ad4b74869ab221188
 SHA512:
-  metadata.gz: d48cffa1eaf135728be2fb5ee8a38edde2eff2120abee3a083e4430ac2cb6979333e124f66895519b1126d8db13b4e49c4a41cfb372873b4cee6d28c34fc6f2b
-  data.tar.gz: a4989b358fa6aa5b103baae12a5baadcbf718427d2c91f6a1f22350f8093749b101133e3fc248d22f366d66d5178a14cf2dd3fefb2c8f92424906a6c893cb4a5
+  metadata.gz: 49033dc14634dce2a4c1a2c1c37f919fe6ac9d7f3d0cf4cf48e5038b7708e3fc11d4a9e1488249443198fc635f4080976b33d637ba25dc97efabde957258f004
+  data.tar.gz: 260954f857485b92e261a04978d6447c844bc4f3af2d1d023afd13104aa6844240d7521d7557fbf54a21c423f0795db29a3f6f400e604df1836602da5ca42885

data/ext/facter/facter/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.2.2)
-project(FACTER VERSION 3.12.1)
+project(FACTER VERSION 3.12.2)
 
 # Set this early, so it's available. AIX gets weird, man.
 if("${CMAKE_SYSTEM_NAME}" MATCHES "AIX")

data/ext/facter/facter/acceptance/Gemfile

@@ -10,10 +10,12 @@ def location_for(place, fake_version = nil)
   end
 end
 
-gem "beaker", *location_for(ENV['BEAKER_VERSION'] || "~> 3.34")
-gem 'beaker-puppet', *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 0.13')
+gem "beaker", *location_for(ENV['BEAKER_VERSION'] || "~> 4")
+gem 'beaker-puppet', *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1')
 gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || "~> 1.1")
 gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || "~> 0.5")
+gem "beaker-vagrant", *location_for(ENV['BEAKER_VAGRANT_VERSION'] || "~> 0")
+gem "beaker-vmpooler", *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || "~> 1")
 gem 'rake', "~> 10.1.0"
 gem "multi_json", "~> 1.8"
 

data/ext/facter/facter/acceptance/lib/helper.rb

@@ -1 +1,3 @@
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
+
+require 'beaker-puppet'

data/ext/facter/facter/acceptance/tests/custom_facts/conflicts_with_builtin_fact.rb

@@ -0,0 +1,106 @@
+test_name 'Facter should appropriately resolve a custom fact when it conflicts with a builtin fact' do
+  tag 'risk:medium'
+
+  def create_custom_fact_on(host, custom_fact_dir, fact_file_name, fact)
+    fact_file_contents = <<-CUSTOM_FACT
+Facter.add(:#{fact[:name]}) do
+  has_weight #{fact[:weight]}
+  setcode do
+    #{fact[:value]}
+  end
+end
+CUSTOM_FACT
+
+    fact_file_path = File.join(custom_fact_dir, fact_file_name) 
+    create_remote_file(host, fact_file_path, fact_file_contents)
+  end
+
+  def clear_custom_facts_on(host, custom_fact_dir)
+    step "Clean-up the previous test's custom facts" do
+      on(agent, "rm -f #{custom_fact_dir}/*")
+    end
+  end
+
+  agents.each do |agent|
+    custom_fact_dir = agent.tmpdir('facter')
+    teardown do
+      on(agent, "rm -rf '#{custom_fact_dir}'")
+    end
+
+    fact_name = 'timezone'
+    builtin_value = on(agent, facter('timezone')).stdout.chomp
+
+    step "Verify that Facter uses the custom fact's value when its weight is > 0" do
+      custom_fact_value = "custom_timezone"
+      create_custom_fact_on(
+        agent,
+        custom_fact_dir,
+        'custom_timezone.rb',
+        name: fact_name,
+        weight: 10,
+        value: "'#{custom_fact_value}'"
+      )
+
+      on(agent, facter("--custom-dir=#{custom_fact_dir} timezone")) do |result|
+        assert_match(/#{custom_fact_value}/, result.stdout.chomp, "Facter does not use the custom fact's value when its weight is > 0")
+      end
+    end
+
+    clear_custom_facts_on(agent, custom_fact_dir)
+
+    step "Verify that Facter uses the builtin fact's value when all conflicting custom facts fail to resolve" do
+      [ 'timezone_one.rb', 'timezone_two.rb'].each do |fact_file|
+        create_custom_fact_on(
+          agent,
+          custom_fact_dir,
+          fact_file,
+          { name: fact_name, weight: 10, value: nil }
+        )
+      end
+
+      on(agent, facter("--custom-dir=#{custom_fact_dir} timezone")) do |result|
+        assert_match(/#{builtin_value}/, result.stdout.chomp, "Facter does not use the builtin fact's value when all conflicting custom facts fail to resolve")
+      end
+    end
+
+    step "Verify that Facter gives precedence to the builtin fact over zero weight custom facts" do
+      step "when all custom facts have zero weight" do
+        {
+          'timezone_one.rb' => "'timezone_one'",
+          'timezone_two.rb' => "'timezone_two'"
+        }.each do |fact_file, fact_value|
+          create_custom_fact_on(
+            agent,
+            custom_fact_dir,
+            fact_file,
+            { name: fact_name, weight: 0, value: fact_value }
+          )
+        end
+
+        on(agent, facter("--custom-dir=#{custom_fact_dir} timezone")) do |result|
+          assert_match(/#{builtin_value}/, result.stdout.chomp, "Facter does not give precedence to the builtin fact when all custom facts have zero weight")
+        end
+      end
+
+      clear_custom_facts_on(agent, custom_fact_dir)
+
+      step "when some custom facts have zero weight" do
+        {
+          'timezone_one.rb' => { weight: 10, value: nil },
+          'timezone_two.rb' => { weight: 0, value: "'timezone_two'" }
+        }.each do |fact_file, fact|
+          create_custom_fact_on(
+            agent,
+            custom_fact_dir,
+            fact_file,
+            fact.merge(name: fact_name)
+          )
+        end
+
+        on(agent, facter("--custom-dir=#{custom_fact_dir} timezone")) do |result|
+          assert_match(/#{builtin_value}/, result.stdout.chomp, "Facter does not give precedence to the builtin fact when only some custom facts have zero weight")
+        end
+      end
+    end
+  end
+end

data/ext/facter/facter/acceptance/tests/facts/networking_facts.rb

@@ -26,12 +26,12 @@ test_name 'C59029: networking facts should be fully populated' do
     refute_empty(primary_interface)
 
     expected_bindings = {
-        "\"networking.interfaces.#{primary_interface}.bindings.0.address\"" => @ip_regex,
-        "\"networking.interfaces.#{primary_interface}.bindings.0.netmask\"" => @netmask_regex,
-        "\"networking.interfaces.#{primary_interface}.bindings.0.network\"" => @ip_regex,
-        "\"networking.interfaces.#{primary_interface}.bindings6.0.address\"" => /[a-f0-9:]+/,
-        "\"networking.interfaces.#{primary_interface}.bindings6.0.netmask\"" => /[a-f0-9:]+/,
-        "\"networking.interfaces.#{primary_interface}.bindings6.0.network\"" => /[a-f0-9:]+/
+        "networking.interfaces.#{primary_interface}.bindings.0.address" => @ip_regex,
+        "networking.interfaces.#{primary_interface}.bindings.0.netmask" => @netmask_regex,
+        "networking.interfaces.#{primary_interface}.bindings.0.network" => @ip_regex,
+        "networking.interfaces.#{primary_interface}.bindings6.0.address" => /[a-f0-9:]+/,
+        "networking.interfaces.#{primary_interface}.bindings6.0.netmask" => /[a-f0-9:]+/,
+        "networking.interfaces.#{primary_interface}.bindings6.0.network" => /[a-f0-9:]+/
     }
 
     if agent['platform'] =~ /eos|solaris|aix|cisco/
@@ -41,9 +41,9 @@ test_name 'C59029: networking facts should be fully populated' do
       expected_networking.delete("networking.network6")
 
       #remove invalid bindings for the primary networking interface eccentric platforms
-      expected_bindings.delete("\"networking.interfaces.#{primary_interface}.bindings6.0.address\"")
-      expected_bindings.delete("\"networking.interfaces.#{primary_interface}.bindings6.0.netmask\"")
-      expected_bindings.delete("\"networking.interfaces.#{primary_interface}.bindings6.0.network\"")
+      expected_bindings.delete("networking.interfaces.#{primary_interface}.bindings6.0.address")
+      expected_bindings.delete("networking.interfaces.#{primary_interface}.bindings6.0.netmask")
+      expected_bindings.delete("networking.interfaces.#{primary_interface}.bindings6.0.network")
     end
 
     if agent['platform'] =~ /aix|sparc|cisco|huawei|sles|s390x/
@@ -57,19 +57,19 @@ test_name 'C59029: networking facts should be fully populated' do
       expected_networking.delete("networking.netmask")
 
       #remove invalid bindings for Cisco's primary networking interface
-      expected_bindings.delete("\"networking.interfaces.#{primary_interface}.bindings.0.netmask\"")
-      expected_bindings.delete("\"networking.interfaces.#{primary_interface}.bindings.0.network\"")
+      expected_bindings.delete("networking.interfaces.#{primary_interface}.bindings.0.netmask")
+      expected_bindings.delete("networking.interfaces.#{primary_interface}.bindings.0.network")
     end
 
     step "Ensure the Networking fact resolves with reasonable values for at least one interface" do
       expected_networking.each do |fact, value|
-        assert_match(value, fact_on(agent, fact))
+        assert_match(value, fact_on(agent, fact).to_s)
       end
     end
 
     step "Ensure bindings for the primary networking interface are present" do
       expected_bindings.each do |fact, value|
-        assert_match(value, fact_on(agent, fact))
+        assert_match(value, fact_on(agent, fact).to_s)
       end
     end
   end

data/ext/facter/facter/lib/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = facter
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.12.1
+PROJECT_NUMBER         = 3.12.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

data/ext/facter/facter/lib/src/ruby/fact.cc

@@ -83,53 +83,69 @@ namespace facter { namespace ruby {
         });
 
         _resolving = true;
-
-        // If no resolutions or the top resolution has a weight of 0, first check the native collection for the fact
-        // This way we treat the "built-in" as implicitly having a resolution with weight 0
         bool add = true;
-        if (_resolutions.empty() || ruby.to_native<resolution>(_resolutions.front())->weight() == 0) {
-            // Check to see the value is in the collection
-            auto value = facts[ruby.to_string(_name)];
-            if (value) {
-                // Already in collection, do not add
-                add = false;
-                _value = facter->to_ruby(value);
-                _weight = value->weight();
-            }
-        }
 
-        if (ruby.is_nil(_value)) {
-            vector<VALUE>::iterator it;
-            ruby.rescue([&]() {
-                volatile VALUE value = ruby.nil_value();
-                size_t weight = 0;
-
-                // Look through the resolutions and find the first allowed resolution that resolves
-                for (it = _resolutions.begin(); it != _resolutions.end(); ++it) {
-                    auto res = ruby.to_native<resolution>(*it);
-                    if (!res->suitable(*facter)) {
-                        continue;
-                    }
-                    value = res->value();
-                    if (!ruby.is_nil(value)) {
-                        weight = res->weight();
-                        break;
-                    }
+        vector<VALUE>::iterator it;
+        ruby.rescue([&]() {
+            volatile VALUE value = ruby.nil_value();
+            size_t weight = 0;
+
+            // Look through the resolutions and find the first allowed resolution that resolves
+            for (it = _resolutions.begin(); it != _resolutions.end(); ++it) {
+                auto res = ruby.to_native<resolution>(*it);
+                if (!res->suitable(*facter)) {
+                    continue;
+                }
+                value = res->value();
+                if (!ruby.is_nil(value)) {
+                    weight = res->weight();
+                    break;
                 }
+            }
 
-                // Set the value to what was resolved
-                _value = value;
-                _weight = weight;
-                return 0;
-            }, [&](VALUE ex) {
-                LOG_ERROR("error while resolving custom fact \"{1}\": {2}", ruby.rb_string_value_ptr(&_name), ruby.exception_to_string(ex));
+            // Set the value to what was resolved
+            _value = value;
+            _weight = weight;
 
-                // Failed, so set to nil
-                _value = ruby.nil_value();
-                _weight = 0;
+            if (! ruby.is_nil(_value) && _weight != 0) {
                 return 0;
-            });
-        }
+            }
+
+            // There's two possibilities here:
+            //   1. None of our resolvers could resolve the value
+            //   2. A resolver of weight 0 resolved the value
+            //
+            // In both cases, we attempt to use the "built-in" fact's
+            // value. This serves as a fallback resolver for Case (1)
+            // while for Case (2), we want built-in values to take
+            // precedence over 0-weight custom facts.
+
+            auto builtin_value = facts[ruby.to_string(_name)];
+            if (! builtin_value) {
+              return 0;
+            }
+            auto builtin_ruby_value = facter->to_ruby(builtin_value);
+
+            // We need this check for Case (2). Otherwise, we risk
+            // overwriting our resolved value in the small chance
+            // that builtin_value exists, but its ruby value is
+            // nil.
+            if (! ruby.is_nil(builtin_ruby_value)) {
+              // Already in collection, do not add
+              add = false;
+              _value = builtin_ruby_value;
+              _weight = builtin_value->weight();
+            }
+
+            return 0;
+        }, [&](VALUE ex) {
+            LOG_ERROR("error while resolving custom fact \"{1}\": {2}", ruby.rb_string_value_ptr(&_name), ruby.exception_to_string(ex));
+
+            // Failed, so set to nil
+            _value = ruby.nil_value();
+            _weight = 0;
+            return 0;
+        });
 
         if (add) {
             facts.add_custom(ruby.to_string(_name), ruby.is_nil(_value) ? nullptr : make_value<ruby::ruby_value>(_value), _weight);

data/ext/facter/leatherman/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.2.2)
-project(leatherman VERSION 1.5.3)
+project(leatherman VERSION 1.5.4)
 
 if (WIN32)
     link_libraries("-Wl,--nxcompat -Wl,--dynamicbase")

data/ext/facter/leatherman/cmake/cflags.cmake

@@ -2,7 +2,10 @@
 # Each of our project dirs sets CMAKE_CXX_FLAGS based on these. We do
 # not set CMAKE_CXX_FLAGS globally because gtest is not warning-clean.
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "\\w*Clang")
-    set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare ${CMAKE_CXX_FLAGS}")
+    if (ENABLE_CXX_WERROR)
+        set(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}")
+    endif()
+    set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare ${CMAKE_CXX_FLAGS}")
 
     # Clang warns that 'register' is deprecated; 'register' is used throughout boost, so it can't be an error yet.
     # The warning flag is different on different clang versions so we need to extract the clang version.
@@ -40,8 +43,12 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     # it's also sometimes wrong
     set(CMAKE_CXX_FLAGS "-Wno-maybe-uninitialized ${CMAKE_CXX_FLAGS}")
 
+    if (ENABLE_CXX_WERROR)
+        set(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}")
+    endif()
+
     # missing-field-initializers is disabled because GCC can't make up their mind how to treat C++11 initializers
-    set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Werror -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unknown-pragmas -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}")
+    set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unknown-pragmas -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}")
     if (NOT "${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
         set(LEATHERMAN_CXX_FLAGS "-Wextra ${LEATHERMAN_CXX_FLAGS}")
     endif()

data/ext/facter/leatherman/cmake/options.cmake

@@ -1,4 +1,5 @@
 include(leatherman)
+defoption(ENABLE_CXX_WERROR "Enables the -Werror compiler option" ON)
 defoption(COVERALLS "Generate code coverage using Coveralls.io" OFF)
 defoption(BOOST_STATIC "Use Boost's static libraries" OFF)
 defoption(CURL_STATIC "Use curl's static libraries" OFF)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 3.12.1.cfacter.20181031
+  version: 3.12.2.cfacter.20181217
 platform: ruby
 authors:
 - Puppet
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: info@puppet.com
@@ -203,6 +203,7 @@ files:
 - ext/facter/facter/acceptance/lib/puppet/acceptance/common_utils.rb
 - ext/facter/facter/acceptance/lib/puppet/acceptance/git_utils.rb
 - ext/facter/facter/acceptance/lib/puppet/acceptance/install_utils.rb
+- ext/facter/facter/acceptance/tests/custom_facts/conflicts_with_builtin_fact.rb
 - ext/facter/facter/acceptance/tests/custom_facts/custom_fact_with_10001_weight_overrides_external_fact.rb
 - ext/facter/facter/acceptance/tests/custom_facts/having_multiple_facts_in_one_file.rb
 - ext/facter/facter/acceptance/tests/custom_facts/using_win32ole_should_not_hang.rb