This repository has been archived by the owner on Jan 8, 2024. It is now read-only.
Scoped Config Sources Upgrade Fix #4382
Merged
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
paladin-devops
force-pushed
the
b-scoped-config-sources-upgrade
branch
from
889dea3
to
621dfbc
Compare
izaaklauer
reviewed
Jan 11, 2023
| // is the simplest way for users to upgrade since custom config sourcer | ||
| // plugins aren't yet supported, as of 1/10/2023. | ||
| key := string(k) | ||
| re := regexp.MustCompile(`aws-ssm|consul|kubernetes|null|packer|terraform-cloud|vault`) |
There was a problem hiding this comment.
Nit: I think it's good for performance to compile your regex once at startup, and then use it throughout (example here:
Line 167 in e19fa4d
I don't think it really matters here, because I don't think this is in a hot loop, so feel free to disregard in this case.
There was a problem hiding this comment.
@izaaklauer thanks for pointing that out! with bucket.ForEach we do loop through each record in the bucket, so I'd say it's a "warm" loop 😄 I'm going to set the regex before we enter the loop, but still in this function, since this function is called once at the start up of the server.
izaaklauer
approved these changes
Jan 11, 2023
This commit updates the Bolt DB implementation of config sources to "upgrade" a pre-v0.10.4 database record from the config_source table. Prior to v0.10.4, the unique identifier for each record in the table was the name of the plugin. This was changed in v0.10.4 with the addition of scoped config sources, and now the ID is a hashed value, whose hash structure is defined by the plugin name, scope, and workspace name. This commit therefore deletes any "old" records, those whose ID is the name of any known config sourcer plugin, from Bolt DB, and creates new records with the ID correctly hashed. With this fix, users who had config sources prior to v0.10.3 may continue to interact with those config sources, whereas before this commit, they could not, and the config sources were permanently "stuck" in the database as they were before upgrading.
paladin-devops
force-pushed
the
b-scoped-config-sources-upgrade
branch
from
54bb172
to
abb4ca5
Compare
cicoyle
approved these changes
Jan 13, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR updates the Bolt DB implementation of config sources to "upgrade" a pre-v0.10.4 database record from the config_source table. Prior to v0.10.4, the unique identifier for each record in the table was the name of the plugin. This was changed in v0.10.4 with the addition of scoped config sources, and now the ID is a hashed value, whose hash structure is defined by the plugin name, scope, and workspace name.
This PR therefore deletes any "old" records, those whose ID is the name of any known config sourcer plugin, from Bolt DB, and creates new records with the ID correctly hashed. With this fix, users who had config sources prior to v0.10.3 may continue to interact with those config sources, whereas before this commit, they could not, and the config sources were permanently "stuck" in the database as they were before upgrading.
Fixes #4360.