Merge pull request #167 from alanconway/event-regression

COO-1178: Fix regression in linkToQuery for events.

Author: openshift-merge-bot[bot]

web/src/__tests__/k8s.spec.ts

@@ -100,10 +100,6 @@ describe('K8sDomain.linkToQuery', () => {
       url: '/k8s/ns/default/core~v1~Pod/bad-deployment-000000000-00000',
       query: 'k8s:Pod.v1:{"namespace":"default","name":"bad-deployment-000000000-00000"}',
     },
-    {
-      url: '/k8s/ns/default/core~v1~Pod/bad-deployment-000000000-00000/events',
-      query: 'k8s:Pod.v1:{"namespace":"default","name":"bad-deployment-000000000-00000"}',
-    },
     {
       url: `/k8s/ns/default/core~v1~Pod/foo`,
       query: `k8s:Pod.v1:{"namespace":"default","name":"foo"}`,
@@ -119,9 +115,19 @@ describe('K8sDomain.linkToQuery', () => {
     { url: `/k8s/cluster/nodes/oscar7`, query: `k8s:Node.v1:{"name":"oscar7"}` },
     { url: `/api-resource/cluster/core~v1~Node`, query: `k8s:Node.v1:{}` },
     { url: '/k8s/ns/netobserv/core~v1~Pod', query: 'k8s:Pod.v1:{"namespace":"netobserv"}' },
-  ])('converts $url', ({ url, query }) =>
-    expect(k8s.linkToQuery(new URIRef(url))).toEqual(Query.parse(query)),
-  );
+    {
+      url: '/k8s/ns/foo/core~v1~Pod/bar/events',
+      query:
+        'k8s:Event.v1:{"fields":{"involvedObject.namespace":"foo","involvedObject.name":"bar","involvedObject.apiVersion":"v1","involvedObject.kind":"Pod"}}',
+    },
+    {
+      url: '/k8s/ns/openshift-lightspeed/operators.coreos.com~v1alpha1~ClusterServiceVersion/lightspeed-operator.v1.0.5/events',
+      query:
+        'k8s:Event.v1:{"fields":{"involvedObject.namespace":"openshift-lightspeed","involvedObject.name":"lightspeed-operator.v1.0.5","involvedObject.apiVersion":"operators.coreos.com/v1alpha1","involvedObject.kind":"ClusterServiceVersion"}}',
+    },
+  ])('converts $url', ({ url, query }) => {
+    expect(k8s.linkToQuery(new URIRef(url))).toEqual(Query.parse(query));
+  });
 });
 
 describe('K8sDomain.queryToLink', () => {

web/src/korrel8r/k8s.ts

@@ -19,10 +19,11 @@ type Selector = {
 };
 
 const pathRE = new RegExp(
-  '(?<prefix>k8s|search|api-resource)' +
-    '/((ns/(?<namespace>[^/]+))|cluster|all-namespaces)' +
-    '(/(?<resource>[^/]+)(/(?<name>([^/]+))(?<events>/events)?)?)?',
+  '(?<prefix>k8s|search|api-resource)' + // prefix
+    '/((ns/(?<namespace>[^/]+))|cluster|all-namespaces)' + // /namespace
+    '(/(?<resource>[^/]+)(/(?<name>([^/]+))(?<events>/events)?)?)?', // [/resource[/name[/events]]]
 );
+
 const versionRE = /(?<version>v[0-9]+((alpha|beta)[0-9]*)?)/;
 const classRE = new RegExp(`^(?<kind>[^./]+)(\\.${versionRE.source})?(.(?<group>[^/]*))?$`);
 
@@ -55,13 +56,30 @@ export class K8sDomain extends Domain {
     const resource = g.resource || link.searchParams.get('kind');
     const model = findResource(resource);
     if (!model?.kind) throw this.badLink(link, `unknown resource: ${resource}`);
+    // api-resource is a resource type not a named instance, ignore the name part of the URL.
     const name = g.prefix === 'api-resource' ? undefined : g.name;
-    const data = {
-      namespace: g.namespace,
-      name,
-      labels: K8sDomain.parseSelector(link.searchParams.get('labels')) || undefined,
-    };
-    return this.modelClass(model).query(JSON.stringify(data));
+    if (g.events) {
+      // Special case for /events, query for events with this resource as involved object
+      const event = eventModel();
+      const about = eventAboutField(event);
+      const apiVersion = `${model.apiGroup ? `${model.apiGroup}/` : ''}${model.apiVersion || 'v1'}`;
+      const data = {
+        fields: {
+          [`${about}.namespace`]: g.namespace,
+          [`${about}.name`]: name,
+          [`${about}.apiVersion`]: apiVersion,
+          [`${about}.kind`]: model.kind,
+        },
+      };
+      return this.modelClass(event).query(JSON.stringify(data));
+    } else {
+      const data = {
+        namespace: g.namespace,
+        name,
+        labels: K8sDomain.parseSelector(link.searchParams.get('labels')) || undefined,
+      };
+      return this.modelClass(model).query(JSON.stringify(data));
+    }
   }
 
   // NOTE: k8s queries don't support query constraints, so neither do console k8s URIs.
@@ -78,7 +96,7 @@ export class K8sDomain extends Domain {
     let name = selector.name;
     let events = '';
     if (isEvent(model)) {
-      // Special case for events, use involved object with '/events' modifier.
+      // Special case for events, generate URL of involved object with '/events' modifier.
       const eventClass = this.modelClass(model);
       const about = eventAboutField(model);
       const [group, version] = parseAPIVersion(selector.fields[`${about}.apiVersion`]);
@@ -134,6 +152,12 @@ function isEvent(m: Model): boolean {
   );
 }
 
+// Returns an event resource model that is supported by the cluster.
+// Prefer the older version as there are still many older clusters out there.
+function eventModel(): Model {
+  return findGVK('', EVENT.version, EVENT.kind) || findGVK(EVENT.group, EVENT.version, EVENT.kind);
+}
+
 function eventAboutField(m: Model): string {
   return m?.apiGroup === EVENT.group ? 'regarding' : 'involvedObject';
 }