facter 3.12.0.cfacter.20181004 → 3.12.1.cfacter.20181023

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7e3f09b89d6dd6008f50ee2edbb1fcbc68fa06acddbb55b78c13df67cd919f2
-  data.tar.gz: dcf0f092bbe3ab62b80f1056a9da60f1654e175e40d2da6796844be4fdc2da81
+  metadata.gz: a7a8c74c202ab1fa96513997f0f5571779517be1ce2c3aa70ede42bef1adf551
+  data.tar.gz: c7a8bd03da7e777d30d91c5d2979072ac4affad9c0e7de5a0235083d47364b85
 SHA512:
-  metadata.gz: f568fe0aca25ba832d7b8e6f5eb5d57f536ef3d989b69d7f7462b523c5f6b2b9cd4e51a99d8dd6d8858f5b243deced45e2c6ba6ec774cc157295ab1a2257fe47
-  data.tar.gz: 41b86b3f3e7088adc07469192ab0973ab44b362e73bc10560500808b971227a047b4c9397f23ad7f89b7d0f53b7680169c2f2e220cacbbf06fc3c9e9620b10b3
+  metadata.gz: 8096ed83cbd2460ae62eda375f75aa10339256a4ce12caa21405a88f36d2826431ae9f54cae6fc70e9eb0aac510b31a6eadf2ab74827832842b223a6b64a5b31
+  data.tar.gz: d8f2b358f0d7876d96ceffb31e06d0032f97e4c7aebec8040afc626bab43d09faae73885bfc31c13b2c5a7cb275c7e43d8701daa2bfae09b8154661b786f046c

data/ext/facter/facter/CMakeLists.txt

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

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

@@ -523,11 +523,13 @@ module Facter
         elsif agent['platform'] =~ /2008/
           os_version = '2008 R2'
         elsif agent['platform'] =~ /2012/
-          os_version = '2012 R2'
+          os_version = agent['platform'] =~ /R2/ ? '2012 R2' : '2012'
         elsif agent['platform'] =~ /-10/
           os_version = '10'
         elsif agent['platform'] =~ /2016/
           os_version = '2016'
+        elsif agent['platform'] =~ /2019/
+          os_version = '2019'
         else
           fail_test "Unknown Windows version #{agent['platform']}"
         end

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

@@ -15,13 +15,13 @@ test_name "C96148: verify dmi facts" do
     expected_facts = {
         'dmi.manufacturer' => /\w+/,
         'dmi.product.name' => /\w+/,
+        'dmi.product.uuid' => /[-0-9A-Fa-f]+/,
     }
     unless agent['platform'] =~ /windows/
       expected_facts.merge!({'dmi.bios.release_date' => /\d+\/\d+\/\d+/,
                              'dmi.bios.vendor'       => /\w+/,
                              'dmi.bios.version'      => /\d+/,
                              'dmi.chassis.type'      => /\w+/,
-                             'dmi.product.uuid'      => /[-0-9A-Fa-f]+/,
                             })
     end
     unless agent['platform'] =~ /windows|cisco|aarch64|el-/

data/ext/facter/facter/appveyor.yml

@@ -1,27 +1,21 @@
 version: 3.1.0.{build}
 clone_depth: 10
 environment:
-  LEATHERMAN_VERSION: 0.99.0
-  CPPHOCON_VERSION: 0.1.4
+  LEATHERMAN_VERSION: 1.4.4
+  CPPHOCON_VERSION: 0.1.8
 
 init:
   - |
-      choco install mingw-w64 -y -Version 4.8.3 -source https://www.myget.org/F/puppetlabs
+      choco install -y mingw-w64 -Version 5.2.0 -source https://www.myget.org/F/puppetlabs
+      choco install -y cmake -Version 3.2.2 -source https://www.myget.org/F/puppetlabs
       choco install -y gettext -Version 0.19.6 -source https://www.myget.org/F/puppetlabs
