Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix influxdb user functionality for version 0.9+ #31770

Merged
merged 1 commit into from Mar 9, 2016

Conversation

Projects
None yet
3 participants
@anlutro
Copy link
Contributor

commented Mar 9, 2016

Fixes #30489

fix influxdb user functionality for version 0.9+
- get_list_cluster_admins no longer exists
- user dict keys changed
@justinta

This comment has been minimized.

Copy link

commented Mar 9, 2016

Go Go Jenkins!

if username == name:
return True
else:
log.warning('Could not find username in user: %s', user)

This comment has been minimized.

Copy link
@rallytime

rallytime Mar 9, 2016

Contributor

Is it intended to warn on every single user in the users list? This seems a little noisy. Would it make more sense to move this out of the loop and warn at the end if we haven't returned already?

This comment has been minimized.

Copy link
@anlutro

anlutro Mar 9, 2016

Author Contributor

I think the log.warning should really never happen, which is why I didn't put much thought into whether to put it in the loop or not. In InfluxDB 0.8, user.get('name') will return the username, and in 0.9+, user.get('user') will return the username. I don't know how 0.7 would behave.

If I put the log outside of the loop, I wouldn't be able to log the user dict that doesn't contain the expected keys, and I'd have to add an additional variable - found_missing_user_keys or something.

This comment has been minimized.

Copy link
@rallytime

rallytime Mar 9, 2016

Contributor

Ah, ok. Sounds good. I didn't realize the else statement would likely never occur. Thanks for the explanation!

rallytime added a commit that referenced this pull request Mar 9, 2016

Merge pull request #31770 from alprs/fix-influxdb_user
Fix influxdb user functionality for version 0.9+

@rallytime rallytime merged commit fd3610c into saltstack:2015.8 Mar 9, 2016

4 of 5 checks passed

default Merged build started.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #14533 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #14095 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #13173 — SUCCESS
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #10477 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.