refactor: improve target selector

Author: FabianKramm

pkg/devspace/kubectl/selector/selector.go

@@ -45,10 +45,7 @@ func initContainerPos(container string, pod *corev1.Pod) int {
 }
 
 var FilterTerminatingContainers = func(p *corev1.Pod, c *corev1.Container) bool {
-	if IsPodTerminating(p) {
-		return true
-	}
-	return false
+	return IsPodTerminating(p)
 }
 
 var FilterNonRunningContainers = func(p *corev1.Pod, c *corev1.Container) bool {
@@ -108,19 +105,15 @@ func (s Selector) String() string {
 }
 
 type FilterContainer func(p *corev1.Pod, c *corev1.Container) bool
-
-type SortPods func(pods []*corev1.Pod, i, j int) bool
 type SortContainers func(containers []*SelectedPodContainer, i, j int) bool
 
 type Filter interface {
 	SelectContainers(ctx context.Context, selectors ...Selector) ([]*SelectedPodContainer, error)
-	SelectPods(ctx context.Context, selectors ...Selector) ([]*corev1.Pod, error)
 }
 
 type filter struct {
 	client kubectl.Client
 
-	sortPods       SortPods
 	sortContainers SortContainers
 }
 
@@ -130,30 +123,13 @@ func NewFilter(client kubectl.Client) Filter {
 	}
 }
 
-func NewFilterWithSort(client kubectl.Client, sortPods SortPods, sortContainers SortContainers) Filter {
+func NewFilterWithSort(client kubectl.Client, sortContainers SortContainers) Filter {
 	return &filter{
 		client:         client,
-		sortPods:       sortPods,
 		sortContainers: sortContainers,
 	}
 }
 
-func (f *filter) SelectPods(ctx context.Context, selectors ...Selector) ([]*corev1.Pod, error) {
-	retList, err := f.SelectContainers(ctx, selectors...)
-	if err != nil {
-		return nil, err
-	}
-
-	pods := podsFromPodContainer(retList)
-	if f.sortPods != nil {
-		sort.Slice(pods, func(i, j int) bool {
-			return f.sortPods(pods, i, j)
-		})
-	}
-
-	return pods, nil
-}
-
 func (f *filter) SelectContainers(ctx context.Context, selectors ...Selector) ([]*SelectedPodContainer, error) {
 	retList := []*SelectedPodContainer{}
 	for _, s := range selectors {
@@ -205,13 +181,17 @@ func deduplicate(stack []*SelectedPodContainer) []*SelectedPodContainer {
 	return retStack
 }
 
-func podsFromPodContainer(stack []*SelectedPodContainer) []*corev1.Pod {
+func PodsFromPodContainer(stack []*SelectedPodContainer) []*corev1.Pod {
 	retPods := []*corev1.Pod{}
 	for _, s := range stack {
 		if !containsPod(retPods, key(s.Pod.Namespace, s.Pod.Name, "")) {
 			retPods = append(retPods, s.Pod)
 		}
 	}
+
+	sort.Slice(retPods, func(i, j int) bool {
+		return SortPodsByNewest(retPods, i, j)
+	})
 	return retPods
 }
 

pkg/devspace/services/targetselector/target_selector.go

@@ -34,7 +34,6 @@ type Options struct {
 	timeout int64
 
 	failIfMultiple bool
-	sortPods       selector.SortPods
 	sortContainers selector.SortContainers
 
 	waitingStrategy WaitingStrategy
@@ -45,7 +44,6 @@ func NewEmptyOptions() Options {
 		selector: selector.Selector{
 			FilterContainer: selector.FilterTerminatingContainers,
 		},
-		sortPods:       selector.SortPodsByNewest,
 		sortContainers: selector.SortContainersByNewest,
 	}
 }
@@ -60,7 +58,6 @@ func NewOptionsFromFlags(containerName string, labelSelector string, imageSelect
 			Namespace:       namespace,
 			FilterContainer: selector.FilterNonRunningContainers,
 		},
-		sortPods:       selector.SortPodsByNewest,
 		sortContainers: selector.SortContainersByNewest,
 	}
 }
@@ -239,7 +236,7 @@ func (t *targetSelector) selectSingle(ctx context.Context, options Options, log
 }
 
 func (t *targetSelector) selectSingleContainer(ctx context.Context, options Options, log log.Logger) (bool, interface{}, error) {
-	containers, err := selector.NewFilterWithSort(t.client, options.sortPods, options.sortContainers).SelectContainers(ctx, options.selector)
+	containers, err := selector.NewFilterWithSort(t.client, options.sortContainers).SelectContainers(ctx, options.selector)
 	if err != nil {
 		return false, nil, err
 	} else if options.waitingStrategy != nil {
@@ -289,10 +286,14 @@ func (t *targetSelector) selectSingleContainer(ctx context.Context, options Opti
 }
 
 func (t *targetSelector) selectSinglePod(ctx context.Context, options Options, log log.Logger) (bool, interface{}, error) {
-	pods, err := selector.NewFilterWithSort(t.client, options.sortPods, options.sortContainers).SelectPods(ctx, options.selector)
+	stack, err := selector.NewFilterWithSort(t.client, options.sortContainers).SelectContainers(ctx, options.selector)
 	if err != nil {
 		return false, nil, err
-	} else if options.waitingStrategy != nil {
+	}
+
+	// transform stack
+	pods := selector.PodsFromPodContainer(stack)
+	if options.waitingStrategy != nil {
 		return options.waitingStrategy.SelectPod(ctx, t.client, options.selector.Namespace, pods, log)
 	}