Add missing API root for external logs requests

Somehow the external logs APIs in the client never used the API root when constructing the URL. This means that if the Dashboard is deployed at a non-root path, the requests never made it to the logs proxy. Update the external logs URL util to include the API root in the same manner as we already do for all other APIs.
tektoncd · Sep 16, 2024 · 2efc34c · 2efc34c
1 parent ce376bf
commit 2efc34c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/src/api/index.js b/src/api/index.js
@@ -153,7 +153,7 @@ export function getExternalLogURL({
   if (queryString) {
     queryString = `?${queryString}`;
   }
-  return `${externalLogsURL}/${namespace}/${podName}/${container}${queryString}`;
+  return `${getAPIRoot({ isDashboardAPI: true })}${externalLogsURL}/${namespace}/${podName}/${container}${queryString}`;
 }
 
 export function getPodLogURL({ container, name, namespace, follow }) {

diff --git a/src/api/index.test.js b/src/api/index.test.js
@@ -156,7 +156,7 @@ it('useEvents', async () => {
 
 it('getExternalLogURL', () => {
   const container = 'fake_container';
-  const externalLogsURL = 'fake_externalLogsURL';
+  const externalLogsURL = '/fake_externalLogsURL';
   const namespace = 'fake_namespace';
   const podName = 'fake_podName';
   const startTime = '2000-01-02T03:04:05Z';
@@ -171,7 +171,7 @@ it('getExternalLogURL', () => {
       startTime
     })
   ).toEqual(
-    `${externalLogsURL}/${namespace}/${podName}/${container}?startTime=${startTime.replaceAll(
+    `http://localhost:3000${externalLogsURL}/${namespace}/${podName}/${container}?startTime=${startTime.replaceAll(
       ':',
       '%3A'
     )}&completionTime=${completionTime.replaceAll(':', '%3A')}`
@@ -180,7 +180,7 @@ it('getExternalLogURL', () => {
 
 it('getExternalLogURL with empty completionTime', () => {
   const container = 'fake_container';
-  const externalLogsURL = 'fake_externalLogsURL';
+  const externalLogsURL = '/fake_externalLogsURL';
   const namespace = 'fake_namespace';
   const podName = 'fake_podName';
   const startTime = '2000-01-02T03:04:05Z';
@@ -193,7 +193,7 @@ it('getExternalLogURL with empty completionTime', () => {
       startTime
     })
   ).toEqual(
-    `${externalLogsURL}/${namespace}/${podName}/${container}?startTime=${startTime.replaceAll(
+    `http://localhost:3000${externalLogsURL}/${namespace}/${podName}/${container}?startTime=${startTime.replaceAll(
       ':',
       '%3A'
     )}`
@@ -202,12 +202,14 @@ it('getExternalLogURL with empty completionTime', () => {
 
 it('getExternalLogURL with empty startTime and completionTime', () => {
   const container = 'fake_container';
-  const externalLogsURL = 'fake_externalLogsURL';
+  const externalLogsURL = '/fake_externalLogsURL';
   const namespace = 'fake_namespace';
   const podName = 'fake_podName';
   expect(
     API.getExternalLogURL({ container, externalLogsURL, namespace, podName })
-  ).toEqual(`${externalLogsURL}/${namespace}/${podName}/${container}`);
+  ).toEqual(
+    `http://localhost:3000${externalLogsURL}/${namespace}/${podName}/${container}`
+  );
 });
 
 it('getPodLog', () => {

diff --git a/src/utils/index.test.js b/src/utils/index.test.js
@@ -133,7 +133,7 @@ describe('fetchLogsFallback', () => {
 
   it('should return a function to retrieve logs from the external provider', () => {
     const container = 'fake_container';
-    const externalLogsURL = 'fake_url';
+    const externalLogsURL = '/fake_url';
     const namespace = 'fake_namespace';
     const podName = 'fake_podName';
     const stepName = 'fake_stepName';
@@ -149,7 +149,7 @@ describe('fetchLogsFallback', () => {
     const fallback = fetchLogsFallback(externalLogsURL);
     fallback(stepName, stepStatus, taskRun);
     expect(comms.get).toHaveBeenCalledWith(
-      `${externalLogsURL}/${namespace}/${podName}/${container}?startTime=${startTime.replaceAll(
+      `http://localhost:3000${externalLogsURL}/${namespace}/${podName}/${container}?startTime=${startTime.replaceAll(
         ':',
         '%3A'
       )}&completionTime=${completionTime.replaceAll(':', '%3A')}`,
@@ -159,7 +159,7 @@ describe('fetchLogsFallback', () => {
 
   it('should handle a missing startTime and completionTime', () => {
     const container = 'fake_container';
-    const externalLogsURL = 'fake_url';
+    const externalLogsURL = '/fake_url';
     const namespace = 'fake_namespace';
     const podName = 'fake_podName';
     const stepName = 'fake_stepName';
@@ -170,7 +170,7 @@ describe('fetchLogsFallback', () => {
     const fallback = fetchLogsFallback(externalLogsURL);
     fallback(stepName, stepStatus, taskRun);
     expect(comms.get).toHaveBeenCalledWith(
-      `${externalLogsURL}/${namespace}/${podName}/${container}`,
+      `http://localhost:3000${externalLogsURL}/${namespace}/${podName}/${container}`,
       { Accept: 'text/plain' }
     );
   });