respect new variable property in gitlab_group_variable and gitlab_project_variable #5667

markuman · 2022-12-08T14:01:37Z

SUMMARY

fixes #5666

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

gitlab_project_variable
gitlab_group_variable

ADDITIONAL INFORMATION

ansibullbot · 2022-12-08T14:05:07Z

cc @Lunik @Shaps @dj-wasabi @lgatellier @marwatk @metanovii @nejch @scodeman @sh0shin @suukit @waheedi @zanssa
click here for bot help

github-actions · 2022-12-08T14:31:45Z

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

plugins/modules/gitlab_group_variable.py

markuman · 2022-12-09T08:46:04Z

Rework done.
Integration test also passes

gitlab_project_variable
localhost : ok=75 changed=28 unreachable=0 failed=0 skipped=0 rescued=0 ignored=1

gitlab_group_variable
localhost : ok=69 changed=26 unreachable=0 failed=0 skipped=6 rescued=0 ignored=1

plugins/module_utils/gitlab.py

Co-authored-by: Nejc Habjan <[email protected]>

plugins/module_utils/gitlab.py

plugins/modules/gitlab_project_variable.py

felixfontein

I think it looks good. But I'm not using this module, so maybe someone who does and/or knows it better should also take a look :)

plugins/modules/gitlab_project_variable.py

Co-authored-by: Felix Fontein <[email protected]>

nejch · 2022-12-10T15:47:10Z

plugins/module_utils/gitlab.py

+
+def filter_returned_variables(gitlab_variables):
+    # pop properties we don't know
+    existing_variables = [dict(x.attributes) for x in gitlab_variables]


Just a note, x.attributes is already a dict (https://github.com/python-gitlab/python-gitlab/blob/b6c08725042380d20ef5f09979bc29f2f6c1ab6f/gitlab/base.py#L139-L149) (and I agree the list comprehension looked a bit more concise). But feel free to ignore this comment.

Probably outside of the scope of this PR but I'm starting to think at some point there could be 1 source of truth for the KNOWN list (the same is used to construct the dicts in the modules).

If x is a dict, dict(x) creates a copy of it. You could also write x.copy().

Ah yes I totally missed that part of the discussion, ignore this :)

nejch

LGTM, just left a non-blocking comment :)

patchback · 2022-12-10T20:40:39Z

Backport to stable-5: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-5/c3bc172bf6fccdca9c16155da058ce95a57e6076/pr-5667

Backported as #5678

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

