Skip to content

Commit 5d283cd

Browse files
authored
Change Bucket and BucketClass name validation (#1406)
1 parent 9b1af90 commit 5d283cd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

internal/apis/storage/validation/bucket.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
func ValidateBucket(bucket *storage.Bucket) field.ErrorList {
1515
var allErrs field.ErrorList
1616

17-
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(bucket, true, apivalidation.NameIsDNSLabel, field.NewPath("metadata"))...)
17+
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(bucket, true, apivalidation.NameIsDNSSubdomain, field.NewPath("metadata"))...)
1818
allErrs = append(allErrs, validateBucketSpec(&bucket.Spec, field.NewPath("spec"))...)
1919

2020
return allErrs
@@ -24,7 +24,7 @@ func validateBucketSpec(spec *storage.BucketSpec, fldPath *field.Path) field.Err
2424
var allErrs field.ErrorList
2525

2626
if bucketClassRef := spec.BucketClassRef; bucketClassRef != nil {
27-
for _, msg := range apivalidation.NameIsDNSLabel(spec.BucketClassRef.Name, false) {
27+
for _, msg := range apivalidation.NameIsDNSSubdomain(spec.BucketClassRef.Name, false) {
2828
allErrs = append(allErrs, field.Invalid(fldPath.Child("bucketClassRef").Child("name"), spec.BucketClassRef.Name, msg))
2929
}
3030

internal/apis/storage/validation/bucketclass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
func ValidateBucketClass(bucketClass *storage.BucketClass) field.ErrorList {
1616
var allErrs field.ErrorList
1717

18-
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(bucketClass, false, apivalidation.NameIsDNSLabel, field.NewPath("metadata"))...)
18+
allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(bucketClass, false, apivalidation.NameIsDNSSubdomain, field.NewPath("metadata"))...)
1919

2020
allErrs = append(allErrs, validateBucketClassCapabilities(bucketClass.Capabilities, field.NewPath("capabilities"))...)
2121

0 commit comments

Comments
 (0)