Fix grafana_user and switch to using flush
#283
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
Previously `save_user` was being called once per changed property and calls were also being made to update user properties, password and the admin flag regardless of whether these properties needed updating. Using `flush` is more efficient. * `full_name` is fixed (it was previously a parameter instead of a property). * When a user is created, `is_admin` is correctly set in a single Puppet run. * Properties can be managed individually. * Instead of making `password` mandatory, (when creating a user), if `password` isn't specified, a random one is used. Fixes voxpupuli#121
alexjfisher
changed the title
grafana_user save_user with flushgrafana_user and switch to using flush
alexjfisher
commented
May 25, 2022
| @@ -48,79 +51,82 @@ def name | |||
| end | |||
|
|
|||
| def name=(value) | |||
| resource[:name] = value | |||
There was a problem hiding this comment.
These lines didn't actually do anything. resource[:foo] was already value. (The function wouldn't have been called if the property was not set)
alexjfisher
commented
May 25, 2022
| @@ -57,7 +57,6 @@ def insync?(_is) | |||
| newproperty(:is_admin) do | |||
| desc 'Whether the user is a grafana admin' | |||
| newvalues(:true, :false) | |||
| defaultto :false | |||
There was a problem hiding this comment.
Now that update_admin_flag is only called if the property has been set, there is no need for a default here (and defaults for properties are generally a bad thing).
bastelfreak
approved these changes
May 25, 2022
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.
Previously
save_userwas being called once per changed property andcalls were also being made to update user properties, password and the
admin flag regardless of whether these properties needed updating.
Using
flushis more efficient.full_nameis fixed (it was previously a parameter instead of a property).is_adminis correctly set in a single Puppet run.passwordmandatory, (when creating a user), ifpasswordisn't specified, a random one is used.Fixes #121