…ject_variable (#5667) * draft * add changelog fragment * rework * rework group variables * add new line at end of file * Update plugins/module_utils/gitlab.py Co-authored-by: Nejc Habjan <[email protected]> * rename * revert * return a copy * Update plugins/modules/gitlab_project_variable.py Co-authored-by: Felix Fontein <[email protected]> Co-authored-by: Nejc Habjan <[email protected]> Co-authored-by: Felix Fontein <[email protected]> (cherry picked from commit c3bc172)

patchback · 2022-12-10T20:40:47Z

Backport to stable-6: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-6/c3bc172bf6fccdca9c16155da058ce95a57e6076/pr-5667

Backported as #5679

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

felixfontein · 2022-12-10T20:40:51Z

@markuman thank for fixing this!
@nejch thanks for reviewing!

…ject_variable (#5667) * draft * add changelog fragment * rework * rework group variables * add new line at end of file * Update plugins/module_utils/gitlab.py Co-authored-by: Nejc Habjan <[email protected]> * rename * revert * return a copy * Update plugins/modules/gitlab_project_variable.py Co-authored-by: Felix Fontein <[email protected]> Co-authored-by: Nejc Habjan <[email protected]> Co-authored-by: Felix Fontein <[email protected]> (cherry picked from commit c3bc172)

…in gitlab_group_variable and gitlab_project_variable (#5678) respect new variable property in gitlab_group_variable and gitlab_project_variable (#5667) * draft * add changelog fragment * rework * rework group variables * add new line at end of file * Update plugins/module_utils/gitlab.py Co-authored-by: Nejc Habjan <[email protected]> * rename * revert * return a copy * Update plugins/modules/gitlab_project_variable.py Co-authored-by: Felix Fontein <[email protected]> Co-authored-by: Nejc Habjan <[email protected]> Co-authored-by: Felix Fontein <[email protected]> (cherry picked from commit c3bc172) Co-authored-by: Markus Bergholz <[email protected]>

…in gitlab_group_variable and gitlab_project_variable (#5679) respect new variable property in gitlab_group_variable and gitlab_project_variable (#5667) * draft * add changelog fragment * rework * rework group variables * add new line at end of file * Update plugins/module_utils/gitlab.py Co-authored-by: Nejc Habjan <[email protected]> * rename * revert * return a copy * Update plugins/modules/gitlab_project_variable.py Co-authored-by: Felix Fontein <[email protected]> Co-authored-by: Nejc Habjan <[email protected]> Co-authored-by: Felix Fontein <[email protected]> (cherry picked from commit c3bc172) Co-authored-by: Markus Bergholz <[email protected]>

draft

f229896

markuman mentioned this pull request Dec 8, 2022

gitlab_group_variable deletes all variables when purge is enabled and GitLab API changes #5666

Closed

1 task

ansibullbot added bug This issue/PR relates to a bug gitlab has_issue module module plugins plugin (any type) source_control labels Dec 8, 2022

add changelog fragment

da417c9

markuman changed the title ~~draft: respect new variable property in gitlab_group_variable and gitlab_project_variable~~ respect new variable property in gitlab_group_variable and gitlab_project_variable Dec 8, 2022

nejch reviewed Dec 8, 2022

View reviewed changes

plugins/modules/gitlab_group_variable.py Outdated Show resolved Hide resolved

felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-5 labels Dec 8, 2022

felixfontein reviewed Dec 8, 2022

View reviewed changes

plugins/modules/gitlab_group_variable.py Outdated Show resolved Hide resolved

felixfontein removed the backport-5 label Dec 8, 2022

markuman added 2 commits December 9, 2022 09:28

rework

0d00480

rework group variables

b6a57b2

markuman requested review from felixfontein and nejch and removed request for felixfontein and nejch December 9, 2022 08:47

ansibullbot added the module_utils module_utils label Dec 9, 2022

This comment was marked as outdated.

Sign in to view

nejch reviewed Dec 9, 2022

View reviewed changes

plugins/module_utils/gitlab.py Outdated Show resolved Hide resolved

Update plugins/module_utils/gitlab.py

2eac504

Co-authored-by: Nejc Habjan <[email protected]>

ansibullbot added needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Dec 9, 2022

rename

4d357e8

ansibullbot removed needs_ci This PR requires CI testing to be performed. Please close and re-open this PR to trigger CI needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR labels Dec 9, 2022

markuman requested a review from felixfontein December 9, 2022 11:04

felixfontein reviewed Dec 9, 2022

View reviewed changes

plugins/module_utils/gitlab.py Show resolved Hide resolved

plugins/modules/gitlab_project_variable.py Outdated Show resolved Hide resolved

markuman added 2 commits December 9, 2022 13:22

revert

66f738b

return a copy

2ad55f6

felixfontein approved these changes Dec 9, 2022

View reviewed changes

plugins/modules/gitlab_project_variable.py Outdated Show resolved Hide resolved

felixfontein added the backport-5 label Dec 9, 2022

Update plugins/modules/gitlab_project_variable.py

74e07ea

Co-authored-by: Felix Fontein <[email protected]>

markuman requested a review from nejch December 9, 2022 13:16

nejch reviewed Dec 10, 2022

View reviewed changes

nejch approved these changes Dec 10, 2022

View reviewed changes

felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Dec 10, 2022

felixfontein merged commit c3bc172 into ansible-collections:main Dec 10, 2022

patchback bot mentioned this pull request Dec 10, 2022

[PR #5667/c3bc172b backport][stable-5] respect new variable property in gitlab_group_variable and gitlab_project_variable #5678

Merged

patchback bot mentioned this pull request Dec 10, 2022

[PR #5667/c3bc172b backport][stable-6] respect new variable property in gitlab_group_variable and gitlab_project_variable #5679

Merged

markuman mentioned this pull request Dec 14, 2022

gitlab_project_variable add support for new expanded key #5685

Closed

1 task

felixfontein mentioned this pull request Dec 22, 2022

community.general.gitlab_group_variable: state "absent" has no impact #5684

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

respect new variable property in gitlab_group_variable and gitlab_project_variable #5667

respect new variable property in gitlab_group_variable and gitlab_project_variable #5667

markuman commented Dec 8, 2022

ansibullbot commented Dec 8, 2022

github-actions bot commented Dec 8, 2022 •

edited

Loading

markuman commented Dec 9, 2022

This comment was marked as outdated.

felixfontein left a comment

nejch Dec 10, 2022 •

edited

Loading

felixfontein Dec 10, 2022

nejch Dec 10, 2022 •

edited

Loading

nejch left a comment

patchback bot commented Dec 10, 2022 •

edited

Loading

patchback bot commented Dec 10, 2022 •

edited

Loading

felixfontein commented Dec 10, 2022

respect new variable property in gitlab_group_variable and gitlab_project_variable #5667

respect new variable property in gitlab_group_variable and gitlab_project_variable #5667

Conversation

markuman commented Dec 8, 2022

SUMMARY

ISSUE TYPE

COMPONENT NAME

ADDITIONAL INFORMATION

ansibullbot commented Dec 8, 2022

github-actions bot commented Dec 8, 2022 • edited Loading

Docs Build 📝

markuman commented Dec 9, 2022

This comment was marked as outdated.

felixfontein left a comment

Choose a reason for hiding this comment

nejch Dec 10, 2022 • edited Loading

Choose a reason for hiding this comment

felixfontein Dec 10, 2022

Choose a reason for hiding this comment

nejch Dec 10, 2022 • edited Loading

Choose a reason for hiding this comment

nejch left a comment

Choose a reason for hiding this comment

patchback bot commented Dec 10, 2022 • edited Loading

Backport to stable-5: 💚 backport PR created

patchback bot commented Dec 10, 2022 • edited Loading

Backport to stable-6: 💚 backport PR created

felixfontein commented Dec 10, 2022

github-actions bot commented Dec 8, 2022 •

edited

Loading

nejch Dec 10, 2022 •

edited

Loading

nejch Dec 10, 2022 •

edited

Loading

patchback bot commented Dec 10, 2022 •

edited

Loading

patchback bot commented Dec 10, 2022 •

edited

Loading