fgerlits commented on a change in pull request #914: URL: https://github.com/apache/nifi-minifi-cpp/pull/914#discussion_r498836072
########## File path: encrypt-config/tests/ConfigFileTests.cpp ########## @@ -0,0 +1,224 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "ConfigFile.h" + +#include "gsl/gsl-lite.hpp" + +#include "TestBase.h" +#include "utils/file/FileUtils.h" + +namespace org { +namespace apache { +namespace nifi { +namespace minifi { +namespace encrypt_config { + +class ConfigFileTestAccessor { + public: + static std::vector<std::string> mergeProperties(std::vector<std::string> left, const std::vector<std::string>& right) { + return ConfigFile::mergeProperties(left, right); + } +}; + +} // namespace encrypt_config +} // namespace minifi +} // namespace nifi +} // namespace apache +} // namespace org + +using org::apache::nifi::minifi::encrypt_config::ConfigFile; +using org::apache::nifi::minifi::encrypt_config::ConfigFileTestAccessor; +using org::apache::nifi::minifi::encrypt_config::ConfigLine; + +TEST_CASE("ConfigLine can be constructed from a line", "[encrypt-config][constructor]") { + auto line_is_parsed_correctly = [](const std::string& line, const std::string& expected_key, const std::string& expected_value) { + ConfigLine config_line{line}; + return config_line.getKey() == expected_key && config_line.getValue() == expected_value; + }; + + REQUIRE(line_is_parsed_correctly("", "", "")); + REQUIRE(line_is_parsed_correctly(" \t \r", "", "")); + REQUIRE(line_is_parsed_correctly("#disabled.setting=foo", "", "")); + REQUIRE(line_is_parsed_correctly("some line without an equals sign", "", "")); + REQUIRE(line_is_parsed_correctly("=value_without_key", "", "")); + REQUIRE(line_is_parsed_correctly("\t =value_without_key", "", "")); + + REQUIRE(line_is_parsed_correctly("nifi.some.key=", "nifi.some.key", "")); + REQUIRE(line_is_parsed_correctly("nifi.some.key=some_value", "nifi.some.key", "some_value")); + REQUIRE(line_is_parsed_correctly("nifi.some.key = some_value", "nifi.some.key", "some_value")); + REQUIRE(line_is_parsed_correctly("\tnifi.some.key\t=\tsome_value", "nifi.some.key", "some_value")); + REQUIRE(line_is_parsed_correctly("nifi.some.key=some_value \r", "nifi.some.key", "some_value")); + REQUIRE(line_is_parsed_correctly("nifi.some.key=some value", "nifi.some.key", "some value")); + REQUIRE(line_is_parsed_correctly("nifi.some.key=value=with=equals=signs=", "nifi.some.key", "value=with=equals=signs=")); +} + +TEST_CASE("ConfigLine can be constructed from a key-value pair", "[encrypt-config][constructor]") { + auto can_construct_from_kv = [](const std::string& key, const std::string& value, const std::string& expected_line) { + ConfigLine config_line{key, value}; + return config_line.getLine() == expected_line; + }; + + REQUIRE(can_construct_from_kv("nifi.some.key", "", "nifi.some.key=")); + REQUIRE(can_construct_from_kv("nifi.some.key", "some_value", "nifi.some.key=some_value")); +} + +TEST_CASE("ConfigLine can update the value", "[encrypt-config][updateValue]") { + auto can_update_value = [](const std::string& original_line, const std::string& new_value, const std::string& expected_line) { + ConfigLine config_line{original_line}; + config_line.updateValue(new_value); + return config_line.getLine() == expected_line; + }; + + REQUIRE(can_update_value("nifi.some.key=some_value", "new_value", "nifi.some.key=new_value")); + REQUIRE(can_update_value("nifi.some.key=", "new_value", "nifi.some.key=new_value")); + REQUIRE(can_update_value("nifi.some.key=some_value", "", "nifi.some.key=")); + REQUIRE(can_update_value("nifi.some.key=some_value", "very_long_new_value", "nifi.some.key=very_long_new_value")); + + // whitespace is preserved in the key, but not in the value + REQUIRE(can_update_value("nifi.some.key= some_value", "some_value", "nifi.some.key=some_value")); + REQUIRE(can_update_value("nifi.some.key = some_value ", "some_value", "nifi.some.key =some_value")); + REQUIRE(can_update_value(" nifi.some.key=some_value", "some_value", " nifi.some.key=some_value")); + REQUIRE(can_update_value(" nifi.some.key =\tsome_value\r", "some_value", " nifi.some.key =some_value")); +} + +TEST_CASE("ConfigFile creates an empty object from a nonexistent file", "[encrypt-config][constructor]") { + ConfigFile test_file{std::ifstream{"resources/nonexistent-minifi.properties"}}; + REQUIRE(test_file.size() == 0); Review comment: In the case of the `bootstrap.conf` file, I wanted to handle the "file does not exist" case and the "file exists but does not contain the `nifi.bootstrap.sensitive.key` property" case in the same way. If the `minifi.properties` file either does not exist or is empty, the user will get an error message (EncryptConfig.cpp:135). ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
