Refactor decoding Base64 to byte[] #9912
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…64 to byte[] Signed-off-by: MichaelMorris <michael.morris@est.tech>
scholzj
reviewed
Apr 3, 2024
| @@ -127,10 +128,10 @@ private static KeycloakInstance createKeycloakInstance(String namespaceName) { | |||
| Secret keycloakSecret = kubeClient().getSecret(namespaceName, KEYCLOAK_SECRET_NAME); | |||
|
|
|||
| String usernameEncoded = keycloakSecret.getData().get("username"); | |||
| String username = new String(Base64.getDecoder().decode(usernameEncoded.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8); | |||
| String username = new String(Util.decodeBytesFromBase64(usernameEncoded.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8); | |||
There was a problem hiding this comment.
Here, but also in the other cases of this ... should these go directly to String instead using the already existing Utils.decodeFromBase64(String data, Charset charset) method? I think when the byte[] is actually used, Util.decodeBytesFromBase64 makes sense. but where we just create a String from it right away, we should use the method to decode it directly to String, or?
There was a problem hiding this comment.
Yes, thats a good point, I've updated the implementation
Signed-off-by: MichaelMorris <michael.morris@est.tech>
scholzj
reviewed
Apr 3, 2024
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
|
|
Comment on lines
131
to
134
| String username = Util.decodeFromBase64(usernameEncoded); | ||
|
|
||
| String passwordEncoded = keycloakSecret.getData().get("password"); | ||
| String password = new String(Base64.getDecoder().decode(passwordEncoded.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8); | ||
| String password = Util.decodeFromBase64(passwordEncoded); |
There was a problem hiding this comment.
Should these keep the UTF_8 charset?
Signed-off-by: MichaelMorris <michael.morris@est.tech>
scholzj
approved these changes
Apr 3, 2024
|
/azp run regression |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Type of change
Refactoring
Description
Introduce new methods in operator-common Util class for decoding Base64 to byte[] and refactor code to use the new methods
Closes #9911
Checklist
Please go through this checklist and make sure all applicable tasks have been done