fix(coo-982): Remove console.log statements, fix apiVersion parsing

Author: alanconway

web/src/hooks/useLocationQuery.ts

@@ -8,8 +8,6 @@ export const useLocationQuery = (): Query | undefined => {
   try {
     const link = new URIRef(location.pathname + location.search);
     const q = allDomains.linkToQuery(link);
-    // eslint-disable-next-line no-console
-    console.log('korrel8r linkToQuery', "\nlink", link, "\nquery", q);
     return q;
   } catch (e) {
     // eslint-disable-next-line no-console

web/src/korrel8r/k8s.ts

@@ -21,7 +21,8 @@ type Selector = {
 const PATH_RE = new RegExp(
   '(?:k8s|search)/(?:(?:ns/([^/]+))|cluster|all-namespaces)(?:/([^/]+)(?:/([^/]+))?)?(/events)?/?$',
 );
-const CLASS_RE = new RegExp('^([^./]+)(?:.(v[0-9]+(?:(?:alpha|beta)[0-9]*)?))?(?:.([^/]*))?$');
+const VERSION_RE = '(v[0-9]+(?:(?:alpha|beta)[0-9]*)?)';
+const CLASS_RE = new RegExp(`^([^./]+)(?:.${VERSION_RE})?(?:.([^/]*))?$`);
 
 export class K8sDomain extends Domain {
   constructor() {
@@ -79,20 +80,24 @@ export class K8sDomain extends Domain {
       throw this.badQuery(query, e.message);
     }
     const m = query.class.name.match(/^([^.]+)(?:\.([^.]*)(?:\.(.*))?)?$/) ?? [];
-    if (!m) throw this.badQuery(query, "incorrect format");
+    if (!m) throw this.badQuery(query, 'incorrect format');
     let model = findGVK(m[3], m[2], m[1]);
-    if (!model) throw this.badQuery(query, "no matching resource");
+    if (!model) throw this.badQuery(query, 'no matching resource');
     let namespace = data.namespace;
     let name = data.name;
     let events = '';
     if (isEvent(model)) {
       // Special treatment for event objects: focus on the involved object, not the event.
       events = '/events';
       const about = eventAboutField(model);
-      const [group, version] = data.fields[`${about}.apiVersion`]?.split("/") ?? []
-      const kind = data.fields[`${about}.kind`]
-      model = findGVK(group, version, kind)
-      if (!model) throw this.badQuery(query, `no resource for group=${group} version=${version} kind=${kind}`);
+      const [group, version] = parseAPIVersion(data.fields[`${about}.apiVersion`]);
+      const kind = data.fields[`${about}.kind`];
+      model = findGVK(group, version, kind);
+      if (!model)
+        throw this.badQuery(
+          query,
+          `no resource for group=${group} version=${version} kind=${kind}`,
+        );
       namespace = data.fields[`${about}.namespace`] || '';
       name = data.fields[`${about}.name`] || '';
     }
@@ -101,15 +106,16 @@ export class K8sDomain extends Domain {
     const params = {
       labels: keyValueList(data.labels) || undefined,
       fields: (!events && keyValueList(data.fields)) || undefined,
-    }
-    if (!name && !namespace && (params.labels || params.fields)) { // This is a search URL
+    };
+    if (!name && !namespace && (params.labels || params.fields)) {
+      // This is a search URL
       return new URIRef(`search/${nsPath}`, {
         ...params,
         kind: `${model.apiGroup || 'core'}~${model.apiVersion}~${model.kind}`,
-      })
-    } else { // Specific resource URL
-      return new URIRef(
-        `k8s/${nsPath}/${model.path}${name ? `/${name}` : ''}${events}`, params)
+      });
+    } else {
+      // Specific resource URL
+      return new URIRef(`k8s/${nsPath}/${model.path}${name ? `/${name}` : ''}${events}`, params);
     }
   }
 
@@ -182,3 +188,16 @@ function findResource(resource: string, kind: string): Model {
     parts[2],
   );
 }
+
+const VERSION_ONLY_RE = new RegExp(`^${VERSION_RE}$`);
+function parseAPIVersion(apiVersion: string): [group: string, version: string] | undefined {
+  const gv = apiVersion.split('/') || [];
+  switch (gv.length) {
+    case 1:
+      return gv[0].match(VERSION_ONLY_RE) ? ['', gv[0]] : [gv[0], ''];
+    case 2:
+      return [gv[0], gv[1]];
+    default:
+      return ['', ''];
+  }
+}