build: Update all tools

Author: jimmidyson

api/go.mod

@@ -5,7 +5,7 @@ module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/ap
 
 go 1.23.0
 
-toolchain go1.24.4
+toolchain go1.24.5
 
 replace github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common => ../common
 

common/go.mod

@@ -5,7 +5,7 @@ module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/co
 
 go 1.23.0
 
-toolchain go1.24.4
+toolchain go1.24.5
 
 require (
 	github.com/evanphx/json-patch/v5 v5.9.11

common/pkg/capi/utils/utils.go

@@ -64,10 +64,12 @@ func ManagementOrFutureManagementCluster(ctx context.Context, c client.Reader) (
 	return cluster, nil
 }
 
-func clusterAnnotationsFromNodes(ctx context.Context, c client.Reader) (string, string, error) {
+func clusterAnnotationsFromNodes(
+	ctx context.Context,
+	c client.Reader,
+) (clusterName, clusterNamespace string, err error) {
 	allNodes := &corev1.NodeList{}
-	err := c.List(ctx, allNodes)
-	if err != nil {
+	if err := c.List(ctx, allNodes); err != nil {
 		return "", "", fmt.Errorf("error listing Nodes: %w", err)
 	}
 

common/pkg/capi/utils/utils_test.go

@@ -138,7 +138,7 @@ func TestManagementOrFutureManagementCluster(t *testing.T) {
 				},
 			},
 			wantErr: fmt.Errorf(
-				"error determining management cluster for the provided client: error getting Cluster object based on Node annotations: clusters.cluster.x-k8s.io \"management-cluster\" not found",
+				`error determining management cluster for the provided client: error getting Cluster object based on Node annotations: clusters.cluster.x-k8s.io "management-cluster" not found`, //nolint:lll // Long error message.
 			),
 		},
 		{
@@ -162,7 +162,7 @@ func TestManagementOrFutureManagementCluster(t *testing.T) {
 				},
 			},
 			wantErr: fmt.Errorf(
-				"error determining management cluster for the provided client: missing \"cluster.x-k8s.io/cluster-name\" annotation",
+				`error determining management cluster for the provided client: missing "cluster.x-k8s.io/cluster-name" annotation`, //nolint:lll // Long error message.
 			),
 		},
 		{
@@ -186,7 +186,7 @@ func TestManagementOrFutureManagementCluster(t *testing.T) {
 				},
 			},
 			wantErr: fmt.Errorf(
-				"error determining management cluster for the provided client: missing \"cluster.x-k8s.io/cluster-namespace\" annotation",
+				`error determining management cluster for the provided client: missing "cluster.x-k8s.io/cluster-namespace" annotation`, //nolint:lll // Long error message.
 			),
 		},
 		{
@@ -213,7 +213,7 @@ func TestManagementOrFutureManagementCluster(t *testing.T) {
 				},
 			},
 			wantErr: fmt.Errorf(
-				"error determining management cluster for the provided client: multiple Cluster objects found, expected exactly one",
+				"error determining management cluster for the provided client: multiple Cluster objects found, expected exactly one", //nolint:lll // Long error message.
 			),
 		},
 	}
@@ -239,7 +239,7 @@ func TestManagementOrFutureManagementCluster(t *testing.T) {
 
 func buildFakeClientForTest(t *testing.T, clusters []clusterv1.Cluster, nodes []corev1.Node) client.Client {
 	t.Helper()
-	var objs []client.Object
+	objs := make([]client.Object, 0, len(clusters)+len(nodes))
 	for i := range clusters {
 		objs = append(objs, &clusters[i])
 	}

common/pkg/testutils/capitest/variables.go

@@ -34,6 +34,8 @@ func ValidateDiscoverVariables[V mutation.DiscoverVariables](
 	handlerCreator func() V,
 	variableTestDefs ...VariableTestDef,
 ) {
+	t.Helper()
+
 	ValidateDiscoverVariablesAs[V, any](
 		t,
 		variableName,

common/pkg/testutils/openapi/cel.go

@@ -70,7 +70,7 @@ func validateCELRecursively(
 			continue
 		}
 
-		jsonName := jsonFieldName(fieldType)
+		jsonName := jsonFieldName(&fieldType)
 		if jsonName == "" {
 			continue
 		}
@@ -99,13 +99,13 @@ func reflectValueToInterface(v reflect.Value) interface{} {
 	return v.Interface()
 }
 
-func jsonFieldName(field reflect.StructField) string {
-	tag := field.Tag.Get("json")
+func jsonFieldName(fld *reflect.StructField) string {
+	tag := fld.Tag.Get("json")
 	if tag == "-" {
 		return ""
 	}
 	if tag == "" {
-		return field.Name
+		return fld.Name
 	}
 	return strings.Split(tag, ",")[0]
 }