Skip to content

Commit 413cca8

Browse files
Merge pull request #351 from erikgb/modernize-omitzero
Enable omitzero modernize linter rule
2 parents ac1b7e2 + bab282b commit 413cca8

File tree

5 files changed

+36
-24
lines changed

5 files changed

+36
-24
lines changed

.golangci.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ linters:
77
paths: [third_party, builtin$, examples$]
88
warn-unused: true
99
settings:
10-
modernize:
11-
disable:
12-
# TODO(erikgb): Enable when we know how to do this correctly in API types
13-
- omitzero
1410
staticcheck:
1511
checks: ["all", "-ST1000", "-ST1001", "-ST1003", "-ST1005", "-ST1012", "-ST1016", "-ST1020", "-ST1021", "-ST1022", "-QF1001", "-QF1003", "-QF1008"]
1612
enable:

examples/simple/api/simple_cluster_issuer_types.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,14 @@ import (
3434

3535
// SimpleClusterIssuer is the Schema for the SimpleClusterIssuers API
3636
type SimpleClusterIssuer struct {
37-
metav1.TypeMeta `json:",inline"`
38-
metav1.ObjectMeta `json:"metadata,omitempty"`
37+
metav1.TypeMeta `json:",inline"`
38+
// +optional
39+
metav1.ObjectMeta `json:"metadata"`
3940

40-
Spec SimpleCertificateSource `json:"spec,omitempty"`
41-
Status v1alpha1.IssuerStatus `json:"status,omitempty"`
41+
// +optional
42+
Spec SimpleCertificateSource `json:"spec"`
43+
// +optional
44+
Status v1alpha1.IssuerStatus `json:"status,omitzero"`
4245
}
4346

4447
func (vi *SimpleClusterIssuer) GetConditions() []metav1.Condition {
@@ -56,7 +59,8 @@ var _ v1alpha1.Issuer = &SimpleClusterIssuer{}
5659
// SimpleClusterIssuerList contains a list of SimpleClusterIssuer
5760
type SimpleClusterIssuerList struct {
5861
metav1.TypeMeta `json:",inline"`
59-
metav1.ListMeta `json:"metadata,omitempty"`
62+
// +optional
63+
metav1.ListMeta `json:"metadata"`
6064
Items []SimpleClusterIssuer `json:"items"`
6165
}
6266

examples/simple/api/simple_issuer_types.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,14 @@ import (
3333

3434
// SimpleIssuer is the Schema for the SimpleIssuers API
3535
type SimpleIssuer struct {
36-
metav1.TypeMeta `json:",inline"`
37-
metav1.ObjectMeta `json:"metadata,omitempty"`
36+
metav1.TypeMeta `json:",inline"`
37+
// +optional
38+
metav1.ObjectMeta `json:"metadata"`
3839

39-
Spec SimpleCertificateSource `json:"spec,omitempty"`
40-
Status v1alpha1.IssuerStatus `json:"status,omitempty"`
40+
// +optional
41+
Spec SimpleCertificateSource `json:"spec"`
42+
// +optional
43+
Status v1alpha1.IssuerStatus `json:"status,omitzero"`
4144
}
4245

4346
func (vi *SimpleIssuer) GetConditions() []metav1.Condition {
@@ -55,7 +58,8 @@ var _ v1alpha1.Issuer = &SimpleIssuer{}
5558
// SimpleIssuerList contains a list of SimpleIssuers
5659
type SimpleIssuerList struct {
5760
metav1.TypeMeta `json:",inline"`
58-
metav1.ListMeta `json:"metadata,omitempty"`
61+
// +optional
62+
metav1.ListMeta `json:"metadata"`
5963
Items []SimpleIssuer `json:"items"`
6064
}
6165

internal/testapi/api/test_cluster_issuer_types.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,14 @@ import (
3535

3636
// TestClusterIssuer is the Schema for the TestClusterIssuers API
3737
type TestClusterIssuer struct {
38-
metav1.TypeMeta `json:",inline"`
39-
metav1.ObjectMeta `json:"metadata,omitempty"`
38+
metav1.TypeMeta `json:",inline"`
39+
// +optional
40+
metav1.ObjectMeta `json:"metadata"`
4041

41-
Spec TestSpec `json:"spec,omitempty"`
42-
Status v1alpha1.IssuerStatus `json:"status,omitempty"`
42+
// +optional
43+
Spec TestSpec `json:"spec"`
44+
// +optional
45+
Status v1alpha1.IssuerStatus `json:"status,omitzero"`
4346
}
4447

4548
func (vi *TestClusterIssuer) GetConditions() []metav1.Condition {
@@ -57,7 +60,8 @@ var _ v1alpha1.Issuer = &TestClusterIssuer{}
5760
// TestClusterIssuerList contains a list of TestClusterIssuer
5861
type TestClusterIssuerList struct {
5962
metav1.TypeMeta `json:",inline"`
60-
metav1.ListMeta `json:"metadata,omitempty"`
63+
// +optional
64+
metav1.ListMeta `json:"metadata"`
6165
Items []TestClusterIssuer `json:"items"`
6266
}
6367

internal/testapi/api/test_issuer_types.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,14 @@ import (
3434

3535
// TestIssuer is the Schema for the TestIssuers API
3636
type TestIssuer struct {
37-
metav1.TypeMeta `json:",inline"`
38-
metav1.ObjectMeta `json:"metadata,omitempty"`
37+
metav1.TypeMeta `json:",inline"`
38+
// +optional
39+
metav1.ObjectMeta `json:"metadata"`
3940

40-
Spec TestSpec `json:"spec,omitempty"`
41-
Status v1alpha1.IssuerStatus `json:"status,omitempty"`
41+
// +optional
42+
Spec TestSpec `json:"spec"`
43+
// +optional
44+
Status v1alpha1.IssuerStatus `json:"status,omitzero"`
4245
}
4346

4447
func (vi *TestIssuer) GetConditions() []metav1.Condition {
@@ -56,7 +59,8 @@ var _ v1alpha1.Issuer = &TestIssuer{}
5659
// TestIssuerList contains a list of TestIssuers
5760
type TestIssuerList struct {
5861
metav1.TypeMeta `json:",inline"`
59-
metav1.ListMeta `json:"metadata,omitempty"`
62+
// +optional
63+
metav1.ListMeta `json:"metadata"`
6064
Items []TestIssuer `json:"items"`
6165
}
6266

0 commit comments

Comments
 (0)