Refactor into helper functions

Author: Jont828

cmd/clusterctl/client/tree/discovery.go

@@ -83,44 +83,13 @@ func Discovery(ctx context.Context, c client.Client, namespace, name string, opt
 
 	if options.ShowAllResources {
 		// Adds resource sets and resource set bindings
-		if resourceSetBindings, err := getResourceSetBindingsInCluster(ctx, c, namespace, name); err == nil {
-			// Should this be in it's own group?
-			addons := VirtualObject(cluster.Namespace, "AddonGroup", "Addons")
-			tree.Add(cluster, addons)
-			for i, resourceSetBinding := range resourceSetBindings {
-				tree.Add(addons, &resourceSetBindings[i], ObjectMetaName("ClusterResourceSetBinding"))
-				for _, binding := range resourceSetBinding.Spec.Bindings {
-					if resourceSet, err := getResourceSetInCluster(ctx, c, namespace, binding.ClusterResourceSetName); err == nil {
-						tree.Add(addons, resourceSet, ObjectMetaName("ClusterResourceSet"))
-					}
-				}
-			}
-		}
+		addAddonsToObjectTree(ctx, c, cluster, tree)
 	}
 
 	// Adds control plane
 	controlPlane, err := external.Get(ctx, c, cluster.Spec.ControlPlaneRef, cluster.Namespace)
 	if err == nil {
-		tree.Add(cluster, controlPlane, ObjectMetaName("ControlPlane"), GroupingObject(true))
-
-		if options.ShowAllResources {
-			// Add control plane infrastructure ref using spec fields guaranteed in contract
-			infrastructureRef, found, err := unstructured.NestedMap(controlPlane.UnstructuredContent(), "spec", "machineTemplate", "infrastructureRef")
-			if err != nil {
-				return nil, err
-			}
-			if found {
-				infrastructureObjectRef := &corev1.ObjectReference{
-					Kind:       infrastructureRef["kind"].(string),
-					Namespace:  infrastructureRef["namespace"].(string),
-					Name:       infrastructureRef["name"].(string),
-					APIVersion: infrastructureRef["apiVersion"].(string),
-				}
-				if machineTemplate, err := external.Get(ctx, c, infrastructureObjectRef, cluster.Namespace); err == nil {
-					tree.Add(controlPlane, machineTemplate, ObjectMetaName("MachineInfrastructureTemplate"))
-				}
-			}
-		}
+		addControlPlane(ctx, c, cluster, controlPlane, tree, options)
 	}
 
 	// Adds control plane machines.
@@ -163,15 +132,76 @@ func Discovery(ctx context.Context, c client.Client, namespace, name string, opt
 	workers := VirtualObject(cluster.Namespace, "WorkerGroup", "Workers")
 	tree.Add(cluster, workers)
 
+	err = addMachineDeploymentToObjectTree(ctx, c, cluster, workers, machinesList, tree, options, addMachineFunc)
+	if err != nil {
+		return nil, err
+	}
+
+	addMachinePoolsToObjectTree(ctx, c, cluster, workers, machinePoolList, tree, options)
+
+	// Handles orphan machines.
+	if len(machineMap) < len(machinesList.Items) {
+		other := VirtualObject(cluster.Namespace, "OtherGroup", "Other")
+		tree.Add(workers, other)
+
+		for i := range machinesList.Items {
+			m := &machinesList.Items[i]
+			if _, ok := machineMap[m.Name]; ok {
+				continue
+			}
+			addMachineFunc(other, m)
+		}
+	}
+
+	return tree, nil
+}
+
+func addAddonsToObjectTree(ctx context.Context, c client.Client, cluster *clusterv1.Cluster, tree *ObjectTree) {
+	if resourceSetBindings, err := getResourceSetBindingsInCluster(ctx, c, cluster.Namespace, cluster.Name); err == nil {
+		// Should this be in it's own group?
+		addons := VirtualObject(cluster.Namespace, "AddonGroup", "Addons")
+		tree.Add(cluster, addons)
+		for i, resourceSetBinding := range resourceSetBindings {
+			tree.Add(addons, &resourceSetBindings[i], ObjectMetaName("ClusterResourceSetBinding"))
+			for _, binding := range resourceSetBinding.Spec.Bindings {
+				if resourceSet, err := getResourceSetInCluster(ctx, c, cluster.Namespace, binding.ClusterResourceSetName); err == nil {
+					tree.Add(addons, resourceSet, ObjectMetaName("ClusterResourceSet"))
+				}
+			}
+		}
+	}
+}
+
+func addControlPlane(ctx context.Context, c client.Client, cluster *clusterv1.Cluster, controlPlane *unstructured.Unstructured, tree *ObjectTree, options DiscoverOptions) {
+	tree.Add(cluster, controlPlane, ObjectMetaName("ControlPlane"), GroupingObject(true))
+
+	if options.ShowAllResources {
+		// Add control plane infrastructure ref using spec fields guaranteed in contract
+		infrastructureRef, found, err := unstructured.NestedMap(controlPlane.UnstructuredContent(), "spec", "machineTemplate", "infrastructureRef")
+		if err != nil && found {
+			infrastructureObjectRef := &corev1.ObjectReference{
+				Kind:       infrastructureRef["kind"].(string),
+				Namespace:  infrastructureRef["namespace"].(string),
+				Name:       infrastructureRef["name"].(string),
+				APIVersion: infrastructureRef["apiVersion"].(string),
+			}
+			if machineTemplate, err := external.Get(ctx, c, infrastructureObjectRef, cluster.Namespace); err == nil {
+				tree.Add(controlPlane, machineTemplate, ObjectMetaName("MachineInfrastructureTemplate"))
+			}
+		}
+	}
+}
+
+func addMachineDeploymentToObjectTree(ctx context.Context, c client.Client, cluster *clusterv1.Cluster, workers *unstructured.Unstructured, machinesList *clusterv1.MachineList, tree *ObjectTree, options DiscoverOptions, addMachineFunc func(parent client.Object, m *clusterv1.Machine)) error {
 	// Adds worker machines.
 	machinesDeploymentList, err := getMachineDeploymentsInCluster(ctx, c, cluster.Namespace, cluster.Name)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	machineSetList, err := getMachineSetsInCluster(ctx, c, cluster.Namespace, cluster.Name)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	for i := range machinesDeploymentList.Items {
@@ -209,6 +239,10 @@ func Discovery(ctx context.Context, c client.Client, namespace, name string, opt
 		}
 	}
 
+	return nil
+}
+
+func addMachinePoolsToObjectTree(ctx context.Context, c client.Client, cluster *clusterv1.Cluster, workers *unstructured.Unstructured, machinePoolList *expv1.MachinePoolList, tree *ObjectTree, options DiscoverOptions) {
 	for i := range machinePoolList.Items {
 		mp := &machinePoolList.Items[i]
 		addOpts := make([]AddObjectOption, 0)
@@ -229,22 +263,6 @@ func Discovery(ctx context.Context, c client.Client, namespace, name string, opt
 
 		// TODO: Add machinepoolmachines when it's implemented
 	}
-
-	// Handles orphan machines.
-	if len(machineMap) < len(machinesList.Items) {
-		other := VirtualObject(cluster.Namespace, "OtherGroup", "Other")
-		tree.Add(workers, other)
-
-		for i := range machinesList.Items {
-			m := &machinesList.Items[i]
-			if _, ok := machineMap[m.Name]; ok {
-				continue
-			}
-			addMachineFunc(other, m)
-		}
-	}
-
-	return tree, nil
 }
 
 func getResourceSetBindingsInCluster(ctx context.Context, c client.Client, namespace string, name string) ([]addonsv1.ClusterResourceSetBinding, error) {