refactor PodScope to include ClusterAttributes

Signed-off-by: Jamie Klassen <jamie.klassen@broadcom.com>
2024-01-24 11:42:21 -05:00
parent b01c86c2b5
commit a8e98aa981
8 changed files with 11 additions and 10 deletions
@@ -119,7 +119,7 @@ export const FixDialog: React.FC<FixDialogProps> = ({
                containerScope={{
                  podName: pod.metadata?.name ?? 'unknown',
                  podNamespace: pod.metadata?.namespace ?? 'unknown',
-                  clusterName: clusterName,
+                  cluster: { name: clusterName },
                  containerName: pf.container,
                }}
              />
@@ -36,7 +36,7 @@ describe('ContainerCard', () => {
          podScope: {
            name: 'some-name',
            namespace: 'some-namespace',
-            clusterName: 'some-cluster',
+            cluster: { name: 'some-cluster' },
          },
          containerSpec: {
            readinessProbe: {},
@@ -71,7 +71,7 @@ describe('ContainerCard', () => {
          podScope: {
            podName: 'some-name',
            podNamespace: 'some-namespace',
-            clusterName: 'some-cluster',
+            cluster: { name: 'some-cluster' },
          },
          containerSpec: {},
          containerStatus: {
@@ -100,7 +100,7 @@ describe('ContainerCard', () => {
          podScope: {
            podName: 'some-name',
            podNamespace: 'some-namespace',
-            clusterName: 'some-cluster',
+            cluster: { name: 'some-cluster' },
          },
          containerSpec: {},
          containerStatus: {
@@ -233,7 +233,7 @@ export const ContainerCard: React.FC<ContainerCardProps> = ({
        />
        {isPodExecTerminalEnabled && (
          <PodExecTerminalDialog
-            clusterName={podScope.clusterName}
+            clusterName={podScope.cluster.name}
            containerName={containerStatus.name}
            podName={podScope.podName}
            podNamespace={podScope.podNamespace}
@@ -161,7 +161,7 @@ export const PodDrawer = ({ podAndErrors, open }: PodDrawerProps) => {
                          podName: podAndErrors.pod.metadata?.name ?? 'unknown',
                          podNamespace:
                            podAndErrors.pod.metadata?.namespace ?? 'unknown',
-                          clusterName: podAndErrors.cluster.name,
+                          cluster: podAndErrors.cluster,
                        }}
                        containerSpec={containerSpec}
                        containerStatus={containerStatus}
@@ -42,7 +42,7 @@ export const PodLogsDialog = ({ containerScope }: PodLogsDialogProps) => {
      buttonIcon={<SubjectIcon />}
      buttonText="Logs"
      disabled={false}
-      title={`${containerScope.podName} - ${containerScope.containerName} logs on cluster ${containerScope.clusterName}`}
+      title={`${containerScope.podName} - ${containerScope.containerName} logs on cluster ${containerScope.cluster.name}`}
    >
      <PodLogs containerScope={containerScope} />
    </KubernetesDialog>
@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+import { ClusterAttributes } from '@backstage/plugin-kubernetes-common';

 /**
 * Contains the details needed to make a log request to Kubernetes, except the container name
@@ -22,7 +23,7 @@
 export interface PodScope {
  podName: string;
  podNamespace: string;
-  clusterName: string;
+  cluster: ClusterAttributes;
 }

 /**
@@ -41,7 +41,7 @@ export const usePodLogs = ({ containerScope, previous }: PodLogsOptions) => {
      podName: containerScope.podName,
      namespace: containerScope.podNamespace,
      containerName: containerScope.containerName,
-      clusterName: containerScope.clusterName,
+      clusterName: containerScope.cluster.name,
      previous,
    });
  }, [JSON.stringify(containerScope)]);