Merge pull request #348 from cert-manager/self-upgrade-main

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

.github/workflows/renovate.yaml

@@ -50,7 +50,7 @@ jobs:
           go-version: ${{ steps.go-version.outputs.result }}
 
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@aec779d4f7845f8431ddf403cf9659d4702ddde0 # v43.0.18
+        uses: renovatebot/github-action@a3c115cd6676c8a5bc72f9715f108759e570daf5 # v43.0.19
         with:
           configurationFile: .github/renovate.json5
           token: ${{ steps.octo-sts.outputs.token }}

.golangci.yaml

@@ -7,6 +7,10 @@ linters:
     paths: [third_party, builtin$, examples$]
     warn-unused: true
   settings:
+    modernize:
+      disable:
+        # TODO(erikgb): Enable when we know how to do this correctly in API types
+        - omitzero
     staticcheck:
       checks: ["all", "-ST1000", "-ST1001", "-ST1003", "-ST1005", "-ST1012", "-ST1016", "-ST1020", "-ST1021", "-ST1022", "-QF1001", "-QF1003", "-QF1008"]
   enable:
@@ -45,6 +49,7 @@ linters:
     - makezero
     - mirror
     - misspell
+    - modernize
     - musttag
     - nakedret
     - nilerr
@@ -72,9 +77,10 @@ formatters:
       sections:
         - standard # Standard section: captures all standard packages.
         - default # Default section: contains all imports that could not be matched to another section type.
-        - prefix(github.com/cert-manager/issuer-lib) # Custom section: groups all imports with the specified Prefix.
+        - localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
         - blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
         - dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
+      custom-order: true
   exclusions:
     generated: lax
     paths: [third_party, builtin$, examples$]

api/v1alpha1/issuer_interface.go

@@ -1,5 +1,4 @@
 //go:build !ignore_autogenerated
-// +build !ignore_autogenerated
 
 /*
 Copyright 2023 The cert-manager Authors.

controllers/certificaterequest_controller.go

@@ -35,6 +35,7 @@ type CertificateRequestReconciler struct {
 
 	// SetCAOnCertificateRequest is used to enable setting the CA status field on
 	// the CertificateRequest resource. This is disabled by default.
+	//
 	// Deprecated: this option is for backwards compatibility only. The use of
 	// ca.crt is discouraged. Instead, the CA certificate should be provided
 	// separately using a tool such as trust-manager.

controllers/combined_controller.go

@@ -61,6 +61,7 @@ type CombinedController struct {
 
 	// SetCAOnCertificateRequest is used to enable setting the CA status field on
 	// the CertificateRequest resource. This is disabled by default.
+	//
 	// Deprecated: this option is for backwards compatibility only. The use of
 	// ca.crt is discouraged. Instead, the CA certificate should be provided
 	// separately using a tool such as trust-manager.

docs/api.md

@@ -61,7 +61,7 @@ const (
 ```
 
 <a name="Issuer"></a>
-## type [Issuer](<https://github.com/cert-manager/issuer-lib/blob/main/api/v1alpha1/issuer_interface.go#L28-L43>)
+## type [Issuer](<https://github.com/cert-manager/issuer-lib/blob/main/api/v1alpha1/issuer_interface.go#L27-L42>)
 
 
 
@@ -119,7 +119,7 @@ func (in *IssuerStatus) DeepCopyInto(out *IssuerStatus)
 DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non\-nil.
 
 <a name="WrappedIssuer"></a>
-## type [WrappedIssuer](<https://github.com/cert-manager/issuer-lib/blob/main/api/v1alpha1/issuer_interface.go#L46-L49>)
+## type [WrappedIssuer](<https://github.com/cert-manager/issuer-lib/blob/main/api/v1alpha1/issuer_interface.go#L45-L48>)
 
 WrappedIssuer is an issuer type to support objects which are not directly of the type Issuer. This could include cert\-manager issuers for example.
 

examples/simple/api/simple_cluster_issuer_types.go

@@ -17,9 +17,8 @@ limitations under the License.
 package api
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"github.com/cert-manager/issuer-lib/api/v1alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // +kubebuilder:object:root=true

examples/simple/api/simple_issuer_types.go

@@ -17,9 +17,8 @@ limitations under the License.
 package api
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"github.com/cert-manager/issuer-lib/api/v1alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // +kubebuilder:object:root=true

examples/simple/controller/signer.go

@@ -27,12 +27,12 @@ import (
 	"math/big"
 	"time"
 
-	ctrl "sigs.k8s.io/controller-runtime"
-	"simple-issuer/api"
-
 	"github.com/cert-manager/issuer-lib/api/v1alpha1"
 	"github.com/cert-manager/issuer-lib/controllers"
 	"github.com/cert-manager/issuer-lib/controllers/signer"
+	ctrl "sigs.k8s.io/controller-runtime"
+
+	"simple-issuer/api"
 )
 
 // +kubebuilder:rbac:groups=cert-manager.io,resources=certificaterequests,verbs=get;list;watch

examples/simple/e2e/e2e_test.go

@@ -41,6 +41,7 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
 	"simple-issuer/api"
 )