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

udm_user: sanity #5559

Merged
merged 10 commits into from
Nov 23, 2022
Merged

udm_user: sanity #5559

merged 10 commits into from
Nov 23, 2022

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Nov 16, 2022

SUMMARY

Fix sanity checks

ISSUE TYPE
  • Bugfix Pull Request
  • Docs Pull Request
COMPONENT NAME

plugins/modules/udm_user.py

@russoz
Copy link
Collaborator Author

russoz commented Nov 16, 2022

Reference docs at: https://service.univention.de/download/docs.api/_modules/univention/admin/handlers/users/user.html

@ansibullbot
Copy link
Collaborator

cc @keachi
click here for bot help

@ansibullbot ansibullbot added bug This issue/PR relates to a bug cloud module module plugins plugin (any type) tests tests labels Nov 16, 2022
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-5 labels Nov 16, 2022
felixfontein
felixfontein approved these changes Nov 16, 2022
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.

Looks good to me. If nobody complains in ~a week, I'll merge this.

@felixfontein felixfontein merged commit 7992983 into ansible-collections:main Nov 23, 2022
@patchback
Copy link

patchback bot commented Nov 23, 2022 •
edited
Loading

Backport to stable-5: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 7992983 on top of patchback/backports/stable-5/79929830c401b5f127d95be71e4b81edf0f61986/pr-5559

Backporting merged PR #5559 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it: 
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code: 
    $ git fetch upstream
$ git checkout -b patchback/backports/stable-5/79929830c401b5f127d95be71e4b81edf0f61986/pr-5559 upstream/stable-5
  4. Now, cherry-pick PR udm_user: sanity #5559 contents into that branch: 
    $ git cherry-pick -x 79929830c401b5f127d95be71e4b81edf0f61986
    If it'll yell at you with something like fatal: Commit 79929830c401b5f127d95be71e4b81edf0f61986 is a merge but no -m option was given., add -m 1 as follows intead: 
    $ git cherry-pick -m1 -x 79929830c401b5f127d95be71e4b81edf0f61986
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR udm_user: sanity #5559 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-5/79929830c401b5f127d95be71e4b81edf0f61986/pr-5559
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

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

@patchback
Copy link

patchback bot commented Nov 23, 2022 •
edited
Loading

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/79929830c401b5f127d95be71e4b81edf0f61986/pr-5559

Backported as #5593

🤖 @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 Nov 23, 2022
@russoz @patchback
udm_user: sanity (#5559)
63c3915 
* fix parameter email

* fix parameter groups

* fix parameters home_telephone_number, mail_alternative_address, mobile_telephone_number, pager_telephonenumber

* fix parameter phone

* fix parameter samba_privileges

* fix parameter samba_user_workstations

* fix parameter secretary

* fix parameter serviceprovider

* remove lines from ignore files

* add changelog fragment

(cherry picked from commit 7992983)
@patchback patchback bot mentioned this pull request Nov 23, 2022
Merged
@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Nov 23, 2022
felixfontein pushed a commit that referenced this pull request Nov 23, 2022
@patchback @russoz
udm_user: sanity (#5559) (#5593)
3a456a6 
* fix parameter email

* fix parameter groups

* fix parameters home_telephone_number, mail_alternative_address, mobile_telephone_number, pager_telephonenumber

* fix parameter phone

* fix parameter samba_privileges

* fix parameter samba_user_workstations

* fix parameter secretary

* fix parameter serviceprovider

* remove lines from ignore files

* add changelog fragment

(cherry picked from commit 7992983)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
@github-actions
Copy link

Docs Build 📝

Thank you for contribution!✨

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

@russoz russoz deleted the udm-user-sanity branch November 24, 2022 01:24
russoz added a commit to russoz-ansible/community.general that referenced this pull request Nov 27, 2022
@russoz
udm_user: sanity (ansible-collections#5559)
c68c92e 
* fix parameter email

* fix parameter groups

* fix parameters home_telephone_number, mail_alternative_address, mobile_telephone_number, pager_telephonenumber

* fix parameter phone

* fix parameter samba_privileges

* fix parameter samba_user_workstations

* fix parameter secretary

* fix parameter serviceprovider

* remove lines from ignore files

* add changelog fragment
russoz added a commit to russoz-ansible/community.general that referenced this pull request Nov 27, 2022
@russoz
udm_user: sanity (ansible-collections#5559)
a02beb8 
* fix parameter email

* fix parameter groups

* fix parameters home_telephone_number, mail_alternative_address, mobile_telephone_number, pager_telephonenumber

* fix parameter phone

* fix parameter samba_privileges

* fix parameter samba_user_workstations

* fix parameter secretary

* fix parameter serviceprovider

* remove lines from ignore files

* add changelog fragment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein approved these changes

Assignees
No one assigned
Labels
bug This issue/PR relates to a bug cloud module module plugins plugin (any type) tests tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@russoz @ansibullbot @felixfontein