Respect Kibana / Fleet config schema when inheriting ES credentials #1394
+845
−9
Conversation
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
Instead of using the defaults as a starting point we apply them after building the config object to any fields that are not set. In doing so we respect fields that are mutually exclusive like api_key and username. Applying defaults at the end makes it easier to check we aren't accidentally building an invalid config.
…tack into fix-invalid-auth-config
|
Woops, not sure why this doesn't seem to be playing nice with the SLO test. I'll switch back to a draft while I sort that out. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes: #1393
Before this PR we were using the ES Config as a starting point and applying Kibana provider block and environment configs on top of that. This can lead to invalid Configs where both Username / Password and ApiKey are both configured.
This PR starts with an empty Kibana / Fleet config, then applies provider settings, environment overrides, then only applies defaults for unknown values (while respecting mutually exclusive values like Username / ApiKey)
Additionally we add
fleetConfigKeysandkibanaConfigKeyswhich allows us to track explicitly set fields. This adds a bit of overhead to maintain state, but allows us to correctly differentiate between explicit empty values and unset values in a way that supports both the sdkv2 and plugin framework implementations. Technically the Kibana config doesn't require tracking the keys because it only inherits string values from ES, but I thought it was more straightforward for Fleet and Kibana to use a similar pattern.