Merge pull request #351 from erikgb/modernize-omitzero

Enable omitzero modernize linter rule

Author: cert-manager-prow[bot]

.golangci.yaml

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

examples/simple/api/simple_cluster_issuer_types.go

@@ -34,11 +34,14 @@ import (
 
 // SimpleClusterIssuer is the Schema for the SimpleClusterIssuers API
 type SimpleClusterIssuer struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ObjectMeta `json:"metadata"`
 
-	Spec   SimpleCertificateSource `json:"spec,omitempty"`
-	Status v1alpha1.IssuerStatus   `json:"status,omitempty"`
+	// +optional
+	Spec SimpleCertificateSource `json:"spec"`
+	// +optional
+	Status v1alpha1.IssuerStatus `json:"status,omitzero"`
 }
 
 func (vi *SimpleClusterIssuer) GetConditions() []metav1.Condition {
@@ -56,7 +59,8 @@ var _ v1alpha1.Issuer = &SimpleClusterIssuer{}
 // SimpleClusterIssuerList contains a list of SimpleClusterIssuer
 type SimpleClusterIssuerList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	// +optional
+	metav1.ListMeta `json:"metadata"`
 	Items           []SimpleClusterIssuer `json:"items"`
 }
 

examples/simple/api/simple_issuer_types.go

@@ -33,11 +33,14 @@ import (
 
 // SimpleIssuer is the Schema for the SimpleIssuers API
 type SimpleIssuer struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ObjectMeta `json:"metadata"`
 
-	Spec   SimpleCertificateSource `json:"spec,omitempty"`
-	Status v1alpha1.IssuerStatus   `json:"status,omitempty"`
+	// +optional
+	Spec SimpleCertificateSource `json:"spec"`
+	// +optional
+	Status v1alpha1.IssuerStatus `json:"status,omitzero"`
 }
 
 func (vi *SimpleIssuer) GetConditions() []metav1.Condition {
@@ -55,7 +58,8 @@ var _ v1alpha1.Issuer = &SimpleIssuer{}
 // SimpleIssuerList contains a list of SimpleIssuers
 type SimpleIssuerList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	// +optional
+	metav1.ListMeta `json:"metadata"`
 	Items           []SimpleIssuer `json:"items"`
 }
 

internal/testapi/api/test_cluster_issuer_types.go

@@ -35,11 +35,14 @@ import (
 
 // TestClusterIssuer is the Schema for the TestClusterIssuers API
 type TestClusterIssuer struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ObjectMeta `json:"metadata"`
 
-	Spec   TestSpec              `json:"spec,omitempty"`
-	Status v1alpha1.IssuerStatus `json:"status,omitempty"`
+	// +optional
+	Spec TestSpec `json:"spec"`
+	// +optional
+	Status v1alpha1.IssuerStatus `json:"status,omitzero"`
 }
 
 func (vi *TestClusterIssuer) GetConditions() []metav1.Condition {
@@ -57,7 +60,8 @@ var _ v1alpha1.Issuer = &TestClusterIssuer{}
 // TestClusterIssuerList contains a list of TestClusterIssuer
 type TestClusterIssuerList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	// +optional
+	metav1.ListMeta `json:"metadata"`
 	Items           []TestClusterIssuer `json:"items"`
 }
 

internal/testapi/api/test_issuer_types.go

@@ -34,11 +34,14 @@ import (
 
 // TestIssuer is the Schema for the TestIssuers API
 type TestIssuer struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.TypeMeta `json:",inline"`
+	// +optional
+	metav1.ObjectMeta `json:"metadata"`
 
-	Spec   TestSpec              `json:"spec,omitempty"`
-	Status v1alpha1.IssuerStatus `json:"status,omitempty"`
+	// +optional
+	Spec TestSpec `json:"spec"`
+	// +optional
+	Status v1alpha1.IssuerStatus `json:"status,omitzero"`
 }
 
 func (vi *TestIssuer) GetConditions() []metav1.Condition {
@@ -56,7 +59,8 @@ var _ v1alpha1.Issuer = &TestIssuer{}
 // TestIssuerList contains a list of TestIssuers
 type TestIssuerList struct {
 	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	// +optional
+	metav1.ListMeta `json:"metadata"`
 	Items           []TestIssuer `json:"items"`
 }