modeldecoder/generator: enable additionalProperties subschema #4464
Conversation
This file contains 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
Handle map value rules without requiring patternProperties in JSON Schema. When value rules (e.g. inputTypesVals) are specified, but no patternKeys rule is specified, then nest the generated schema under additionalProperties. This will enable us to remove the patternKeys rules from labels, tags, etc. when moving label key sanitization into the server, without dropping label value validation.
Codecov Report
@@ Coverage Diff @@
## master #4464 +/- ##
==========================================
+ Coverage 76.08% 76.09% +0.01%
==========================================
Files 158 158
Lines 9776 9773 -3
==========================================
- Hits 7438 7437 -1
+ Misses 2338 2336 -2
|
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Steps errors
Expand to view the steps failures
|
simitt
approved these changes
Nov 30, 2020
axw
added a commit
to axw/apm-server
that referenced
this pull request
Dec 14, 2020
…c#4464) Handle map value rules without requiring patternProperties in JSON Schema. When value rules (e.g. inputTypesVals) are specified, but no patternKeys rule is specified, then nest the generated schema under additionalProperties. This will enable us to remove the patternKeys rules from labels, tags, etc. when moving label key sanitization into the server, without dropping label value validation.
axw
added a commit
that referenced
this pull request
Dec 14, 2020
…#4524) Handle map value rules without requiring patternProperties in JSON Schema. When value rules (e.g. inputTypesVals) are specified, but no patternKeys rule is specified, then nest the generated schema under additionalProperties. This will enable us to remove the patternKeys rules from labels, tags, etc. when moving label key sanitization into the server, without dropping label value validation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation/summary
Handle map value rules without requiring patternProperties in
JSON Schema.
When value rules (e.g. inputTypesVals) are specified, but no
patternKeys rule is specified, then nest the generated schema
under additionalProperties.
This will enable us to remove the patternKeys rules from labels,
tags, etc. when moving label key sanitization into the server,
without dropping label value validation.
Checklist
- [ ] I have updated CHANGELOG.asciidocI have considered changes for:
- [ ] documentation- [ ] logging (add log lines, choose appropriate log selector, etc.)- [ ] metrics and monitoring (create issue for Kibana team to add metrics to visualizations, e.g. Kibana#44001)- [ ] telemetry- [ ] Elasticsearch Service (https://cloud.elastic.co)- [ ] Elastic Cloud Enterprise (https://www.elastic.co/products/ece)- [ ] Elastic Cloud on Kubernetes (https://www.elastic.co/elastic-cloud-kubernetes)How to test these changes
make testRelated issues
#4225