lordgamez commented on code in PR #1895: URL: https://github.com/apache/nifi-minifi-cpp/pull/1895#discussion_r1981346931
########## PARAMETER_PROVIDERS.md: ########## @@ -0,0 +1,37 @@ +<!-- +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. +--> +## Table of Contents + +- [EnvironmentVariableParameterProvider](#EnvironmentVariableParameterProvider) + +## EnvironmentVariableParameterProvider + +### Description + +Fetches parameters from environment variables + +### Properties + +In the list below, the names of required properties appear in bold. Any other properties (not in bold) are considered optional. The table also indicates any default values. + +| Name | Default Value | Allowable Values | Description | +|---------------------------------------------|---------------|--------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **Environment Variable Inclusion Strategy** | Include All | Include All<br/>Comma-Separated<br/>Regular Expression | Indicates how Environment Variables should be included | +| Include Environment Variables | | | Specifies comma separated environment variable names or regular expression (depending on the Environment Variable Inclusion Strategy) that should be used to fetch environment variables. | +| **Parameter Group Name** | | | The name of the parameter group that will be fetched. This indicates the name of the Parameter Context that may receive the fetched parameters. | + +### Generated Parameter Contexts + +This provider generates a single Parameter Context with the name specified in the `Parameter Group Name` property. The parameters generated match the name of the environment variables that are included. Review Comment: Good point, updated in https://github.com/apache/nifi-minifi-cpp/pull/1895/commits/8bb3d7cf48eb0418eade0530a00ffaedc9b9f632 ########## utils/src/utils/Environment.cpp: ########## @@ -123,4 +130,49 @@ bool Environment::isRunningAsService() { return runningAsService; } +std::unordered_map<std::string, std::string> Environment::getEnvironmentVariables() { + std::unordered_map<std::string, std::string> env_var_map; + +#ifdef WIN32 + LPWCH env_strings = GetEnvironmentStringsW(); + if (!env_strings) { + return env_var_map; + } + + LPWCH env = env_strings; + + while (*env) { + std::wstring wstring_variable_key_value_pair(env); + + int size_needed = WideCharToMultiByte(CP_UTF8, 0, wstring_variable_key_value_pair.c_str(), -1, nullptr, 0, nullptr, nullptr); + std::vector<char> buffer(size_needed); + WideCharToMultiByte(CP_UTF8, 0, wstring_variable_key_value_pair.c_str(), -1, buffer.data(), size_needed, nullptr, nullptr); + + std::string variable_key_value_pair(buffer.data()); Review Comment: Good catch, updated in https://github.com/apache/nifi-minifi-cpp/pull/1895/commits/8bb3d7cf48eb0418eade0530a00ffaedc9b9f632 -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
