fix parseApi not accepting versions that don't start with 'v'

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

dashboard/client/api/kube-api.ts

@@ -32,20 +32,31 @@ export interface IKubeApiLinkRef {
   namespace?: string;
 }
 
-export class KubeApi<T extends KubeObject = any> {
-  static matcher = /(\/apis?.*?)\/(?:(.*?)\/)?(v.*?)(?:\/namespaces\/(.+?))?\/([^\/]+)(?:\/([^\/?]+))?.*$/
+export interface IKubeApiLinkBase extends IKubeApiLinkRef {
+  apiBase: string;
+  apiGroup: string;
+  apiVersionWithGroup: string;
+}
 
-  static parseApi(apiPath = "") {
+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 apiVersionWithGroup = [apiGroup, apiVersion].filter(v => v).join("/");
     const apiBase = [apiPrefix, apiGroup, apiVersion, resource].filter(v => v).join("/");
+
+    if (!apiBase) {
+      throw new Error(`invalid apiPath: ${apiPath}`)
+    }
+
     return {
       apiBase,
       apiPrefix, apiGroup,
       apiVersion, apiVersionWithGroup,
       namespace, resource, name,
-    }
+    };
   }
 
   static createLink(ref: IKubeApiLinkRef): string {
@@ -55,7 +66,7 @@ export class KubeApi<T extends KubeObject = any> {
       namespace = `namespaces/${namespace}`
     }
     return [apiPrefix, apiVersion, namespace, resource, name]
-      .filter(v => !!v)
+      .filter(v => v)
       .join("/")
   }
 
@@ -130,8 +141,9 @@ export class KubeApi<T extends KubeObject = any> {
     if (KubeObject.isJsonApiData(data)) {
       return new KubeObjectConstructor(data);
     }
+    
     // process items list response
-    else if (KubeObject.isJsonApiDataList(data)) {
+    if (KubeObject.isJsonApiDataList(data)) {
       const { apiVersion, items, metadata } = data;
       this.setResourceVersion(namespace, metadata.resourceVersion);
       this.setResourceVersion("", metadata.resourceVersion);
@@ -141,10 +153,12 @@ export class KubeApi<T extends KubeObject = any> {
         ...item,
       }))
     }
+    
     // custom apis might return array for list response, e.g. users, groups, etc.
-    else if (Array.isArray(data)) {
+    if (Array.isArray(data)) {
       return data.map(data => new KubeObjectConstructor(data));
     }
+    
     return data;
   }
 
@@ -162,16 +176,19 @@ export class KubeApi<T extends KubeObject = any> {
 
   async create({ name = "", namespace = "default" } = {}, data?: Partial<T>): Promise<T> {
     const apiUrl = this.getUrl({ namespace });
-    return this.request.post(apiUrl, {
-      data: merge({
-        kind: this.kind,
-        apiVersion: this.apiVersionWithGroup,
-        metadata: {
-          name,
-          namespace
-        }
-      }, data)
-    }).then(this.parseResponse);
+    
+    return this.request
+      .post(apiUrl, {
+        data: merge({
+          kind: this.kind,
+          apiVersion: this.apiVersionWithGroup,
+          metadata: {
+            name,
+            namespace
+          }
+        }, data)
+      })
+      .then(this.parseResponse);
   }
 
   async update({ name = "", namespace = "default" } = {}, data?: Partial<T>): Promise<T> {

dashboard/package.json

@@ -31,7 +31,7 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-transform-runtime": "^7.6.2",
-    "@babel/preset-env": "=7.9.0",
+    "@babel/preset-env": "^7.10.1",
     "@babel/preset-react": "^7.7.0",
     "@babel/preset-typescript": "^7.8.3",
     "@babel/runtime": "^7.7.2",

src/main/prometheus/lens.ts

@@ -18,7 +18,7 @@ export class PrometheusLens implements PrometheusProvider {
         port: service.spec.ports[0].port
       }
     } catch(error) {
-      logger.warn(`PrometheusLens: failed to list services: ${error.toString()}`)
+      logger.warn(`PrometheusLens: failed to list services: ${error.response.body.message}`)
     }
   }