From 2bae1be978d808db09367c91e22b2229764c8c7a Mon Sep 17 00:00:00 2001
From: Jamie Klassen <jamie.klassen@broadcom.com>
Date: Wed, 24 Jan 2024 11:54:08 -0500
Subject: [PATCH] ClusterAttributes prop for PodExecTerminal

Signed-off-by: Jamie Klassen <jamie.klassen@broadcom.com>
---
 plugins/kubernetes-react/api-report.md                      | 2 +-
 .../src/components/PodExecTerminal/PodExecTerminal.test.tsx | 6 +++---
 .../src/components/PodExecTerminal/PodExecTerminal.tsx      | 3 ++-
 .../components/PodExecTerminal/PodExecTerminalDialog.tsx    | 4 ++--
 .../src/components/Pods/PodDrawer/ContainerCard.tsx         | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/kubernetes-react/api-report.md b/plugins/kubernetes-react/api-report.md
index 734bacc7c9..ede2c9ddb7 100644
--- a/plugins/kubernetes-react/api-report.md
+++ b/plugins/kubernetes-react/api-report.md
@@ -692,7 +692,7 @@ export const PodExecTerminalDialog: (
 // @public
 export interface PodExecTerminalProps {
   // (undocumented)
-  clusterName: string;
+  cluster: ClusterAttributes;
   // (undocumented)
   containerName: string;
   // (undocumented)
diff --git a/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.test.tsx b/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.test.tsx
index 18e40bc241..4aa6112436 100644
--- a/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.test.tsx
+++ b/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.test.tsx
@@ -32,7 +32,7 @@ global.TextEncoder = require('util').TextEncoder;
 const textEncoder = new TextEncoder();
 
 describe('PodExecTerminal', () => {
-  const clusterName = 'cluster1';
+  const cluster = { name: 'cluster1' };
   const containerName = 'container2';
   const podName = 'pod1';
   const podNamespace = 'podNamespace';
@@ -45,7 +45,7 @@ describe('PodExecTerminal', () => {
     await renderInTestApp(
       <TestApiProvider apis={[[discoveryApiRef, mockDiscoveryApi]]}>
         <PodExecTerminal
-          clusterName={clusterName}
+          cluster={cluster}
           containerName={containerName}
           podName={podName}
           podNamespace={podNamespace}
@@ -68,7 +68,7 @@ describe('PodExecTerminal', () => {
     await renderInTestApp(
       <TestApiProvider apis={[[discoveryApiRef, mockDiscoveryApi]]}>
         <PodExecTerminal
-          clusterName={clusterName}
+          cluster={cluster}
           containerName={containerName}
           podName={podName}
           podNamespace={podNamespace}
diff --git a/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.tsx b/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.tsx
index f67d79abb8..d8c9b0dc02 100644
--- a/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.tsx
+++ b/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminal.tsx
@@ -16,6 +16,7 @@
 import 'xterm/css/xterm.css';
 
 import { discoveryApiRef, useApi } from '@backstage/core-plugin-api';
+import { ClusterAttributes } from '@backstage/plugin-kubernetes-common';
 import { createStyles, makeStyles, Theme } from '@material-ui/core';
 import React, { useEffect, useMemo, useState } from 'react';
 import { Terminal } from 'xterm';
@@ -29,7 +30,7 @@ import { PodExecTerminalAttachAddon } from './PodExecTerminalAttachAddon';
  * @public
  */
 export interface PodExecTerminalProps {
-  clusterName: string;
+  cluster: ClusterAttributes;
   containerName: string;
   podName: string;
   podNamespace: string;
diff --git a/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminalDialog.tsx b/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminalDialog.tsx
index 0b321aa108..a073ad7525 100644
--- a/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminalDialog.tsx
+++ b/plugins/kubernetes-react/src/components/PodExecTerminal/PodExecTerminalDialog.tsx
@@ -27,7 +27,7 @@ import { PodExecTerminal, PodExecTerminalProps } from './PodExecTerminal';
  * @public
  */
 export const PodExecTerminalDialog = (props: PodExecTerminalProps) => {
-  const { clusterName, containerName, podName } = props;
+  const { cluster, containerName, podName } = props;
 
   const isPodExecTerminalSupported = useIsPodExecTerminalSupported();
 
@@ -42,7 +42,7 @@ export const PodExecTerminalDialog = (props: PodExecTerminalProps) => {
           isPodExecTerminalSupported.loading ||
           !isPodExecTerminalSupported.value
         }
-        title={`${podName} - ${containerName} terminal shell on cluster ${clusterName}`}
+        title={`${podName} - ${containerName} terminal shell on cluster ${cluster.name}`}
       >
         <PodExecTerminal {...props} />
       </KubernetesDialog>
diff --git a/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.tsx b/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.tsx
index e6ad8a18aa..746abbd668 100644
--- a/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.tsx
+++ b/plugins/kubernetes-react/src/components/Pods/PodDrawer/ContainerCard.tsx
@@ -233,7 +233,7 @@ export const ContainerCard: React.FC<ContainerCardProps> = ({
         />
         {isPodExecTerminalEnabled && (
           <PodExecTerminalDialog
-            clusterName={podScope.cluster.name}
+            cluster={podScope.cluster}
             containerName={containerStatus.name}
             podName={podScope.podName}
             podNamespace={podScope.podNamespace}