optimize getv2clusters (#26)

* feat: improve list function

* chore: address comments

Author: adorney99

VERSION

@@ -1 +1 @@
-2.0.6
+2.0.7

deployment/charts/cluster-manager/Chart.yaml

@@ -16,6 +16,6 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.6
-appVersion: 2.0.6
+version: 2.0.7
+appVersion: 2.0.7
 annotations: {}

deployment/charts/cluster-template-crd/Chart.yaml

@@ -6,6 +6,6 @@ apiVersion: v2
 name: cluster-template-crd
 description: A Helm chart for the ClusterTemplate CRD
 type: application
-version: 2.0.6
-appVersion: 2.0.6
+version: 2.0.7
+appVersion: 2.0.7
 annotations: {}

internal/rest/getv2clusters.go

@@ -105,6 +105,11 @@ func (s *Server) getClusters(ctx context.Context, namespace string, orderBy, fil
 
 func (s *Server) convertClusters(ctx context.Context, namespace string, unstructuredClusters []unstructured.Unstructured) []api.ClusterInfo {
 	clusters := make([]api.ClusterInfo, 0, len(unstructuredClusters))
+	allMachines, err := fetchAllMachinesList(ctx, s, namespace)
+	if err != nil {
+		slog.Error("failed to fetch machines", "namespace", namespace, "error", err)
+		return nil
+	}
 	for _, item := range unstructuredClusters {
 		capiCluster := capi.Cluster{}
 		if err := runtime.DefaultUnstructuredConverter.FromUnstructured(item.Object, &capiCluster); err != nil {
@@ -114,11 +119,7 @@ func (s *Server) convertClusters(ctx context.Context, namespace string, unstruct
 
 		slog.Debug("Processing cluster", "name", capiCluster.Name, "labels", capiCluster.Labels)
 		// get machines associated with the cluster
-		machines, err := fetchMachinesList(ctx, s, namespace, capiCluster.Name)
-		if err != nil {
-			slog.Error("failed to fetch machines for cluster", "cluster", capiCluster.Name, "error", err)
-			continue
-		}
+		machines := getClusterMachines(allMachines, capiCluster.Name)
 
 		labels := labels.Filter(capiCluster.Labels)
 		unstructuredLabels := convert.MapStringToAny(labels)
@@ -200,3 +201,4 @@ func orderClustersBy(cluster1, cluster2 api.ClusterInfo, orderBy *OrderBy) bool
 		return false
 	}
 }
+

internal/rest/getv2clusters_test.go

@@ -63,14 +63,26 @@ var clusterStatusInProgressControlPlane = capi.ClusterStatus{
 
 func createMockServer(t *testing.T, clusters []capi.Cluster, projectID string, options ...bool) *Server {
 	unstructuredClusters := make([]unstructured.Unstructured, len(clusters))
+	machinesList := make([]unstructured.Unstructured, len(clusters))
 	for i, cluster := range clusters {
 		unstructuredCluster, err := convert.ToUnstructured(cluster)
 		require.NoError(t, err, "convertClusterToUnstructured() error = %v, want nil")
 		unstructuredClusters[i] = *unstructuredCluster
+		machine := capi.Machine{
+			ObjectMeta: metav1.ObjectMeta{Name: cluster.Name},
+			Spec:       capi.MachineSpec{ClusterName: cluster.Name},
+			Status:     capi.MachineStatus{Phase: string(capi.MachinePhaseRunning)},
+		}
+		unstructuredMachine, err := convert.ToUnstructured(machine)
+		require.NoError(t, err, "convertClusterToUnstructured() error = %v, want nil")
+		machinesList[i] = *unstructuredMachine
 	}
 	unstructuredClusterList := &unstructured.UnstructuredList{
 		Items: unstructuredClusters,
 	}
+	unstructuredMachineList := &unstructured.UnstructuredList{
+		Items: machinesList,
+	}
 	// default is to set up k8s client and machineResource mocks
 	setupK8sMocks := true
 	mockMachineResource := true
@@ -88,12 +100,16 @@ func createMockServer(t *testing.T, clusters []capi.Cluster, projectID string, o
 		mockedk8sclient = k8s.NewMockInterface(t)
 		mockedk8sclient.EXPECT().Resource(core.ClusterResourceSchema).Return(nsResource)
 		if mockMachineResource {
+			machineResource := k8s.NewMockResourceInterface(t)
+			machineResource.EXPECT().List(mock.Anything, metav1.ListOptions{}).Return(unstructuredMachineList, nil)
+			namespacedMachineResource := k8s.NewMockNamespaceableResourceInterface(t)
 			for _, cluster := range clusters {
-				resource.EXPECT().List(mock.Anything, metav1.ListOptions{
+				machineResource.EXPECT().List(mock.Anything, metav1.ListOptions{
 					LabelSelector: "cluster.x-k8s.io/cluster-name=" + cluster.Name,
 				}).Return(&unstructured.UnstructuredList{Items: []unstructured.Unstructured{}}, nil).Maybe()
 			}
-			mockedk8sclient.EXPECT().Resource(core.MachineResourceSchema).Return(nsResource).Maybe()
+			namespacedMachineResource.EXPECT().Namespace(projectID).Return(machineResource)
+			mockedk8sclient.EXPECT().Resource(core.MachineResourceSchema).Return(namespacedMachineResource).Maybe()
 		}
 	}
 	return NewServer(mockedk8sclient)
@@ -158,7 +174,7 @@ var expectedActiveProjectID = "655a6892-4280-4c37-97b1-31161ac0b99e"
 func TestGetV2Clusters200(t *testing.T) {
 	t.Run("No Clusters", func(t *testing.T) {
 		clusters := []capi.Cluster{}
-		server := createMockServer(t, clusters, expectedActiveProjectID, true, false)
+		server := createMockServer(t, clusters, expectedActiveProjectID, true, true)
 		require.NotNil(t, server, "NewServer() returned nil, want not nil")
 
 		// Create a new request & response recorder

internal/rest/utils.go

@@ -25,6 +25,7 @@ type ContextKey string
 const (
 	ActiveProjectIdHeaderKey             = "Activeprojectid"
 	ActiveProjectIdContextKey ContextKey = ActiveProjectIdHeaderKey
+	ClusterNameSelectorKey             = "cluster.x-k8s.io/cluster-name"
 )
 
 func validateClusterDetail(clusterDetail api.ClusterDetailInfo) error {
@@ -293,6 +294,17 @@ func getNodeHealth(cluster *capi.Cluster, machines []unstructured.Unstructured)
 	return status
 }
 
+// getClusterMachines filters the machines by cluster name
+func getClusterMachines(machines []unstructured.Unstructured, name string ) ([]unstructured.Unstructured) {
+	var filteredMachines []unstructured.Unstructured
+	for _, machine := range machines {
+		if machine.GetLabels()[ClusterNameSelectorKey] == name {
+			filteredMachines = append(filteredMachines, machine)
+		}
+	}
+	return filteredMachines
+}
+
 func ptr[T any](v T) *T {
 	return &v
 }
@@ -341,7 +353,7 @@ func fetchMachineFromCluster(ctx context.Context, s *Server, namespace string, c
 func fetchIntelMachineBindingFromCluster(ctx context.Context, s *Server, namespace string, clusterName string, nodeID string) (*intelv1alpha1.IntelMachineBinding, error) {
 	// first get the machine using the nodeID
 	unstructuredMachines, err := s.k8sclient.Resource(core.MachineResourceSchema).Namespace(namespace).List(ctx, v1.ListOptions{
-		LabelSelector: "cluster.x-k8s.io/cluster-name=" + clusterName,
+		LabelSelector: ClusterNameSelectorKey + "=" + clusterName,
 	})
 	if unstructuredMachines == nil || len(unstructuredMachines.Items) == 0 {
 		return nil, fmt.Errorf("machine not found for node ID %s", nodeID)
@@ -366,7 +378,7 @@ func fetchIntelMachineBindingFromCluster(ctx context.Context, s *Server, namespa
 	}
 	// get the machine bindings for the cluster
 	unstructuredMachineList, err := s.k8sclient.Resource(core.BindingsResourceSchema).Namespace(namespace).List(ctx, v1.ListOptions{
-		LabelSelector: "cluster.x-k8s.io/cluster-name=" + clusterName,
+		LabelSelector: ClusterNameSelectorKey + "=" + clusterName,
 	})
 	if err != nil {
 		return nil, err
@@ -388,7 +400,7 @@ func fetchIntelMachineBindingFromCluster(ctx context.Context, s *Server, namespa
 
 func fetchMachine(ctx context.Context, s *Server, namespace string, clusterName string, nodeID string) (*capi.Machine, error) {
 	unstructuredMachines, err := s.k8sclient.Resource(core.MachineResourceSchema).Namespace(namespace).List(ctx, v1.ListOptions{
-		LabelSelector: "cluster.x-k8s.io/cluster-name=" + clusterName,
+		LabelSelector: ClusterNameSelectorKey + "=" + clusterName,
 	})
 	if unstructuredMachines == nil || len(unstructuredMachines.Items) == 0 {
 		return nil, fmt.Errorf("machine not found for node ID %s", nodeID)
@@ -411,10 +423,18 @@ func fetchMachine(ctx context.Context, s *Server, namespace string, clusterName
 
 func fetchMachinesList(ctx context.Context, s *Server, namespace string, clusterName string) ([]unstructured.Unstructured, error) {
 	unstructuredMachineList, err := s.k8sclient.Resource(core.MachineResourceSchema).Namespace(namespace).List(ctx, v1.ListOptions{
-		LabelSelector: "cluster.x-k8s.io/cluster-name=" + clusterName,
+		LabelSelector: ClusterNameSelectorKey + "=" + clusterName,
 	})
 	if err != nil {
 		return nil, err
 	}
 	return unstructuredMachineList.Items, nil
 }
+
+func fetchAllMachinesList(ctx context.Context, s *Server, namespace string) ([]unstructured.Unstructured, error) {
+	unstructuredMachineList, err := s.k8sclient.Resource(core.MachineResourceSchema).Namespace(namespace).List(ctx, v1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+	return unstructuredMachineList.Items, nil
+}