Fix lint

Signed-off-by: Jonathan Ogilvie <[email protected]>

Author: jcogilvie

pkg/cache/cluster.go

@@ -1119,13 +1119,13 @@ func buildGraph(nsNodes map[kube.ResourceKey]*Resource, allResources map[kube.Re
 				// Try same-namespace lookup first (preserves existing behavior)
 				sameNSKey := kube.ResourceKey{Group: group.Group, Kind: ownerRef.Kind, Namespace: childNode.Ref.Namespace, Name: ownerRef.Name}
 				graphKeyNode, ok := nsNodes[sameNSKey]
-				
+
 				// If not found and we have cross-namespace capabilities, try cluster-scoped lookup
 				if !ok && allResources != nil {
 					clusterScopedKey := kube.ResourceKey{Group: group.Group, Kind: ownerRef.Kind, Namespace: "", Name: ownerRef.Name}
 					graphKeyNode, ok = allResources[clusterScopedKey]
 				}
-				
+
 				if !ok {
 					// No resource found with the given graph key, so move on.
 					continue
@@ -1147,7 +1147,7 @@ func buildGraph(nsNodes map[kube.ResourceKey]*Resource, allResources map[kube.Re
 					}
 				}
 			}
-			
+
 			if ok {
 				for _, uidNode := range uidNodes {
 					// Update the graph for this owner to include the child.
@@ -1170,33 +1170,31 @@ func buildGraph(nsNodes map[kube.ResourceKey]*Resource, allResources map[kube.Re
 			}
 		}
 	}
-	
+
 	// Second pass: process cross-namespace children if allResources is provided
-	if allResources != nil {
-		for _, childNode := range allResources {
-			// Skip if already processed in the current namespace
-			if _, exists := nsNodes[childNode.ResourceKey()]; exists {
+	for _, childNode := range allResources {
+		// Skip if already processed in the current namespace
+		if _, exists := nsNodes[childNode.ResourceKey()]; exists {
+			continue
+		}
+
+		// Check if this child has a parent in the current namespace
+		for _, ownerRef := range childNode.OwnerRefs {
+			group, err := schema.ParseGroupVersion(ownerRef.APIVersion)
+			if err != nil {
 				continue
 			}
-			
-			// Check if this child has a parent in the current namespace
-			for _, ownerRef := range childNode.OwnerRefs {
-				group, err := schema.ParseGroupVersion(ownerRef.APIVersion)
-				if err != nil {
-					continue
-				}
-				parentKey := kube.ResourceKey{Group: group.Group, Kind: ownerRef.Kind, Namespace: "", Name: ownerRef.Name}
-				if parentNode, exists := nsNodes[parentKey]; exists {
-					// Found a cross-namespace relationship
-					if _, ok := graph[parentNode.ResourceKey()]; !ok {
-						graph[parentNode.ResourceKey()] = make(map[types.UID]*Resource)
-					}
-					graph[parentNode.ResourceKey()][childNode.Ref.UID] = childNode
+			parentKey := kube.ResourceKey{Group: group.Group, Kind: ownerRef.Kind, Namespace: "", Name: ownerRef.Name}
+			if parentNode, exists := nsNodes[parentKey]; exists {
+				// Found a cross-namespace relationship
+				if _, ok := graph[parentNode.ResourceKey()]; !ok {
+					graph[parentNode.ResourceKey()] = make(map[types.UID]*Resource)
 				}
+				graph[parentNode.ResourceKey()][childNode.Ref.UID] = childNode
 			}
 		}
 	}
-	
+
 	return graph
 }
 

pkg/cache/cluster_test.go

@@ -92,11 +92,11 @@ func newClusterWithOptions(_ testing.TB, opts []UpdateSettingsFunc, objs ...runt
 	client.PrependReactor("list", "*", func(action testcore.Action) (handled bool, ret runtime.Object, err error) {
 		handled, ret, err = reactor.React(action)
 		if err != nil || !handled {
-			return
+			return handled, ret, fmt.Errorf("reactor failed: %w", err)
 		}
 		// make sure list response have resource version
 		ret.(metav1.ListInterface).SetResourceVersion("123")
-		return
+		return handled, ret, nil
 	})
 
 	apiResources := []kube.APIResourceInfo{{
@@ -1158,12 +1158,12 @@ func TestIterateHierachyV2(t *testing.T) {
 	})
 }
 
-// TestIterateHierarchyV2_CrossNamespaceOwnerReference tests that cross-namespace 
-// owner references work correctly, specifically cluster-scoped resources with 
+// TestIterateHierarchyV2_CrossNamespaceOwnerReference tests that cross-namespace
+// owner references work correctly, specifically cluster-scoped resources with
 // namespaced children
 func TestIterateHierarchyV2_CrossNamespaceOwnerReference(t *testing.T) {
 	cluster := newCluster(t)
-	
+
 	// Create cluster-scoped parent resource (ProviderRevision)
 	parentUID := types.UID("parent-uid-123")
 	clusterScopedParent := &Resource{
@@ -1220,35 +1220,36 @@ func TestIterateHierarchyV2_CrossNamespaceOwnerReference(t *testing.T) {
 	var visitedResources []*Resource
 	cluster.IterateHierarchyV2(
 		[]kube.ResourceKey{clusterScopedParent.ResourceKey()},
-		func(resource *Resource, namespaceResources map[kube.ResourceKey]*Resource) bool {
+		func(resource *Resource, _ map[kube.ResourceKey]*Resource) bool {
 			visitedResources = append(visitedResources, resource)
 			return true
 		},
 	)
 
 	// Should visit parent + both children (3 resources)
-	assert.Equal(t, 3, len(visitedResources), "Should visit parent and both children")
-	
+	assert.Len(t, visitedResources, 3, "Should visit parent and both children")
+
 	visitedNames := make([]string, len(visitedResources))
 	for i, res := range visitedResources {
 		visitedNames[i] = res.Ref.Name
 	}
-	
+
 	// Check we have the expected resources by type and namespace combination
 	foundParent := false
 	foundClusterChild := false
 	foundNamespacedChild := false
-	
+
 	for _, res := range visitedResources {
-		if res.Ref.Kind == "ProviderRevision" && res.Ref.Namespace == "" {
+		switch {
+		case res.Ref.Kind == "ProviderRevision" && res.Ref.Namespace == "":
 			foundParent = true
-		} else if res.Ref.Kind == "ClusterRole" && res.Ref.Namespace == "" {
+		case res.Ref.Kind == "ClusterRole" && res.Ref.Namespace == "":
 			foundClusterChild = true
-		} else if res.Ref.Kind == "Deployment" && res.Ref.Namespace == "crossplane-system" {
+		case res.Ref.Kind == "Deployment" && res.Ref.Namespace == "crossplane-system":
 			foundNamespacedChild = true
 		}
 	}
-	
+
 	assert.True(t, foundParent, "Should visit ProviderRevision parent")
 	assert.True(t, foundClusterChild, "Should visit ClusterRole child")
 	assert.True(t, foundNamespacedChild, "Should visit Deployment child (this tests the fix)")
@@ -1286,7 +1287,7 @@ func Test_watchEvents_Deadlock(t *testing.T) {
 			// deadlock.RLock()
 			// defer deadlock.RUnlock()
 
-			return
+			return info, cacheManifest
 		}),
 	}, res1, res2, testDeploy())
 	defer func() {