Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: print diff resource as yaml #2542

Merged
merged 6 commits into from
Sep 30, 2024
Merged

feat: print diff resource as yaml #2542

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ea02163
feat: print diff resource as yaml
10000-ki Sep 29, 2024
2633cfd
feat: fix naming
10000-ki Sep 29, 2024
72911d6
feat: logging in yaml format only in debug mode
10000-ki Sep 30, 2024
200983b
feat: fix log msg
10000-ki Sep 30, 2024
c09abc2
feat: fix lint error
10000-ki Sep 30, 2024
96920ab
feat: remove useless code
10000-ki Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...dk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ public boolean matches(R actual, R desired, Context<?> context) {
removeIrrelevantValues(desiredMap);

if (LoggingUtils.isNotSensitiveResource(desired)) {
log.debug("Pruned actual: \n {} \n desired: \n {} ", prunedActual, desiredMap);
var actualYaml = objectMapper.asYaml(prunedActual);
Copy link
Collaborator

@metacosm metacosm Sep 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would protect these calls with a check to whether debug is enabled so as to not incur the YAML serialization cost in that situation.

Copy link
Contributor Author

@10000-ki 10000-ki Sep 30, 2024 •
edited by metacosm
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would protect these calls with a check to whether debug is enabled so as to not incur the YAML serialization cost in that situation.

yes it would be better thank you, i will fix it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@metacosm
72911d6

fixed it in this commit

thank you!!

var desiredYaml = objectMapper.asYaml(desiredMap);
log.debug("Pruned actual: \n {} \n desired: \n {} ", actualYaml, desiredYaml);
}

return prunedActual.equals(desiredMap);
Expand Down
Loading