Merge pull request #62 from alanconway/fix-pod-labels

fix #61: Incorrect URL for Pod label searches.

Author: openshift-merge-bot[bot]

web/src/__tests__/k8s-node.spec.ts

@@ -110,7 +110,7 @@ describe('K8sNode.fromQuery', () => {
     },
     {
       query: `k8s:Pod:{"namespace":"x","name":"y","labels":{"a":"b","c":"d"},"fields": {"x":"y"}}`,
-      url: `k8s/ns/x/pods/y?q=${encodeURIComponent('a=b,c=d')}`,
+      url: `k8s/ns/x/pods/y?labels=${encodeURIComponent('a=b,c=d')}`,
     },
     {
       query:
@@ -119,21 +119,21 @@ describe('K8sNode.fromQuery', () => {
     },
     {
       query: `k8s:Pod:{"namespace":"x","name":"y","labels":{"a":"b"}}`,
-      url: `k8s/ns/x/pods/y?q=${encodeURIComponent('a=b')}`,
+      url: `k8s/ns/x/pods/y?labels=${encodeURIComponent('a=b')}`,
     },
     {
       query: `k8s:Pod:{"namespace":"x","labels":{"a":"b"}}`,
-      url: `k8s/ns/x/pods?q=${encodeURIComponent('a=b')}`,
+      url: `k8s/ns/x/pods?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:{"labels":{"a":"b"}}`,
-      url: `search/all-namespaces?q=${encodeURIComponent('a=b')}&kind=core~v1~Pod`,
+      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?q=${encodeURIComponent('a=b')}`,
+      url: `k8s/ns/x/pods?labels=${encodeURIComponent('a=b')}`,
     },
 
     // Variations on korrel8r class spec.

web/src/korrel8r/k8s.ts

@@ -65,7 +65,7 @@ export class K8sNode extends Korrel8rNode {
       const data = {
         namespace: namespace,
         name: name,
-        labels: K8sNode.parseSelector(params.get('q')) || undefined,
+        labels: K8sNode.parseSelector(params.get('labels')) || undefined,
       };
       return new K8sNode(url, `${K8sNode.classFor(groupVersionKind)}:${JSON.stringify(data)}`);
     }
@@ -105,19 +105,21 @@ export class K8sNode extends Korrel8rNode {
     const [gvk2, resource] = this.findKind(gvk); // Fill out partial GVK
     gvk = gvk2;
     const nsPath = namespace ? `ns/${namespace}` : 'all-namespaces';
-    const qParam = data.labels ? `?q=${encodeURIComponent(keyValueList(data.labels))}` : '';
+    const labelsParam = data.labels
+      ? `?labels=${encodeURIComponent(keyValueList(data.labels))}`
+      : '';
 
     let url: string;
-    if (!name && !namespace && qParam) {
+    if (!name && !namespace && labelsParam) {
       // Search URL
       url =
-        `search/${nsPath}${qParam}&kind=` +
+        `search/${nsPath}${labelsParam}&kind=` +
         `${gvk.group || 'core'}~` +
         `${gvk.version || undefined}~` +
         `${gvk.kind}`;
     } else {
       // Resource URL
-      url = `k8s/${nsPath}/${resource}${name && `/${name}`}${qParam}${events}`;
+      url = `k8s/${nsPath}/${resource}${name && `/${name}`}${events}${labelsParam}`;
     }
     return new K8sNode(url, query);
   }