Merge pull request #358 from cert-manager/modernize-omitzero

Enable omitzero modernize linter rule

Author: cert-manager-prow[bot]

.golangci.yaml

@@ -14,10 +14,6 @@ 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:

api/v1beta1/googlecasclusterissuer_types.go

@@ -29,11 +29,13 @@ import (
 // +kubebuilder:subresource:status
 // GoogleCASClusterIssuer is the Schema for the googlecasclusterissuers API
 type GoogleCASClusterIssuer struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ObjectMeta `json:"metadata"`
 
-	Spec   GoogleCASIssuerSpec   `json:"spec,omitempty"`
-	Status v1alpha1.IssuerStatus `json:"status,omitempty"`
+	Spec GoogleCASIssuerSpec `json:"spec"`
+	// +optional
+	Status v1alpha1.IssuerStatus `json:"status,omitzero"`
 }
 
 func (vi *GoogleCASClusterIssuer) GetConditions() []metav1.Condition {
@@ -50,7 +52,8 @@ var _ v1alpha1.Issuer = &GoogleCASClusterIssuer{}
 // GoogleCASClusterIssuerList contains a list of GoogleCASClusterIssuer
 type GoogleCASClusterIssuerList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	// +optional
+	metav1.ListMeta `json:"metadata"`
 	Items           []GoogleCASClusterIssuer `json:"items"`
 }
 

api/v1beta1/googlecasissuer_types.go

@@ -41,7 +41,7 @@ type GoogleCASIssuerSpec struct {
 
 	// Credentials is a reference to a Kubernetes Secret Key that contains Google Service Account Credentials
 	// +optional
-	Credentials cmmetav1.SecretKeySelector `json:"credentials,omitempty"`
+	Credentials cmmetav1.SecretKeySelector `json:"credentials,omitzero"`
 
 	// CertificateTemplate is specific certificate template to
 	// use. Omit to not specify a template
@@ -56,11 +56,13 @@ type GoogleCASIssuerSpec struct {
 // +kubebuilder:subresource:status
 // GoogleCASIssuer is the Schema for the googlecasissuers API
 type GoogleCASIssuer struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ObjectMeta `json:"metadata"`
 
-	Spec   GoogleCASIssuerSpec   `json:"spec,omitempty"`
-	Status v1alpha1.IssuerStatus `json:"status,omitempty"`
+	Spec GoogleCASIssuerSpec `json:"spec"`
+	// +optional
+	Status v1alpha1.IssuerStatus `json:"status,omitzero"`
 }
 
 func (vi *GoogleCASIssuer) GetConditions() []metav1.Condition {
@@ -77,7 +79,8 @@ var _ v1alpha1.Issuer = &GoogleCASIssuer{}
 // GoogleCASIssuerList contains a list of GoogleCASIssuer
 type GoogleCASIssuerList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	// +optional
+	metav1.ListMeta `json:"metadata"`
 	Items           []GoogleCASIssuer `json:"items"`
 }
 

deploy/charts/google-cas-issuer/templates/crd-cas-issuer.jetstack.io_googlecasclusterissuers.yaml

@@ -155,6 +155,8 @@ spec:
                     - type
                   x-kubernetes-list-type: map
               type: object
+          required:
+            - spec
           type: object
       served: true
       storage: true

deploy/charts/google-cas-issuer/templates/crd-cas-issuer.jetstack.io_googlecasissuers.yaml

@@ -155,6 +155,8 @@ spec:
                     - type
                   x-kubernetes-list-type: map
               type: object
+          required:
+            - spec
           type: object
       served: true
       storage: true

deploy/crds/cas-issuer.jetstack.io_googlecasclusterissuers.yaml

@@ -155,6 +155,8 @@ spec:
                 - type
                 x-kubernetes-list-type: map
             type: object
+        required:
+        - spec
         type: object
     served: true
     storage: true

deploy/crds/cas-issuer.jetstack.io_googlecasissuers.yaml

@@ -154,6 +154,8 @@ spec:
                 - type
                 x-kubernetes-list-type: map
             type: object
+        required:
+        - spec
         type: object
     served: true
     storage: true