From 9a350ff10419660e2e86c8962dbe1324690826bd Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Tue, 21 Oct 2025 08:37:42 -0700 Subject: [PATCH] git: removed deprecated gpg_whitelist alias (#86011) Fixes: #86004 Signed-off-by: Abhijeet Kasurde --- changelogs/fragments/git_gpg.yml | 3 +++ lib/ansible/modules/git.py | 11 +---------- test/sanity/ignore.txt | 1 - 3 files changed, 4 insertions(+), 11 deletions(-) create mode 100644 changelogs/fragments/git_gpg.yml diff --git a/changelogs/fragments/git_gpg.yml b/changelogs/fragments/git_gpg.yml new file mode 100644 index 0000000000..8946f0390f --- /dev/null +++ b/changelogs/fragments/git_gpg.yml @@ -0,0 +1,3 @@ +--- +removed_features: + - git - removed deprecated alias gpg_whitelist (https://github.com/ansible/ansible/issues/86004). diff --git a/lib/ansible/modules/git.py b/lib/ansible/modules/git.py index 4564277cec..5b301820a4 100644 --- a/lib/ansible/modules/git.py +++ b/lib/ansible/modules/git.py @@ -218,11 +218,9 @@ options: - Only used when O(verify_commit=yes). - Use of this feature requires Git 2.6+ due to its reliance on git's C(--raw) flag to C(verify-commit) and C(verify-tag). - Alias O(gpg_allowlist) is added in version 2.17. - - Alias O(gpg_whitelist) is deprecated and will be removed in version 2.21. type: list elements: str default: [] - aliases: [ gpg_whitelist ] version_added: "2.9" requirements: @@ -1185,14 +1183,7 @@ def main(): update=dict(default='yes', type='bool'), verify_commit=dict(default='no', type='bool'), gpg_allowlist=dict( - default=[], type='list', aliases=['gpg_whitelist'], elements='str', - deprecated_aliases=[ - dict( - name='gpg_whitelist', - version='2.21', - collection_name='ansible.builtin', - ) - ], + default=[], type='list', elements='str', ), accept_hostkey=dict(default='no', type='bool'), accept_newhostkey=dict(default='no', type='bool'), diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt index e9a5302027..69375faac4 100644 --- a/test/sanity/ignore.txt +++ b/test/sanity/ignore.txt @@ -240,5 +240,4 @@ lib/ansible/module_utils/compat/datetime.py pylint:ansible-deprecated-version # lib/ansible/module_utils/compat/paramiko.py pylint:ansible-deprecated-version # TODO: 2.21 lib/ansible/plugins/connection/paramiko_ssh.py pylint:ansible-deprecated-version # TODO: 2.21 lib/ansible/plugins/strategy/__init__.py pylint:ansible-deprecated-version # TODO: 2.21 -lib/ansible/modules/git.py validate-modules:ansible-deprecated-version # TODO: 2.21 .github/RELEASE_NAMES.txt release-names # TODO: 2.21