adds minimal support for attaching detected ACM clusters

thoraxe · thoraxe · commit cb6750e34064 · 2025-08-11T12:56:18.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ dist/
 .DS_Store
 .env
 gui_test_screenshots
+.nodeenv
diff --git a/src/components/AttachMenu.tsx b/src/components/AttachMenu.tsx
@@ -41,6 +41,13 @@ import ResourceIcon from './ResourceIcon';
 
 const ALERTS_ENDPOINT = '/api/prometheus/api/v1/rules?type=alert';
 
+// Managed clusters have an additional info object that lives in a namespace whose name matches the cluster name
+const fetchManagedClusterInfo = async (clusterName: string): Promise<K8sResourceKind> => {
+  const endpoint = `/api/kubernetes/apis/internal.open-cluster-management.io/v1beta1/namespaces/${clusterName}/managedclusterinfos/${clusterName}`;
+  const response = await consoleFetchJSON(endpoint, 'get', getRequestInitWithAuthHeader());
+  return response;
+};
+
 // Sanity check on the YAML file size
 const MAX_FILE_SIZE_KB = 500;
 
@@ -194,6 +201,56 @@ const AttachMenu: React.FC = () => {
             setError(t('Error fetching alerting rules: {{err}}', { err }));
             setLoaded();
           });
+      } else if (
+        // Only show this attachment option when the object in play is a ManagedCluster
+        kind === 'cluster.open-cluster-management.io~v1~ManagedCluster' &&
+        attachmentType === AttachmentTypes.YAML
+      ) {
+        setLoading();
+
+        // First attach the ManagedCluster object
+        if (context) {
+          const clusterData = cloneDeep(context);
+          delete clusterData.metadata.managedFields;
+          try {
+            const clusterYaml = dumpYAML(clusterData, { lineWidth: -1 }).trim();
+            dispatch(
+              attachmentSet(AttachmentTypes.YAML, kind, name, undefined, namespace, clusterYaml),
+            );
+          } catch (e) {
+            setError(t('Error converting ManagedCluster to YAML: {{e}}', { e }));
+            setLoaded();
+            return;
+          }
+        }
+
+        // Then fetch and attach the ManagedClusterInfo object
+        fetchManagedClusterInfo(name)
+          .then((clusterInfo) => {
+            const data = cloneDeep(clusterInfo);
+            delete data.metadata.managedFields;
+            try {
+              const yaml = dumpYAML(data, { lineWidth: -1 }).trim();
+              dispatch(
+                attachmentSet(
+                  AttachmentTypes.YAML,
+                  'ManagedClusterInfo',
+                  name,
+                  undefined,
+                  name,
+                  yaml,
+                ),
+              );
+              close();
+            } catch (e) {
+              setError(t('Error converting ManagedClusterInfo to YAML: {{e}}', { e }));
+            }
+            setLoaded();
+          })
+          .catch((err) => {
+            setError(t('Error fetching cluster info: {{err}}', { err }));
+            setLoaded();
+          });
       } else if (
         context &&
         (attachmentType === AttachmentTypes.YAML || attachmentType === AttachmentTypes.YAMLFiltered)
@@ -335,6 +392,11 @@ const AttachMenu: React.FC = () => {
               <SelectOption value={AttachmentTypes.YAML}>
                 <FileCodeIcon /> {t('Alert')} {isLoading && <Spinner size="md" />}
               </SelectOption>
+            ) : kind === 'cluster.open-cluster-management.io~v1~ManagedCluster' ? (
+              <SelectOption value={AttachmentTypes.YAML}>
+                <TaskIcon /> {t('Attach cluster info')}
+                {isLoading && <Spinner size="md" />}
+              </SelectOption>
             ) : (
               <>
                 {isResourceContext && (
diff --git a/src/hooks/useLocationContext.ts b/src/hooks/useLocationContext.ts
@@ -66,6 +66,27 @@ export const useLocationContext = () => {
             }
           }
         }
+
+        urlMatches = path.match(
+          // This is what ACM cluster URLs look like:
+          // http://something.tld/multicloud/infrastructure/clusters/details/aks-central/aks-central/overview
+          // they are not namespaced and the resource name is repeated
+          new RegExp(
+            `/multicloud/infrastructure/clusters/details/(${resourceName})/${resourceName}/overview`,
+          ),
+        );
+        if (urlMatches) {
+          // The k8s object for the cluster is not in the URL path, so we have to directly check if we are looking
+          // at a cluster object here
+          const key = 'cluster.open-cluster-management.io~v1~ManagedCluster';
+
+          if (models[key]) {
+            setKind(key);
+            setName(urlMatches[1]);
+            setNamespace(undefined);
+            return;
+          }
+        }
       }
 
       if (new RegExp('^/monitoring/alerts/[0-9]+').test(path)) {
diff --git a/tests/tests/lightspeed-install.cy.ts b/tests/tests/lightspeed-install.cy.ts
@@ -657,4 +657,181 @@ metadata:
       { force: true },
     );
   });
