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

Jump to bottom

fix boot ssh key setting #33

Merged
merged 10 commits into from
Jan 4, 2022
Merged

fix boot ssh key setting #33

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
28ceb37
fix boot ssh key setting
mkbrechtel Dec 28, 2021
4056422
code style
mkbrechtel Dec 28, 2021
c1eef73
boot idempotency check comment
mkbrechtel Dec 28, 2021
7d6df71
changelog fragment
mkbrechtel Dec 28, 2021
635d730
changelog fragment with save
mkbrechtel Dec 28, 2021
56df49f
fix changelog fragment wording
mkbrechtel Dec 28, 2021
a2f49bc
Update changelogs/fragments/33-fix-boot-ssh-key-setting.yaml
Dec 29, 2021
e5b0791
Apply suggestions from code review
felixfontein Jan 4, 2022
2f90009
Adjust tests.
felixfontein Jan 4, 2022
ee51245
Update changelog fragment.
felixfontein Jan 4, 2022
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/33-fix-boot-ssh-key-setting.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- bugfix for incorrect handling of ssh-keys for the community.hcloud.boot module. Trying to set the boot record with the module lets the API return errors (reported in https://github.com/ansible-collections/community.hrobot/issues/32). This is and the idempotence for ssh-keys is fixed with the https://github.com/ansible-collections/community.hrobot/pull/33 MR.
This conversation was marked as resolved.
Show resolved Hide resolved
14 changes: 11 additions & 3 deletions plugins/modules/boot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,15 +384,23 @@ def main():
option = module.params[option_name][option_key]
if option is None or option == []:
continue
data[data_key] = option

if isinstance(option, list):
data[data_key+'[]'] = option
felixfontein marked this conversation as resolved.
Show resolved Hide resolved
else:
data[data_key] = option
felixfontein marked this conversation as resolved.
Show resolved Hide resolved
if existing.get('active'):
# Idempotence check
needs_change = False
for option_key, (result_key, data_key) in options.items():
should = module.params[option_name][option_key]
if should is None:
continue
has = existing.get(data_key)
# unfold the return object for the idempotence check to work correctly
if option_key == 'authorized_keys':
has = list(map(lambda x: x['key']['fingerprint'], existing.get(data_key)))
else:
has = existing.get(data_key)
felixfontein marked this conversation as resolved.
Show resolved Hide resolved
if isinstance(has, list):
has = sorted(has)
if not isinstance(should, list):
Expand All @@ -415,7 +423,7 @@ def main():
result, dummy = fetch_url_json(
module,
url,
data=urlencode(data),
data=urlencode(data, True),
headers=headers,
method='POST',
)
Expand Down