Skip to content

Commit

Permalink
print actual resources when trace is enabled
Browse files Browse the repository at this point in the history
Signed-off-by: bachmanity1 <[email protected]>
  • Loading branch information
bachmanity1 committed Oct 2, 2024
1 parent c1b86b8 commit 611ecdb
Showing 1 changed file with 8 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,15 @@ public boolean matches(R actual, R desired, Context<?> context) {

private String getDiff(Map<String, Object> prunedActualMap, Map<String, Object> desiredMap,
KubernetesSerialization serialization) {
var actualLines = serialization.asYaml(sortMap(prunedActualMap)).lines().toList();
var desiredLines = serialization.asYaml(sortMap(desiredMap)).lines().toList();
var actualYaml = serialization.asYaml(sortMap(prunedActualMap));
var desiredYaml = serialization.asYaml(sortMap(desiredMap));
if (log.isTraceEnabled()) {
log.trace("Pruned actual resource: \n{} \ndesired resource: \n{} ", actualYaml, desiredYaml);
}

var patch = DiffUtils.diff(actualLines, desiredLines);
List<String> unifiedDiff = DiffUtils.generateUnifiedDiff("", "", actualLines, patch, 1);
var patch = DiffUtils.diff(actualYaml.lines().toList(), desiredYaml.lines().toList());
List<String> unifiedDiff =
DiffUtils.generateUnifiedDiff("", "", actualYaml.lines().toList(), patch, 1);
return String.join("\n", unifiedDiff);
}

Expand Down

0 comments on commit 611ecdb

Please sign in to comment.