feat(tekton-results): update to use ownerReference id

openshift · Nov 12, 2024 · 6fcc21b · 6fcc21b
1 parent 298ce7a
commit 6fcc21b
Show file tree

Hide file tree

Showing 26 changed files with 219 additions and 237 deletions.
diff --git a/src/components/EnterpriseContractView/SecurityEnterpriseContractTab.tsx b/src/components/EnterpriseContractView/SecurityEnterpriseContractTab.tsx
@@ -44,11 +44,10 @@ const getResultsSummary = (ECs, ecLoaded) => {
 
 export const SecurityEnterpriseContractTab: React.FC<
   React.PropsWithChildren<{
-    pipelineRunName: string;
-    pipelineRunUID: string;
+    pipelineRun: string;
   }>
-> = ({ pipelineRunName, pipelineRunUID }) => {
-  const [ecResult, ecResultLoaded] = useEnterpriseContractResults(pipelineRunName, pipelineRunUID);
+> = ({ pipelineRun }) => {
+  const [ecResult, ecResultLoaded] = useEnterpriseContractResults(pipelineRun);
 
   const [nameFilter, setNameFilter] = useSearchParam('name', '');
 

diff --git a/src/components/EnterpriseContractView/__tests__/SecurityEnterpriseContractTab.spec.tsx b/src/components/EnterpriseContractView/__tests__/SecurityEnterpriseContractTab.spec.tsx
@@ -22,23 +22,17 @@ describe('SecurityEnterpriseContractTab', () => {
   it('should render empty state for security tab when pods are missing', () => {
     mockUseEnterpriseContractResults.mockReturnValue([undefined, true]);
 
-    routerRenderer(
-      <SecurityEnterpriseContractTab pipelineRunName="dummy" pipelineRunUID="pipelinerun-test" />,
-    );
+    routerRenderer(<SecurityEnterpriseContractTab pipelineRun="dummy" />);
     screen.getByTestId('security-tab-empty-state');
   });
 
   it('should render component security tab', () => {
-    routerRenderer(
-      <SecurityEnterpriseContractTab pipelineRunName="dummy" pipelineRunUID="pipelinerun-test" />,
-    );
+    routerRenderer(<SecurityEnterpriseContractTab pipelineRun="dummy" />);
     screen.getByText('Missing CVE scan results');
   });
 
   it('should filter out results based on the name input field', () => {
-    routerRenderer(
-      <SecurityEnterpriseContractTab pipelineRunName="dummy" pipelineRunUID="pipelinerun-test" />,
-    );
+    routerRenderer(<SecurityEnterpriseContractTab pipelineRun="dummy" />);
     screen.getByText('Missing CVE scan results');
     fireEvent.input(screen.getByPlaceholderText('Filter by rule...'), {
       target: { value: 'No tasks' },
@@ -49,9 +43,7 @@ describe('SecurityEnterpriseContractTab', () => {
   });
 
   it('should filter out based on the status dropdown', async () => {
-    routerRenderer(
-      <SecurityEnterpriseContractTab pipelineRunName="dummy" pipelineRunUID="pipelinerun-test" />,
-    );
+    routerRenderer(<SecurityEnterpriseContractTab pipelineRun="dummy" />);
     screen.getByText('Missing CVE scan results');
     fireEvent.click(screen.getByRole('button', { name: 'Status filter menu' }));
     fireEvent.click(screen.getByLabelText('Success'));
@@ -61,9 +53,7 @@ describe('SecurityEnterpriseContractTab', () => {
   });
 
   it('should show empty state when no search result found', () => {
-    routerRenderer(
-      <SecurityEnterpriseContractTab pipelineRunName="dummy" pipelineRunUID="pipelinerun-test" />,
-    );
+    routerRenderer(<SecurityEnterpriseContractTab pipelineRun="dummy" />);
     screen.getByText('Missing CVE scan results');
     fireEvent.click(screen.getByRole('button', { name: 'Status filter menu' }));
     fireEvent.click(screen.getByLabelText('Failed'));
@@ -78,9 +68,7 @@ describe('SecurityEnterpriseContractTab', () => {
   });
 
   it('should sort by Status', () => {
-    routerRenderer(
-      <SecurityEnterpriseContractTab pipelineRunName="dummy" pipelineRunUID="pipelinerun-test" />,
-    );
+    routerRenderer(<SecurityEnterpriseContractTab pipelineRun="dummy" />);
     const status = screen.getAllByTestId('rule-status');
     expect(status[0].textContent.trim()).toEqual('Failed');
     fireEvent.click(screen.getAllByText('Status')[1]);
@@ -89,9 +77,7 @@ describe('SecurityEnterpriseContractTab', () => {
   });
 
   it('should render result summary', () => {
-    routerRenderer(
-      <SecurityEnterpriseContractTab pipelineRunName="dummy" pipelineRunUID="pipelinerun-test" />,
-    );
+    routerRenderer(<SecurityEnterpriseContractTab pipelineRun="dummy" />);
     const resultSummary = screen.getByTestId('result-summary');
     const status = resultSummary.getElementsByTagName('span');
     expect(status[0].textContent.trim()).toBe('Failed');

diff --git a/src/components/EnterpriseContractView/__tests__/useEnterpriseContractResultFromLogs.spec.tsx b/src/components/EnterpriseContractView/__tests__/useEnterpriseContractResultFromLogs.spec.tsx
@@ -55,7 +55,7 @@ describe('useEnterpriseContractResultFromLogs', () => {
 
   it('should parse valid rules to json', async () => {
     const { result, waitForNextUpdate } = renderHook(() =>
-      useEnterpriseContractResultFromLogs('dummy-abcd', 'pipelinerun-test'),
+      useEnterpriseContractResultFromLogs('dummy-abcd'),
     );
     await waitForNextUpdate();
     expect(mockCommmonFetchJSON).toHaveBeenCalled();
@@ -69,9 +69,7 @@ describe('useEnterpriseContractResultFromLogs', () => {
     mockGetTaskRunLogs.mockReturnValue(`asdfcdfadsf
       [report-json] { "components": [] }
       `);
-    const { result } = renderHook(() =>
-      useEnterpriseContractResultFromLogs('dummy-abcd', 'pipelinerun-test'),
-    );
+    const { result } = renderHook(() => useEnterpriseContractResultFromLogs('dummy-abcd'));
     const [, loaded] = result.current;
     expect(mockCommmonFetchJSON).toHaveBeenCalled();
     expect(loaded).toBe(true);
@@ -82,7 +80,7 @@ describe('useEnterpriseContractResultFromLogs', () => {
 
   it('should filter out all 404 image url components from EC results', async () => {
     const { result, waitForNextUpdate } = renderHook(() =>
-      useEnterpriseContractResultFromLogs('dummy-abcd', 'pipelinerun-test'),
+      useEnterpriseContractResultFromLogs('dummy-abcd'),
     );
     await waitForNextUpdate();
     const [ecResult, loaded] = result.current;
@@ -95,7 +93,7 @@ describe('useEnterpriseContractResultFromLogs', () => {
     mockCommmonFetchJSON.mockRejectedValue(new Error('Api error'));
 
     const { result, waitForNextUpdate } = renderHook(() =>
-      useEnterpriseContractResultFromLogs('dummy-abcd', 'pipelinerun-test'),
+      useEnterpriseContractResultFromLogs('dummy-abcd'),
     );
     await waitForNextUpdate();
     const [ecResult, loaded] = result.current;
@@ -126,7 +124,7 @@ describe('useEnterpriseContractResultFromLogs', () => {
     `);
 
     const { result, waitForNextUpdate } = renderHook(() =>
-      useEnterpriseContractResultFromLogs('dummy-abcd', 'pipelinerun-test'),
+      useEnterpriseContractResultFromLogs('dummy-abcd'),
     );
     const [, loaded] = result.current;
     expect(mockCommmonFetchJSON).toHaveBeenCalled();
@@ -179,7 +177,7 @@ describe('useEnterpriseContractResults', () => {
 
   it('should return enterprise contract results', async () => {
     const { result, waitForNextUpdate } = renderHook(() =>
-      useEnterpriseContractResults('dummy-abcd', 'pipelinerun-test'),
+      useEnterpriseContractResults('dummy-abcd'),
     );
     expect(result.current[0]).toEqual(undefined);
     expect(result.current[1]).toEqual(false);

diff --git a/src/components/EnterpriseContractView/useEnterpriseContractResultFromLogs.tsx b/src/components/EnterpriseContractView/useEnterpriseContractResultFromLogs.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { commonFetchJSON, getK8sResourceURL } from '@openshift/dynamic-plugin-sdk-utils';
 import { useTaskRuns } from '../../hooks/useTaskRuns';
+import { PipelineRunModel } from '../../models';
 import { PodModel } from '../../models/pod';
 import { getTaskRunLog } from '../../utils/tekton-results';
 import { useWorkspaceInfo } from '../../utils/workspace-context-utils';
@@ -14,7 +15,6 @@ import { extractEcResultsFromTaskRunLogs } from './utils';
 
 export const useEnterpriseContractResultFromLogs = (
   pipelineRunName: string,
-  pipelineRunUID: string,
 ): [ComponentEnterpriseContractResult[], boolean] => {
   const { namespace, workspace } = useWorkspaceInfo();
   const [taskRun, loaded, error] = useTaskRuns(namespace, pipelineRunName, 'verify');
@@ -67,13 +67,16 @@ export const useEnterpriseContractResultFromLogs = (
   React.useEffect(() => {
     let unmount = false;
     if (fetchTknLogs) {
+      const pipelineRunUID = taskRun[0]?.metadata?.ownerReferences?.find(
+        (reference) => reference.kind === PipelineRunModel.kind,
+      )?.uid;
       const fetch = async () => {
         try {
           const logs = await getTaskRunLog(
             workspace,
             taskRun[0].metadata.namespace,
             pipelineRunUID,
-            taskRun[0],
+            taskRun[0].metadata?.uid,
           );
           if (unmount) return;
           const json = extractEcResultsFromTaskRunLogs(logs);
@@ -95,7 +98,7 @@ export const useEnterpriseContractResultFromLogs = (
     return () => {
       unmount = true;
     };
-  }, [fetchTknLogs, taskRun, workspace, pipelineRunUID]);
+  }, [fetchTknLogs, taskRun, workspace]);
 
   const ecResult = React.useMemo(() => {
     // filter out components for which ec didn't execute because invalid image URL
@@ -160,9 +163,8 @@ export const mapEnterpriseContractResultData = (
 
 export const useEnterpriseContractResults = (
   pipelineRunName: string,
-  pipelineRunUID: string,
 ): [UIEnterpriseContractData[], boolean] => {
-  const [ec, ecLoaded] = useEnterpriseContractResultFromLogs(pipelineRunName, pipelineRunUID);
+  const [ec, ecLoaded] = useEnterpriseContractResultFromLogs(pipelineRunName);
   const ecResult = React.useMemo(() => {
     return ecLoaded && ec ? mapEnterpriseContractResultData(ec) : undefined;
   }, [ec, ecLoaded]);

diff --git a/src/components/PipelineRunDetailsView/PipelineRunDetailsView.tsx b/src/components/PipelineRunDetailsView/PipelineRunDetailsView.tsx
@@ -141,10 +141,7 @@ export const PipelineRunDetailsView: React.FC<
                   key: 'security',
                   label: 'Security',
                   component: (
-                    <SecurityEnterpriseContractTab
-                      pipelineRunName={pipelineRun.metadata.name}
-                      pipelineRunUID={pipelineRun.metadata.uid}
-                    />
+                    <SecurityEnterpriseContractTab pipelineRun={pipelineRun.metadata.name} />
                   ),
                 },
               ]

diff --git a/src/components/PipelineRunDetailsView/PipelineRunSidePanel.tsx b/src/components/PipelineRunDetailsView/PipelineRunSidePanel.tsx
@@ -11,13 +11,9 @@ import { isTaskNode } from './visualization/utils/pipelinerun-graph-utils';
 
 type Props = {
   scrollIntoView?: (node: Node) => void;
-  pipelineRunUID: string;
 };
 
-const PipelineRunSidePanel: React.FC<React.PropsWithChildren<Props>> = ({
-  scrollIntoView,
-  pipelineRunUID,
-}) => {
+const PipelineRunSidePanel: React.FC<React.PropsWithChildren<Props>> = ({ scrollIntoView }) => {
   const [[selectedId], setSelectedIds] = useVisualizationState<string[]>(SELECTION_STATE, []);
   const controller = useVisualizationController();
 
@@ -32,11 +28,7 @@ const PipelineRunSidePanel: React.FC<React.PropsWithChildren<Props>> = ({
   }, [controller, selectedId]);
 
   const panel = taskNode ? (
-    <TaskRunPanel
-      onClose={() => setSelectedIds([])}
-      taskNode={taskNode}
-      pipelineRunUID={pipelineRunUID}
-    />
+    <TaskRunPanel onClose={() => setSelectedIds([])} taskNode={taskNode} />
   ) : null;
 
   const isExpanded = !!panel;

diff --git a/src/components/PipelineRunDetailsView/PipelineRunVisualization.tsx b/src/components/PipelineRunDetailsView/PipelineRunVisualization.tsx
@@ -40,10 +40,7 @@ const PipelineRunVisualization = ({ pipelineRun, error, taskRuns }) => {
         layoutFactory={layoutFactory}
         model={model}
       >
-        <PipelineRunSidePanel
-          scrollIntoView={scrollIntoView}
-          pipelineRunUID={pipelineRun?.metadata?.uid}
-        />
+        <PipelineRunSidePanel scrollIntoView={scrollIntoView} />
       </VisualizationFactory>
     </div>
   );

diff --git a/src/components/PipelineRunDetailsView/__tests__/PipelineRunSidePanel.spec.tsx b/src/components/PipelineRunDetailsView/__tests__/PipelineRunSidePanel.spec.tsx
@@ -18,7 +18,7 @@ describe('PipelineRunSidePanel', () => {
   it('should render nothing by default', () => {
     const setPropsFn = jest.fn();
 
-    render(<PipelineRunSidePanel pipelineRunUID="pipelinerun-test" />, {
+    render(<PipelineRunSidePanel />, {
       wrapper: ({ children }) => (
         <SidePanelContext.Provider value={{ setProps: setPropsFn, close: () => {} }}>
           {children}
@@ -42,7 +42,7 @@ describe('PipelineRunSidePanel', () => {
 
     const setPropsFn = jest.fn();
 
-    render(<PipelineRunSidePanel pipelineRunUID="pipelinerun-test" />, {
+    render(<PipelineRunSidePanel />, {
       wrapper: ({ children }) => (
         <SidePanelContext.Provider value={{ setProps: setPropsFn, close: () => {} }}>
           {children}
@@ -68,16 +68,13 @@ describe('PipelineRunSidePanel', () => {
 
     const setPropsFn = jest.fn();
 
-    render(
-      <PipelineRunSidePanel pipelineRunUID="pipelinerun-test" scrollIntoView={scrollIntoViewFn} />,
-      {
-        wrapper: ({ children }) => (
-          <SidePanelContext.Provider value={{ setProps: setPropsFn, close: () => {} }}>
-            {children}
-          </SidePanelContext.Provider>
-        ),
-      },
-    );
+    render(<PipelineRunSidePanel scrollIntoView={scrollIntoViewFn} />, {
+      wrapper: ({ children }) => (
+        <SidePanelContext.Provider value={{ setProps: setPropsFn, close: () => {} }}>
+          {children}
+        </SidePanelContext.Provider>
+      ),
+    });
 
     expect(setPropsFn).toHaveBeenCalledWith(
       expect.objectContaining({

diff --git a/src/components/PipelineRunDetailsView/sidepanels/TaskRunPanel.tsx b/src/components/PipelineRunDetailsView/sidepanels/TaskRunPanel.tsx
@@ -20,14 +20,9 @@ import './TaskRunPanel.scss';
 type Props = {
   onClose: () => void;
   taskNode: GraphElement<ElementModel, PipelineRunNodeData>;
-  pipelineRunUID: string;
 };
 
-const TaskRunPanel: React.FC<React.PropsWithChildren<Props>> = ({
-  taskNode,
-  onClose,
-  pipelineRunUID,
-}) => {
+const TaskRunPanel: React.FC<React.PropsWithChildren<Props>> = ({ taskNode, onClose }) => {
   const task = taskNode.getData().task;
   const taskRun = taskNode.getData().taskRun;
   const { status } = taskNode.getData();
@@ -69,7 +64,6 @@ const TaskRunPanel: React.FC<React.PropsWithChildren<Props>> = ({
                 taskRun={taskRun}
                 namespace={taskNode.getData().namespace}
                 status={status}
-                pipelineRunUID={pipelineRunUID}
               />
             </DrawerPanelBody>
           </Tab>

diff --git a/src/components/TaskRunDetailsView/TaskRunDetailsView.tsx b/src/components/TaskRunDetailsView/TaskRunDetailsView.tsx
@@ -117,26 +117,15 @@ export const TaskRunDetailsView: React.FC<React.PropsWithChildren<TaskRunDetails
                 body={JSON.stringify(plrError)}
               />
             ) : (
-              <TaskRunLogsTab pipelineRunUID={pipelineRun?.metadata?.uid} taskRun={taskRun} />
+              <TaskRunLogsTab taskRun={taskRun} />
             ),
         },
         ...(isEnterpriseContract
           ? [
               {
                 key: 'security',
                 label: 'Security',
-                component:
-                  (plrLoaded && plrError) || (plrLoaded && !pipelineRun) ? (
-                    <ErrorEmptyState
-                      title={`Unable to load pipelineRun ${plrName}`}
-                      body={JSON.stringify(plrError)}
-                    />
-                  ) : (
-                    <SecurityEnterpriseContractTab
-                      pipelineRunName={plrName}
-                      pipelineRunUID={pipelineRun?.metadata?.uid}
-                    />
-                  ),
+                component: <SecurityEnterpriseContractTab pipelineRun={plrName} />,
               },
             ]
           : []),

diff --git a/src/components/TaskRunDetailsView/tabs/TaskRunLogsTab.tsx b/src/components/TaskRunDetailsView/tabs/TaskRunLogsTab.tsx
@@ -5,24 +5,13 @@ import TaskRunLogs from '../../TaskRuns/TaskRunLogs';
 
 export type TaskRunLogProps = {
   taskRun: TaskRunKind;
-  pipelineRunUID: string;
 };
 
-const TaskRunLogsTab: React.FC<React.PropsWithChildren<TaskRunLogProps>> = ({
-  taskRun,
-  pipelineRunUID,
-}) => {
+const TaskRunLogsTab: React.FC<React.PropsWithChildren<TaskRunLogProps>> = ({ taskRun }) => {
   const status = taskRunStatus(taskRun);
   const namespace = taskRun.metadata?.namespace;
 
-  return (
-    <TaskRunLogs
-      taskRun={taskRun}
-      status={status}
-      namespace={namespace}
-      pipelineRunUID={pipelineRunUID}
-    />
-  );
+  return <TaskRunLogs taskRun={taskRun} status={status} namespace={namespace} />;
 };
 
 export default TaskRunLogsTab;
diff --git a/src/components/TaskRunDetailsView/tabs/__tests__/TaskRunLogsTab.spec.tsx b/src/components/TaskRunDetailsView/tabs/__tests__/TaskRunLogsTab.spec.tsx
@@ -45,7 +45,6 @@ describe('TaskRunLogs', () => {
             ],
           },
         }}
-        pipelineRunUID="test-id"
       />,
       {
         wrapper: BrowserRouter,