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

Rundeck modules fixes and improvements #6300

Merged
merged 10 commits into from
Apr 16, 2023
Merged

Rundeck modules fixes and improvements #6300

merged 10 commits into from
Apr 16, 2023

Conversation

phsmith
Copy link
Contributor

@phsmith phsmith commented Apr 8, 2023 •
edited
Loading

SUMMARY

Following PR #5887 and issue #5742, I've made some updates and improvements to the rundeck_acl_policy and rundeck_project modules to fix the issues and make them more standard.

Fixes #5742

ISSUE TYPE
  • Bugfix Pull Request
  • Docs Pull Request
  • Refactoring Pull Request
COMPONENT NAME
  • rundeck_acl_policy
  • rundeck_project
ADDITIONAL INFORMATION
  • Changed the modules for using module_utils.rundeck functions and arguments
  • Fixed empty response errors in module_utils.rundeck

@ansibullbot
Copy link
Collaborator

@phsmith this PR contains the following merge commits:

Please rebase your branch to remove these commits.

click here for bot help

@ansibullbot ansibullbot added bug This issue/PR relates to a bug merge_commit This PR contains at least one merge commit. Please resolve! module module needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html labels Apr 8, 2023
@github-actions
Copy link

github-actions bot commented Apr 8, 2023 •
edited
Loading

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

@ansibullbot

This comment was marked as outdated.

Sign in to view
@ansibullbot ansibullbot added ci_verified Push fixes to PR branch to re-run CI needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Apr 8, 2023
felixfontein
felixfontein reviewed Apr 8, 2023
View reviewed changes
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contribution. Please add a changelog fragment. I've added some first comments below.

I would also suggest to avoid mixing refactoring and new features if not strictly necessary. It's better to do new features in a follow-up PR to avoid making this PR too complex.

plugins/modules/rundeck_acl_policy.py Show resolved Hide resolved
plugins/doc_fragments/rundeck.py Outdated Show resolved Hide resolved
plugins/modules/rundeck_acl_policy.py Outdated Show resolved Hide resolved
@phsmith phsmith force-pushed the feat/rundeck-modules-improvements branch from 666c625 to 0b2670a Compare April 8, 2023 17:23
@ansibullbot
Copy link
Collaborator

cc @nerzhul
click here for bot help

@ansibullbot ansibullbot added docs_fragments docs_fragments plugin (shared docs) module_utils module_utils plugins plugin (any type) web_infrastructure and removed ci_verified Push fixes to PR branch to re-run CI 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 Apr 8, 2023
@ansibullbot

This comment was marked as outdated.

Sign in to view
@ansibullbot ansibullbot added the ci_verified Push fixes to PR branch to re-run CI label Apr 8, 2023
@ansibullbot ansibullbot removed ci_verified Push fixes to PR branch to re-run CI needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Apr 8, 2023
russoz
russoz reviewed Apr 9, 2023
View reviewed changes
Copy link
Collaborator

@russoz russoz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi @phsmith thanks for your contribution!

I caught a typo and a couple of nit picking on the changelog fragment.

changelogs/fragments/6300-rundeck-modules-fixes-and-improvements.yml Outdated Show resolved Hide resolved
changelogs/fragments/6300-rundeck-modules-fixes-and-improvements.yml Outdated Show resolved Hide resolved
changelogs/fragments/6300-rundeck-modules-fixes-and-improvements.yml Outdated Show resolved Hide resolved
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-6 labels Apr 9, 2023
felixfontein
felixfontein reviewed Apr 9, 2023
View reviewed changes
plugins/modules/rundeck_acl_policy.py Outdated Show resolved Hide resolved
plugins/modules/rundeck_acl_policy.py Outdated Show resolved Hide resolved
russoz
russoz approved these changes Apr 9, 2023
View reviewed changes
Copy link
Collaborator

@russoz russoz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Apr 16, 2023
@felixfontein felixfontein merged commit a35542d into ansible-collections:main Apr 16, 2023
@patchback
Copy link

patchback bot commented Apr 16, 2023 •
edited
Loading

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/a35542d0d109df232f40a911f9ac31209d5dd4f1/pr-6300

Backported as #6343

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

patchback bot pushed a commit that referenced this pull request Apr 16, 2023
@phsmith @patchback
Rundeck modules fixes and improvements (#6300)
9be7a13 
* feat: add token alias to api_token parameter

* fix: return (None, info) on empty content response

* feat: update the modules for using module_utils.rundeck funcs

* docs: add changelog fragment

* fix: add trailing commas

* fix: changelog fragment invalid syntax

* fix: changelog typos

* fix: remove token aliases from api_token

* fix: add token alias to api_token param

* fix: add partial overwrite of params and docs

(cherry picked from commit a35542d)
@patchback patchback bot mentioned this pull request Apr 16, 2023
Merged
@felixfontein
Copy link
Collaborator

@phsmith thanks for your contribution!
@russoz thanks for your review!

@phsmith
Copy link
Contributor Author

phsmith commented Apr 16, 2023

Thanks @russoz and @felixfontein!
I always learning a lot with you guys. 👍

@phsmith phsmith deleted the feat/rundeck-modules-improvements branch April 16, 2023 11:28
felixfontein pushed a commit that referenced this pull request Apr 16, 2023
@patchback @phsmith
[PR #6300/a35542d0 backport][stable-6] Rundeck modules fixes and impr…
aa8728b 
…ovements (#6343)

Rundeck modules fixes and improvements (#6300)

* feat: add token alias to api_token parameter

* fix: return (None, info) on empty content response

* feat: update the modules for using module_utils.rundeck funcs

* docs: add changelog fragment

* fix: add trailing commas

* fix: changelog fragment invalid syntax

* fix: changelog typos

* fix: remove token aliases from api_token

* fix: add token alias to api_token param

* fix: add partial overwrite of params and docs

(cherry picked from commit a35542d)

Co-authored-by: Phillipe Smith <phsmithcc@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein left review comments

@russoz russoz russoz approved these changes

Assignees
No one assigned
Labels
bug This issue/PR relates to a bug docs_fragments docs_fragments plugin (shared docs) module_utils module_utils module module plugins plugin (any type) web_infrastructure
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

rundeck_project not working
4 participants
@phsmith @ansibullbot @felixfontein @russoz