Add support for MariaDB 10.5's new grants and grant aliases

[pprkut]

What does this PR do?

MariaDB 10.5 added alias for the REPLICATION SLAVE and REPLICATION CLIENT grants, and split up the SUPER grant into smaller pieces.
This adds the necessary code to support both the new aliases as well as the new grants resulting from the SUPER split (the SUPER grant itself is still supported).

Reference: https://mariadb.com/kb/en/grant/

What issues does this PR fix or reference?

Fixes: #58297

Previous Behavior

The mysql_grants.present state returns an error becomes it wants to add REPLICATION CLIENT but the db added BINLOG MONITOR

New Behavior

The state reports that the REPLICATION CLIENT grant was added successfully

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

• Docs
• Changelog - https://docs.saltstack.com/en/master/topics/development/changelog.html
• Tests written/updated

Commits signed with GPG?

No

[babs]

LGTM, definitely needs integration :)

[garethgreenaway]

@pprkut Thanks for the PR. Can you rebase to the latest master branch so we can see if these failing tests pass. Also, if you can add some tests for the changes that would be great. There are some newer tests that I added in a previous PR that use various versions of the MySQL variants running in Docker containers to test functionality.

[pprkut]

@garethgreenaway Is tests/pytests/integration/modules/test_mysql.py the right place to look at for adding new tests? Can I just add new functions in there or do they need to be registered somewhere else as well?

[jsoligny]

Hello @pprkut,

Thanks a lot, we were block by this issue until I saw your PR. Do you still work on this PR ? Because we're greatly interested in your fixes.

Have a nice day,

Jérémie

[pprkut]

@jsoligny Yes, still on my TODO list, just haven't had time yet to work on the tests :-/
I'm hoping to be able to have another go at it before the end of the year though.

[pprkut]

It's really difficult to test the tests because of all the "Slow tests are disabled!" 😞

[garethgreenaway]

@pprkut If you're running the tests locally you can pass the flat --run-slow to have the Slow tests run.

[pprkut]

@garethgreenaway I'm afraid I'm not. I don't have the infrastructure for that locally, so I'm fully reliant on the CI 😞

[garethgreenaway]

@pprkut Looks like there are some merge conflicts here. Unfortunately something, I suspect permissions, is preventing me from seeing what is conflicting. If you want to open that up I can look at adding some tests here for the new grants.

[pprkut]

@garethgreenaway I don't see the usual checkbox for allowing maintainer writes, so I tried something else.
I also think I managed to fix up the conflicts (the test file moved and modules are called slightly differently there)

[garethgreenaway]

@pprkut Something is still preventing me from updating the branch or editing any files, which isn't necessary just sometimes helpful if unrelated tests are failing and a merge from master is necessary. Thanks for adding the tests, this is great! It does look like they're not skipping on variants where they shouldn't be running though.

[pprkut]

@garethgreenaway I sent you an invite to our repo. As far as I read, that's the only way to do it in this case 😕

Regarding the tests, that's where I got stuck, yes. The actual tests should be fine, just something in the logic that checks the mariadb version that's off

[garethgreenaway]

@pprkut I'll look for the invite and check the tests. Thanks!

[garethgreenaway]

@pprkut Looks like the invite to the ORG allows me additional permissions. Thanks!

[garethgreenaway]

@pprkut Spinning up the tests locally I can see at least one of the tests is failing with the following error:
Incorrect usage of DB GRANT and GLOBAL PRIVILEGES, quick Google search for this looks like maybe the grant needs to be done on the global level instead of on the salt database?

[pprkut]

@garethgreenaway Ah that might indeed be one thing, yes. I checked our pillar config and we do indeed specify those permissions on a global level there

[garethgreenaway]

@pprkut Awesome. I updated the tests using globals and the tests are now passing, remaining tests failures are unrelated so I'll restart them.