+
+  it('Test attach cluster info for ManagedCluster', () => {
+    // Mock ManagedCluster details page
+    cy.visit(
+      '/k8s/ns/test-cluster/cluster.open-cluster-management.io~v1~ManagedCluster/test-cluster',
+    );
+    cy.get(mainButton).click();
+    cy.get(popover).should('exist');
+
+    // Test that the attach menu shows "Attach cluster info" option for ManagedCluster
+    cy.get(attachMenuButton).click();
+    cy.get(attachMenu)
+      .should('include.text', 'Attach cluster info')
+      .should('include.text', 'Upload from computer')
+      .should('not.include.text', 'Full YAML file')
+      .should('not.include.text', 'Filtered YAML')
+      .should('not.include.text', 'Events')
+      .should('not.include.text', 'Logs');
+
+    // Mock the API calls for ManagedCluster and ManagedClusterInfo
+    cy.intercept(
+      'GET',
+      '/api/kubernetes/apis/cluster.open-cluster-management.io/v1/managedclusters/test-cluster',
+      {
+        statusCode: 200,
+        body: {
+          kind: 'ManagedCluster',
+          apiVersion: 'cluster.open-cluster-management.io/v1',
+          metadata: {
+            name: 'test-cluster',
+            namespace: 'test-cluster',
+          },
+          spec: {
+            hubAcceptsClient: true,
+          },
+          status: {
+            conditions: [
+              {
+                type: 'ManagedClusterConditionAvailable',
+                status: 'True',
+              },
+            ],
+          },
+        },
+      },
+    ).as('getManagedCluster');
+
+    cy.intercept(
+      'GET',
+      '/api/kubernetes/apis/internal.open-cluster-management.io/v1beta1/namespaces/test-cluster/managedclusterinfos/test-cluster',
+      {
+        statusCode: 200,
+        body: {
+          kind: 'ManagedClusterInfo',
+          apiVersion: 'internal.open-cluster-management.io/v1beta1',
+          metadata: {
+            name: 'test-cluster',
+            namespace: 'test-cluster',
+          },
+          status: {
+            distributionInfo: {
+              type: 'OCP',
+              ocp: {
+                version: '4.14.0',
+              },
+            },
+            nodeList: [
+              {
+                name: 'master-0',
+                conditions: [
+                  {
+                    type: 'Ready',
+                    status: 'True',
+                  },
+                ],
+              },
+            ],
+          },
+        },
+      },
+    ).as('getManagedClusterInfo');
+
+    // Click "Attach cluster info" button
+    cy.get(attachMenu).find('button').contains('Attach cluster info').click();
+
+    // Wait for both API calls
+    cy.wait('@getManagedCluster');
+    cy.wait('@getManagedClusterInfo');
+
+    // Verify that both ManagedCluster and ManagedClusterInfo attachments are added
+    cy.get(attachments)
+      .should('include.text', 'test-cluster')
+      .should('include.text', 'YAML')
+      .find('button')
+      .should('have.length', 2); // Should have both ManagedCluster and ManagedClusterInfo attachments
+
+    // Test the ManagedCluster attachment preview
+    cy.get(attachments).find('button').contains('test-cluster').first().click();
+    cy.get(modal)
+      .should('include.text', 'Preview attachment')
+      .should('include.text', 'test-cluster')
+      .should('include.text', 'kind: ManagedCluster')
+      .should('include.text', 'apiVersion: cluster.open-cluster-management.io/v1')
+      .find('button')
+      .contains('Dismiss')
+      .click();
+
+    // Test the ManagedClusterInfo attachment preview
+    cy.get(attachments).find('button').contains('test-cluster').last().click();
+    cy.get(modal)
+      .should('include.text', 'Preview attachment')
+      .should('include.text', 'test-cluster')
+      .should('include.text', 'kind: ManagedClusterInfo')
+      .should('include.text', 'apiVersion: internal.open-cluster-management.io/v1beta1')
+      .should('include.text', 'distributionInfo')
+      .find('button')
+      .contains('Dismiss')
+      .click();
+
+    // Test submitting a prompt with cluster attachments
+    cy.interceptQuery('queryStub', PROMPT_SUBMITTED, null, [
+      { attachmentType: 'yaml', contentType: 'application/yaml' },
+      { attachmentType: 'yaml', contentType: 'application/yaml' },
+    ]);
+    cy.get(promptInput).type(`${PROMPT_SUBMITTED}{enter}`);
+    cy.wait('@queryStub');
+  });
+
+  it('Test ManagedCluster attachment error handling', () => {
+    // Mock ManagedCluster details page
+    cy.visit(
+      '/k8s/ns/test-cluster/cluster.open-cluster-management.io~v1~ManagedCluster/test-cluster',
+    );
+    cy.get(mainButton).click();
+    cy.get(popover).should('exist');
+
+    // Mock successful ManagedCluster API call but failed ManagedClusterInfo call
+    cy.intercept(
+      'GET',
+      '/api/kubernetes/apis/cluster.open-cluster-management.io/v1/managedclusters/test-cluster',
+      {
+        statusCode: 200,
+        body: {
+          kind: 'ManagedCluster',
+          apiVersion: 'cluster.open-cluster-management.io/v1',
+          metadata: {
+            name: 'test-cluster',
+            namespace: 'test-cluster',
+          },
+        },
+      },
+    ).as('getManagedCluster');
+
+    cy.intercept(
+      'GET',
+      '/api/kubernetes/apis/internal.open-cluster-management.io/v1beta1/namespaces/test-cluster/managedclusterinfos/test-cluster',
+      {
+        statusCode: 404,
+        body: {
+          kind: 'Status',
+          message:
+            'managedclusterinfos.internal.open-cluster-management.io "test-cluster" not found',
+        },
+      },
+    ).as('getManagedClusterInfoError');
+
+    // Click "Attach cluster info" button
+    cy.get(attachMenuButton).click();
+    cy.get(attachMenu).find('button').contains('Attach cluster info').click();
+
+    // Wait for API calls
+    cy.wait('@getManagedCluster');
+    cy.wait('@getManagedClusterInfoError');
+
+    // Verify error is displayed
+    cy.get(attachMenu).should('include.text', 'Error fetching cluster info');
+  });
 });
