ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fixed gitlab_*_variable when using purge (#7251)

Browse source 
* Fixed gitlab_*_variable when using purge, see issue #7250

* Update changelogs/fragments/7251-gitlab-variables-deleteing-all-variables.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
MaxBidlingmaier 2023-09-20 19:37:27 +02:00 committed by GitHub
parent 9489a1ea1c
commit fc2e6c4b45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/7251-gitlab-variables-deleteing-all-variables.yml Normal file
View file

@ -0,0 +1,3 @@
bugfixes:
- gitlab_project_variable - deleted all variables when used with ``purge=true`` due to missing ``raw`` property in KNOWN attributes (https://github.com/ansible-collections/community.general/issues/7250).
- gitlab_group_variable - deleted all variables when used with ``purge=true`` due to missing ``raw`` property in KNOWN attributes (https://github.com/ansible-collections/community.general/issues/7250).

2
plugins/module_utils/gitlab.py
View file

@ -116,7 +116,7 @@ def gitlab_authentication(module):
def filter_returned_variables(gitlab_variables): def filter_returned_variables(gitlab_variables):
# pop properties we don't know # pop properties we don't know
existing_variables = [dict(x.attributes) for x in gitlab_variables] existing_variables = [dict(x.attributes) for x in gitlab_variables]
KNOWN = ['key', 'value', 'masked', 'protected', 'variable_type', 'environment_scope'] KNOWN = ['key', 'value', 'masked', 'protected', 'variable_type', 'environment_scope', 'raw']
for item in existing_variables: for item in existing_variables:
for key in list(item.keys()): for key in list(item.keys()):
if key not in KNOWN: if key not in KNOWN:

2
plugins/modules/gitlab_group_variable.py
View file

@ -381,6 +381,8 @@ def main():
group=dict(type='str', required=True), group=dict(type='str', required=True),
purge=dict(type='bool', required=False, default=False), purge=dict(type='bool', required=False, default=False),
vars=dict(type='dict', required=False, default=dict(), no_log=True), vars=dict(type='dict', required=False, default=dict(), no_log=True),
# please mind whenever changing the variables dict to also change module_utils/gitlab.py's
# KNOWN dict in filter_returned_variables or bad evil will happen
variables=dict(type='list', elements='dict', required=False, default=list(), options=dict( variables=dict(type='list', elements='dict', required=False, default=list(), options=dict(
name=dict(type='str', required=True), name=dict(type='str', required=True),
value=dict(type='str', no_log=True), value=dict(type='str', no_log=True),

2
plugins/modules/gitlab_project_variable.py
View file

@ -404,6 +404,8 @@ def main():
project=dict(type='str', required=True), project=dict(type='str', required=True),
purge=dict(type='bool', required=False, default=False), purge=dict(type='bool', required=False, default=False),
vars=dict(type='dict', required=False, default=dict(), no_log=True), vars=dict(type='dict', required=False, default=dict(), no_log=True),
# please mind whenever changing the variables dict to also change module_utils/gitlab.py's
# KNOWN dict in filter_returned_variables or bad evil will happen
variables=dict(type='list', elements='dict', required=False, default=list(), options=dict( variables=dict(type='list', elements='dict', required=False, default=list(), options=dict(
name=dict(type='str', required=True), name=dict(type='str', required=True),
value=dict(type='str', no_log=True), value=dict(type='str', no_log=True),