Skip to content

Commit 86c7d73

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #74 from sivchari/unify-marker-definition
unify marker definitions to markers package
2 parents 2c83ed3 + 4de5446 commit 86c7d73

File tree

8 files changed

+163
-123
lines changed

8 files changed

+163
-123
lines changed

‎pkg/analysis/maxlength/analyzer.go

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,13 @@ import (
2323
kalerrors "sigs.k8s.io/kube-api-linter/pkg/analysis/errors"
2424
"sigs.k8s.io/kube-api-linter/pkg/analysis/helpers/extractjsontags"
2525
"sigs.k8s.io/kube-api-linter/pkg/analysis/helpers/inspector"
26-
"sigs.k8s.io/kube-api-linter/pkg/analysis/helpers/markers"
26+
markershelper "sigs.k8s.io/kube-api-linter/pkg/analysis/helpers/markers"
2727
"sigs.k8s.io/kube-api-linter/pkg/analysis/utils"
28+
"sigs.k8s.io/kube-api-linter/pkg/markers"
2829
)
2930

3031
const (
3132
name = "maxlength"
32-
33-
kubebuilderMaxLength = "kubebuilder:validation:MaxLength"
34-
kubebuilderEnum = "kubebuilder:validation:Enum"
35-
kubebuilderFormat = "kubebuilder:validation:Format"
36-
37-
kubebuilderItemsMaxLength = "kubebuilder:validation:items:MaxLength"
38-
kubebuilderItemsEnum = "kubebuilder:validation:items:Enum"
39-
kubebuilderItemsFormat = "kubebuilder:validation:items:Format"
40-
41-
kubebuilderMaxItems = "kubebuilder:validation:MaxItems"
4233
)
4334

4435
// Analyzer is the analyzer for the maxlength package.
@@ -56,25 +47,25 @@ func run(pass *analysis.Pass) (any, error) {
5647
return nil, kalerrors.ErrCouldNotGetInspector
5748
}
5849

59-
inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
50+
inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
6051
checkField(pass, field, markersAccess)
6152
})
6253

6354
return nil, nil //nolint:nilnil
6455
}
6556

