Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement derive(ValidateSchema) macro for generating cel validation on CRDs #1649

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

Danil-Grigorev
Copy link
Member

@Danil-Grigorev Danil-Grigorev commented Nov 24, 2024

Motivation

Related to #1367

CRDs allow to declare server-side validation rules using CEL. This functionality is supported via #[schemars(schema_with = "<schemagen-wrapper>")], but requires defining a method with handling logic, which may be error-prone.

Since kube owns CRD generation code, the idea is to simplify this process for added validation rules and achieve more declarative approach, similar to the kubebuilder library. This approach will be compatible with kopium generation based on existing CRD structures, already using CEL expressions.

Solution

Allow for a more native handling of CEL validation rules on the CRDs via a field macro.

#[derive(, ValidateSchema)]
#[kube(
  rule = Rule::new("self.metadata.name == 'singleton'"),

)]
pub struct FooSpec {
    // Field with CEL validation
    #[serde(default)]
    #[cel_validate(
         rule = Rule::new("self != 'illegal'").message("string cannot be illegal").reason(Reason::FieldValueForbidden),
         rule = Rule::new("self != 'not legal'").reason(Reason::FieldValueInvalid),
     )]
    cel_validated: Option<String>,

This PR is a followup on #1621 which addresses some of the concerns.

  1. Implemented by generating a JsonSchema, which allows further additions to the schema later, struct level validation rules and is not affected by schemars version.
  2. Based on Implement CEL validation proc macro for generated CRDs #1621 (comment) - using methods from the kube::core and invoking from kube::derive.
  3. Generally simplified the code to make it easier to maintain (Implement CEL validation proc macro for generated CRDs #1621 (comment))

Other things tried (TLDR)

Visitor trait:

It is possible to generate a new Visitor implementation per each validation rule. But the problem with this approach is that the generation happens for Validator derive on the structure, while the CustomResource derive is responsible for populating additional visitors for crd(). There is no one specific method which can collect all visitors under one chain, invoked from schemars. This likely requires every individual field in each struct to implement the Validated trait, involving creation of a shemars/serde type of logic.

Then the schemars Schema has no indicators for the source structure in the schema within Visitor, so there is no way (without generating schemars(title = “FooSpec”) as a metadata) to match the added visitor on the processed object param to make modifications. It is possible to add preserve_order feature to schemars and “search” for the property of the structure, as long as the source struct name is mapped to the Schema content.

With generating JsonSchema visitor extensions for more complex scenarios are possible to explore in the future.

Generating schemars attributes

While it is a viable option, such thing is not possible with derive macro, and has to use proc_macro instead, This approach is additionally hiding the updates of derive attributes under the hood, which feels unintuitive, as it performs updates to the macro markers, meant to generate code. Explored in #1621

@Danil-Grigorev Danil-Grigorev force-pushed the cel-expression-on-crds branch 2 times, most recently from 8a8cef3 to f286169 Compare November 24, 2024 17:58
Copy link

codecov bot commented Nov 24, 2024

Codecov Report

Attention: Patch coverage is 20.00000% with 36 lines in your changes missing coverage. Please review.

Project coverage is 75.2%. Comparing base (3ee4ae5) to head (ee96ec4).

Files with missing lines Patch % Lines
kube-derive/src/custom_resource.rs 28.2% 23 Missing ⚠️
kube-core/src/validation.rs 0.0% 11 Missing ⚠️
kube-derive/src/lib.rs 0.0% 2 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##            main   #1649     +/-   ##
=======================================
- Coverage   75.6%   75.2%   -0.3%     
=======================================
  Files         82      83      +1     
  Lines       7405    7450     +45     
=======================================
+ Hits        5591    5600      +9     
- Misses      1814    1850     +36     
Files with missing lines Coverage Δ
kube/src/lib.rs 88.5% <ø> (ø)
kube-derive/src/lib.rs 0.0% <0.0%> (ø)
kube-core/src/validation.rs 0.0% <0.0%> (ø)
kube-derive/src/custom_resource.rs 75.2% <28.2%> (-7.3%) ⬇️
---- 🚨 Try these New Features:

@Danil-Grigorev Danil-Grigorev force-pushed the cel-expression-on-crds branch 7 times, most recently from 047b626 to 06ea3e9 Compare November 24, 2024 20:51
- Extend with supported values from docs
- https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#validation-rules
- Implement as Validated derive macro
- Use the raw Rule for the validated attribute

Signed-off-by: Danil-Grigorev <[email protected]>
@Danil-Grigorev Danil-Grigorev changed the title [WIP] Implement cel validation proc macro for generated CRDs Implement cel validation proc macro for generated CRDs Nov 24, 2024
@Danil-Grigorev Danil-Grigorev changed the title Implement cel validation proc macro for generated CRDs Implement cel validation derive(Validated) macro for generated CRDs Nov 24, 2024
@Danil-Grigorev Danil-Grigorev changed the title Implement cel validation derive(Validated) macro for generated CRDs Implement cel validation derive(Validated) macro for generated CRDs Nov 24, 2024
Copy link
Member

@clux clux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some comments and questions. i think this is a pretty cool approach.


/// Reason is a machine-readable value providing more detail about why a field failed the validation.
///
/// More in [docs](https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#field-reason)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interestingly, I see these ones in the generated docs under https://github.com/kube-rs/k8s-pb/blob/ce4261fb52266f05cd7a06dbb8f4c0fcaa41c06a/k8s-pb/src/apiextensions_apiserver/pkg/apis/apiextensions/v1/mod.rs#L736 but because of bad go enum usage it's just a doc comment :(

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would not pretend I saw it being generated, but yeah, missing enum is better to have :). Maybe worth adding From/Into conversion for ensuring compatibility.

