Merge pull request #151 from JoelSpeed/uniquemarkers-dv-1.35

Teach uniquemarkers about 1.35 DV markers

Author: k8s-ci-robot

pkg/analysis/uniquemarkers/analyzer.go

@@ -280,5 +280,33 @@ func defaultUniqueMarkers() []UniqueMarker {
 			},
 		},
 		// ------
+
+		// K8s-specific unique markers
+		// ------
+		{
+			Identifier: markersconsts.K8sFormatMarker,
+		},
+		{
+			Identifier: markersconsts.K8sMinLengthMarker,
+		},
+		{
+			Identifier: markersconsts.K8sMaxLengthMarker,
+		},
+		{
+			Identifier: markersconsts.K8sMinItemsMarker,
+		},
+		{
+			Identifier: markersconsts.K8sMaxItemsMarker,
+		},
+		{
+			Identifier: markersconsts.K8sMinimumMarker,
+		},
+		{
+			Identifier: markersconsts.K8sMaximumMarker,
+		},
+		{
+			Identifier: markersconsts.K8sListTypeMarker,
+		},
+		// ------
 	}
 }

pkg/analysis/uniquemarkers/testdata/src/a/k8s.go

@@ -0,0 +1,45 @@
+package a
+
+type K8s struct {
+	// +k8s:format:=date-time
+	UniqueFormat string
+
+	// +k8s:format:=date-time
+	// +k8s:format:=password
+	NonUniqueFormat string // want "field NonUniqueFormat has multiple definitions of marker k8s:format when only a single definition should exist"
+
+	// +k8s:minLength:=10
+	UniqueMinLength string
+
+	// +k8s:minLength:=10
+	// +k8s:minLength:=20
+	NonUniqueMinLength string // want "field NonUniqueMinLength has multiple definitions of marker k8s:minLength when only a single definition should exist"
+
+	// +k8s:maxLength:=100
+	UniqueMaxLength string
+
+	// +k8s:maxLength:=100
+	// +k8s:maxLength:=200
+	NonUniqueMaxLength string // want "field NonUniqueMaxLength has multiple definitions of marker k8s:maxLength when only a single definition should exist"
+
+	// +k8s:minItems:=10
+	UniqueMinItems []string
+
+	// +k8s:minItems:=10
+	// +k8s:minItems:=20
+	NonUniqueMinItems []string // want "field NonUniqueMinItems has multiple definitions of marker k8s:minItems when only a single definition should exist"
+
+	// +k8s:maxItems:=100
+	UniqueMaxItems []string
+
+	// +k8s:maxItems:=100
+	// +k8s:maxItems:=200
+	NonUniqueMaxItems []string // want "field NonUniqueMaxItems has multiple definitions of marker k8s:maxItems when only a single definition should exist"
+
+	// +k8s:listType:=map
+	UniqueListType []string
+
+	// +k8s:listType:=map
+	// +k8s:listType:=atomic
+	NonUniqueListType []string // want "field NonUniqueListType has multiple definitions of marker k8s:listType when only a single definition should exist"
+}

pkg/markers/markers.go

@@ -166,4 +166,40 @@ const (
 
 	// K8sRequiredMarker is the marker that indicates that a field is required in k8s declarative validation.
 	K8sRequiredMarker = "k8s:required"
+
+	// K8sFormatMarker is the marker that indicates that a field has a format in k8s declarative validation.
+	K8sFormatMarker = "k8s:format"
+
+	// K8sMinLengthMarker is the marker that indicates that a field has a minimum length in k8s declarative validation.
+	K8sMinLengthMarker = "k8s:minLength"
+
+	// K8sMaxLengthMarker is the marker that indicates that a field has a maximum length in k8s declarative validation.
+	K8sMaxLengthMarker = "k8s:maxLength"
+
+	// K8sMinItemsMarker is the marker that indicates that a field has a minimum number of items in k8s declarative validation.
+	K8sMinItemsMarker = "k8s:minItems"
+
+	// K8sMaxItemsMarker is the marker that indicates that a field has a maximum number of items in k8s declarative validation.
+	K8sMaxItemsMarker = "k8s:maxItems"
+
+	// K8sEnumMarker is the marker that indicates that a field has an enum in k8s declarative validation.
+	K8sEnumMarker = "k8s:enum"
+
+	// K8sMinimumMarker is the marker that indicates that a field has a minimum value in k8s declarative validation.
+	K8sMinimumMarker = "k8s:minimum"
+
+	// K8sMaximumMarker is the marker that indicates that a field has a maximum value in k8s declarative validation.
+	K8sMaximumMarker = "k8s:maximum"
+
+	// K8sExclusiveMaximumMarker is the marker that indicates that a field has an exclusive maximum value in k8s declarative validation.
+	K8sExclusiveMaximumMarker = "k8s:exclusiveMaximum"
+
+	// K8sExclusiveMinimumMarker is the marker that indicates that a field has an exclusive minimum value in k8s declarative validation.
+	K8sExclusiveMinimumMarker = "k8s:exclusiveMinimum"
+
+	// K8sListTypeMarker is the marker that indicates that a field is a list in k8s declarative validation.
+	K8sListTypeMarker = "k8s:listType"
+
+	// K8sListMapKeyMarker is the marker that indicates that a field is a map in k8s declarative validation.
+	K8sListMapKeyMarker = "k8s:listMapKey"
 )