Add missing MariaDB Grants to mysql module #61410
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
cebe
commented
Jan 6, 2022
|
another issue for this: #58297 |
|
@cebe Looks good. Would be great to add some tests, please let me know if you need help getting those in. |
garethgreenaway
added
Sulfur v3006.0
|
bump @cebe can you respond to @garethgreenaway comment above? |
|
#59280 has been merged in which addresses similar issues to this PR. |
|
Closing this one out in favor of #59280 |
|
#59280 does not contain all of what is in here, I'll update my branch with the changes from #59280 to show the diff. @garethgreenaway Please reopen. |
|
@cebe can you resovle the merge conflict? @garethgreenaway will this require tests or is there already test coverage for a change like this? |
|
@Ch3LL I just rebased my commit on master, here are the changes that are left:
as far as I see, no extra tests are needed for this. |
MariaDB has added some grants in 10.4.x and 10.5.x that are not present here, which results in an error when creating. This is an addition to saltstack#59280. Also improved exception handling in `grant_add` which did not log the original error message and replaced it with a generic error.
Ch3LL
approved these changes
Oct 17, 2022
garethgreenaway
approved these changes
Oct 17, 2022
|
Nice, thanks for merging! |
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.
What does this PR do?
MariaDB has added some grants in 10.4.x and 10.5.x that are not present here, which results in an error when creating.
Also improved exception handling in
grant_addwhich did not log the original error message and replaced it with a generic error.What issues does this PR fix or reference?
Fixes: #61409
Previous Behavior
Error when trying to add grants that salt is not aware of.
The error message is very unspecific: "Error during grant generation"
New Behavior
No error for new MariaDB grants, better error message in case of unsupported grants.
Merge requirements satisfied?
Commits signed with GPG?
Yes