Fix #5313: redhat_subscription module is not idempotent when pool_ids are used #5319

cfiehe · 2022-09-29T11:44:40Z

SUMMARY

This fix ensures the idempotency of the redhat_subscription module when pool_ids are used. The main problem was, that a 'None' quantity was not properly handled and that the quantity check compared a string with an integer.

Signed-off-by: Christoph Fiehe [email protected]

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

redhat_subscription

ADDITIONAL INFORMATION

cfiehe · 2022-09-29T11:46:08Z

Sorry, I had some trouble with rebasing the branch. I have modified the changelog fragment and created a new pull request.

ansibullbot · 2022-09-29T11:55:14Z

cc @alikins @barnabycourt @kahowell
click here for bot help

felixfontein · 2022-09-29T18:38:47Z

Continues #5314.

plugins/modules/packaging/os/redhat_subscription.py

cfiehe · 2022-10-02T19:13:37Z

Yes, I think you are right. We can remove the first conditional part quantity == 0 and use quantity is not None and quantity != quantity_used solely 👍. Of course, quantity == 0 implies quantity is not None so the check quantity != quantity_used can also handle this case.

cfiehe · 2022-10-02T19:29:15Z

Should I modify the pull request?

felixfontein · 2022-10-02T19:42:28Z

I think so.

cfiehe · 2022-10-02T20:10:24Z

I think so.

Done 🙂.

plugins/modules/packaging/os/redhat_subscription.py

felixfontein

I think this looks correct now. I assume you did also test the latest version whether it really does what it should :)

I'll merge tomorrow evening if nobody complains by then.

cfiehe · 2022-10-02T21:26:44Z

I think this looks correct now. I assume you did also test the latest version whether it really does what it should :)

I must test it tomorrow. RHEL testing is always more complicated. Please wait for my feedback.

cfiehe · 2022-10-03T07:00:37Z

I have tested the modifications. They work like a charm 😊.

Thanks for your support.

…otent when pool_ids This fix ensures the idempotency of the redhat_subscription module when pool_ids are used. The main problem was, that a 'None' quantity was not properly handled and that the quantity check compared a string with an integer. Signed-off-by: Christoph Fiehe <[email protected]>

patchback · 2022-10-03T18:24:57Z

Backport to stable-4: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4/6fe2a84e8733c4f27d6aca7b77dbdb9bb6e173be/pr-5319

Backported as #5329

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

…#5319) This fix ensures the idempotency of the redhat_subscription module when pool_ids are used. The main problem was, that a 'None' quantity was not properly handled and that the quantity check compared a string with an integer. Signed-off-by: Christoph Fiehe <[email protected]> Signed-off-by: Christoph Fiehe <[email protected]> Co-authored-by: Christoph Fiehe <[email protected]> (cherry picked from commit 6fe2a84)

felixfontein · 2022-10-03T18:25:08Z

@cfiehe thanks for your contribution!

patchback · 2022-10-03T18:25:08Z

Backport to stable-5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-5/6fe2a84e8733c4f27d6aca7b77dbdb9bb6e173be/pr-5319

Backported as #5330

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

…#5319) This fix ensures the idempotency of the redhat_subscription module when pool_ids are used. The main problem was, that a 'None' quantity was not properly handled and that the quantity check compared a string with an integer. Signed-off-by: Christoph Fiehe <[email protected]> Signed-off-by: Christoph Fiehe <[email protected]> Co-authored-by: Christoph Fiehe <[email protected]> (cherry picked from commit 6fe2a84)

…#5319) (#5329) This fix ensures the idempotency of the redhat_subscription module when pool_ids are used. The main problem was, that a 'None' quantity was not properly handled and that the quantity check compared a string with an integer. Signed-off-by: Christoph Fiehe <[email protected]> Signed-off-by: Christoph Fiehe <[email protected]> Co-authored-by: Christoph Fiehe <[email protected]> (cherry picked from commit 6fe2a84) Co-authored-by: cfiehe <[email protected]>

