From cf4c298ca8b0447af521c3a97adb41ae61c226ad Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Thu, 17 Oct 2024 19:14:47 +0300 Subject: [PATCH] fix: use %t to print bools --- k8sutils/pkg/describe/common.go | 7 ------- k8sutils/pkg/describe/odigos.go | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/k8sutils/pkg/describe/common.go b/k8sutils/pkg/describe/common.go index a7f3c25e4..3fe026154 100644 --- a/k8sutils/pkg/describe/common.go +++ b/k8sutils/pkg/describe/common.go @@ -26,10 +26,3 @@ func describeText(sb *strings.Builder, indent int, printftext string, args ...in lineText := fmt.Sprintf(printftext, args...) sb.WriteString(fmt.Sprintf("%s%s\n", indentText, lineText)) } - -func boolToText(b bool) string { - if b { - return "True" - } - return "False" -} diff --git a/k8sutils/pkg/describe/odigos.go b/k8sutils/pkg/describe/odigos.go index 9554a785b..276b3497d 100644 --- a/k8sutils/pkg/describe/odigos.go +++ b/k8sutils/pkg/describe/odigos.go @@ -156,15 +156,15 @@ func printClusterCollectorStatus(clusterCollector clusterCollectorResources, exp describeText(sb, 2, wrapTextInRed("Deployed: Status Unavailable")) } else { if deployedCondition.Status == metav1.ConditionTrue { - describeText(sb, 2, wrapTextInGreen("Deployed: True")) + describeText(sb, 2, wrapTextInGreen("Deployed: true")) } else { - describeText(sb, 2, wrapTextInRed("Deployed: False")) + describeText(sb, 2, wrapTextInRed("Deployed: false")) describeText(sb, 2, wrapTextInRed(fmt.Sprintf("Reason: %s", deployedCondition.Message))) } } ready := clusterCollector.CollectorsGroup.Status.Ready - describeText(sb, 2, wrapTextSuccessOfFailure(fmt.Sprintf("Ready: %s", boolToText(ready)), ready)) + describeText(sb, 2, wrapTextSuccessOfFailure(fmt.Sprintf("Ready: %t", ready), ready)) if clusterCollector.LatestRevisionPods == nil || clusterCollector.Deployment == nil { describeText(sb, 2, wrapTextInRed("Number of Replicas: Status Unavailable")) @@ -231,7 +231,7 @@ func printNodeCollectorStatus(nodeCollector nodeCollectorResources, expectingNod } ready := nodeCollector.CollectorsGroup.Status.Ready - describeText(sb, 2, wrapTextSuccessOfFailure(fmt.Sprintf("Ready: %s", boolToText(ready)), ready)) + describeText(sb, 2, wrapTextSuccessOfFailure(fmt.Sprintf("Ready: %t", ready), ready)) // this is copied from k8sutils/pkg/describe/describe.go // I hope the info is accurate since there can be many edge cases