+      choco install -y pl-toolchain-x64 -Version 2015.12.01.1 -source https://www.myget.org/F/puppetlabs
+      choco install -y pl-boost-x64 -Version 1.58.0.2 -source https://www.myget.org/F/puppetlabs
+      choco install -y pl-openssl-x64 -Version 1.0.24.1 -source https://www.myget.org/F/puppetlabs
+      choco install -y pl-curl-x64 -Version 7.46.0.1 -source https://www.myget.org/F/puppetlabs
+      choco install -y pl-yaml-cpp-x64 -Version 0.5.1.2 -source https://www.myget.org/F/puppetlabs
       cmake --version
   - ps: |
-      $env:PATH = $env:PATH.Replace("Git\bin", "Git\cmd")
-      $env:PATH = $env:PATH.Replace("Git\usr\bin", "Git\cmd")
-
-      wget 'https://s3.amazonaws.com/kylo-pl-bucket/boost_1_57_0-x86_64_mingw-w64_4.8.3_win32_seh.7z' -OutFile "$env:temp\boost.7z"
-      7z.exe x $env:temp\boost.7z -oC:\tools | FIND /V "ing  "
-
-      wget 'https://s3.amazonaws.com/kylo-pl-bucket/yaml-cpp-0.5.1-x86_64_mingw-w64_4.8.3_win32_seh.7z' -OutFile "$env:temp\yaml-cpp.7z"
-      7z.exe x $env:temp\yaml-cpp.7z -oC:\tools | FIND /V "ing  "
-
-      wget 'https://s3.amazonaws.com/kylo-pl-bucket/curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh.7z' -OutFile "$env:temp\curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh.7z"
-      7z.exe x "$env:temp\curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh.7z" -oC:\tools | FIND /V "ing "
-
       wget "https://github.com/puppetlabs/leatherman/releases/download/$env:LEATHERMAN_VERSION/leatherman.7z" -OutFile "$env:temp\leatherman.7z"
       7z.exe x $env:temp\leatherman.7z -oC:\tools | FIND /V "ing "
 
@@ -29,12 +23,15 @@ init:
       7z.exe x $env:temp\cpp-hocon.7z -oC:\tools | FIND /V "ing "
 
 install:
-  - SET PATH=C:\Ruby21-x64\bin;C:\tools\mingw64\bin;C:\Program Files\gettext-iconv;%PATH%
+    # Minimize environment polution; previously we were linking against the wrong OpenSSL DLLs.
+    # Include Ruby and Powershell for unit tests.
+  - SET PATH=C:\tools\pl-build-tools\bin;C:\tools\mingw64\bin;C:\ProgramData\chocolatey\bin;C:\Ruby22-x64\bin;C:\Program Files\7-Zip;C:\Windows\system32;C:\Windows;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Program Files\gettext-iconv
+  - ps: rm -r C:\OpenSSL-Win64
   - bundle install --jobs 4 --retry 2 --gemfile=lib/Gemfile --quiet
 
 build_script:
   - ps: |
-      cmake -G "MinGW Makefiles" -DBOOST_ROOT="C:\tools\boost_1_57_0-x86_64_mingw-w64_4.8.3_win32_seh" -DYAMLCPP_ROOT="C:\tools\yaml-cpp-0.5.1-x86_64_mingw-w64_4.8.3_win32_seh" -DBOOST_STATIC=ON -DCURL_STATIC=ON -DCMAKE_INSTALL_PREFIX="C:\Program Files\FACTER" -DCMAKE_PREFIX_PATH="C:\tools\leatherman;C:\tools\curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh;C:\tools\cpp-hocon" .
+      cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE="C:\tools\pl-build-tools\pl-build-toolchain.cmake" -DCMAKE_PREFIX_PATH="C:\tools\leatherman;C:\tools\cpp-hocon" -DCMAKE_INSTALL_PREFIX="C:\Program Files\FACTER" -DBOOST_STATIC=ON .
       mingw32-make -j2
 
 test_script:

data/ext/facter/facter/exe/facter.cc

