From eca1cfb259f609b0291f375ab9a1765ef20d3403 Mon Sep 17 00:00:00 2001 From: yongruilin Date: Tue, 16 Sep 2025 04:56:14 +0000 Subject: [PATCH] chore(validation): add validation identifier for declarative validation in ResourceClaim --- pkg/registry/resource/resourceclaim/strategy.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/registry/resource/resourceclaim/strategy.go b/pkg/registry/resource/resourceclaim/strategy.go index 6799bafc149..32aa15fb0a4 100644 --- a/pkg/registry/resource/resourceclaim/strategy.go +++ b/pkg/registry/resource/resourceclaim/strategy.go @@ -101,8 +101,9 @@ func (s *resourceclaimStrategy) Validate(ctx context.Context, obj runtime.Object if utilfeature.DefaultFeatureGate.Enabled(features.DeclarativeValidation) { takeover := utilfeature.DefaultFeatureGate.Enabled(features.DeclarativeValidationTakeover) - declarativeErrs := rest.ValidateDeclaratively(ctx, legacyscheme.Scheme, claim, rest.WithTakeover(takeover)) - rest.CompareDeclarativeErrorsAndEmitMismatches(ctx, allErrs, declarativeErrs, takeover) + const validationIdentifier = "resourceclaim_create" + declarativeErrs := rest.ValidateDeclaratively(ctx, legacyscheme.Scheme, claim, rest.WithTakeover(takeover), rest.WithValidationIdentifier(validationIdentifier)) + rest.CompareDeclarativeErrorsAndEmitMismatches(ctx, allErrs, declarativeErrs, takeover, validationIdentifier) if takeover { allErrs = append(allErrs.RemoveCoveredByDeclarative(), declarativeErrs...) } @@ -138,8 +139,9 @@ func (s *resourceclaimStrategy) ValidateUpdate(ctx context.Context, obj, old run if utilfeature.DefaultFeatureGate.Enabled(features.DeclarativeValidation) { takeover := utilfeature.DefaultFeatureGate.Enabled(features.DeclarativeValidationTakeover) - declarativeErrs := rest.ValidateUpdateDeclaratively(ctx, legacyscheme.Scheme, newClaim, oldClaim, rest.WithTakeover(takeover)) - rest.CompareDeclarativeErrorsAndEmitMismatches(ctx, errorList, declarativeErrs, takeover) + const validationIdentifier = "resourceclaim_update" + declarativeErrs := rest.ValidateUpdateDeclaratively(ctx, legacyscheme.Scheme, newClaim, oldClaim, rest.WithTakeover(takeover), rest.WithValidationIdentifier(validationIdentifier)) + rest.CompareDeclarativeErrorsAndEmitMismatches(ctx, errorList, declarativeErrs, takeover, validationIdentifier) if takeover { errorList = append(errorList.RemoveCoveredByDeclarative(), declarativeErrs...) }