From 435a56263064b06814e7eeff6f2ba8dc2652764e Mon Sep 17 00:00:00 2001 From: Andrew Saraceni Date: Tue, 1 Aug 2017 22:06:39 -0400 Subject: [PATCH] Rename win_group_member module to win_group_membership (#27614) * rename win_group_member to win_group_membership * adding details to BOTMETA.yml --- .github/BOTMETA.yml | 6 ++-- CHANGELOG.md | 2 +- ...up_member.ps1 => win_group_membership.ps1} | 0 ...roup_member.py => win_group_membership.py} | 6 ++-- .../aliases | 0 .../tasks/main.yml | 10 +++---- .../tasks/tests.yml | 30 +++++++++---------- 7 files changed, 28 insertions(+), 26 deletions(-) rename lib/ansible/modules/windows/{win_group_member.ps1 => win_group_membership.ps1} (100%) rename lib/ansible/modules/windows/{win_group_member.py => win_group_membership.py} (97%) rename test/integration/targets/{win_group_member => win_group_membership}/aliases (100%) rename test/integration/targets/{win_group_member => win_group_membership}/tasks/main.yml (69%) rename test/integration/targets/{win_group_member => win_group_membership}/tasks/tests.yml (94%) diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml index b29d0bba7b8..833cfeaa090 100644 --- a/.github/BOTMETA.yml +++ b/.github/BOTMETA.yml @@ -27,7 +27,7 @@ # labels - list of GitHub labels to apply # -files: +files: $module_utils/aci.py: dagwieers schunduri $modules/cloud/amazon/: notify: @@ -732,6 +732,8 @@ files: $modules/windows/win_firewall_rule.py: TimothyVandenbrande ar7z1 $modules/windows/win_get_url.ps1: angstwad jhawkesworth $modules/windows/win_get_url.py: angstwad jhawkesworth + $modules/windows/win_group_membership.ps1: andrewsaraceni + $modules/windows/win_group_membership.py: andrewsaraceni $modules/windows/win_group.ps1: chrishoffman $modules/windows/win_group.py: chrishoffman $modules/windows/win_iis_virtualdirectory.ps1: $team_ansible @@ -1029,7 +1031,7 @@ files: test/sanity/validate-modules: keywords: - validate-modules -macros: +macros: module_utils: lib/ansible/module_utils modules: lib/ansible/modules team_ansible: [] diff --git a/CHANGELOG.md b/CHANGELOG.md index 068295856d8..d598d65cf57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -276,7 +276,7 @@ Ansible Changes By Release * win_domain_group * win_dsc * win_firewall - * win_group_member + * win_group_membership * win_psmodule * win_route * win_security_policy diff --git a/lib/ansible/modules/windows/win_group_member.ps1 b/lib/ansible/modules/windows/win_group_membership.ps1 similarity index 100% rename from lib/ansible/modules/windows/win_group_member.ps1 rename to lib/ansible/modules/windows/win_group_membership.ps1 diff --git a/lib/ansible/modules/windows/win_group_member.py b/lib/ansible/modules/windows/win_group_membership.py similarity index 97% rename from lib/ansible/modules/windows/win_group_member.py rename to lib/ansible/modules/windows/win_group_membership.py index ac1a581f7b4..0b6a89988cb 100644 --- a/lib/ansible/modules/windows/win_group_member.py +++ b/lib/ansible/modules/windows/win_group_membership.py @@ -27,7 +27,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.0', DOCUMENTATION = r''' --- -module: win_group_member +module: win_group_membership version_added: "2.4" short_description: Manage Windows local group membership description: @@ -58,7 +58,7 @@ author: EXAMPLES = r''' - name: Add a local and domain user to a local group - win_group_member: + win_group_membership: name: Remote Desktop Users members: - NewLocalAdmin @@ -66,7 +66,7 @@ EXAMPLES = r''' state: present - name: Remove a domain group and service user from a local group - win_group_member: + win_group_membership: name: Backup Operators members: - DOMAIN\TestGroup diff --git a/test/integration/targets/win_group_member/aliases b/test/integration/targets/win_group_membership/aliases similarity index 100% rename from test/integration/targets/win_group_member/aliases rename to test/integration/targets/win_group_membership/aliases diff --git a/test/integration/targets/win_group_member/tasks/main.yml b/test/integration/targets/win_group_membership/tasks/main.yml similarity index 69% rename from test/integration/targets/win_group_member/tasks/main.yml rename to test/integration/targets/win_group_membership/tasks/main.yml index 09902eb68e0..c2297ee0168 100644 --- a/test/integration/targets/win_group_member/tasks/main.yml +++ b/test/integration/targets/win_group_membership/tasks/main.yml @@ -3,27 +3,27 @@ - name: Remove potentially leftover test group win_group: &wg_absent - name: WinGroupMemberTest + name: WinGroupMembershipTest state: absent - name: Add new test group win_group: - name: WinGroupMemberTest + name: WinGroupMembershipTest state: present -- name: Run tests for win_group_member +- name: Run tests for win_group_membership block: - name: Test in normal mode include_tasks: tests.yml vars: - win_local_group: WinGroupMemberTest + win_local_group: WinGroupMembershipTest in_check_mode: no - name: Test in check-mode include_tasks: tests.yml vars: - win_local_group: WinGroupMemberTest + win_local_group: WinGroupMembershipTest in_check_mode: yes check_mode: yes diff --git a/test/integration/targets/win_group_member/tasks/tests.yml b/test/integration/targets/win_group_membership/tasks/tests.yml similarity index 94% rename from test/integration/targets/win_group_member/tasks/tests.yml rename to test/integration/targets/win_group_membership/tasks/tests.yml index bdcbbf7a4a5..b3d15bd3c3e 100644 --- a/test/integration/targets/win_group_member/tasks/tests.yml +++ b/test/integration/targets/win_group_membership/tasks/tests.yml @@ -1,4 +1,4 @@ -# Test code for win_group_member +# Test code for win_group_membership # (c) 2017, Andrew Saraceni # @@ -18,7 +18,7 @@ # along with Ansible. If not, see . - name: Remove potentially leftover group members - win_group_member: + win_group_membership: name: "{{ win_local_group }}" members: - Administrator @@ -29,7 +29,7 @@ - name: Add user to fake group - win_group_member: + win_group_membership: name: FakeGroup members: - Administrator @@ -39,7 +39,7 @@ - name: Add fake local user - win_group_member: + win_group_membership: name: "{{ win_local_group }}" members: - FakeUser @@ -49,7 +49,7 @@ - name: Add fake FQDN domain user - win_group_member: + win_group_membership: name: "{{ win_local_group }}" members: - FakeUser@domain.fake @@ -59,7 +59,7 @@ - name: Add users to group - win_group_member: &wgm_present + win_group_membership: &wgm_present name: "{{ win_local_group }}" members: - Administrator @@ -86,7 +86,7 @@ - name: Add users to group (again) - win_group_member: *wgm_present + win_group_membership: *wgm_present register: add_users_to_group_again - name: Test add_users_to_group_again (normal mode) @@ -99,7 +99,7 @@ - name: Add different syntax users to group (again) - win_group_member: + win_group_membership: <<: *wgm_present members: - "{{ ansible_hostname }}\\Administrator" @@ -124,7 +124,7 @@ - name: Add another user to group - win_group_member: &wgma_present + win_group_membership: &wgma_present <<: *wgm_present members: - NT AUTHORITY\NETWORK SERVICE @@ -148,7 +148,7 @@ - name: Add another user to group (again) - win_group_member: *wgma_present + win_group_membership: *wgma_present register: add_another_user_to_group_again - name: Test add_another_user_to_group_1_again (normal mode) @@ -161,7 +161,7 @@ - name: Remove users from group - win_group_member: &wgm_absent + win_group_membership: &wgm_absent <<: *wgm_present state: absent register: remove_users_from_group @@ -184,7 +184,7 @@ - name: Remove users from group (again) - win_group_member: *wgm_absent + win_group_membership: *wgm_absent register: remove_users_from_group_again - name: Test remove_users_from_group_again (normal mode) @@ -197,7 +197,7 @@ - name: Remove different syntax users from group (again) - win_group_member: + win_group_membership: <<: *wgm_absent members: - "{{ ansible_hostname }}\\Administrator" @@ -222,7 +222,7 @@ - name: Remove another user from group - win_group_member: &wgma_absent + win_group_membership: &wgma_absent <<: *wgm_absent members: - NT AUTHORITY\NETWORK SERVICE @@ -246,7 +246,7 @@ - name: Remove another user from group (again) - win_group_member: *wgma_absent + win_group_membership: *wgma_absent register: remove_another_user_from_group_again - name: Test remove_another_user_from_group_again (normal mode)