From b88b08b8702865ca28d91085f85e5bee41961e29 Mon Sep 17 00:00:00 2001 From: aimuz Date: Thu, 22 Sep 2022 23:10:20 +0800 Subject: [PATCH] improve readability, code nesting too deep Signed-off-by: aimuz --- pkg/printers/internalversion/printers.go | 41 +++++++++++++----------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/pkg/printers/internalversion/printers.go b/pkg/printers/internalversion/printers.go index 7a5bfe0af01..78827cbdd8e 100644 --- a/pkg/printers/internalversion/printers.go +++ b/pkg/printers/internalversion/printers.go @@ -619,35 +619,38 @@ func formatEndpoints(endpoints *api.Endpoints, ports sets.String) string { ss := &endpoints.Subsets[i] if len(ss.Ports) == 0 { // It's possible to have headless services with no ports. + count += len(ss.Addresses) for i := range ss.Addresses { if len(list) == max { more = true + // the next loop is redundant + break } - if !more { - list = append(list, ss.Addresses[i].IP) - } - count++ + list = append(list, ss.Addresses[i].IP) } - } else { - // "Normal" services with ports defined. - for i := range ss.Ports { - port := &ss.Ports[i] - if ports == nil || ports.Has(port.Name) { - for i := range ss.Addresses { - if len(list) == max { - more = true - } - addr := &ss.Addresses[i] - if !more { - hostPort := net.JoinHostPort(addr.IP, strconv.Itoa(int(port.Port))) - list = append(list, hostPort) - } - count++ + // avoid nesting code too deeply + continue + } + + // "Normal" services with ports defined. + for i := range ss.Ports { + port := &ss.Ports[i] + if ports == nil || ports.Has(port.Name) { + count += len(ss.Addresses) + for i := range ss.Addresses { + if len(list) == max { + more = true + // the next loop is redundant + break } + addr := &ss.Addresses[i] + hostPort := net.JoinHostPort(addr.IP, strconv.Itoa(int(port.Port))) + list = append(list, hostPort) } } } } + ret := strings.Join(list, ",") if more { return fmt.Sprintf("%s + %d more...", ret, count-max)