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.

Sign up for GitHub

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 KeyError when comparing datasource without basicAuth #316

Merged
merged 3 commits into from
Nov 5, 2023
Merged

Fix KeyError when comparing datasource without basicAuth #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
020105f
chg: only remove basicAuthUser from datasource if it is present
Oct 12, 2023
9e04956
add changelog fragment
LiMuBei Oct 26, 2023
b910e81
Update plugins/modules/grafana_datasource.py
rrey Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/fix-316.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- Fix error with datasources configured without basicAuth
3 changes: 2 additions & 1 deletion plugins/modules/grafana_datasource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,8 @@
if 'readOnly' in current:
del current['readOnly']
if current['basicAuth'] is False:
del current['basicAuthUser']
if 'basicAuthUser' in current:
del current['basicAuthUser']

Check warning on line 523 in plugins/modules/grafana_datasource.py

View check run for this annotation

Codecov / codecov/patch

plugins/modules/grafana_datasource.py#L523 

Added line #L523 was not covered by tests
if 'password' in current:
del current['password']
if 'basicAuthPassword' in current:
Expand Down
Loading