@@ -332,7 +332,8 @@ int main(int argc, char **argv)
             if (vm.count("custom-dir")) {
                 custom_directories = vm["custom-dir"].as<vector<string>>();
             }
-            facter::ruby::load_custom_facts(facts, vm.count("puppet"), custom_directories);
+            bool redirect_ruby_stdout = vm.count("json") || vm.count("yaml");
+            facter::ruby::load_custom_facts(facts, vm.count("puppet"), redirect_ruby_stdout, custom_directories);
         }
 
         if (!vm["no-external-facts"].as<bool>()) {

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.0
+PROJECT_NUMBER         = 3.12.1
 
 # 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/inc/facter/ruby/ruby.hpp

@@ -21,6 +21,17 @@ namespace facter { namespace ruby {
      */
     LIBFACTER_EXPORT bool initialize(bool include_stack_trace = false);
 
+    /**
+     * Loads custom facts into the given collection.
+     * Important: this function should be called from main().
+     * Calling this function from an arbitrary stack depth may result in segfaults during Ruby GC.
+     * @param facts The collection to populate with custom facts.
+     * @param initialize_puppet Whether puppet should be loaded to find additional facts.
+     * @param redirect_stdout Whether Ruby's stdout should be redirected to stderr
+     * @param paths The paths to search for custom facts.
+     */
+    LIBFACTER_EXPORT void load_custom_facts(facter::facts::collection& facts, bool initialize_puppet, bool redirect_stdout, std::vector<std::string> const& paths = {});
+
     /**
      * Loads custom facts into the given collection.
      * Important: this function should be called from main().

data/ext/facter/facter/lib/src/facts/collection.cc

@@ -309,6 +309,8 @@ namespace facter { namespace facts {
     {
         resolve_facts();
 
+        // We intentionally are using find_if with no return value as a "map until" construct.
+        // cppcheck-suppress ignoredReturnValue
         find_if(begin(_facts), end(_facts), [&func](map<string, unique_ptr<value>>::value_type const& it) {
             return !func(it.first, it.second.get());
         });

data/ext/facter/facter/lib/src/facts/windows/dmi_resolver.cc

@@ -17,11 +17,12 @@ namespace facter { namespace facts { namespace windows {
     {
         data result;
 
-        auto vals = _wmi->query(wmi::computersystemproduct, {wmi::name});
+        auto vals = _wmi->query(wmi::computersystemproduct, {wmi::name, wmi::uuid});
         if (vals.empty()) {
-            LOG_DEBUG("WMI query returned no results for {1} with value {2}.", wmi::computersystemproduct, wmi::name);
+            LOG_DEBUG("WMI query returned no results for {1} with values {2} and {3}.", wmi::computersystemproduct, wmi::name, wmi::uuid);
         } else {
             result.product_name = wmi::get(vals, wmi::name);
+            result.uuid = wmi::get(vals, wmi::uuid);
         }
 
         vals = _wmi->query(wmi::bios, {wmi::manufacturer, wmi::serialnumber});

data/ext/facter/facter/lib/src/facts/windows/operating_system_resolver.cc

@@ -2,7 +2,9 @@
 #include <leatherman/windows/system_error.hpp>
 #include <leatherman/windows/wmi.hpp>
 #include <leatherman/windows/windows.hpp>
+#include <facter/facts/fact.hpp>
 #include <facter/facts/collection.hpp>
+#include <facter/facts/scalar_value.hpp>
 #include <facter/facts/os_family.hpp>
 #include <leatherman/logging/logging.hpp>
 #include <leatherman/util/regex.hpp>
@@ -10,6 +12,7 @@
 #include <winnt.h>
 #include <Shlobj.h>
 #include <map>
+#include <string>
 #include <boost/filesystem.hpp>
 
 using namespace std;
@@ -101,7 +104,26 @@ namespace facter { namespace facts { namespace windows {
         auto version = result.release.substr(0, lastDot);
         bool consumerrel = (wmi::get(vals, wmi::producttype) == "1");
         if (version == "10.0") {
-            result.release = consumerrel ? "10" : "2016";
+            // Calculate the build number to distinguish between
+            // Windows Server 2016 and 2019. Note that the kernel
+            // version is written as <major>.<minor>.<build_number>
+            auto kernel_version_fact = facts.get<string_value>(fact::kernel_version);
+            if (! kernel_version_fact) {
+                LOG_DEBUG("Could not resolve the OS release and OS major version facts from the kernel version fact");
+                return result;
+            }
+            auto kernel_version = kernel_version_fact->value();
+            auto build_number_as_str = kernel_version.substr(
+                kernel_version.find_last_of('.') + 1);
+            auto build_number = stol(build_number_as_str);
+
+            if (consumerrel) {
+              result.release = "10";
+            } else if (build_number >= 17623L) {
+              result.release = "2019";
+            } else {
+              result.release = "2016";
+            }
         } else if (version == "6.3") {
             result.release = consumerrel ? "8.1" : "2012 R2";
         } else if (version == "6.2") {

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

@@ -30,6 +30,27 @@ static const char load_puppet[] =
 "  end\n"
 "end\n";
 
+// This struct redirects stdout to stderr in the ruby runtime for the
+// duration of its lifetime. We use this to ensure that any custom
+// facts writing to stdout during their initialization or execution
+// won't corrupt json/yaml output from the facter executable.
+struct RbStdoutGuard {
+    VALUE old_stdout;
+    api& ruby;
+
+    RbStdoutGuard(api& ruby) :ruby(ruby) {
+        LOG_DEBUG("Redirecting ruby's stdout to stderr");
+        auto rb_stderr = ruby.rb_gv_get("$stderr");
+        old_stdout = ruby.rb_gv_get("$stdout");
+        ruby.rb_gv_set("$stdout", rb_stderr);
+    }
+
+    ~RbStdoutGuard() {
+        LOG_DEBUG("Restoring Ruby's stdout");
+        ruby.rb_gv_set("$stdout", old_stdout);
+    }
+};
+
 namespace facter { namespace ruby {
 
     bool initialize(bool include_stack_trace)
@@ -48,7 +69,7 @@ namespace facter { namespace ruby {
         return true;
     }
 
-    void load_custom_facts(collection& facts, bool initialize_puppet, vector<string> const& paths)
+    void load_custom_facts(collection& facts, bool initialize_puppet, bool redirect_stdout, vector<string> const& paths)
     {
 #ifdef _WIN32
         // Initialize WSA before resolving custom facts. The Ruby runtime does this only when running
@@ -67,12 +88,23 @@ namespace facter { namespace ruby {
             }
         }
         mod.search(paths);
-        mod.resolve_facts();
+        if (redirect_stdout) {
+            // Redirect stdout->stderr for custom facts.
+            RbStdoutGuard stdout_guard{ruby};
+            mod.resolve_facts();
+        } else {
+            mod.resolve_facts();
+        }
     }
 
     void load_custom_facts(collection& facts, vector<string> const& paths)
     {
-         load_custom_facts(facts, false, paths);
+        load_custom_facts(facts, false, false, paths);
+    }
+
+    void load_custom_facts(collection& facts, bool initialize_puppet, vector<string> const& paths)
+    {
+        load_custom_facts(facts, initialize_puppet, false, paths);
     }
 
     value const* lookup(value const* value, vector<string>::iterator segment, vector<string>::iterator end) {

data/ext/facter/facter/lib/tests/CMakeLists.txt

@@ -40,6 +40,7 @@ set(LIBFACTER_TESTS_COMMON_SOURCES
     "logging/logging.cc"
     "log_capture.cc"
     "main.cc"
+    "mock_server.cc"
     "util/string.cc"
     "fixtures.cc"
     "collection_fixture.cc"
@@ -127,37 +128,20 @@ include_directories(
     ${CPPHOCON_INCLUDE_DIRS}
 )
 
-# On EL 4, we run into a linking error when trying to create libraries or
-# executables that link in a static library with code using threads. As I
-# described in https://gcc.gnu.org/ml/gcc-help/2015-08/msg00035.html, we get
-# the error undefined reference to symbol '__tls_get_addr@@GLIBC_2.3'.
-# Build mock_server as a separate shared library to avoid this error.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
-add_library(mock-server SHARED mock_server.cc)
-target_link_libraries(mock-server PRIVATE
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${LIBFACTER_TESTS_PLATFORM_LIBRARIES})
+if (WIN32)
+    # On Windows with GCC 5.2, Boost.System emits warnings that aren't correctly
+    # suppressed by pragmas. Explicitly skip them.
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
+endif()
 
 add_executable(libfacter_test $<TARGET_OBJECTS:libfactersrc>
     ${LIBFACTER_TESTS_COMMON_SOURCES}
     ${LIBFACTER_TESTS_PLATFORM_SOURCES}
     ${LIBFACTER_TESTS_CATEGORY_SOURCES})
-# On Windows, mock-server comes after Boost libraries to avoid double
-# definition of boost::system::system_category() on Windows. On Linux, it
-# comes before to avoid picking up incomplete Boost.Asio symbols included
-# by Boost.Log in Leatherman logging.
-if (WIN32)
-    target_link_libraries(libfacter_test
-        ${LIBS}
-        ${LIBFACTER_TESTS_PLATFORM_LIBRARIES}
-        mock-server)
-else()
-    target_link_libraries(libfacter_test
-        mock-server
-        ${LIBS}
-        ${LIBFACTER_TESTS_PLATFORM_LIBRARIES})
-endif()
+target_link_libraries(libfacter_test
+    ${LIBS}
+    ${LIBFACTER_TESTS_PLATFORM_LIBRARIES})
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND BOOST_STATIC AND LEATHERMAN_USE_LOCALES)
     target_link_libraries(libfacter_test iconv)

data/ext/facter/facter/lib/tests/facts/collection.cc

@@ -67,7 +67,7 @@ struct multi_resolver : facter::facts::resolver
 
 struct temp_variable
 {
-    temp_variable(string name, string const& value) :
+    temp_variable(string&& name, string const& value) :
         _name(move(name))
     {
         environment::set(_name, value);

data/ext/facter/facter/locales/FACTER.pot

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FACTER 3.12.0\n"
+"Project-Id-Version: FACTER 3.12.1\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -1225,11 +1225,6 @@ msgstr ""
 msgid "failed adding platform facts that require WMI: {1}"
 msgstr ""
 
-#. debug
-#: lib/src/facts/windows/dmi_resolver.cc
-msgid "WMI query returned no results for {1} with value {2}."
-msgstr ""
-
 #. debug
 #: lib/src/facts/windows/dmi_resolver.cc
 msgid "WMI query returned no results for {1} with values {2} and {3}."
@@ -1294,6 +1289,13 @@ msgstr ""
 msgid "error finding SYSTEMROOT: {1}"
 msgstr ""
 
+#. debug
+#: lib/src/facts/windows/operating_system_resolver.cc
+msgid ""
+"Could not resolve the OS release and OS major version facts from the kernel "
+"version fact"
+msgstr ""
+
 #. debug
 #: lib/src/facts/windows/processor_resolver.cc
 msgid "WMI processor Name, Architecture query returned no results."
@@ -1529,6 +1531,16 @@ msgstr ""
 msgid "timeout= is not supported for custom facts and will be ignored."
 msgstr ""
 
+#. debug
+#: lib/src/ruby/ruby.cc
+msgid "Redirecting ruby's stdout to stderr"
+msgstr ""
+
+#. debug
+#: lib/src/ruby/ruby.cc
+msgid "Restoring Ruby's stdout"
+msgstr ""
+
 #. warning
 #: lib/src/ruby/ruby.cc
 msgid "Could not load puppet; some facts may be unavailable: {1}"

data/ext/facter/leatherman/CMakeLists.txt

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 3.12.0.cfacter.20181004
+  version: 3.12.1.cfacter.20181023
 platform: ruby
 authors:
 - Puppet
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: info@puppet.com