address feedback

This commit is contained in:
Aaron Prindle
2025-11-03 21:30:17 +00:00
parent 39ad8278e2
commit a22b3d031f

View File

@@ -92,7 +92,7 @@ func testDeclarativeValidate(t *testing.T, apiVersion string) {
},
},
"invalid requests, too many AND duplicate name (short-circuit check)": {
input: mkValidResourceClaim(tweakDevicesRequestsTooManyAndDuplicate(33)),
input: mkValidResourceClaim(tweakDevicesRequests(33), tweakAddDeviceRequest(mkDeviceRequest("req-0"))),
expectedErrs: field.ErrorList{
// We expect ONLY TooMany, suppressing the Duplicate error because of short-circuiting
field.TooMany(field.NewPath("spec", "devices", "requests"), 33, 32).WithOrigin("maxItems"),
@@ -507,20 +507,6 @@ func tweakDevicesRequests(items int) func(*resource.ResourceClaim) {
}
}
func tweakDevicesRequestsTooManyAndDuplicate(count int) func(*resource.ResourceClaim) {
return func(rc *resource.ResourceClaim) {
// Ensure we have 'count' requests total.
// Base claim already has 1 ("req-0").
for i := 1; i < count; i++ {
rc.Spec.Devices.Requests = append(rc.Spec.Devices.Requests, mkDeviceRequest(fmt.Sprintf("req-%d", i)))
}
// Force a duplicate if we have enough items by setting the last one to match the first
if count > 1 {
rc.Spec.Devices.Requests[count-1].Name = "req-0"
}
}
}
func tweakDuplicateFirstAvailableName(name string) func(*resource.ResourceClaim) {
return func(rc *resource.ResourceClaim) {
rc.Spec.Devices.Requests[0].Exactly = nil