-
Notifications
You must be signed in to change notification settings - Fork 13
validations: add pattern field validation
#44
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
Open
LoginovIlia
wants to merge
1
commit into
kubernetes-sigs:main
Choose a base branch
from
LoginovIlia:pattern-validation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| // Copyright 2025 The Kubernetes Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package property | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
|
|
||
| apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" | ||
| "sigs.k8s.io/crdify/pkg/config" | ||
| "sigs.k8s.io/crdify/pkg/validations" | ||
| ) | ||
|
|
||
| var ( | ||
| _ validations.Validation = (*Pattern)(nil) | ||
| _ validations.Comparator[apiextensionsv1.JSONSchemaProps] = (*Pattern)(nil) | ||
| ) | ||
|
|
||
| const patternValidationName = "pattern" | ||
|
|
||
| // RegisterPattern registers the Pattern validation | ||
| // with the provided validation registry. | ||
| func RegisterPattern(registry validations.Registry) { | ||
| registry.Register(patternValidationName, patternFactory) | ||
| } | ||
|
|
||
| // patternFactory is a function used to initialize a Pattern validation | ||
| // implementation based on the provided configuration. | ||
| func patternFactory(_ map[string]interface{}) (validations.Validation, error) { | ||
| return &Pattern{}, nil | ||
| } | ||
|
|
||
| // Pattern is a Validation that can be used to identify | ||
| // incompatible changes to the pattern constraints of CRD properties. | ||
| type Pattern struct { | ||
| enforcement config.EnforcementPolicy | ||
| } | ||
|
|
||
| // Name returns the name of the Pattern validation. | ||
| func (p *Pattern) Name() string { | ||
| return patternValidationName | ||
| } | ||
|
|
||
| // SetEnforcement sets the EnforcementPolicy for the Pattern validation. | ||
| func (p *Pattern) SetEnforcement(policy config.EnforcementPolicy) { | ||
| p.enforcement = policy | ||
| } | ||
|
|
||
| // Compare compares an old and a new JSONSchemaProps, checking for incompatible changes to the pattern constraints of a property. | ||
| // In order for callers to determine if diffs to a JSONSchemaProps have been handled by this validation | ||
| // the JSONSchemaProps.pattern field will be reset to '""' as part of this method. | ||
| // It is highly recommended that only copies of the JSONSchemaProps to compare are provided to this method | ||
| // to prevent unintentional modifications. | ||
| func (p *Pattern) Compare(a, b *apiextensionsv1.JSONSchemaProps) validations.ComparisonResult { | ||
| var err error | ||
|
|
||
| switch { | ||
| case a.Pattern == b.Pattern: | ||
| // nothing to do | ||
| case a.Pattern == "" && b.Pattern != "": | ||
| err = fmt.Errorf("%w : %q -> %q", ErrPatternAdded, a.Pattern, b.Pattern) | ||
| case a.Pattern != "" && b.Pattern == "": | ||
| // removing a pattern is considered safe | ||
| case a.Pattern != b.Pattern: | ||
| err = fmt.Errorf("%w : %q -> %q", ErrPatternChanged, a.Pattern, b.Pattern) | ||
| } | ||
|
|
||
| a.Pattern = "" | ||
| b.Pattern = "" | ||
|
|
||
| return validations.HandleErrors(p.Name(), p.enforcement, err) | ||
| } | ||
|
|
||
| // ErrPatternAdded represents an error state when a property Pattern was added. | ||
| var ErrPatternAdded = errors.New("pattern added") | ||
|
|
||
| // ErrPatternChanged represents an error state when a property Pattern changed. | ||
| var ErrPatternChanged = errors.New("pattern changed") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| // Copyright 2025 The Kubernetes Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package property | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" | ||
| internaltesting "sigs.k8s.io/crdify/pkg/validations/internal/testing" | ||
| ) | ||
|
|
||
| func TestPattern(t *testing.T) { | ||
| testcases := []internaltesting.Testcase[apiextensionsv1.JSONSchemaProps]{ | ||
| { | ||
| Name: "no diff, not flagged", | ||
| Old: &apiextensionsv1.JSONSchemaProps{ | ||
| Pattern: "^[a-z]+$", | ||
| }, | ||
| New: &apiextensionsv1.JSONSchemaProps{ | ||
| Pattern: "^[a-z]+$", | ||
| }, | ||
| Flagged: false, | ||
| ComparableValidation: &Pattern{}, | ||
| }, | ||
| { | ||
| Name: "pattern added, flagged", | ||
| Old: &apiextensionsv1.JSONSchemaProps{}, | ||
| New: &apiextensionsv1.JSONSchemaProps{ | ||
| Pattern: "^[a-z]+$", | ||
| }, | ||
| Flagged: true, | ||
| ComparableValidation: &Pattern{}, | ||
| }, | ||
| { | ||
| Name: "pattern changed, flagged", | ||
| Old: &apiextensionsv1.JSONSchemaProps{ | ||
| Pattern: "^[a-z]+$", | ||
| }, | ||
| New: &apiextensionsv1.JSONSchemaProps{ | ||
| Pattern: "^[A-Z]+$", | ||
| }, | ||
| Flagged: true, | ||
| ComparableValidation: &Pattern{}, | ||
| }, | ||
| { | ||
| Name: "pattern removed, not flagged", | ||
| Old: &apiextensionsv1.JSONSchemaProps{ | ||
| Pattern: "^[a-z]+$", | ||
| }, | ||
| New: &apiextensionsv1.JSONSchemaProps{}, | ||
| Flagged: false, | ||
| ComparableValidation: &Pattern{}, | ||
| }, | ||
| { | ||
| Name: "different field changed, not flagged", | ||
| Old: &apiextensionsv1.JSONSchemaProps{ | ||
| ID: "foo", | ||
| }, | ||
| New: &apiextensionsv1.JSONSchemaProps{ | ||
| ID: "bar", | ||
| }, | ||
| Flagged: false, | ||
| ComparableValidation: &Pattern{}, | ||
| }, | ||
| } | ||
|
|
||
| internaltesting.RunTestcases(t, testcases...) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: patternexamples.example.com | ||
| spec: | ||
| group: example.com | ||
| names: | ||
| kind: PatternExample | ||
| listKind: PatternExampleList | ||
| plural: patternexamples | ||
| singular: patternexample | ||
| scope: Namespaced | ||
| versions: | ||
| - name: v1 | ||
| served: true | ||
| storage: true | ||
| schema: | ||
| openAPIV3Schema: | ||
| type: object | ||
| properties: | ||
| spec: | ||
| type: object | ||
| properties: | ||
| code: | ||
| type: string |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: patternexamples.example.com | ||
| spec: | ||
| group: example.com | ||
| names: | ||
| kind: PatternExample | ||
| listKind: PatternExampleList | ||
| plural: patternexamples | ||
| singular: patternexample | ||
| scope: Namespaced | ||
| versions: | ||
| - name: v1 | ||
| served: true | ||
| storage: true | ||
| schema: | ||
| openAPIV3Schema: | ||
| type: object | ||
| properties: | ||
| spec: | ||
| type: object | ||
| properties: | ||
| code: | ||
| type: string | ||
| pattern: ^[a-z]+$ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "sameVersionValidation": [ | ||
| { | ||
| "version": "v1", | ||
| "propertyComparisons": [ | ||
| { | ||
| "property": "^.spec.code", | ||
| "comparisonResults": [ | ||
| { | ||
| "name": "pattern", | ||
| "errors": [ | ||
| "pattern added : \"\" -\u003e \"^[a-z]+$\"" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: patternexamples.example.com | ||
| spec: | ||
| group: example.com | ||
| names: | ||
| kind: PatternExample | ||
| listKind: PatternExampleList | ||
| plural: patternexamples | ||
| singular: patternexample | ||
| scope: Namespaced | ||
| versions: | ||
| - name: v1 | ||
| served: true | ||
| storage: true | ||
| schema: | ||
| openAPIV3Schema: | ||
| type: object | ||
| properties: | ||
| spec: | ||
| type: object | ||
| properties: | ||
| code: | ||
| type: string | ||
| pattern: ^[a-z]+$ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| name: patternexamples.example.com | ||
| spec: | ||
| group: example.com | ||
| names: | ||
| kind: PatternExample | ||
| listKind: PatternExampleList | ||
| plural: patternexamples | ||
| singular: patternexample | ||
| scope: Namespaced | ||
| versions: | ||
| - name: v1 | ||
| served: true | ||
| storage: true | ||
| schema: | ||
| openAPIV3Schema: | ||
| type: object | ||
| properties: | ||
| spec: | ||
| type: object | ||
| properties: | ||
| code: | ||
| type: string | ||
| pattern: ^[A-Z]+$ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "sameVersionValidation": [ | ||
| { | ||
| "version": "v1", | ||
| "propertyComparisons": [ | ||
| { | ||
| "property": "^.spec.code", | ||
| "comparisonResults": [ | ||
| { | ||
| "name": "pattern", | ||
| "errors": [ | ||
| "pattern changed : \"^[a-z]+$\" -\u003e \"^[A-Z]+$\"" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We may want to allow users to restrict removal of a pattern as well (and maybe we default to restricting this too).
Removing a pattern is a compatible change for writers, but is likely a breaking change to readers.
Older clients may no longer be able to handle the values here if they were built on the assumption that valid values for that field always adhere to that pattern.