kube-core/src/validation.rs Outdated Show resolved Hide resolved
/// Example:
/// "must be a URL with the host matching spec.host"
Message(String),
/// Expression declares a CEL expression that evaluates to the validation failure message that is returned when this rule fails.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these doc strings taken from anywhere?

kube/src/lib.rs Outdated
@@ -168,6 +168,10 @@ pub use kube_derive::CustomResource;
#[cfg_attr(docsrs, doc(cfg(feature = "derive")))]
pub use kube_derive::Resource;

#[cfg(feature = "derive")]
#[cfg_attr(docsrs, doc(cfg(feature = "derive")))]
pub use kube_derive::Validated;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

naming wise, possibly this introduces an confusion possiblities with garde::Validate - which we do advocate for

/// #[kube(group = "kube.rs", version = "v1", kind = "Struct")]
/// struct MyStruct {
/// #[serde(default = "default")]
/// #[validated(rule = Rule{rule: "self != ''".into(), message: Some("failure message".into()), ..Default::default()})]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pretty cool that you can do a full struct here like this. does it support shorthands as well if we were to create builders on Rule? could lead to:

#[validated(rule = Rule::rule("self != ''").message("failure message")]

possibly

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is possible, including something simple such as #[validated(rule = “self != ‘’”.into())].

Comment on lines 8 to 11
/// Rule is a CEL validation rule for the CRD field
#[derive(Default, Serialize, Deserialize, Clone)]
#[serde(rename_all = "camelCase")]
pub struct Rule {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note to self; this may perhaps be churned through a cel crate against an object to perform validation client side. should investigate this later.

@Danil-Grigorev Danil-Grigorev changed the title Implement cel validation derive(Validated) macro for generated CRDs Implement cel validation derive(ValidateSchema) macro for generated CRDs Dec 1, 2024
@Danil-Grigorev Danil-Grigorev changed the title Implement cel validation derive(ValidateSchema) macro for generated CRDs Implement derive(ValidateSchema) macro for generating cel validation on CRDs Dec 1, 2024
Signed-off-by: Danil-Grigorev <[email protected]>
Signed-off-by: Danil-Grigorev <[email protected]>
Comment on lines -11 to +12
#[derive(CustomResource, Serialize, Deserialize, Debug, PartialEq, Clone, JsonSchema)]
#[derive(CustomResource, Serialize, Deserialize, Debug, PartialEq, Clone, ValidateSchema)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the idea here now is to replace JsonSchema with ValidateSchema whenever we need to use rule annotations? I see it's not a universal replacement, the sub-structs still use JsonSchema.

Copy link
Member Author

@Danil-Grigorev Danil-Grigorev Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is a wrapper on top of the JsonSchema implementing it. Crate path for the JsonSchema can be overridden, same as in the CustomResource trait. Rule is one of the keywords which can be used here, there maybe more in the future, since the implementation is extensible and will not be affected by schemars versions. Sub-schemas don’t need ValidateSchema, if a rule is not used there. Implementing this would require to blanket implement the ValidateSchema (trait, a new one) for all standard types, and since we only modify “this current schema I see now” I tried to keep it simple, and it also was the only path forward.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved towards implementing option 3 from comment, so current changes are direct descendants of this (and the fact that I realized how to work around unordered properties in the schema)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants