Skip to content

Commit 98c389a

Browse files
committed
fix: swapped the name and namespace columns and also kept a distance of 2 extra spaces after the end of the length for better visibility
Signed-off-by: Abinand P <[email protected]>
1 parent db662a5 commit 98c389a

File tree

1 file changed

+30
-8
lines changed

1 file changed

+30
-8
lines changed

cyctl/internal/get/resources.go

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package get
22

33
import (
44
"fmt"
5-
"strings"
65

76
"github.com/cyclops-ui/cyclops/cyclops-ctrl/pkg/cluster/k8sclient"
87
"github.com/cyclops-ui/cycops-cyctl/internal/kubeconfig"
@@ -39,14 +38,37 @@ func listResources(clientset *k8sclient.KubernetesClient, moduleNames []string)
3938
return
4039
}
4140

42-
headerSpacing := 20
43-
output := "KIND" + strings.Repeat(" ", 16) + " NAME" + strings.Repeat(" ", 16) + " NAMESPACE\n"
44-
fmt.Print(output)
41+
maxKindLen := len("KIND")
42+
maxNameLen := len("NAME")
43+
maxNamespaceLen := len("NAMESPACE")
44+
45+
for _, resource := range resources {
46+
if len(resource.GetKind()) > maxKindLen {
47+
maxKindLen = len(resource.GetKind())
48+
}
49+
if len(resource.GetName()) > maxNameLen {
50+
maxNameLen = len(resource.GetName())
51+
}
52+
if len(resource.GetNamespace()) > maxNamespaceLen {
53+
maxNamespaceLen = len(resource.GetNamespace())
54+
}
55+
}
56+
maxKindLen = maxKindLen + 2
57+
maxNameLen = maxNameLen + 2
58+
maxNamespaceLen = maxNamespaceLen + 2
59+
60+
// Step 2: Print the header with proper spacing
61+
header := fmt.Sprintf("%-*s %-*s %-*s\n",
62+
maxKindLen, "KIND",
63+
maxNamespaceLen, "NAMESPACE", maxNameLen, "NAME")
64+
fmt.Print(header)
65+
66+
// Step 3: Print each resource with calculated spacing
4567
for _, resource := range resources {
46-
nameSpacing := max(0, headerSpacing-len(resource.GetKind()))
47-
namespaceSpacing := max(0, headerSpacing-len(resource.GetName()))
48-
fmt.Printf("%s"+strings.Repeat(" ", nameSpacing)+" %s"+strings.Repeat(" ", namespaceSpacing)+"%s\n",
49-
resource.GetKind(), resource.GetName(), resource.GetNamespace())
68+
fmt.Printf("%-*s %-*s %-*s\n",
69+
maxKindLen, resource.GetKind(),
70+
maxNamespaceLen, resource.GetNamespace(), maxNameLen, resource.GetName(),
71+
)
5072
}
5173

5274
}

0 commit comments

Comments
 (0)