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

refactor(gitlab modules): remove duplicate gitlab package check (#7486)

Browse source
This commit is contained in:
Léo GATELLIER 2023-11-11 12:20:12 +01:00 • committed by GitHub
parent 6b00b76f32
commit 4a74f46e56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 63 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/modules/gitlab_project_variable.py
View file

@ -221,13 +221,12 @@ project_variable:
sample: ['ACCESS_KEY_ID', 'SECRET_ACCESS_KEY']
'''
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.api import basic_auth_argument_spec
from ansible_collections.community.general.plugins.module_utils.gitlab import (
auth_argument_spec, gitlab_authentication, ensure_gitlab_package, filter_returned_variables, vars_to_variables,
HAS_GITLAB_PACKAGE, GITLAB_IMP_ERR
auth_argument_spec, gitlab_authentication, filter_returned_variables, vars_to_variables
)
@ -436,10 +435,9 @@ def main():
],
supports_check_mode=True
)
ensure_gitlab_package(module)
if not HAS_GITLAB_PACKAGE:
module.fail_json(msg=missing_required_lib("python-gitlab"), exception=GITLAB_IMP_ERR)
# check prerequisites and connect to gitlab server
gitlab_instance = gitlab_authentication(module)
purge = module.params['purge']
var_list = module.params['vars']
@ -454,8 +452,6 @@ def main():
if any(x['value'] is None for x in variables):
module.fail_json(msg='value parameter is required for all variables in state present')
gitlab_instance = gitlab_authentication(module)
this_gitlab = GitlabProjectVariables(module=module, gitlab_instance=gitlab_instance)
change, raw_return_value, before, after = native_python_main(this_gitlab, purge, variables, state, module)