[GitHub] [nifi] alopresto commented on a change in pull request #4164: NIFI-5481 - Add new providers of protected sensitive configuration values

[GitBox <gi...@apache.org>]

alopresto commented on a change in pull request #4164:
URL: https://github.com/apache/nifi/pull/4164#discussion_r438353860



##########
File path: nifi-toolkit/nifi-toolkit-encrypt-config/src/main/groovy/org/apache/nifi/properties/ConfigEncryptionTool.groovy
##########
@@ -1467,18 +1470,18 @@ class ConfigEncryptionTool {
                 if (!tool.ignorePropertiesFiles || (tool.handlingFlowXml && existingNiFiPropertiesAreEncrypted)) {
                     // If we are handling the flow.xml.gz and nifi.properties is already encrypted, try getting the key from bootstrap.conf rather than the console
                     if (tool.ignorePropertiesFiles) {
-                        tool.keyHex = NiFiPropertiesLoader.extractKeyFromBootstrapFile(tool.bootstrapConfPath)
+                        tool.keyOrKeyId = NiFiPropertiesLoader.extractKeyFromBootstrapFile(tool.bootstrapConfPath)
                     } else {
-                        tool.keyHex = tool.getKey()
+                        tool.keyOrKeyId = tool.getKey()
                     }
 
-                    if (!tool.keyHex) {
+                    if (!tool.keyOrKeyId) {
                         tool.printUsageAndThrow("Hex key must be provided", ExitCode.INVALID_ARGS)
                     }
 
                     try {
                         // Validate the length and format
-                        tool.keyHex = parseKey(tool.keyHex)
+                        tool.keyOrKeyId = parseHexKey(tool.keyOrKeyId)

Review comment:
       @jfrazee I'm going to be taking this work over. I have been closing out some other things this week but should be able to get something going by the end of the week. 




----------------------------------------------------------------
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:
users@infra.apache.org