From f34d59dbef1333a742e4f7eba5685f4d6c6c643d Mon Sep 17 00:00:00 2001
From: John R Barker <john@johnrbarker.com>
Date: Wed, 6 Nov 2019 12:35:12 +0000
Subject: [PATCH] Move gitlab modules to own subdir (#64497)

* Move gitlab modules to own subdir

* Correct module_utils
---
 .github/BOTMETA.yml                           |  3 +-
 .../modules/source_control/gitlab/__init__.py |  0
 .../{ => gitlab}/_gitlab_hooks.py             |  0
 .../{ => gitlab}/gitlab_deploy_key.py         |  0
 .../{ => gitlab}/gitlab_group.py              |  0
 .../{ => gitlab}/gitlab_hook.py               |  0
 .../{ => gitlab}/gitlab_project.py            |  0
 .../{ => gitlab}/gitlab_project_variable.py   |  0
 .../{ => gitlab}/gitlab_runner.py             |  0
 .../{ => gitlab}/gitlab_user.py               |  0
 test/sanity/ignore.txt                        | 28 +++++++++----------
 .../modules/source_control/gitlab/__init__.py |  0
 .../source_control/{ => gitlab}/gitlab.py     |  0
 .../{ => gitlab}/test_gitlab_deploy_key.py    |  2 +-
 .../{ => gitlab}/test_gitlab_group.py         |  2 +-
 .../{ => gitlab}/test_gitlab_hook.py          |  2 +-
 .../{ => gitlab}/test_gitlab_project.py       |  2 +-
 .../{ => gitlab}/test_gitlab_runner.py        |  2 +-
 .../{ => gitlab}/test_gitlab_user.py          |  2 +-
 19 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 lib/ansible/modules/source_control/gitlab/__init__.py
 rename lib/ansible/modules/source_control/{ => gitlab}/_gitlab_hooks.py (100%)
 rename lib/ansible/modules/source_control/{ => gitlab}/gitlab_deploy_key.py (100%)
 rename lib/ansible/modules/source_control/{ => gitlab}/gitlab_group.py (100%)
 rename lib/ansible/modules/source_control/{ => gitlab}/gitlab_hook.py (100%)
 rename lib/ansible/modules/source_control/{ => gitlab}/gitlab_project.py (100%)
 rename lib/ansible/modules/source_control/{ => gitlab}/gitlab_project_variable.py (100%)
 rename lib/ansible/modules/source_control/{ => gitlab}/gitlab_runner.py (100%)
 rename lib/ansible/modules/source_control/{ => gitlab}/gitlab_user.py (100%)
 create mode 100644 test/units/modules/source_control/gitlab/__init__.py
 rename test/units/modules/source_control/{ => gitlab}/gitlab.py (100%)
 rename test/units/modules/source_control/{ => gitlab}/test_gitlab_deploy_key.py (97%)
 rename test/units/modules/source_control/{ => gitlab}/test_gitlab_group.py (97%)
 rename test/units/modules/source_control/{ => gitlab}/test_gitlab_hook.py (97%)
 rename test/units/modules/source_control/{ => gitlab}/test_gitlab_project.py (97%)
 rename test/units/modules/source_control/{ => gitlab}/test_gitlab_runner.py (97%)
 rename test/units/modules/source_control/{ => gitlab}/test_gitlab_user.py (98%)

diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
index 4b376a1a8a5..529fba1b206 100644
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -447,7 +447,7 @@ files:
   $modules/source_control/git.py: $team_ansible
   $modules/source_control/github/github_key.py:
     ignored: erydo
-  $modules/source_control/gitlab_: &gitlab
+  $modules/source_control/gitlab/: &gitlab
     keywords: [ gitlab, source_control ]
     labels: gitlab
     maintainers: $team_gitlab
@@ -1576,6 +1576,7 @@ files:
   test/units/modules/network/iosxr: *iosxr
   test/units/modules/network/nso: *nso
   test/units/modules/network/nxos: *nxos
+  test/units/modules/source_control/gitlab/: *gitlab
   test/units/modules/storage/hpe3par: *hpe3par
   test/units/modules/storage/netapp:
     maintainers: $team_netapp
diff --git a/lib/ansible/modules/source_control/gitlab/__init__.py b/lib/ansible/modules/source_control/gitlab/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/ansible/modules/source_control/_gitlab_hooks.py b/lib/ansible/modules/source_control/gitlab/_gitlab_hooks.py
similarity index 100%
rename from lib/ansible/modules/source_control/_gitlab_hooks.py
rename to lib/ansible/modules/source_control/gitlab/_gitlab_hooks.py
diff --git a/lib/ansible/modules/source_control/gitlab_deploy_key.py b/lib/ansible/modules/source_control/gitlab/gitlab_deploy_key.py
similarity index 100%
rename from lib/ansible/modules/source_control/gitlab_deploy_key.py
rename to lib/ansible/modules/source_control/gitlab/gitlab_deploy_key.py
diff --git a/lib/ansible/modules/source_control/gitlab_group.py b/lib/ansible/modules/source_control/gitlab/gitlab_group.py
similarity index 100%
rename from lib/ansible/modules/source_control/gitlab_group.py
rename to lib/ansible/modules/source_control/gitlab/gitlab_group.py
diff --git a/lib/ansible/modules/source_control/gitlab_hook.py b/lib/ansible/modules/source_control/gitlab/gitlab_hook.py
similarity index 100%
rename from lib/ansible/modules/source_control/gitlab_hook.py
rename to lib/ansible/modules/source_control/gitlab/gitlab_hook.py
diff --git a/lib/ansible/modules/source_control/gitlab_project.py b/lib/ansible/modules/source_control/gitlab/gitlab_project.py
similarity index 100%
rename from lib/ansible/modules/source_control/gitlab_project.py
rename to lib/ansible/modules/source_control/gitlab/gitlab_project.py
diff --git a/lib/ansible/modules/source_control/gitlab_project_variable.py b/lib/ansible/modules/source_control/gitlab/gitlab_project_variable.py
similarity index 100%
rename from lib/ansible/modules/source_control/gitlab_project_variable.py
rename to lib/ansible/modules/source_control/gitlab/gitlab_project_variable.py
diff --git a/lib/ansible/modules/source_control/gitlab_runner.py b/lib/ansible/modules/source_control/gitlab/gitlab_runner.py
similarity index 100%
rename from lib/ansible/modules/source_control/gitlab_runner.py
rename to lib/ansible/modules/source_control/gitlab/gitlab_runner.py
diff --git a/lib/ansible/modules/source_control/gitlab_user.py b/lib/ansible/modules/source_control/gitlab/gitlab_user.py
similarity index 100%
rename from lib/ansible/modules/source_control/gitlab_user.py
rename to lib/ansible/modules/source_control/gitlab/gitlab_user.py
diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt
index a3c68bd2efa..ca8491ef41a 100644
--- a/test/sanity/ignore.txt
+++ b/test/sanity/ignore.txt
@@ -5717,8 +5717,8 @@ test/units/modules/remote_management/oneview/test_oneview_san_manager.py future-
 test/units/modules/remote_management/oneview/test_oneview_san_manager.py metaclass-boilerplate
 test/units/modules/remote_management/oneview/test_oneview_san_manager_info.py future-import-boilerplate
 test/units/modules/remote_management/oneview/test_oneview_san_manager_info.py metaclass-boilerplate
-test/units/modules/source_control/gitlab.py future-import-boilerplate
-test/units/modules/source_control/gitlab.py metaclass-boilerplate
+test/units/modules/source_control/gitlab/gitlab.py future-import-boilerplate
+test/units/modules/source_control/gitlab/gitlab.py metaclass-boilerplate
 test/units/modules/source_control/test_bitbucket_access_key.py future-import-boilerplate
 test/units/modules/source_control/test_bitbucket_access_key.py metaclass-boilerplate
 test/units/modules/source_control/test_bitbucket_pipeline_key_pair.py future-import-boilerplate
@@ -5727,18 +5727,18 @@ test/units/modules/source_control/test_bitbucket_pipeline_known_host.py future-i
 test/units/modules/source_control/test_bitbucket_pipeline_known_host.py metaclass-boilerplate
 test/units/modules/source_control/test_bitbucket_pipeline_variable.py future-import-boilerplate
 test/units/modules/source_control/test_bitbucket_pipeline_variable.py metaclass-boilerplate
-test/units/modules/source_control/test_gitlab_deploy_key.py future-import-boilerplate
-test/units/modules/source_control/test_gitlab_deploy_key.py metaclass-boilerplate
-test/units/modules/source_control/test_gitlab_group.py future-import-boilerplate
-test/units/modules/source_control/test_gitlab_group.py metaclass-boilerplate
-test/units/modules/source_control/test_gitlab_hook.py future-import-boilerplate
-test/units/modules/source_control/test_gitlab_hook.py metaclass-boilerplate
-test/units/modules/source_control/test_gitlab_project.py future-import-boilerplate
-test/units/modules/source_control/test_gitlab_project.py metaclass-boilerplate
-test/units/modules/source_control/test_gitlab_runner.py future-import-boilerplate
-test/units/modules/source_control/test_gitlab_runner.py metaclass-boilerplate
-test/units/modules/source_control/test_gitlab_user.py future-import-boilerplate
-test/units/modules/source_control/test_gitlab_user.py metaclass-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_deploy_key.py future-import-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_deploy_key.py metaclass-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_group.py future-import-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_group.py metaclass-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_hook.py future-import-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_hook.py metaclass-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_project.py future-import-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_project.py metaclass-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_runner.py future-import-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_runner.py metaclass-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_user.py future-import-boilerplate
+test/units/modules/source_control/gitlab/test_gitlab_user.py metaclass-boilerplate
 test/units/modules/storage/hpe3par/test_ss_3par_cpg.py future-import-boilerplate
 test/units/modules/storage/hpe3par/test_ss_3par_cpg.py metaclass-boilerplate
 test/units/modules/storage/netapp/test_na_elementsw_cluster_config.py future-import-boilerplate
diff --git a/test/units/modules/source_control/gitlab/__init__.py b/test/units/modules/source_control/gitlab/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/units/modules/source_control/gitlab.py b/test/units/modules/source_control/gitlab/gitlab.py
similarity index 100%
rename from test/units/modules/source_control/gitlab.py
rename to test/units/modules/source_control/gitlab/gitlab.py
diff --git a/test/units/modules/source_control/test_gitlab_deploy_key.py b/test/units/modules/source_control/gitlab/test_gitlab_deploy_key.py
similarity index 97%
rename from test/units/modules/source_control/test_gitlab_deploy_key.py
rename to test/units/modules/source_control/gitlab/test_gitlab_deploy_key.py
index 7228f1c2af4..24578524a37 100644
--- a/test/units/modules/source_control/test_gitlab_deploy_key.py
+++ b/test/units/modules/source_control/gitlab/test_gitlab_deploy_key.py
@@ -7,7 +7,7 @@ from __future__ import absolute_import
 
 import pytest
 
-from ansible.modules.source_control.gitlab_deploy_key import GitLabDeployKey
+from ansible.modules.source_control.gitlab.gitlab_deploy_key import GitLabDeployKey
 
 
 def _dummy(x):
diff --git a/test/units/modules/source_control/test_gitlab_group.py b/test/units/modules/source_control/gitlab/test_gitlab_group.py
similarity index 97%
rename from test/units/modules/source_control/test_gitlab_group.py
rename to test/units/modules/source_control/gitlab/test_gitlab_group.py
index 8132df4ab73..e43e92f162f 100644
--- a/test/units/modules/source_control/test_gitlab_group.py
+++ b/test/units/modules/source_control/gitlab/test_gitlab_group.py
@@ -7,7 +7,7 @@ from __future__ import absolute_import
 
 import pytest
 
-from ansible.modules.source_control.gitlab_group import GitLabGroup
+from ansible.modules.source_control.gitlab.gitlab_group import GitLabGroup
 
 
 def _dummy(x):
diff --git a/test/units/modules/source_control/test_gitlab_hook.py b/test/units/modules/source_control/gitlab/test_gitlab_hook.py
similarity index 97%
rename from test/units/modules/source_control/test_gitlab_hook.py
rename to test/units/modules/source_control/gitlab/test_gitlab_hook.py
index 5c400fb45f4..29401ee53c6 100644
--- a/test/units/modules/source_control/test_gitlab_hook.py
+++ b/test/units/modules/source_control/gitlab/test_gitlab_hook.py
@@ -6,7 +6,7 @@
 from __future__ import absolute_import
 import pytest
 
-from ansible.modules.source_control.gitlab_hook import GitLabHook
+from ansible.modules.source_control.gitlab.gitlab_hook import GitLabHook
 
 
 def _dummy(x):
diff --git a/test/units/modules/source_control/test_gitlab_project.py b/test/units/modules/source_control/gitlab/test_gitlab_project.py
similarity index 97%
rename from test/units/modules/source_control/test_gitlab_project.py
rename to test/units/modules/source_control/gitlab/test_gitlab_project.py
index d7b27dca702..31b773f9cb6 100644
--- a/test/units/modules/source_control/test_gitlab_project.py
+++ b/test/units/modules/source_control/gitlab/test_gitlab_project.py
@@ -7,7 +7,7 @@ from __future__ import absolute_import
 
 import pytest
 
-from ansible.modules.source_control.gitlab_project import GitLabProject
+from ansible.modules.source_control.gitlab.gitlab_project import GitLabProject
 
 
 def _dummy(x):
diff --git a/test/units/modules/source_control/test_gitlab_runner.py b/test/units/modules/source_control/gitlab/test_gitlab_runner.py
similarity index 97%
rename from test/units/modules/source_control/test_gitlab_runner.py
rename to test/units/modules/source_control/gitlab/test_gitlab_runner.py
index 16d1bd13163..57f3f2411fe 100644
--- a/test/units/modules/source_control/test_gitlab_runner.py
+++ b/test/units/modules/source_control/gitlab/test_gitlab_runner.py
@@ -7,7 +7,7 @@ from __future__ import absolute_import
 
 import pytest
 
-from ansible.modules.source_control.gitlab_runner import GitLabRunner
+from ansible.modules.source_control.gitlab.gitlab_runner import GitLabRunner
 
 
 def _dummy(x):
diff --git a/test/units/modules/source_control/test_gitlab_user.py b/test/units/modules/source_control/gitlab/test_gitlab_user.py
similarity index 98%
rename from test/units/modules/source_control/test_gitlab_user.py
rename to test/units/modules/source_control/gitlab/test_gitlab_user.py
index 5d285500986..e7ac926ed8c 100644
--- a/test/units/modules/source_control/test_gitlab_user.py
+++ b/test/units/modules/source_control/gitlab/test_gitlab_user.py
@@ -7,7 +7,7 @@ from __future__ import absolute_import
 
 import pytest
 
-from ansible.modules.source_control.gitlab_user import GitLabUser
+from ansible.modules.source_control.gitlab.gitlab_user import GitLabUser
 
 
 def _dummy(x):