From 2a1e3db02df4559ed8b403bf97a3d3392d3e2df7 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Tue, 15 Nov 2022 09:57:07 -0500
Subject: [PATCH] Simplify getOrderedVersions

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/common/k8s-api/kube-api.ts | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/common/k8s-api/kube-api.ts b/src/common/k8s-api/kube-api.ts
index c4501a009e..afde6d5524 100644
--- a/src/common/k8s-api/kube-api.ts
+++ b/src/common/k8s-api/kube-api.ts
@@ -26,6 +26,7 @@ import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-global
 import { apiKubeInjectionToken } from "./api-kube";
 import type AbortController from "abort-controller";
 import loggerInjectable from "../logger.injectable";
+import { matches } from "lodash/fp";
 
 /**
  * The options used for creating a `KubeApi`
@@ -156,24 +157,12 @@ export interface KubeApiResourceVersionList {
   versions: KubeApiResourceVersion[];
 }
 
-const getOrderedVersions = (list: KubeApiResourceVersionList): KubeApiResourceVersion[] => {
-  const result = [
-    list.preferredVersion,
-  ];
+const not = <T>(fn: (val: T) => boolean) => (val: T) => !(fn(val));
 
-  for (const version of list.versions) {
-    if (
-      version.groupVersion === list.preferredVersion.groupVersion
-      && version.version === list.preferredVersion.version
-    ) {
-      continue;
-    }
-
-    result.push(version);
-  }
-
-  return result;
-};
+const getOrderedVersions = (list: KubeApiResourceVersionList): KubeApiResourceVersion[] => [
+  list.preferredVersion,
+  ...list.versions.filter(not(matches(list.preferredVersion))),
+];
 
 export type PropagationPolicy = undefined | "Orphan" | "Foreground" | "Background";