internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 05:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

gitlab modules: improved imports (#5259)

Browse Source 
* gitlab modules: improved imports

* add changelog fragment

* refactored the import check to its sole function
This commit is contained in:
Alexei Znamensky
2022-09-13 06:30:02 +12:00
committed by GitHub
parent 5470ea30dc
commit 6b463e6fa6
14 changed files with 85 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/modules/source_control/gitlab/gitlab_runner.py
View File

@@ -172,21 +172,14 @@ runner:
type: dict
'''
import traceback
GITLAB_IMP_ERR = None
try:
import gitlab
HAS_GITLAB_PACKAGE = True
except Exception:
GITLAB_IMP_ERR = traceback.format_exc()
HAS_GITLAB_PACKAGE = False
from ansible.module_utils.api import basic_auth_argument_spec
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.common.text.converters import to_native
from ansible_collections.community.general.plugins.module_utils.gitlab import auth_argument_spec, gitlab_authentication
from ansible_collections.community.general.plugins.module_utils.gitlab import (
auth_argument_spec, gitlab_authentication, gitlab, ensure_gitlab_package
)
try:
cmp # pylint: disable=used-before-assignment
@@ -362,6 +355,7 @@ def main():
],
supports_check_mode=True,
)
ensure_gitlab_package(module)
state = module.params['state']
runner_description = module.params['description']
@@ -374,9 +368,6 @@ def main():
registration_token = module.params['registration_token']
project = module.params['project']
if not HAS_GITLAB_PACKAGE:
module.fail_json(msg=missing_required_lib("python-gitlab"), exception=GITLAB_IMP_ERR)
gitlab_instance = gitlab_authentication(module)
gitlab_project = None
if project: