OSSForks/ansible
1
0
Fork 0
mirror of https://github.com/zebrajr/ansible.git synced 2025-12-06 00:19:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed string type in tags fieldattribute (#84655)

Browse Source 
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2025-07-07 11:44:19 -07:00 committed by GitHub
parent 34f2f39abe
commit 8207406306
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ansible/playbook/taggable.py
View File

@ -20,7 +20,6 @@ from __future__ import annotations
import typing as t
from ansible.errors import AnsibleError
from ansible.module_utils.six import string_types
from ansible.module_utils.common.sentinel import Sentinel
from ansible.module_utils._internal._datatag import AnsibleTagHelper
from ansible.playbook.attribute import FieldAttribute
@ -40,7 +39,7 @@ def _flatten_tags(tags: list[str | int]) -> list[str | int]:
class Taggable:
untagged = frozenset(['untagged'])
tags = FieldAttribute(isa='list', default=list, listof=(string_types, int), extend=True)
tags = FieldAttribute(isa='list', default=list, listof=(str, int), extend=True)
def _load_tags(self, attr, ds):
if isinstance(ds, list):

11
test/units/playbook/test_base.py
View File

@ -332,6 +332,7 @@ class BaseSubClass(base.Base):
test_attr_int = FieldAttribute(isa='int', always_post_validate=True)
test_attr_float = FieldAttribute(isa='float', default=3.14159, always_post_validate=True)
test_attr_list = FieldAttribute(isa='list', listof=(str,), always_post_validate=True)
test_attr_mixed_list = FieldAttribute(isa='list', listof=(str, int), always_post_validate=True)
test_attr_list_no_listof = FieldAttribute(isa='list', always_post_validate=True)
test_attr_list_required = FieldAttribute(isa='list', listof=(str,), required=True,
default=list, always_post_validate=True)
@ -518,6 +519,16 @@ class TestBaseSubClass(TestBase):
bsc = self._base_validate(ds)
self.assertEqual(string_list, bsc._test_attr_list)
def test_attr_mixed_list(self):
mixed_list = ['foo', 1]
ds = {'test_attr_mixed_list': mixed_list}
bsc = self._base_validate(ds)
self.assertEqual(mixed_list, bsc._test_attr_mixed_list)
def test_attr_mixed_list_invalid(self):
ds = {'test_attr_mixed_list': [['foo'], 1]}
self.assertRaises(AnsibleParserError, self._base_validate, ds)
def test_attr_list_none(self):
ds = {'test_attr_list': None}
bsc = self._base_validate(ds)