…#5319) (#5330) This fix ensures the idempotency of the redhat_subscription module when pool_ids are used. The main problem was, that a 'None' quantity was not properly handled and that the quantity check compared a string with an integer. Signed-off-by: Christoph Fiehe <[email protected]> Signed-off-by: Christoph Fiehe <[email protected]> Co-authored-by: Christoph Fiehe <[email protected]> (cherry picked from commit 6fe2a84) Co-authored-by: cfiehe <[email protected]>

* upstream/main: (203 commits) Make pfexec become usable for illumos (ansible-collections#3889) znode: add options for authentication (ansible-collections#5306) keycloak_user_federation: add explanation and example to vendor option (ansible-collections#4893) Next expected release is 5.8.0. Allow terraform module to specify complex variable structures (ansible-collections#4797) Fix ansible-collections#5313: redhat_subscription module is not idempotent when pool_ids (ansible-collections#5319) bitwarden: Add field to search for all item attributes, instead of on… (ansible-collections#5297) New Module: Keycloak User Rolemapping (ansible-collections#4898) chore: Update lxc_container to support py3 (ansible-collections#5304) terraform: run `init` with no-color, too (ansible-collections#5147) nmcli: fix error when setting previously unset mac address (ansible-collections#5291) [feat] proxmox_snap: snapshot containers with configured mountpoints (ansible-collections#5274) machinectl: include the success command (ansible-collections#5287) Add SetSessionService to redfish_config (ansible-collections#5009) locale_gen: fix UbuntuMode (ansible-collections#5282) ini_file: fix lint error (ansible-collections#5307) netcup_dnsapi: Add timeout paramter (ansible-collections#5301) stable-2.14 is now default. Add stable-2.14 to CI, adjust to devel version bump (ansible-collections#5298) Try to run reuse workflow without explicitly allowing it for new contributors. (ansible-collections#5296) ...

…otent when pool_ids (ansible-collections#5319) This fix ensures the idempotency of the redhat_subscription module when pool_ids are used. The main problem was, that a 'None' quantity was not properly handled and that the quantity check compared a string with an integer. Signed-off-by: Christoph Fiehe <[email protected]> Signed-off-by: Christoph Fiehe <[email protected]> Co-authored-by: Christoph Fiehe <[email protected]>

ansibullbot added bug This issue/PR relates to a bug module module needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR new_contributor Help guide this first time contributor os packaging plugins plugin (any type) labels Sep 29, 2022

felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-4 labels Sep 29, 2022

felixfontein mentioned this pull request Sep 29, 2022

Fixes #5313: redhat_subscription module is not idempotent when pool_ids are used #5314

Closed

ansibullbot removed the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR label Sep 29, 2022

felixfontein reviewed Oct 1, 2022

View reviewed changes

plugins/modules/packaging/os/redhat_subscription.py Outdated Show resolved Hide resolved

felixfontein reviewed Oct 2, 2022

View reviewed changes

plugins/modules/packaging/os/redhat_subscription.py Outdated Show resolved Hide resolved

plugins/modules/packaging/os/redhat_subscription.py Outdated Show resolved Hide resolved

This comment was marked as outdated.

Sign in to view

ansibullbot added merge_commit This PR contains at least one merge commit. Please resolve! needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html labels Oct 2, 2022

cfiehe force-pushed the rhsm_fix_idempotency_with_pool_ids branch from e89e1e6 to 7512089 Compare October 2, 2022 20:08

ansibullbot removed merge_commit This PR contains at least one merge commit. Please resolve! needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html labels Oct 2, 2022

felixfontein reviewed Oct 2, 2022

View reviewed changes

plugins/modules/packaging/os/redhat_subscription.py Outdated Show resolved Hide resolved

cfiehe force-pushed the rhsm_fix_idempotency_with_pool_ids branch from 7512089 to d2d4d2a Compare October 2, 2022 20:42

felixfontein approved these changes Oct 2, 2022

View reviewed changes

cfiehe force-pushed the rhsm_fix_idempotency_with_pool_ids branch from d2d4d2a to 4cec80e Compare October 3, 2022 07:17

This comment was marked as outdated.

Sign in to view

ansibullbot added the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR label Oct 3, 2022

cfiehe force-pushed the rhsm_fix_idempotency_with_pool_ids branch from 4cec80e to 4dc6790 Compare October 3, 2022 08:15

cfiehe force-pushed the rhsm_fix_idempotency_with_pool_ids branch from 4dc6790 to 1e66d0f Compare October 3, 2022 08:21

cfiehe changed the title ~~Fix #5313: redhat_subscription module is not idempotent when pool_ids~~ Fix #5313: redhat_subscription module is not idempotent when pool_ids are used Oct 3, 2022

felixfontein approved these changes Oct 3, 2022

View reviewed changes

felixfontein merged commit 6fe2a84 into ansible-collections:main Oct 3, 2022

patchback bot mentioned this pull request Oct 3, 2022

[PR #5319/6fe2a84e backport][stable-4] Fix #5313: redhat_subscription module is not idempotent when pool_ids are used #5329

Merged

patchback bot mentioned this pull request Oct 3, 2022

[PR #5319/6fe2a84e backport][stable-5] Fix #5313: redhat_subscription module is not idempotent when pool_ids are used #5330

Merged

felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Oct 3, 2022

This was referenced Nov 24, 2022

Redhat_subscription always return changed status #226

Open

Consumed subscriptions, still listed as available are consumed again #1228

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #5313: redhat_subscription module is not idempotent when pool_ids are used #5319

Fix #5313: redhat_subscription module is not idempotent when pool_ids are used #5319

cfiehe commented Sep 29, 2022

cfiehe commented Sep 29, 2022

ansibullbot commented Sep 29, 2022

felixfontein commented Sep 29, 2022

cfiehe commented Oct 2, 2022 •

edited

Loading

cfiehe commented Oct 2, 2022

felixfontein commented Oct 2, 2022

This comment was marked as outdated.

cfiehe commented Oct 2, 2022

felixfontein left a comment

cfiehe commented Oct 2, 2022

cfiehe commented Oct 3, 2022 •

edited

Loading

This comment was marked as outdated.

patchback bot commented Oct 3, 2022 •

edited

Loading

felixfontein commented Oct 3, 2022

patchback bot commented Oct 3, 2022 •

edited

Loading

Fix #5313: redhat_subscription module is not idempotent when pool_ids are used #5319

Fix #5313: redhat_subscription module is not idempotent when pool_ids are used #5319

Conversation

cfiehe commented Sep 29, 2022

SUMMARY

ISSUE TYPE

COMPONENT NAME

ADDITIONAL INFORMATION

cfiehe commented Sep 29, 2022

ansibullbot commented Sep 29, 2022

felixfontein commented Sep 29, 2022

cfiehe commented Oct 2, 2022 • edited Loading

cfiehe commented Oct 2, 2022

felixfontein commented Oct 2, 2022

This comment was marked as outdated.

cfiehe commented Oct 2, 2022

felixfontein left a comment

Choose a reason for hiding this comment

cfiehe commented Oct 2, 2022

cfiehe commented Oct 3, 2022 • edited Loading

This comment was marked as outdated.

patchback bot commented Oct 3, 2022 • edited Loading

Backport to stable-4: 💚 backport PR created

felixfontein commented Oct 3, 2022

patchback bot commented Oct 3, 2022 • edited Loading

Backport to stable-5: 💚 backport PR created

cfiehe commented Oct 2, 2022 •

edited

Loading

cfiehe commented Oct 3, 2022 •

edited

Loading

patchback bot commented Oct 3, 2022 •

edited

Loading

patchback bot commented Oct 3, 2022 •

edited

Loading