Add ability to mask object key prefixes in logs #402
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
ivanyu
force-pushed
the
ivanyu/mask-object-key
branch
5 times, most recently
from
027e2ef to
5e01385
Compare
ivanyu
commented
Sep 28, 2023
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| class ObjectKeyFactoryTest { |
There was a problem hiding this comment.
Renamed from ObjectKeyTest.java + prefixMasking* tests added.
ivanyu
commented
Sep 28, 2023
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| class ObjectKeyTest { |
There was a problem hiding this comment.
Renamed into ObjectKeyFactoryTest
ivanyu
force-pushed
the
ivanyu/mask-object-key
branch
from
5e01385 to
b024730
Compare
ivanyu
commented
Sep 28, 2023
Comment on lines
-67
to
+68
| throw new KeyNotFoundException(this, key, e); | ||
| throw new KeyNotFoundException(this, key); |
There was a problem hiding this comment.
This is needed to satisfy the new tests for masking in BaseStorageTest. I don't think we that badly need this inner exception in the file system storage implementation to make the test more complex, so I just decided to remove it. The same below.
ivanyu
commented
Sep 28, 2023
| return "masked-key"; | ||
| } | ||
| }; | ||
|
|
There was a problem hiding this comment.
Deletions don't throw exceptions when keys don't exist => not tested here.
ivanyu
commented
Sep 28, 2023
| integrationTestImplementation "org.wiremock:wiremock:$wireMockVersion" | ||
|
|
||
| integrationTestImplementation("org.wiremock:wiremock:$wireMockVersion") { | ||
| exclude group: "org.slf4j" |
There was a problem hiding this comment.
It screws up logging in s3 tests otherwise. Doing in this PR because I needed it for visual validation of masking.
AnatolyPopov
previously approved these changes
Sep 28, 2023
core/src/test/java/io/aiven/kafka/tieredstorage/ObjectKeyFactoryTest.java
Outdated
Show resolved
Hide resolved
storage/core/src/testFixtures/java/io/aiven/kafka/tieredstorage/storage/TestObjectKey.java
Show resolved
Hide resolved
ivanyu
force-pushed
the
ivanyu/mask-object-key
branch
from
b024730 to
7fba3dd
Compare
jeqo
approved these changes
Sep 28, 2023
AnatolyPopov
approved these changes
Sep 29, 2023
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.
See individual commits for details.