facter 3.11.2.cfacter.20180612 → 3.11.3.cfacter.20180716

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7588ac463dcd3b514ae465ba049b1920bbdde2ee
-  data.tar.gz: 80e9f0eceee6a484f3ed5d48abf6ac8796fcb1cb
+  metadata.gz: 59604eb95692d9fe7a11d3c65c28f32a4b807e11
+  data.tar.gz: e11014d9bfff774641b5fe5c75f81c831671bbe1
 SHA512:
-  metadata.gz: 91b319c115bfcfe844434de4f9c55e8a6af87338bd8076bcf254fc593a2a90103686d7fa22427833be3aab2d91ed6dc84caf33d4fe659a36e51d1c637d5b531f
-  data.tar.gz: e808eee29eb7dda579de56e443aa2a9e31c2cae64891f57331fc1c9ae1ffaea31216c8193210c396bdc7dafae0effdff22fdd622bd100d8fd614df021aac2756
+  metadata.gz: dee599e4596509d648066b32ade20990dbe4d430c6a7b8364f3ee75423827e65a6194f871541301a05aed4c28b0e1f79c0590c3d1eabb0f7f12749b91389c6ff
+  data.tar.gz: 68e4ab3e73b07dbba067e591582199a996a6fd2b58c5f887e010e0dbb4c220d31bed3d7da7eae085c1800233aa96791fb80fa34a6d2c91b9a94de1c17ce8324d

data/ext/facter/cpp-hocon/CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.2.2)
 # Project Setup - modify to match project naming
 ## Source code for a simple command-line executable for a dynamic library will be generated from the project name.
 ## The command-line and library names will be based off the project name.
-project(cpp-hocon VERSION 0.1.5)
+project(cpp-hocon VERSION 0.1.7)
 
 string(MAKE_C_IDENTIFIER ${PROJECT_NAME} PROJECT_C_NAME)
 string(TOUPPER ${PROJECT_C_NAME} PROJECT_NAME_UPPER)

data/ext/facter/cpp-hocon/README.md

