Skip to content

Commit b116919

Browse files
committed
print actual resources when trace is enabled
1 parent beab833 commit b116919

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,15 @@ public boolean matches(R actual, R desired, Context<?> context) {
120120

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

126-
var patch = DiffUtils.diff(actualLines, desiredLines);
127-
List<String> unifiedDiff = DiffUtils.generateUnifiedDiff("", "", actualLines, patch, 1);
129+
var patch = DiffUtils.diff(actualYaml.lines().toList(), desiredYaml.lines().toList());
130+
List<String> unifiedDiff =
131+
DiffUtils.generateUnifiedDiff("", "", actualYaml.lines().toList(), patch, 1);
128132
return String.join("\n", unifiedDiff);
129133
}
130134

0 commit comments

Comments
 (0)