ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 05:40:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add require_two_factor_authentication property to gitlab group (#3367)

Browse source 
* feat: add require_two_factor_authentication property

* chore: add changelog fragment

* chore: add gitlab_group test tasks

* chore: add gitlab tests

* chore: add gitlab group tests

* docs: apply suggestions

* fix: removing default value
This commit is contained in:
Chris Frage 2021-09-20 06:55:43 +02:00 • committed by GitHub
commit 9ce1009643
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 53 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/unit/plugins/modules/source_control/gitlab/gitlab.py
View file

@ -195,6 +195,7 @@ def resp_get_group(url, request):
'"web_url": "http://localhost:3000/groups/foo-bar", "request_access_enabled": false,'
'"full_name": "Foobar Group", "full_path": "foo-bar",'
'"project_creation_level": "maintainer", "subgroup_creation_level": "maintainer",'
'"require_two_factor_authentication": true,'
'"file_template_project_id": 1, "parent_id": null, "projects": [{"id": 1,"description": null, "default_branch": "master",'
'"ssh_url_to_repo": "git@example.com:diaspora/diaspora-client.git",'
'"http_url_to_repo": "http://example.com/diaspora/diaspora-client.git",'
@ -227,7 +228,8 @@ def resp_create_group(url, request):
'"web_url": "http://localhost:3000/groups/foo-bar", "request_access_enabled": false,'
'"full_name": "Foobar Group", "full_path": "foo-bar",'
'"file_template_project_id": 1, "parent_id": null,'
'"project_creation_level": "developer", "subgroup_creation_level": "maintainer"}')
'"project_creation_level": "developer", "subgroup_creation_level": "maintainer",'
'"require_two_factor_authentication": true}')
content = content.encode("utf-8")
return response(200, content, headers, None, 5, request)
@ -241,7 +243,8 @@ def resp_create_subgroup(url, request):
'"web_url": "http://localhost:3000/groups/foo-bar/bar-foo", "request_access_enabled": false,'
'"full_name": "BarFoo Group", "full_path": "foo-bar/bar-foo",'
'"file_template_project_id": 1, "parent_id": 1,'
'"project_creation_level": "noone"}')
'"project_creation_level": "noone",'
'"require_two_factor_authentication": true}')
content = content.encode("utf-8")
return response(200, content, headers, None, 5, request)

12
tests/unit/plugins/modules/source_control/gitlab/test_gitlab_group.py
View file

@ -70,7 +70,8 @@ class TestGitlabGroup(GitlabModuleTestCase):
'path': "foo-bar",
'description': "An interesting group",
'project_creation_level': "developer",
'subgroup_creation_level': "maintainer"})
'subgroup_creation_level': "maintainer",
'require_two_factor_authentication': True})
self.assertEqual(type(group), Group)
self.assertEqual(group.name, "Foobar Group")
@ -78,6 +79,7 @@ class TestGitlabGroup(GitlabModuleTestCase):
self.assertEqual(group.description, "An interesting group")
self.assertEqual(group.project_creation_level, "developer")
self.assertEqual(group.subgroup_creation_level, "maintainer")
self.assertEqual(group.require_two_factor_authentication, True)
self.assertEqual(group.id, 1)
@with_httmock(resp_create_subgroup)
@ -85,12 +87,14 @@ class TestGitlabGroup(GitlabModuleTestCase):
group = self.moduleUtil.createGroup({'name': "BarFoo Group",
'path': "bar-foo",
'parent_id': 1,
'project_creation_level': "noone"})
'project_creation_level': "noone",
'require_two_factor_authentication': True})
self.assertEqual(type(group), Group)
self.assertEqual(group.name, "BarFoo Group")
self.assertEqual(group.full_path, "foo-bar/bar-foo")
self.assertEqual(group.project_creation_level, "noone")
self.assertEqual(group.require_two_factor_authentication, True)
self.assertEqual(group.id, 2)
self.assertEqual(group.parent_id, 1)
@ -99,12 +103,14 @@ class TestGitlabGroup(GitlabModuleTestCase):
group = self.gitlab_instance.groups.get(1)
changed, newGroup = self.moduleUtil.updateGroup(group, {'name': "BarFoo Group",
'visibility': "private",
'project_creation_level': "maintainer"})
'project_creation_level': "maintainer",
'require_two_factor_authentication': True})
self.assertEqual(changed, True)
self.assertEqual(newGroup.name, "BarFoo Group")
self.assertEqual(newGroup.visibility, "private")
self.assertEqual(newGroup.project_creation_level, "maintainer")
self.assertEqual(newGroup.require_two_factor_authentication, True)
changed, newGroup = self.moduleUtil.updateGroup(group, {'name': "BarFoo Group"})