fix: NO-JIRA: Always use full GVK in URLs.

Previously was using path, which works for built-in kinds, but not custom resources.
GVK works for both.

Author: alanconway

web/src/__tests__/all-domains.spec.ts

@@ -29,7 +29,7 @@ it.each([
     },
   },
   {
-    url: 'k8s/ns/default/pods/bad-deployment-000000000-00000',
+    url: 'k8s/ns/default/core~v1~Pod/bad-deployment-000000000-00000',
     query: 'k8s:Pod.v1:{"namespace":"default","name":"bad-deployment-000000000-00000"}',
     constraint: {
       start: null,

web/src/__tests__/k8s.spec.ts

@@ -77,16 +77,19 @@ describe('K8sNode.fromURL', () => {
       query: 'k8s:Deployment.v1.apps:{"namespace":"korrel8r","name":"korrel8r"}',
     },
     {
-      url: 'k8s/ns/default/pods/bad-deployment-000000000-00000',
+      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/pods/bad-deployment-000000000-00000/events',
+      url: 'k8s/ns/default/core~v1~Pod/bad-deployment-000000000-00000/events',
       query:
         'k8s:Event.v1:{"fields":{"involvedObject.namespace":"default","involvedObject.name":"bad-deployment-000000000-00000","involvedObject.apiVersion":"v1","involvedObject.kind":"Pod"}}',
     },
-    { url: `/k8s/ns/default/pods/foo`, query: `k8s:Pod.v1:{"namespace":"default","name":"foo"}` },
-    { url: `/k8s/ns/default/pods`, query: `k8s:Pod.v1:{"namespace":"default"}` },
+    {
+      url: `/k8s/ns/default/core~v1~Pod/foo`,
+      query: `k8s:Pod.v1:{"namespace":"default","name":"foo"}`,
+    },
+    { url: `/k8s/ns/default/core~v1~Pod`, query: `k8s:Pod.v1:{"namespace":"default"}` },
     { url: `/k8s/cluster/projects/foo`, query: `k8s:Namespace.v1:{"name":"foo"}` },
     {
       url: `/k8s/ns/x/operators.coreos.com~v1alpha1~ClusterServiceVersion/y`,
@@ -107,44 +110,44 @@ describe('K8sNode.fromQuery', () => {
     // Note "fields" are ignored.
     {
       query: 'k8s:Pod.v1:{"namespace":"default","name":"bad-deployment-000000000-00000"}',
-      url: 'k8s/ns/default/pods/bad-deployment-000000000-00000',
+      url: 'k8s/ns/default/core~v1~Pod/bad-deployment-000000000-00000',
     },
     {
       query: `k8s:Pod:{"namespace":"x","name":"y","labels":{"a":"b","c":"d"},"fields": {"x":"y"}}`,
-      url: `k8s/ns/x/pods/y?labels=${encodeURIComponent('a=b,c=d')}&fields=${encodeURIComponent(
-        'x=y',
-      )}`,
+      url: `k8s/ns/x/core~v1~Pod/y?labels=${encodeURIComponent(
+        'a=b,c=d',
+      )}&fields=${encodeURIComponent('x=y')}`,
     },
     {
       query:
         'k8s:Event.v1:{"fields":{"involvedObject.namespace":"default","involvedObject.name":"bad-deployment-000000000-00000","involvedObject.apiVersion":"v1","involvedObject.kind":"Pod"}}',
-      url: 'k8s/ns/default/pods/bad-deployment-000000000-00000/events',
+      url: 'k8s/ns/default/core~v1~Pod/bad-deployment-000000000-00000/events',
     },
     {
       query: `k8s:Pod:{ "namespace":"x", "name":"y", "labels":{ "a":"b" } }`,
-      url: `k8s/ns/x/pods/y?labels=${encodeURIComponent('a=b')}`,
+      url: `k8s/ns/x/core~v1~Pod/y?labels=${encodeURIComponent('a=b')}`,
     },
     {
       query: `k8s:Pod:{ "namespace":"x", "labels":{ "a":"b" } }`,
-      url: `k8s/ns/x/pods?labels=${encodeURIComponent('a=b')}`,
+      url: `k8s/ns/x/core~v1~Pod?labels=${encodeURIComponent('a=b')}`,
     },
-    { query: `k8s:Pod.v1:{ "namespace":"x", "name":"y" }`, url: `k8s/ns/x/pods/y` },
-    { query: `k8s:Pod.v1:{ "namespace":"x" }`, url: `k8s/ns/x/pods` },
+    { query: `k8s:Pod.v1:{ "namespace":"x", "name":"y" }`, url: `k8s/ns/x/core~v1~Pod/y` },
+    { query: `k8s:Pod.v1:{ "namespace":"x" }`, url: `k8s/ns/x/core~v1~Pod` },
     {
       query: `k8s:Pod.v1:{ "labels":{ "a":"b" } }`,
       url: `search/all-namespaces?labels=${encodeURIComponent('a=b')}&kind=core~v1~Pod`,
     },
     {
       query: `k8s:Pod.v1:{"namespace":"x","labels":{"a":"b"}}`,
-      url: `k8s/ns/x/pods?labels=${encodeURIComponent('a=b')}`,
+      url: `k8s/ns/x/core~v1~Pod?labels=${encodeURIComponent('a=b')}`,
     },
 
     // Variations on korrel8r class spec.
     {
       query: `k8s:Role.v1.rbac.authorization.k8s.io:{ "namespace":"x", "name":"y" }`,
-      url: `k8s/ns/x/roles/y`,
+      url: `k8s/ns/x/rbac.authorization.k8s.io~v1~Role/y`,
     },
-    { query: `k8s:Pod:{}`, url: 'k8s/all-namespaces/pods' },
+    { query: `k8s:Pod:{}`, url: 'k8s/all-namespaces/core~v1~Pod' },
   ])('converts $query to $url', ({ url, query }) => {
     expect(k8s.queryToLink(Query.parse(query))).toEqual(new URIRef(url));
   });

web/src/korrel8r/k8s.ts

@@ -104,19 +104,17 @@ export class K8sDomain extends Domain {
     }
     // Prepare parts of the URL
     const nsPath = namespace ? `ns/${namespace}` : 'all-namespaces';
+    const kind = `${model.apiGroup || 'core'}~${model.apiVersion}~${model.kind}`;
     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
-      return new URIRef(`search/${nsPath}`, {
-        ...params,
-        kind: `${model.apiGroup || 'core'}~${model.apiVersion}~${model.kind}`,
-      });
+      // Search URL
+      return new URIRef(`search/${nsPath}`, { ...params, kind });
     } else {
       // Specific resource URL
-      return new URIRef(`k8s/${nsPath}/${model.path}${name ? `/${name}` : ''}${events}`, params);
+      return new URIRef(`k8s/${nsPath}/${kind}${name ? `/${name}` : ''}${events}`, params);
     }
   }