66-
func checkField(pass *analysis.Pass, field *ast.Field, markersAccess markers.Markers) {
57+
func checkField(pass *analysis.Pass, field *ast.Field, markersAccess markershelper.Markers) {
6758
if len(field.Names) == 0 || field.Names[0] == nil {
6859
return
6960
}
7061

7162
fieldName := field.Names[0].Name
7263
prefix := fmt.Sprintf("field %s", fieldName)
7364

74-
checkTypeExpr(pass, field.Type, field, nil, markersAccess, prefix, kubebuilderMaxLength, needsStringMaxLength)
65+
checkTypeExpr(pass, field.Type, field, nil, markersAccess, prefix, markers.KubebuilderMaxLengthMarker, needsStringMaxLength)
7566
}
7667

77-
func checkIdent(pass *analysis.Pass, ident *ast.Ident, node ast.Node, aliases []*ast.TypeSpec, markersAccess markers.Markers, prefix, marker string, needsMaxLength func(markers.MarkerSet) bool) {
68+
func checkIdent(pass *analysis.Pass, ident *ast.Ident, node ast.Node, aliases []*ast.TypeSpec, markersAccess markershelper.Markers, prefix, marker string, needsMaxLength func(markershelper.MarkerSet) bool) {
7869
if utils.IsBasicType(pass, ident) { // Built-in type
7970
checkString(pass, ident, node, aliases, markersAccess, prefix, marker, needsMaxLength)
8071

@@ -89,7 +80,7 @@ func checkIdent(pass *analysis.Pass, ident *ast.Ident, node ast.Node, aliases []
8980
checkTypeSpec(pass, tSpec, node, append(aliases, tSpec), markersAccess, fmt.Sprintf("%s type", prefix), marker, needsMaxLength)
9081
}
9182

92-
func checkString(pass *analysis.Pass, ident *ast.Ident, node ast.Node, aliases []*ast.TypeSpec, markersAccess markers.Markers, prefix, marker string, needsMaxLength func(markers.MarkerSet) bool) {
83+
func checkString(pass *analysis.Pass, ident *ast.Ident, node ast.Node, aliases []*ast.TypeSpec, markersAccess markershelper.Markers, prefix, marker string, needsMaxLength func(markershelper.MarkerSet) bool) {
9384
if ident.Name != "string" {
9485
return
9586
}
@@ -101,7 +92,7 @@ func checkString(pass *analysis.Pass, ident *ast.Ident, node ast.Node, aliases [
10192
}
10293
}
10394

104-
func checkTypeSpec(pass *analysis.Pass, tSpec *ast.TypeSpec, node ast.Node, aliases []*ast.TypeSpec, markersAccess markers.Markers, prefix, marker string, needsMaxLength func(markers.MarkerSet) bool) {
95+
func checkTypeSpec(pass *analysis.Pass, tSpec *ast.TypeSpec, node ast.Node, aliases []*ast.TypeSpec, markersAccess markershelper.Markers, prefix, marker string, needsMaxLength func(markershelper.MarkerSet) bool) {
10596
if tSpec.Name == nil {
10697
return
10798
}
@@ -112,7 +103,7 @@ func checkTypeSpec(pass *analysis.Pass, tSpec *ast.TypeSpec, node ast.Node, alia
112103
checkTypeExpr(pass, tSpec.Type, node, aliases, markersAccess, prefix, marker, needsMaxLength)
113104
}
114105

115-
func checkTypeExpr(pass *analysis.Pass, typeExpr ast.Expr, node ast.Node, aliases []*ast.TypeSpec, markersAccess markers.Markers, prefix, marker string, needsMaxLength func(markers.MarkerSet) bool) {
106+
func checkTypeExpr(pass *analysis.Pass, typeExpr ast.Expr, node ast.Node, aliases []*ast.TypeSpec, markersAccess markershelper.Markers, prefix, marker string, needsMaxLength func(markershelper.MarkerSet) bool) {
116107
switch typ := typeExpr.(type) {
117108
case *ast.Ident:
118109
checkIdent(pass, typ, node, aliases, markersAccess, prefix, marker, needsMaxLength)
@@ -123,7 +114,7 @@ func checkTypeExpr(pass *analysis.Pass, typeExpr ast.Expr, node ast.Node, aliase
123114
}
124115
}
125116

126-
func checkArrayType(pass *analysis.Pass, arrayType *ast.ArrayType, node ast.Node, aliases []*ast.TypeSpec, markersAccess markers.Markers, prefix string) {
117+
func checkArrayType(pass *analysis.Pass, arrayType *ast.ArrayType, node ast.Node, aliases []*ast.TypeSpec, markersAccess markershelper.Markers, prefix string) {
127118
if arrayType.Elt != nil {
128119
if ident, ok := arrayType.Elt.(*ast.Ident); ok {
129120
if ident.Name == "byte" {
@@ -133,7 +124,7 @@ func checkArrayType(pass *analysis.Pass, arrayType *ast.ArrayType, node ast.Node
133124
NamePos: ident.NamePos,
134125
Name: "string",
135126
}
136-
checkString(pass, i, node, aliases, markersAccess, prefix, kubebuilderMaxLength, needsStringMaxLength)
127+
checkString(pass, i, node, aliases, markersAccess, prefix, markers.KubebuilderMaxLengthMarker, needsStringMaxLength)
137128

138129
return
139130
}
@@ -142,16 +133,16 @@ func checkArrayType(pass *analysis.Pass, arrayType *ast.ArrayType, node ast.Node
142133
}
143134
}
144135

145-
markers := getCombinedMarkers(markersAccess, node, aliases)
136+
markerSet := getCombinedMarkers(markersAccess, node, aliases)
146137

147-
if !markers.Has(kubebuilderMaxItems) {
148-
pass.Reportf(node.Pos(), "%s must have a maximum items, add %s marker", prefix, kubebuilderMaxItems)
138+
if !markerSet.Has(markers.KubebuilderMaxItemsMarker) {
139+
pass.Reportf(node.Pos(), "%s must have a maximum items, add %s marker", prefix, markers.KubebuilderMaxItemsMarker)
149140
}
150141
}
151142

152-
func checkArrayElementIdent(pass *analysis.Pass, ident *ast.Ident, node ast.Node, aliases []*ast.TypeSpec, markersAccess markers.Markers, prefix string) {
143+
func checkArrayElementIdent(pass *analysis.Pass, ident *ast.Ident, node ast.Node, aliases []*ast.TypeSpec, markersAccess markershelper.Markers, prefix string) {
153144
if ident.Obj == nil { // Built-in type
154-
checkString(pass, ident, node, aliases, markersAccess, prefix, kubebuilderItemsMaxLength, needsItemsMaxLength)
145+
checkString(pass, ident, node, aliases, markersAccess, prefix, markers.KubebuilderItemsMaxLengthMarker, needsItemsMaxLength)
155146

156147
return
157148
}
@@ -163,13 +154,13 @@ func checkArrayElementIdent(pass *analysis.Pass, ident *ast.Ident, node ast.Node
163154

164155
// If the array element wasn't directly a string, allow a string alias to be used
165156
// with either the items style markers or the on alias style markers.
166-
checkTypeSpec(pass, tSpec, node, append(aliases, tSpec), markersAccess, fmt.Sprintf("%s type", prefix), kubebuilderMaxLength, func(ms markers.MarkerSet) bool {
157+
checkTypeSpec(pass, tSpec, node, append(aliases, tSpec), markersAccess, fmt.Sprintf("%s type", prefix), markers.KubebuilderMaxLengthMarker, func(ms markershelper.MarkerSet) bool {
167158
return needsStringMaxLength(ms) && needsItemsMaxLength(ms)
168159
})
169160
}
170161

171-
func getCombinedMarkers(markersAccess markers.Markers, node ast.Node, aliases []*ast.TypeSpec) markers.MarkerSet {
172-
base := markers.NewMarkerSet(getMarkers(markersAccess, node).UnsortedList()...)
162+
func getCombinedMarkers(markersAccess markershelper.Markers, node ast.Node, aliases []*ast.TypeSpec) markershelper.MarkerSet {
163+
base := markershelper.NewMarkerSet(getMarkers(markersAccess, node).UnsortedList()...)
173164

174165
for _, a := range aliases {
175166
base.Insert(getMarkers(markersAccess, a).UnsortedList()...)
@@ -178,7 +169,7 @@ func getCombinedMarkers(markersAccess markers.Markers, node ast.Node, aliases []
178169
return base
179170
}
180171

181-
func getMarkers(markersAccess markers.Markers, node ast.Node) markers.MarkerSet {
172+
func getMarkers(markersAccess markershelper.Markers, node ast.Node) markershelper.MarkerSet {
182173
switch t := node.(type) {
183174
case *ast.Field:
184175
return markersAccess.FieldMarkers(t)
@@ -192,10 +183,10 @@ func getMarkers(markersAccess markers.Markers, node ast.Node) markers.MarkerSet
192183
// needsMaxLength returns true if the field needs a maximum length.
193184
// Fields do not need a maximum length if they are already marked with a maximum length,
194185
// or if they are an enum, or if they are a date, date-time or duration.
195-
func needsStringMaxLength(markerSet markers.MarkerSet) bool {
186+
func needsStringMaxLength(markerSet markershelper.MarkerSet) bool {
196187
switch {
197-
case markerSet.Has(kubebuilderMaxLength),
198-
markerSet.Has(kubebuilderEnum),
188+
case markerSet.Has(markers.KubebuilderMaxLengthMarker),
189+
markerSet.Has(markers.KubebuilderEnumMarker),
199190
markerSet.HasWithValue(kubebuilderFormatWithValue("date")),
200191
markerSet.HasWithValue(kubebuilderFormatWithValue("date-time")),
201192
markerSet.HasWithValue(kubebuilderFormatWithValue("duration")):
@@ -205,10 +196,10 @@ func needsStringMaxLength(markerSet markers.MarkerSet) bool {
205196
return true
206197
}
207198

208-
func needsItemsMaxLength(markerSet markers.MarkerSet) bool {
199+
func needsItemsMaxLength(markerSet markershelper.MarkerSet) bool {
209200
switch {
210-
case markerSet.Has(kubebuilderItemsMaxLength),
211-
markerSet.Has(kubebuilderItemsEnum),
201+
case markerSet.Has(markers.KubebuilderItemsMaxLengthMarker),
202+
markerSet.Has(markers.KubebuilderItemsEnumMarker),
212203
markerSet.HasWithValue(kubebuilderItemsFormatWithValue("date")),
213204
markerSet.HasWithValue(kubebuilderItemsFormatWithValue("date-time")),
214205
markerSet.HasWithValue(kubebuilderItemsFormatWithValue("duration")):
@@ -219,9 +210,9 @@ func needsItemsMaxLength(markerSet markers.MarkerSet) bool {
219210
}
220211

221212
func kubebuilderFormatWithValue(value string) string {
222-
return fmt.Sprintf("%s:=%s", kubebuilderFormat, value)
213+
return fmt.Sprintf("%s:=%s", markers.KubebuilderFormatMarker, value)
223214
}
224215

225216
func kubebuilderItemsFormatWithValue(value string) string {
226-
return fmt.Sprintf("%s:=%s", kubebuilderItemsFormat, value)
217+
return fmt.Sprintf("%s:=%s", markers.KubebuilderItemsFormatMarker, value)
227218
}

‎pkg/analysis/optionalorrequired/analyzer.go

Lines changed: 36 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -23,40 +23,23 @@ import (
2323
kalerrors "sigs.k8s.io/kube-api-linter/pkg/analysis/errors"
2424
"sigs.k8s.io/kube-api-linter/pkg/analysis/helpers/extractjsontags"
2525
"sigs.k8s.io/kube-api-linter/pkg/analysis/helpers/inspector"
26-
"sigs.k8s.io/kube-api-linter/pkg/analysis/helpers/markers"
26+
markershelper "sigs.k8s.io/kube-api-linter/pkg/analysis/helpers/markers"
2727
"sigs.k8s.io/kube-api-linter/pkg/config"
28+
"sigs.k8s.io/kube-api-linter/pkg/markers"
2829
)
2930

3031
const (
3132
name = "optionalorrequired"
32-
33-
// OptionalMarker is the marker that indicates that a field is optional.
34-
OptionalMarker = "optional"
35-
36-
// RequiredMarker is the marker that indicates that a field is required.
37-
RequiredMarker = "required"
38-
39-
// KubebuilderOptionalMarker is the marker that indicates that a field is optional in kubebuilder.
40-
KubebuilderOptionalMarker = "kubebuilder:validation:Optional"
41-
42-
// KubebuilderRequiredMarker is the marker that indicates that a field is required in kubebuilder.
43-
KubebuilderRequiredMarker = "kubebuilder:validation:Required"
44-
45-
// K8sOptionalMarker is the marker that indicates that a field is optional in k8s declarative validation.
46-
K8sOptionalMarker = "k8s:optional"
47-
48-
// K8sRequiredMarker is the marker that indicates that a field is required in k8s declarative validation.
49-
K8sRequiredMarker = "k8s:required"
5033
)
5134

5235
func init() {
53-
markers.DefaultRegistry().Register(
54-
OptionalMarker,
55-
RequiredMarker,
56-
KubebuilderOptionalMarker,
57-
KubebuilderRequiredMarker,
58-
K8sOptionalMarker,
59-
K8sRequiredMarker,
36+
markershelper.DefaultRegistry().Register(
37+
markers.OptionalMarker,
38+
markers.RequiredMarker,
39+
markers.KubebuilderOptionalMarker,
40+
markers.KubebuilderRequiredMarker,
41+
markers.K8sOptionalMarker,
42+
markers.K8sRequiredMarker,
6043
)
6144
}
6245

@@ -75,21 +58,21 @@ func newAnalyzer(cfg config.OptionalOrRequiredConfig) *analysis.Analyzer {
7558
a := &analyzer{}
7659

7760
switch cfg.PreferredOptionalMarker {
78-
case OptionalMarker:
79-
a.primaryOptionalMarker = OptionalMarker
80-
a.secondaryOptionalMarker = KubebuilderOptionalMarker
81-
case KubebuilderOptionalMarker:
82-
a.primaryOptionalMarker = KubebuilderOptionalMarker
83-
a.secondaryOptionalMarker = OptionalMarker
61+
case markers.OptionalMarker:
62+
a.primaryOptionalMarker = markers.OptionalMarker
63+
a.secondaryOptionalMarker = markers.KubebuilderOptionalMarker
64+
case markers.KubebuilderOptionalMarker:
65+
a.primaryOptionalMarker = markers.KubebuilderOptionalMarker
66+
a.secondaryOptionalMarker = markers.OptionalMarker
8467
}
8568

8669
switch cfg.PreferredRequiredMarker {
87-
case RequiredMarker:
88-
a.primaryRequiredMarker = RequiredMarker
89-
a.secondaryRequiredMarker = KubebuilderRequiredMarker
90-
case KubebuilderRequiredMarker:
91-
a.primaryRequiredMarker = KubebuilderRequiredMarker
92-
a.secondaryRequiredMarker = RequiredMarker
70+
case markers.RequiredMarker:
71+
a.primaryRequiredMarker = markers.RequiredMarker
72+
a.secondaryRequiredMarker = markers.KubebuilderRequiredMarker
73+
case markers.KubebuilderRequiredMarker:
74+
a.primaryRequiredMarker = markers.KubebuilderRequiredMarker
75+
a.secondaryRequiredMarker = markers.RequiredMarker
9376
}
9477

9578
return &analysis.Analyzer{
@@ -106,19 +89,19 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
10689
return nil, kalerrors.ErrCouldNotGetInspector
10790
}
10891

109-
inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
92+
inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
11093
a.checkField(pass, field, markersAccess.FieldMarkers(field), jsonTagInfo)
11194
})
11295

113-
inspect.InspectTypeSpec(func(typeSpec *ast.TypeSpec, markersAccess markers.Markers) {
96+
inspect.InspectTypeSpec(func(typeSpec *ast.TypeSpec, markersAccess markershelper.Markers) {
11497
a.checkTypeSpec(pass, typeSpec, markersAccess)
11598
})
11699

117100
return nil, nil //nolint:nilnil
118101
}
119102

120103
//nolint:cyclop
121-
func (a *analyzer) checkField(pass *analysis.Pass, field *ast.Field, fieldMarkers markers.MarkerSet, fieldTagInfo extractjsontags.FieldTagInfo) {
104+
func (a *analyzer) checkField(pass *analysis.Pass, field *ast.Field, fieldMarkers markershelper.MarkerSet, fieldTagInfo extractjsontags.FieldTagInfo) {
122105
if fieldTagInfo.Inline {
123106
// Inline fields would have no effect if they were marked as optional/required.
124107
return
@@ -169,24 +152,24 @@ func (a *analyzer) checkField(pass *analysis.Pass, field *ast.Field, fieldMarker
169152
}
170153
}
171154

172-
func (a *analyzer) checkK8sMarkers(pass *analysis.Pass, field *ast.Field, fieldMarkers markers.MarkerSet, prefix string, hasEitherOptional, hasEitherRequired bool) {
173-
hasK8sOptional := fieldMarkers.Has(K8sOptionalMarker)
174-
hasK8sRequired := fieldMarkers.Has(K8sRequiredMarker)
155+
func (a *analyzer) checkK8sMarkers(pass *analysis.Pass, field *ast.Field, fieldMarkers markershelper.MarkerSet, prefix string, hasEitherOptional, hasEitherRequired bool) {
156+
hasK8sOptional := fieldMarkers.Has(markers.K8sOptionalMarker)
157+
hasK8sRequired := fieldMarkers.Has(markers.K8sRequiredMarker)
175158

176159
if hasK8sOptional && hasK8sRequired {
177-
pass.Reportf(field.Pos(), "%s must not be marked as both %s and %s", prefix, K8sOptionalMarker, K8sRequiredMarker)
160+
pass.Reportf(field.Pos(), "%s must not be marked as both %s and %s", prefix, markers.K8sOptionalMarker, markers.K8sRequiredMarker)
178161
}
179162

180163
if hasK8sOptional && hasEitherRequired {
181-
pass.Reportf(field.Pos(), "%s must not be marked as both %s and %s", prefix, K8sOptionalMarker, RequiredMarker)
164+
pass.Reportf(field.Pos(), "%s must not be marked as both %s and %s", prefix, markers.K8sOptionalMarker, markers.RequiredMarker)
182165
}
183166

184167
if hasK8sRequired && hasEitherOptional {
185-
pass.Reportf(field.Pos(), "%s must not be marked as both %s and %s", prefix, OptionalMarker, K8sRequiredMarker)
168+
pass.Reportf(field.Pos(), "%s must not be marked as both %s and %s", prefix, markers.OptionalMarker, markers.K8sRequiredMarker)
186169
}
187170
}
188171

189-
func reportShouldReplaceSecondaryMarker(field *ast.Field, marker []markers.Marker, primaryMarker, secondaryMarker, prefix string) analysis.Diagnostic {
172+
func reportShouldReplaceSecondaryMarker(field *ast.Field, marker []markershelper.Marker, primaryMarker, secondaryMarker, prefix string) analysis.Diagnostic {
190173
textEdits := make([]analysis.TextEdit, len(marker))
191174

192175
for i, m := range marker {
@@ -219,7 +202,7 @@ func reportShouldReplaceSecondaryMarker(field *ast.Field, marker []markers.Marke
219202
}
220203
}
221204

222-
func reportShouldRemoveSecondaryMarker(field *ast.Field, marker []markers.Marker, primaryMarker, secondaryMarker, prefix string) analysis.Diagnostic {
205+
func reportShouldRemoveSecondaryMarker(field *ast.Field, marker []markershelper.Marker, primaryMarker, secondaryMarker, prefix string) analysis.Diagnostic {
223206
textEdits := make([]analysis.TextEdit, len(marker))
224207

225208
for i, m := range marker {
@@ -242,13 +225,13 @@ func reportShouldRemoveSecondaryMarker(field *ast.Field, marker []markers.Marker
242225
}
243226
}
244227

245-
func (a *analyzer) checkTypeSpec(pass *analysis.Pass, typeSpec *ast.TypeSpec, markersAccess markers.Markers) {
228+
func (a *analyzer) checkTypeSpec(pass *analysis.Pass, typeSpec *ast.TypeSpec, markersAccess markershelper.Markers) {
246229
name := typeSpec.Name.Name
247230
set := markersAccess.TypeMarkers(typeSpec)
248231

249232
for _, marker := range set.UnsortedList() {
250233
switch marker.Identifier {
251-
case a.primaryOptionalMarker, a.secondaryOptionalMarker, a.primaryRequiredMarker, a.secondaryRequiredMarker, K8sOptionalMarker, K8sRequiredMarker:
234+
case a.primaryOptionalMarker, a.secondaryOptionalMarker, a.primaryRequiredMarker, a.secondaryRequiredMarker, markers.K8sOptionalMarker, markers.K8sRequiredMarker:
252235
pass.Report(analysis.Diagnostic{
253236
Pos: typeSpec.Pos(),
254237
Message: fmt.Sprintf("type %s should not be marked as %s", name, marker.String()),
@@ -271,10 +254,10 @@ func (a *analyzer) checkTypeSpec(pass *analysis.Pass, typeSpec *ast.TypeSpec, ma
271254

272255
func defaultConfig(cfg *config.OptionalOrRequiredConfig) {
273256
if cfg.PreferredOptionalMarker == "" {
274-
cfg.PreferredOptionalMarker = OptionalMarker
257+
cfg.PreferredOptionalMarker = markers.OptionalMarker
275258
}
276259

277260
if cfg.PreferredRequiredMarker == "" {
278-
cfg.PreferredRequiredMarker = RequiredMarker
261+
cfg.PreferredRequiredMarker = markers.RequiredMarker
279262
}
280263
}

‎pkg/analysis/optionalorrequired/analyzer_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"golang.org/x/tools/go/analysis/analysistest"
2222
"sigs.k8s.io/kube-api-linter/pkg/analysis/optionalorrequired"
2323
"sigs.k8s.io/kube-api-linter/pkg/config"
24+
"sigs.k8s.io/kube-api-linter/pkg/markers"
2425
)
2526

2627
func TestDefaultConfiguration(t *testing.T) {
@@ -39,8 +40,8 @@ func TestSwappedMarkerPriority(t *testing.T) {
3940

4041
a, err := optionalorrequired.Initializer().Init(config.LintersConfig{
4142
OptionalOrRequired: config.OptionalOrRequiredConfig{
42-
PreferredOptionalMarker: optionalorrequired.KubebuilderOptionalMarker,
43-
PreferredRequiredMarker: optionalorrequired.KubebuilderRequiredMarker,
43+
PreferredOptionalMarker: markers.KubebuilderOptionalMarker,
44+
PreferredRequiredMarker: markers.KubebuilderRequiredMarker,
4445
},
4546
})
4647
if err != nil {

0 commit comments

Comments
 (0)