From 611ecdb4012e471265a6891cbfd52ba163f1aee3 Mon Sep 17 00:00:00 2001 From: bachmanity1 Date: Wed, 2 Oct 2024 17:43:47 +0900 Subject: [PATCH] print actual resources when trace is enabled Signed-off-by: bachmanity1 --- .../SSABasedGenericKubernetesResourceMatcher.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java index 370d6e4c4a..7bf3e07999 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/SSABasedGenericKubernetesResourceMatcher.java @@ -120,11 +120,15 @@ public boolean matches(R actual, R desired, Context context) { private String getDiff(Map prunedActualMap, Map 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 unifiedDiff = DiffUtils.generateUnifiedDiff("", "", actualLines, patch, 1); + var patch = DiffUtils.diff(actualYaml.lines().toList(), desiredYaml.lines().toList()); + List unifiedDiff = + DiffUtils.generateUnifiedDiff("", "", actualYaml.lines().toList(), patch, 1); return String.join("\n", unifiedDiff); }