new parseAPI function with unit tests

Signed-off-by: Sebastian Malton <smalton@mirantis.com>

dashboard/client/api/__test__/parseAPI.test.ts

@@ -0,0 +1,58 @@
+import { KubeApi, IKubeApiLinkBase } from "../kube-api";
+
+interface ParseAPITest {
+    url: string;
+    expected: IKubeApiLinkBase;
+}
+
+const tests: ParseAPITest[] = [
+  {
+    url: "/api/v1/namespaces/kube-system/pods/coredns-6955765f44-v8p27",
+    expected: {
+      apiBase: "/api/v1/pods",
+      apiPrefix: "/api",
+      apiGroup: "",
+      apiVersion: "v1",
+      apiVersionWithGroup: "v1",
+      namespace: "kube-system",
+      resource: "pods",
+      name: "coredns-6955765f44-v8p27"
+    },
+  },
+  {
+    url: "/apis/stable.example.com/foo1/crontabs",
+    expected: {
+      apiBase: "/apis/stable.example.com/foo1/crontabs",
+      apiPrefix: "/apis",
+      apiGroup: "stable.example.com",
+      apiVersion: "foo1",
+      apiVersionWithGroup: "stable.example.com/foo1",
+      resource: "crontabs",
+      name: undefined,
+      namespace: undefined,
+    },
+  },
+  {
+    url: "/apis/cluster.k8s.io/v1alpha1/clusters",
+    expected: {
+      apiBase: "/apis/cluster.k8s.io/v1alpha1/clusters",
+      apiPrefix: "/apis",
+      apiGroup: "cluster.k8s.io",
+      apiVersion: "v1alpha1",
+      apiVersionWithGroup: "cluster.k8s.io/v1alpha1",
+      resource: "clusters",
+      name: undefined,
+      namespace: undefined,
+    },
+  },
+];
+
+jest.mock('../kube-watch-api.ts', () => 'KubeWatchApi');
+describe("parseAPI unit tests", () => {
+  for (const i in tests) {
+    const { url: tUrl, expected:tExpect} = tests[i];
+    test(`test #${parseInt(i)+1}`, () => {
+      expect(KubeApi.parseApi(tUrl)).toStrictEqual(tExpect);
+    });
+  }
+});

dashboard/client/api/kube-api.ts

@@ -7,6 +7,7 @@ import { IKubeObjectRef, KubeJsonApi, KubeJsonApiData, KubeJsonApiDataList } fro
 import { apiKube } from "./index";
 import { kubeWatchApi } from "./kube-watch-api";
 import { apiManager } from "./api-manager";
+import { split } from "../utils/arrays";
 
 export interface IKubeApiOptions<T extends KubeObject> {
   kind: string; // resource type within api-group, e.g. "Namespace"
@@ -39,11 +40,25 @@ export interface IKubeApiLinkBase extends IKubeApiLinkRef {
 }
 
 export class KubeApi<T extends KubeObject = any> {
-  static matcher = /(\/apis?.*?)\/(?:(.*?)\/)?(.*?)(?:\/namespaces\/(.+?))?\/([^\/]+)(?:\/([^\/?]+))?.*$/
-
   static parseApi(apiPath = ""): IKubeApiLinkBase {
     apiPath = new URL(apiPath, location.origin).pathname;
-    const [, apiPrefix, apiGroup = "", apiVersion, namespace, resource, name] = apiPath.match(KubeApi.matcher) || [];
+    const [, prefix, ...parts] = apiPath.split("/");
+    const apiPrefix = `/${prefix}`;
+
+    const [left, right, found] = split(parts, "namespaces");
+    let apiGroup, apiVersion, namespace, resource, name;
+
+    if (found) {
+      if (left.length == 0) {
+        throw new Error(`invalid apiPath: ${apiPath}`)
+      }
+
+      apiVersion = left.pop();
+      apiGroup = left.join("/");
+      [namespace, resource, name] = right;
+    } else {
+      [apiGroup, apiVersion, resource] = left;
+    }
     const apiVersionWithGroup = [apiGroup, apiVersion].filter(v => v).join("/");
     const apiBase = [apiPrefix, apiGroup, apiVersion, resource].filter(v => v).join("/");
 

dashboard/client/utils/__tests__/arrays.test.ts

@@ -0,0 +1,31 @@
+import { split } from "../arrays";
+
+describe("split array on element tests", () => {
+  test("empty array", () => {
+    expect(split([], 10)).toStrictEqual([[], [], false]);
+  });
+
+  test("one element, not in array", () => {
+    expect(split([1], 10)).toStrictEqual([[1], [], false]);
+  });
+
+  test("ten elements, not in array", () => {
+    expect(split([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 10)).toStrictEqual([[0, 1, 2, 3, 4, 5, 6, 7, 8, 9], [], false]);
+  });
+
+  test("one elements, in array", () => {
+    expect(split([1], 1)).toStrictEqual([[], [], true]);
+  });
+  
+  test("ten elements, in front array", () => {
+    expect(split([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 0)).toStrictEqual([[], [1, 2, 3, 4, 5, 6, 7, 8, 9], true]);
+  });
+
+  test("ten elements, in middle array", () => {
+    expect(split([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 4)).toStrictEqual([[0, 1, 2, 3], [5, 6, 7, 8, 9], true]);
+  });
+
+  test("ten elements, in end array", () => {
+    expect(split([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], 9)).toStrictEqual([[0, 1, 2, 3, 4, 5, 6, 7, 8], [], true]);
+  });
+});

dashboard/client/utils/arrays.ts

@@ -0,0 +1,19 @@
+/**
+ * This function splits an array into two sub arrays on the first instance of 
+ * element (from the left). If the array does not contain the element. The
+ * return value is defined to be `[array, [], false]`. If the element is in
+ * the array then the return value is `[left, right, true]` where `left` is
+ * the elements of `array` from `[0, index)` and `right` is `(index, length)`
+ * @param array the full array to split into two sub-arrays
+ * @param element the element in the middle of the array
+ * @returns the left and right sub-arrays which when conjoined with `element`
+ *          is the same as `array`, and `true`
+ */
+export function split<T>(array: Array<T>, element: T): [Array<T>, Array<T>, boolean] {
+  const index = array.indexOf(element);
+  if (index < 0) {
+    return [array, [], false];
+  }
+
+  return [array.slice(0, index), array.slice(index+1, array.length), true]
+}