Merge pull request #852 from negz/y-u-do-this-golangci

Bump to Go v1.24, and golangci-lint v2.2.0

Author: phisco

.golangci.yml

@@ -3,7 +3,7 @@ VERSION --try --raw-output 0.8
 
 PROJECT crossplane/crossplane-runtime
 
-ARG --global GO_VERSION=1.23.7
+ARG --global GO_VERSION=1.24.4
 
 # reviewable checks that a branch is ready for review. Run it before opening a
 # pull request. It will catch a lot of the things our CI workflow will catch.
@@ -102,7 +102,7 @@ go-test:
 
 # go-lint lints Go code.
 go-lint:
-  ARG GOLANGCI_LINT_VERSION=v1.64.8
+  ARG GOLANGCI_LINT_VERSION=v2.2.1
   FROM +go-modules
   # This cache is private because golangci-lint doesn't support concurrent runs.
   CACHE --id go-lint --sharing private /root/.cache/golangci-lint

Earthfile

@@ -68,7 +68,7 @@ const (
 // See https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#typical-status-properties
 
 // A Condition that may apply to a resource.
-type Condition struct {
+type Condition struct { //nolint:recvcheck // False positive - only has non-pointer methods AFAICT.
 	// Type of this condition. At most one of each condition type may apply to
 	// a resource at any point in time.
 	Type ConditionType `json:"type"`
@@ -126,6 +126,7 @@ func IsSystemConditionType(t ConditionType) bool {
 	case TypeReady, TypeSynced, TypeHealthy:
 		return true
 	}
+
 	return false
 }
 
@@ -150,6 +151,7 @@ type ConditionedStatus struct {
 func NewConditionedStatus(c ...Condition) *ConditionedStatus {
 	s := &ConditionedStatus{}
 	s.SetConditions(c...)
+
 	return s
 }
 
@@ -171,6 +173,7 @@ func (s *ConditionedStatus) GetCondition(ct ConditionType) Condition {
 func (s *ConditionedStatus) SetConditions(c ...Condition) {
 	for _, cond := range c {
 		exists := false
+
 		for i, existing := range s.Conditions {
 			if existing.Type != cond.Type {
 				continue
@@ -184,6 +187,7 @@ func (s *ConditionedStatus) SetConditions(c ...Condition) {
 			s.Conditions[i] = cond
 			exists = true
 		}
+
 		if !exists {
 			s.Conditions = append(s.Conditions, cond)
 		}

apis/common/v1/condition.go

@@ -72,6 +72,7 @@ func (in *ConnectionSecretMetadata) SetOwnerUID(uid types.UID) {
 	if in.Labels == nil {
 		in.Labels = map[string]string{}
 	}
+
 	in.Labels[LabelKeyOwnerUID] = string(uid)
 }
 
@@ -80,6 +81,7 @@ func (in *ConnectionSecretMetadata) GetOwnerUID() string {
 	if u, ok := in.Labels[LabelKeyOwnerUID]; ok {
 		return u
 	}
+
 	return ""
 }
 
@@ -145,13 +147,13 @@ type Config struct {
 // KubernetesAuthConfig required to authenticate to a K8s API. It expects
 // a "kubeconfig" file to be provided.
 type KubernetesAuthConfig struct {
-	// Source of the credentials.
-	// +kubebuilder:validation:Enum=None;Secret;Environment;Filesystem
-	Source CredentialsSource `json:"source"`
-
 	// CommonCredentialSelectors provides common selectors for extracting
 	// credentials.
 	CommonCredentialSelectors `json:",inline"`
+
+	// Source of the credentials.
+	// +kubebuilder:validation:Enum=None;Secret;Environment;Filesystem
+	Source CredentialsSource `json:"source"`
 }
 
 // KubernetesSecretStoreConfig represents the required configuration

apis/common/v1/connection_details.go

@@ -40,9 +40,11 @@ func (mo *MergeOptions) MergoConfiguration() []func(*mergo.Config) {
 	if mo.KeepMapValues != nil && *mo.KeepMapValues {
 		config = config[:0]
 	}
+
 	if mo.AppendSlice != nil && *mo.AppendSlice {
 		config = append(config, mergo.WithAppendSlice)
 	}
+
 	return config
 }
 

apis/common/v1/merge.go

@@ -33,12 +33,15 @@ func (arr mergoOptArr) names() []string {
 	for i, opt := range arr {
 		names[i] = runtime.FuncForPC(reflect.ValueOf(opt).Pointer()).Name()
 	}
+
 	sort.Strings(names)
+
 	return names
 }
 
 func TestMergoConfiguration(t *testing.T) {
 	valTrue := true
+
 	tests := map[string]struct {
 		mo   *MergeOptions
 		want mergoOptArr

apis/common/v1/merge_test.go

@@ -101,6 +101,7 @@ func (p *Policy) IsResolutionPolicyOptional() bool {
 	if p == nil || p.Resolution == nil {
 		return false
 	}
+
 	return *p.Resolution == ResolutionPolicyOptional
 }
 
@@ -109,6 +110,7 @@ func (p *Policy) IsResolvePolicyAlways() bool {
 	if p == nil || p.Resolve == nil {
 		return false
 	}
+
 	return *p.Resolve == ResolvePolicyAlways
 }
 

apis/common/v1/resource.go

@@ -1,8 +1,6 @@
 module github.com/crossplane/crossplane-runtime
 
-go 1.23.0
-
-toolchain go1.23.7
+go 1.24.0
 
 require (
 	dario.cat/mergo v1.0.1

go.mod

@@ -36,12 +36,14 @@ const (
 func LoadMTLSConfig(caPath, certPath, keyPath string, isServer bool) (*tls.Config, error) {
 	tlsCertFilePath := filepath.Clean(certPath)
 	tlsKeyFilePath := filepath.Clean(keyPath)
+
 	certificate, err := tls.LoadX509KeyPair(tlsCertFilePath, tlsKeyFilePath)
 	if err != nil {
 		return nil, errors.Wrap(err, errLoadCert)
 	}
 
 	caCertFilePath := filepath.Clean(caPath)
+
 	ca, err := os.ReadFile(caCertFilePath)
 	if err != nil {
 		return nil, errors.Wrap(err, errLoadCA)

pkg/certificates/certificates.go

@@ -27,10 +27,12 @@ func TestLoad(t *testing.T) {
 		certsFolderPath         string
 		requireClientValidation bool
 	}
+
 	type want struct {
 		err error
 		out *tls.Config
 	}
+
 	cases := map[string]struct {
 		reason string
 		args
@@ -92,16 +94,16 @@ func TestLoad(t *testing.T) {
 	}
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
-			certsFolderPath := tc.args.certsFolderPath
-			requireClient := tc.args.requireClientValidation
+			certsFolderPath := tc.certsFolderPath
+			requireClient := tc.requireClientValidation
 
 			cfg, err := LoadMTLSConfig(filepath.Join(certsFolderPath, caCertFileName), filepath.Join(certsFolderPath, tlsCertFileName), filepath.Join(certsFolderPath, tlsKeyFileName), requireClient)
-			if diff := cmp.Diff(tc.want.err, err, test.EquateErrors()); diff != "" {
+			if diff := cmp.Diff(tc.err, err, test.EquateErrors()); diff != "" {
 				t.Errorf("\n%s\nLoad(...): -want error, +got error:\n%s", tc.reason, diff)
 			}
 
 			if requireClient {
-				if diff := cmp.Diff(tc.want.out.ClientAuth, cfg.ClientAuth); diff != "" {
+				if diff := cmp.Diff(tc.out.ClientAuth, cfg.ClientAuth); diff != "" {
 					t.Errorf("\n%s\nLoad(...): -want, +got:\n%s", tc.reason, diff)
 				}
 			}