@@ -37,6 +37,13 @@ M=MMMMMMMM++  FOR HUMANS   ++M8MMMMMM7M
   7MM   MMMDMMMM?MM88MM?MMMMOMM8   MM8
 ```
 
+## Caveats
+
+This is a mostly complete implementation of the HOCON format. It currently has some known limitations
+
+* Include requires the location specifier, i.e. `include "foo"` won't work but `include file("foo")` will. URL is not yet implemented, and classpath won't be supported as it makes less sense outside of the JVM.
+* Unicode testing is absent so support is unknown. There are likely things that won't work.
+
 
 ## Build Requirements
 

data/ext/facter/cpp-hocon/appveyor.yml

@@ -1,31 +1,37 @@
 environment:
-  LEATHERMAN_VERSION: 0.9.0
-install:
-  - git submodule update --init --recursive
-
-  - choco install -y mingw-w64 -Version 4.8.3 -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
-  - SET PATH=C:\Ruby21-x64\bin;C:\tools\mingw64\bin;C:\Program Files\gettext-iconv;%PATH%
-  - ps: $env:PATH = $env:PATH.Replace("Git\bin", "Git\cmd")
-  - ps: $env:PATH = $env:PATH.Replace("Git\usr\bin", "Git\cmd")
+  LEATHERMAN_VERSION: 1.4.0
+  matrix:
+  - shared: OFF
+
+init:
+  - |
+      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
 
-  - ps: wget 'https://s3.amazonaws.com/kylo-pl-bucket/boost_1_58_0-x86_64_mingw-w64_4.8.3_win32_seh.7z' -OutFile "$pwd\boost.7z"
-  - ps: 7z.exe x boost.7z -oC:\tools | FIND /V "ing  "
-
-  - ps: wget 'https://s3.amazonaws.com/kylo-pl-bucket/curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh.7z' -OutFile "$pwd\curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh.7z"
-  - ps: 7z.exe x "curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh.7z" -oC:\tools | FIND /V "ing "
+install:
+  - ps: |
+      wget "https://github.com/puppetlabs/leatherman/releases/download/$env:LEATHERMAN_VERSION/leatherman.7z" -OutFile "$pwd\leatherman.7z"
+      7z.exe x leatherman.7z -oC:\tools | FIND /V "ing "
 
-  - ps: wget "https://github.com/puppetlabs/leatherman/releases/download/$env:LEATHERMAN_VERSION/leatherman.7z" -OutFile "$pwd\leatherman.7z"
-  - ps: 7z.exe x leatherman.7z -oC:\tools | FIND /V "ing "
+    # 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
 
 build_script:
-  - ps: cmake -G "MinGW Makefiles" -DBOOST_ROOT="C:\tools\boost_1_58_0-x86_64_mingw-w64_4.8.3_win32_seh" -DCMAKE_PREFIX_PATH="C:\tools\leatherman;C:\tools\curl-7.42.1-x86_64_mingw-w64_4.8.3_win32_seh" -DCURL_STATIC=ON -DBOOST_STATIC=ON -Wno-dev -DCMAKE_INSTALL_PREFIX=C:\tools\cpp-hocon .
-  - ps: mingw32-make install
-  - ps: 7z.exe a -t7z cpp-hocon.7z C:\tools\cpp-hocon\
+  - ps: |
+      cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE="C:\tools\pl-build-tools\pl-build-toolchain.cmake" -DCMAKE_PREFIX_PATH="C:\tools\leatherman" -DCMAKE_INSTALL_PREFIX=C:\tools\cpp-hocon -DBOOST_STATIC=ON -DBUILD_SHARED_LIBS="$env:shared" .
+      mingw32-make -j2
 
 test_script:
-  - ps: ctest -V 2>&1 | %{ if ($_ -is [System.Management.Automation.ErrorRecord]) { $_ | c++filt } else { $_ } }
+  - ps: |
+      ctest -V 2>&1 | %{ if ($_ -is [System.Management.Automation.ErrorRecord]) { $_ | c++filt } else { $_ } }
+      mingw32-make install
+      7z.exe a -t7z cpp-hocon.7z C:\tools\cpp-hocon\
 
 artifacts:
   - path: cpp-hocon.7z
@@ -39,3 +45,4 @@ deploy:
   artifact: cpp-hocon.7z
   on:
     appveyor_repo_tag: true
+    shared: OFF

data/ext/facter/cpp-hocon/lib/inc/hocon/config_value.hpp

@@ -211,15 +211,15 @@ namespace hocon {
 
         class modifier {
          public:
-            virtual shared_value modify_child_may_throw(std::string key_or_null, shared_value v) = 0;
+            virtual shared_value modify_child_may_throw(std::string const& key_or_null, shared_value v) = 0;
         };
 
         class no_exceptions_modifier : public modifier {
         public:
             no_exceptions_modifier(std::string prefix);
 
-            shared_value modify_child_may_throw(std::string key_or_null, shared_value v) override;
-            shared_value modify_child(std::string key, shared_value v) const;
+            shared_value modify_child_may_throw(std::string const &key_or_null, shared_value v) override;
+            shared_value modify_child(std::string const& key, shared_value v) const;
         private:
             std::string _prefix;
         };

data/ext/facter/cpp-hocon/lib/inc/internal/values/config_delayed_merge_object.hpp

@@ -7,10 +7,12 @@
 
 namespace hocon {
 
-    class config_delayed_merge_object : public config_object, public replaceable_merge_stack {
+    class config_delayed_merge_object : public config_object, public unmergeable, public replaceable_merge_stack {
     public:
         config_delayed_merge_object(shared_origin origin, std::vector<shared_value> const& stack);
 
+        resolve_result<shared_value> resolve_substitutions(resolve_context const& context, resolve_source const& source) const override;
+        std::vector<shared_value> unmerged_values() const override;
         shared_value make_replacement(resolve_context const& context, int skipping) const override;
 
         shared_object with_value(path raw_path, shared_value value) const override;

data/ext/facter/cpp-hocon/lib/src/simple_includer.cc

@@ -58,7 +58,7 @@ namespace hocon {
     }
 
     shared_object simple_includer::include_file_without_fallback(shared_include_context context, std::string what) {
-        return config::parse_file_any_syntax(move(what), context->parse_options())->root();
+        return config::parse_file_any_syntax(move(what), context->parse_options())->resolve(config_resolve_options(true, true))->root();
     }
 
     config_parse_options simple_includer::clear_for_include(config_parse_options const& options) {

data/ext/facter/cpp-hocon/lib/src/tokenizer.cc

@@ -304,7 +304,7 @@ namespace hocon {
                     utf[i] = _input->get();
                 }
                 original += string(utf);
-                short character;
+                unsigned short character;
                 sscanf(utf, "%hx", &character);
                 wchar_t buffer[] { static_cast<wchar_t>(character), '\0'};
                 parsed += boost::nowide::narrow(buffer);

data/ext/facter/cpp-hocon/lib/src/values/config_delayed_merge_object.cc

@@ -1,6 +1,7 @@
 #include <internal/values/config_delayed_merge_object.hpp>
 #include <internal/values/config_delayed_merge.hpp>
 #include <internal/values/simple_config_list.hpp>
+#include <internal/resolve_result.hpp>
 #include <hocon/config_exception.hpp>
 #include <leatherman/locale/locale.hpp>
 
@@ -28,6 +29,15 @@ namespace hocon {
         }
     }
 
+    resolve_result<shared_value> config_delayed_merge_object::resolve_substitutions(resolve_context const& context,
+                                                                                    resolve_source const& source) const {
+        return config_delayed_merge::resolve_substitutions(dynamic_pointer_cast<const replaceable_merge_stack>(shared_from_this()), _stack, context, source);
+    }
+
+    vector<shared_value> config_delayed_merge_object::unmerged_values() const {
+        return _stack;
+    }
+
     shared_value config_delayed_merge_object::make_replacement(resolve_context const &context, int skipping) const {
         return config_delayed_merge::make_replacement(move(context), _stack, move(skipping));
     }

data/ext/facter/cpp-hocon/lib/src/values/config_value.cc

@@ -164,7 +164,7 @@ namespace hocon {
 
     config_value::no_exceptions_modifier::no_exceptions_modifier(string prefix): _prefix(std::move(prefix)) {}
 
-    shared_value config_value::no_exceptions_modifier::modify_child_may_throw(string key_or_null, shared_value v) {
+    shared_value config_value::no_exceptions_modifier::modify_child_may_throw(string const& key_or_null, shared_value v) {
         try {
             return modify_child(key_or_null, v);
         } catch (runtime_error& e) {
@@ -174,7 +174,7 @@ namespace hocon {
         }
     }
 
-    shared_value config_value::no_exceptions_modifier::modify_child(string key, shared_value v) const {
+    shared_value config_value::no_exceptions_modifier::modify_child(string const& key, shared_value v) const {
         return v->relativized(_prefix);
     }
 

data/ext/facter/cpp-hocon/lib/src/values/simple_config_list.cc

@@ -19,7 +19,7 @@ namespace hocon {
     struct simple_config_list::resolve_modifier : public modifier {
         resolve_modifier(resolve_context c, resolve_source s) : context(move(c)), source(move(s)) {}
 
-        shared_value modify_child_may_throw(string key, shared_value v) override
+        shared_value modify_child_may_throw(string const& key, shared_value v) override
         {
             resolve_result<shared_value> result = context.resolve(v, source);
             context = result.context;

data/ext/facter/cpp-hocon/lib/src/values/simple_config_object.cc

@@ -23,13 +23,13 @@ namespace hocon {
         resolve_modifier(resolve_context c, resolve_source s)
                 : context(move(c)), source(move(s)), original_restrict(context.restrict_to_child()) {}
 
-        shared_value modify_child_may_throw(string key, shared_value v) override
+        shared_value modify_child_may_throw(string const& key, shared_value v) override
         {
             if (context.is_restricted_to_child()) {
                 if (key == *context.restrict_to_child().first()) {
                     auto remainder = context.restrict_to_child().remainder();
 
-                    if (remainder.empty()) {
+                    if (!remainder.empty()) {
                         auto result = context.restrict(remainder).resolve(v, source);
                         context = result.context.unrestricted().restrict(original_restrict);
                         return result.value;

data/ext/facter/cpp-hocon/lib/tests/conf_parser_test.cc

@@ -310,15 +310,15 @@ TEST_CASE("to string for parseables") {
     // TODO: are other APIs needed?
 }
 
-static void assert_comments(vector<string> comments, shared_config conf) {
+static void assert_comments(vector<string> const& comments, shared_config conf) {
     REQUIRE(comments == conf->root()->origin()->comments());
 }
 
-static void assert_comments(vector<string> comments, shared_config conf, string path) {
+static void assert_comments(vector<string> const& comments, shared_config conf, string const& path) {
     REQUIRE(comments == conf->get_value(path)->origin()->comments());
 }
 
-static void assert_comments(vector<string> comments, shared_config conf, string path, int index) {
+static void assert_comments(vector<string> const& comments, shared_config conf, string const& path, int index) {
     // TODO:
     // auto v = conf->get_list(path)->get(index);
     // REQUIRE(comments == v->origin()->comments());
@@ -632,6 +632,11 @@ TEST_CASE("include file") {
     REQUIRE(1u == conf->get_int("fromJson1"));
 }
 
+TEST_CASE("include file relative paths") {
+    auto conf = config::parse_string("root { include file(\"" + fixture_path("test01.conf") + "\") }");
+    REQUIRE("abcd" == conf->get_string("root.strings.abcdAgain"));
+}
+
 TEST_CASE("include file with extension") {
     auto conf = config::parse_string("include file(\"" + fixture_path("test01.conf") + "\")");
 

data/ext/facter/cpp-hocon/lib/tests/config_document_parser_test.cc

@@ -91,7 +91,7 @@ TEST_CASE("parse values", "[doc-parser]") {
     }
 }
 
-void invalid_json_test(string original_text, string message) {
+void invalid_json_test(string const& original_text, string const& message) {
     try {
         json_parse(original_text);
     } catch (parse_exception& ex) {
@@ -144,7 +144,7 @@ TEST_CASE("parse empty document", "[doc-parser]") {
     REQUIRE(dynamic_pointer_cast<const config_node_object>(node2->value()));
 }
 
-void parse_test_string(string original_text) {
+void parse_test_string(string const& original_text) {
     auto node = conf_parse(original_text);
     REQUIRE(original_text == node->render());
 }

data/ext/facter/cpp-hocon/lib/tests/config_document_tests.cc

@@ -6,8 +6,8 @@
 using namespace hocon;
 using namespace std;
 
-void replace_test(string original_text, string final_text, string new_value,
-                  string replace_path, config_syntax syntax) {
+void replace_test(string const& original_text, string const& final_text, string const& new_value,
+                  string const& replace_path, config_syntax syntax) {
     auto config_doc = config_document_factory::parse_string(original_text,
                                                             config_parse_options().set_syntax(syntax));
     REQUIRE(original_text == config_doc->render());

data/ext/facter/cpp-hocon/lib/tests/config_substitution_test.cc

@@ -320,9 +320,7 @@ TEST_CASE("ignore hidden circular subst") {
     REQUIRE(42u == resolved->get_int("a"));
 }
 
-// TODO: the following tests dealing with delayed merge objects do not pass, see HC-78
-
-TEST_CASE("(pending HC-78) avoid delayed merge object problem 1", "[!shouldfail]") {
+TEST_CASE("avoid delayed merge object problem 1") {
     auto problem = parse_object(R"(
     defaults {
             a = 1
@@ -346,9 +344,9 @@ TEST_CASE("(pending HC-78) avoid delayed merge object problem 1", "[!shouldfail]
     REQUIRE(3 == resolved->get_int("item2.b"));
 }
 
-TEST_CASE("(pending HC-78) avoid delayed merge object resolve problem 2", "[!shouldfail]") {
+TEST_CASE("avoid delayed merge object resolve problem 2") {
     auto problem = parse_object(R"(
-defaults {
+  defaults {
     a = 1
     b = 2
   }
@@ -365,7 +363,7 @@ defaults {
     REQUIRE(dynamic_pointer_cast<const config_delayed_merge_object>(problem->attempt_peek_with_partial_resolve("item1")));
 
     auto resolved = resolve_without_fallbacks(problem);
-    REQUIRE(parse_object("{ c : 43 }") == resolved->get_object("item1.b"));
+    REQUIRE(*parse_object("{ c : 43 }") == *resolved->get_object("item1.b"));
     REQUIRE(43 == resolved->get_int("item1.b.c"));
     REQUIRE(43 == resolved->get_int("item2.b.c"));
 
@@ -373,7 +371,7 @@ defaults {
 
 TEST_CASE("(pending HC-78) avoid delayed merge object resolve problem 3", "[!shouldfail]") {
     auto problem = parse_object(R"(
-item1.b.c = 100
+  item1.b.c = 100
   defaults {
     // we depend on item1.b.c
     a = ${item1.b.c}
@@ -392,15 +390,15 @@ item1.b.c = 100
     REQUIRE(dynamic_pointer_cast<const config_delayed_merge_object>(problem->attempt_peek_with_partial_resolve("item1")));
 
     auto resolved = resolve_without_fallbacks(problem);
-    REQUIRE(parse_object("{ c : 43 }") == resolved->get_object("item1.b"));
+    REQUIRE(*parse_object("{ c : 43 }") == *resolved->get_object("item1.b"));
     REQUIRE(43 == resolved->get_int("item1.b.c"));
     REQUIRE(43 == resolved->get_int("item2.b.c"));
     REQUIRE(100 == resolved->get_int("defaults.a"));
 }
 
-TEST_CASE("(pending HC-78) avoid delayed merge object resolve problem 4", "[!shouldfail]") {
+TEST_CASE("avoid delayed merge object resolve problem 4") {
     auto problem = parse_object(R"(
-defaults {
+  defaults {
     a = 1
     b = 2
   }
@@ -422,7 +420,7 @@ defaults {
 
 TEST_CASE("(pending HC-78) avoid delayed merge object resolve problem 5", "[!shouldfail]") {
     auto problem = parse_object(R"(
-defaults {
+  defaults {
     a = ${item1.b} // tricky cycle - we won't see ${defaults}
                    // as we resolve this
     b = 2
@@ -441,12 +439,12 @@ defaults {
     auto resolved = resolve_without_fallbacks(problem);
     REQUIRE(2 == resolved->get_int("item1.b"));
     REQUIRE(2 == resolved->get_int("item2.b"));
-    REQUIRE(7 == resolved->get_int("defauls.a"));
+    REQUIRE(7 == resolved->get_int("defaults.a"));
 }
 
 TEST_CASE("(pending HC-78) avoid delayed merge object resolve problem 6", "[!shouldfail]") {
     auto problem = parse_object(R"(
-z = 15
+  z = 15
   defaults-defaults-defaults {
     m = ${z}
     n.o.p = ${z}
@@ -480,12 +478,12 @@ z = 15
 
     REQUIRE(dynamic_pointer_cast<const config_delayed_merge_object>(problem->attempt_peek_with_partial_resolve("item1")));
 
-    unwrapped_value expected(10);
+    unwrapped_value expected(101);
     bool test = expected == problem->to_config()->get_object("item1")->attempt_peek_with_partial_resolve("xyz")->unwrapped();
     REQUIRE(test);
 
     auto resolved = resolve_without_fallbacks(problem);
-    REQUIRE(parse_object("{ c : 43 }") == resolved->get_object("item1.b"));
+    REQUIRE(*parse_object("{ c : 43 }") == *resolved->get_object("item1.b"));
     REQUIRE(43 == resolved->get_int("item1.b.c"));
     REQUIRE(43 == resolved->get_int("item2.b.c"));
     REQUIRE(15 == resolved->get_int("item1.n.o.p"));
@@ -493,7 +491,7 @@ z = 15
 
 TEST_CASE("Fetch known value from delayed merge object") {
     auto obj = parse_object(R"(
-defaults {
+  defaults {
     a = 1
     b = 2
   }
@@ -524,7 +522,7 @@ TEST_CASE("Fail to fetch from delayed merge object needs full resolve") {
     REQUIRE_THROWS(obj->to_config()->get_object("item1.b"));
 }
 
-TEST_CASE("(pending HC-78) resolve delayed merge object embrace", "[!shouldfail]") {
+TEST_CASE("resolve delayed merge object embrace") {
     auto obj = parse_object(R"(
   defaults {
     a = 1
@@ -599,8 +597,7 @@ TEST_CASE("use relative to root when relativized") {
     REQUIRE("in parent" == resolved->get_string("a.bar"));
 }
 
-// TODO: this test legitimately fails: HC-73
-TEST_CASE("pending HC-73: complex resolve (pending)", "[!shouldfail]") {
+TEST_CASE("complex resolve") {
     auto resolved = resolve_without_fallbacks(subst_complex_object());
 
     REQUIRE(57u == resolved->get_int("foo"));
@@ -610,7 +607,6 @@ TEST_CASE("pending HC-73: complex resolve (pending)", "[!shouldfail]") {
     REQUIRE(57u == resolved->get_int("objB.d"));
 }
 
-
 // TODO: env variable fallback legitimately fails: HC-74
 TEST_CASE("pending HC-74: fallback to env (pending)", "[!shouldfail]") {
     auto resolved = resolve(subst_env_var_object());

data/ext/facter/cpp-hocon/lib/tests/test_utils.cc

@@ -109,7 +109,7 @@ namespace hocon { namespace test_utils {
         return make_shared<config_node_simple_value>(bool_token(value));
     }
 
-    shared_ptr<config_node_simple_value> string_node(string text) {
+    shared_ptr<config_node_simple_value> string_node(string const& text) {
         return make_shared<config_node_simple_value>(string_token(text));
     }
 
@@ -117,7 +117,7 @@ namespace hocon { namespace test_utils {
         return make_shared<config_node_simple_value>(null_token());
     }
 
-    shared_ptr<config_node_simple_value> unquoted_text_node(string text) {
+    shared_ptr<config_node_simple_value> unquoted_text_node(string const& text) {
         return make_shared<config_node_simple_value>(unquoted_text_token(text));
     }
 
@@ -129,11 +129,11 @@ namespace hocon { namespace test_utils {
         return make_shared<config_node_single_token>(line_token(line_number));
     }
 
-    shared_ptr<config_node_single_token> whitespace_node(string whitespace) {
+    shared_ptr<config_node_single_token> whitespace_node(string const& whitespace) {
         return make_shared<config_node_single_token>(whitespace_token(whitespace));
     }
 
-    shared_ptr<config_node_comment> double_slash_comment_node(string text) {
+    shared_ptr<config_node_comment> double_slash_comment_node(string const& text) {
         return make_shared<config_node_comment>(double_slash_comment_token(text));
     }
 
@@ -161,7 +161,7 @@ namespace hocon { namespace test_utils {
         return make_shared<config_reference>(fake_origin(), make_shared<substitution_expression>(path::new_path(ref), optional));
     }
 
-    shared_ptr<config_concatenation> subst_in_string(string ref, bool optional) {
+    shared_ptr<config_concatenation> subst_in_string(string const& ref, bool optional) {
         auto pieces = vector<shared_value> {string_value("start<"), subst(ref, optional), string_value(">end")};
         return make_shared<config_concatenation>(fake_origin(), pieces);
     }
@@ -446,7 +446,7 @@ namespace hocon { namespace test_utils {
         return new_tests;
     }
 
-    std::string fixture_path(std::string fixture_name) {
+    std::string fixture_path(std::string const& fixture_name) {
         return string(TEST_FILE_DIR) + "/fixtures/" + fixture_name;
     }
 }}  // namespace hocon::test_utils

data/ext/facter/cpp-hocon/lib/tests/test_utils.hpp

@@ -75,21 +75,21 @@ namespace hocon { namespace test_utils {
 
     std::shared_ptr<config_node_simple_value> double_node(double number);
 
-    std::shared_ptr<config_node_simple_value> string_node(std::string text);
+    std::shared_ptr<config_node_simple_value> string_node(std::string const& text);
 
     std::shared_ptr<config_node_simple_value> null_node();
 
     std::shared_ptr<config_node_simple_value> bool_node(bool value);
 
-    std::shared_ptr<config_node_simple_value> unquoted_text_node(std::string text);
+    std::shared_ptr<config_node_simple_value> unquoted_text_node(std::string const& text);
 
     std::shared_ptr<config_node_simple_value> substitution_node(shared_token key, bool optional);
 
     std::shared_ptr<config_node_single_token> line_node(int line_number);
 
-    std::shared_ptr<config_node_single_token> whitespace_node(std::string whitespace);
+    std::shared_ptr<config_node_single_token> whitespace_node(std::string const& whitespace);
 
-    std::shared_ptr<config_node_comment> double_slash_comment_node(std::string text);
+    std::shared_ptr<config_node_comment> double_slash_comment_node(std::string const& text);
 
     // it's important that these do NOT use the public API to create the
     // instances, because we may be testing that the public API returns the
@@ -108,7 +108,7 @@ namespace hocon { namespace test_utils {
 
     std::shared_ptr<config_reference> subst(std::string ref, bool optional = false);
 
-    std::shared_ptr<config_concatenation> subst_in_string(std::string ref, bool optional = false);
+    std::shared_ptr<config_concatenation> subst_in_string(std::string const& ref, bool optional = false);
 
     /** Paths */
     path test_path(std::initializer_list<std::string> path_elements);
@@ -118,6 +118,7 @@ namespace hocon { namespace test_utils {
     shared_config parse_config(std::string);
 
     struct parse_test {
+        // cppcheck-suppress passedByValue
         parse_test(std::string t, bool lbe = false, bool wm = false)
             : test(move(t)), lift_behavior_unexpected(lbe), whitespace_matters(wm) { }
 
@@ -135,5 +136,5 @@ namespace hocon { namespace test_utils {
 
     std::vector<parse_test> whitespace_variations(std::vector<parse_test> const& tests, bool valid_in_lift);
 
-    std::string fixture_path(std::string fixture_name);
+    std::string fixture_path(std::string const& fixture_name);
 }}  // namespace hocon::test_utils

data/ext/facter/cpp-hocon/lib/tests/tokenizer_test.cc

@@ -17,7 +17,7 @@ token_list tokenize_as_list(string const& source) {
     return tokens;
 }
 
-void tokenizer_test(string source, token_list expected) {
+void tokenizer_test(string const& source, token_list expected) {
     token_list result = tokenize_as_list(source);
     for (size_t i = 0; i < expected.size(); i++) {
         if (!(*expected[i] == *result[i])) {

data/ext/facter/cpp-hocon/locales/cpp-hocon.pot

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cpp-hocon 0.1.2\n"
+"Project-Id-Version: cpp-hocon 0.1.7\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

data/ext/facter/facter/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.2.2)
-project(FACTER VERSION 3.11.2)
+project(FACTER VERSION 3.11.3)
 
 # 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

@@ -227,9 +227,9 @@ module Facter
             'os.family'                => 'RedHat',
             'os.hardware'              => os_hardware,
             'os.name'                  => os_name,
-            'os.release.full'          => /#{os_version}\.\d+(\.\d+)?/,
+            'os.release.full'          => /#{os_version}(\.\d+)?(\.\d+)?/,
             'os.release.major'         => os_version,
-            'os.release.minor'         => /\d+/,
+            'os.release.minor'         => /(\d+)?/,
             'processors.count'         => /[1-9]/,
             'processors.physicalcount' => /[1-9]/,
             'processors.isa'           => os_hardware,

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.11.2
+PROJECT_NUMBER         = 3.11.3
 
 # 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/facts/linux/os_linux.cc

@@ -285,8 +285,10 @@ namespace facter { namespace facts { namespace linux {
             })) {
                 if (boost::ends_with(contents, "(Rawhide)")) {
                     value = "Rawhide";
-                } else {
+                } else if (contents.find("release") != string::npos) {
                     re_search(contents, boost::regex("release (\\d[\\d.]*)"), &value);
+                } else {
+                    re_search(contents, boost::regex("Amazon Linux (\\d+)"), &value);
                 }
             }
         }

data/ext/facter/facter/lib/src/util/solaris/k_stat.cc

@@ -30,44 +30,36 @@ namespace facter { namespace util { namespace solaris {
         return lookup(entry.first, -1, entry.second);
     }
 
+// I believe precedence to be sufficiently obvious in this function,
+// but this is a worthwhile diagnostic in most cases. We disable it
+// here, instead of globally.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wparentheses"
     vector<k_stat_entry> k_stat::lookup(string const& module, int instance, string const& name)
     {
-        kstat_t* kp = kstat_lookup(ctrl, const_cast<char*>(module.c_str()), instance, name.empty() ? nullptr : const_cast<char *>(name.c_str()));
-        if (kp == nullptr) {
-            throw kstat_exception(_("kstat_lookup of module {1}/{2}/{3} failed: {4} ({5})",
-                                    module,
-                                    to_string(instance),
-                                    name,
-                                    string(strerror(errno)),
-                                    to_string(errno)));
-        }
-
+        kstat_t* kp = static_cast<kstat_ctl_t*>(ctrl)->kc_chain;
         vector<k_stat_entry> arr;
-        while (kp) {
-            if (kstat_read(ctrl, kp, 0) == -1) {
-                throw kstat_exception(_("kstat_read failed: {1} ({2})",
-                                        string(strerror(errno)),
-                                        to_string(errno)));
-            }
-
-            bool insert = true;
-            if (!module.empty() && module != kp->ks_module) {
-                insert = false;
+        do {
+            if (!module.empty() && module != kp->ks_module ||
+                !name.empty() && name != kp->ks_name ||
+                instance != -1 && instance != kp->ks_instance) {
+                continue;
             }
-            if (instance != -1 && instance != kp->ks_instance) {
-                insert = false;
+            while (kstat_read(ctrl, kp, 0) == -1) {
+                if (errno == EAGAIN) {
+                    continue;
+                } else {
+                    throw kstat_exception(_("kstat_read failed: {1} ({2})",
+                                            string(strerror(errno)),
+                                            to_string(errno)));
+                }
             }
-            if (!name.empty() && name != kp->ks_name) {
-                insert = false;
-            }
-            if (insert) {
-                arr.push_back(k_stat_entry(kp));
-            }
-            kp = kp->ks_next;
-        }
+            arr.push_back(k_stat_entry(kp));
+        } while (kp = kp->ks_next);
 
         return arr;
     }
+#pragma GCC diagnostic pop
 
     k_stat_entry::k_stat_entry(kstat_t* kp) :
         k_stat(kp)

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

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FACTER 3.11.2\n"
+"Project-Id-Version: FACTER 3.11.3\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -1497,10 +1497,6 @@ msgstr ""
 msgid "kstat_open failed"
 msgstr ""
 
-#: lib/src/util/solaris/k_stat.cc
-msgid "kstat_lookup of module {1}/{2}/{3} failed: {4} ({5})"
-msgstr ""
-
 #: lib/src/util/solaris/k_stat.cc
 msgid "kstat_read failed: {1} ({2})"
 msgstr ""

data/ext/facter/leatherman/CMakeLists.txt

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

data/ext/facter/leatherman/curl/inc/leatherman/curl/client.hpp

@@ -350,6 +350,13 @@ namespace leatherman { namespace curl {
          */
         void set_client_cert(std::string const& client_cert, std::string const& client_key);
 
+        /**
+         * Set proxy information.
+         * @param proxy String with following components [scheme]://[hostname]:[port].
+         *        (see more: https://curl.haxx.se/libcurl/c/CURLOPT_PROXY.html)
+         */
+        void set_proxy(std::string const& proxy);
+
         /**
          * Set and limit what protocols curl will support
          * @param client_protocols bitmask of CURLPROTO_*
@@ -387,6 +394,7 @@ namespace leatherman { namespace curl {
         std::string _ca_cert;
         std::string _client_cert;
         std::string _client_key;
+        std::string _proxy;
         long _client_protocols = CURLPROTO_ALL;
 
         response perform(http_method method, request const& req);
@@ -407,6 +415,7 @@ namespace leatherman { namespace curl {
         LEATHERMAN_CURL_NO_EXPORT void set_client_info(context &ctx);
         LEATHERMAN_CURL_NO_EXPORT void set_ca_info(context& ctx);
         LEATHERMAN_CURL_NO_EXPORT void set_client_protocols(context& ctx);
+        LEATHERMAN_CURL_NO_EXPORT void set_proxy_info(context& ctx);
 
         template <typename ParamType>
         LEATHERMAN_CURL_NO_EXPORT void curl_easy_setopt_maybe(

data/ext/facter/leatherman/curl/src/client.cc

@@ -231,6 +231,7 @@ namespace leatherman { namespace curl {
         set_ca_info(ctx);
         set_client_info(ctx);
         set_client_protocols(ctx);
+        set_proxy_info(ctx);
 
         // Perform the request
         auto result = curl_easy_perform(_handle);
@@ -275,6 +276,7 @@ namespace leatherman { namespace curl {
         set_ca_info(ctx);
         set_client_info(ctx);
         set_client_protocols(ctx);
+        set_proxy_info(ctx);
 
         // More detailed error messages
         curl_easy_setopt_maybe(ctx, CURLOPT_ERRORBUFFER, errbuf);
@@ -305,6 +307,11 @@ namespace leatherman { namespace curl {
         _ca_cert = cert_file;
     }
 
+    void client::set_proxy(string const& proxy)
+    {
+        _proxy = proxy;
+    }
+
     void client::set_client_cert(string const& client_cert, string const& client_key)
     {
         _client_cert = client_cert;
@@ -430,6 +437,14 @@ namespace leatherman { namespace curl {
         curl_easy_setopt_maybe(ctx, CURLOPT_SSLKEY, _client_key.c_str());
     }
 
+    void client::set_proxy_info(context &ctx) {
+        if (_proxy == "") {
+          return;
+        }
+
+        curl_easy_setopt_maybe(ctx, CURLOPT_PROXY, _proxy.c_str());
+    }
+
     void client::set_client_protocols(context& ctx) {
         curl_easy_setopt_maybe(ctx, CURLOPT_PROTOCOLS, _client_protocols);
     }

data/ext/facter/leatherman/curl/tests/client_test.cc

@@ -236,6 +236,21 @@ TEST_CASE("curl::client CA bundle and SSL setup") {
         REQUIRE(test_impl->cacert == "cacert");
     }
 
+    SECTION("Proxy should be unspecified by default") {
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->proxy == "");
+    }
+
+    SECTION("cURL should receive the proxy specified in the request") {
+        test_client.set_proxy("proxy");
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->proxy == "proxy");
+    }
+
     SECTION("Client cert name should be unspecified by default") {
         auto resp = test_client.get(test_request);
         CURL* const& handle = test_client.get_handle();

data/ext/facter/leatherman/curl/tests/mock_curl.cc

@@ -217,6 +217,14 @@ CURLcode curl_easy_setopt(CURL *handle, CURLoption option, ...)
             }
             h->client_cert = va_arg(vl, char*);
             break;
+        case CURLOPT_PROXY:
+            // Set the mock curl proxy to that which was passed in the request.
+            if (h->test_failure_mode == curl_impl::error_mode::proxy_error) {
+                va_end(vl);
+                return CURLE_OUT_OF_MEMORY;
+            }
+            h->proxy = va_arg(vl, char*);
+            break;
         case CURLOPT_SSLKEY:
             // Set the mock curl private keyfile name to that which was passed in the request.
             if (h->test_failure_mode == curl_impl::error_mode::ssl_key_error) {

data/ext/facter/leatherman/curl/tests/mock_curl.hpp

@@ -40,6 +40,7 @@ struct curl_impl
         ssl_cert_error,
         ssl_key_error,
         protocol_error,
+        proxy_error
     };
 
     error_mode test_failure_mode = error_mode::success;
@@ -56,7 +57,7 @@ struct curl_impl
     std::function<size_t(char*, size_t, size_t, void*)> read_function;
     void* read_data; // Where to read the request body from
 
-    std::string request_url, cookie, cacert, client_cert, client_key;
+    std::string request_url, cookie, cacert, client_cert, client_key, proxy;
     long protocols;
     long connect_timeout;
     http_method method = http_method::get;

data/ext/facter/leatherman/locales/leatherman.pot

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: leatherman 1.4.0\n"
+"Project-Id-Version: leatherman 1.5.0\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 3.11.2.cfacter.20180612
+  version: 3.11.3.cfacter.20180716
 platform: ruby
 authors:
 - Puppet
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: info@puppet.com