Merge pull request #1110 from jbw976/backport-1108-to-release-2.3

Author: phisco

.golangci.yml

@@ -95,6 +95,9 @@ linters:
     # against idiomatic Go programming, which encourages this approach - e.g.
     # to scope errors.
     - noinlineerr
+
+    # Deprecated in favour of gomodguard_v2, which is enabled by default: all
+    - gomodguard
   settings:
     depguard:
       rules:
@@ -117,6 +120,7 @@ linters:
     goconst:
       min-len: 3
       min-occurrences: 5
+      ignore-tests: true
     gocritic:
       enabled-tags:
         - performance
@@ -159,7 +163,6 @@ linters:
           - gochecknoglobals
           - gochecknoinits
           - gocognit
-          - goconst
           - gosec
           - scopelint
           - unparam
@@ -178,6 +181,14 @@ linters:
           - gochecknoinits
         path: apis/
 
+      # The xcrd package builds OpenAPI schemas, so it repeats schema
+      # vocabulary like "string", "object", and "apiVersion". Each literal
+      # mirrors the schema field it emits, which reads better than a named
+      # constant standing in for it.
+      - linters:
+          - goconst
+        path: pkg/xcrd/
+
       # These are performance optimisations rather than style issues per se.
       # They warn when function arguments or range values copy a lot of memory
       # rather than using a pointer.

apis/changelogs/proto/v1alpha1/changelog.pb.go

@@ -5,7 +5,7 @@
   description = "Crossplane Runtime - Go library for building Crossplane providers and controllers";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
     # TODO(negz): Unpin once https://github.com/nix-community/gomod2nix/pull/231 is released.
@@ -99,7 +99,7 @@
               pkgs.kubernetes-controller-tools
 
               # Nix
-              pkgs.nixfmt-rfc-style
+              pkgs.nixfmt
             ];
 
             shellHook = ''

apis/changelogs/proto/v1alpha1/changelog_grpc.pb.go

@@ -120,7 +120,7 @@
         nativeBuildInputs = [
           pkgs.statix
           pkgs.deadnix
-          pkgs.nixfmt-rfc-style
+          pkgs.nixfmt
         ];
       }
       ''