actions/kubeconform
13
0
Fork 0
mirror of https://github.com/yannh/kubeconform.git synced 2026-06-28 16:00:44 +00:00
Code Releases 1 Activity Actions

fix: support Scala duration format (weeks/days) without P prefix

Browse source 
Kubernetes API machinery accepts Scala duration format, e.g., '2w' for 2 weeks
and '3d' for 3 days, in addition to Go duration format (e.g., '1h30m') and ISO 8601
format (e.g., 'P2W'). This fix adds validation support for these commonly used
duration formats.

Closes #347
This commit is contained in:
shui 2026-04-13 09:09:13 +08:00
parent e60892483e
commit fdf0ebbc38
1 changed files with 52 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

57
pkg/validator/validator.go
View file

@ -292,16 +292,63 @@ func (val *v) Validate(filename string, r io.ReadCloser) []Result {
// https://github.com/kubernetes/apiextensions-apiserver/blob/1ecd29f74da0639e2e6e3b8fac0c9bfd217e05eb/pkg/apis/apiextensions/v1/types_jsonschema.go#L71
func validateDuration(v any) error {
// Try validation with the Go duration format
if _, err := time.ParseDuration(v.(string)); err == nil {
return nil
}
s, ok := v.(string)
if !ok {
return nil
}
// must start with 'P'
// Try Go duration format (e.g., "1h30m", "30s")
if _, err := time.ParseDuration(s); err == nil {
return nil
}
// Kubernetes API machinery also accepts Scala duration format without P prefix
// specifically for weeks (e.g., "2w") and days (e.g., "3d")
// https://github.com/kubernetes/apiextensions-apiserver/blob/1ecd29f74da0639e2e6e3b8fac0c9bfd217e05eb/pkg/apis/apiextensions/v1/types_jsonschema.go#L71
// Check for weeks (e.g., "2w", "3W")
if s, ok := strings.CutSuffix(s, "w"); ok {
if s != "" {
for _, ch := range s {
if ch < '0' || ch > '9' {
return fmt.Errorf("invalid duration: weeks must be a number")
}
}
return nil
}
}
if s, ok := strings.CutSuffix(s, "W"); ok {
if s != "" {
for _, ch := range s {
if ch < '0' || ch > '9' {
return fmt.Errorf("invalid duration: weeks must be a number")
}
}
return nil
}
}
// Check for days (e.g., "3d", "5D")
if s, ok := strings.CutSuffix(s, "d"); ok {
if s != "" {
for _, ch := range s {
if ch < '0' || ch > '9' {
return fmt.Errorf("invalid duration: days must be a number")
}
}
return nil
}
}
if s, ok := strings.CutSuffix(s, "D"); ok {
if s != "" {
for _, ch := range s {
if ch < '0' || ch > '9' {
return fmt.Errorf("invalid duration: days must be a number")
}
}
return nil
}
}
// Must start with 'P' for ISO 8601 format
s, ok = strings.CutPrefix(s, "P")
if !ok {
return fmt.Errorf("must start with P")