Skip to content

Commit a8c79bd

Browse files
committed
Add Ansible sanity tests to the github action
1 parent 2d0a859 commit a8c79bd

File tree

6 files changed

+31
-94
lines changed

6 files changed

+31
-94
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,23 @@ jobs:
1010
- uses: actions/setup-python@v5
1111
with:
1212
python-version: '3.11'
13-
- run: pip install -r ci/requirements.txt
14-
- run: pip install -r utils/python/requirements/base-requirements.txt
15-
- run: pip install -r utils/python/requirements/roles-requirements.txt
16-
- run: python -m unittest discover -s tests/unit/plugins/modules
13+
- run: |
14+
pip install -r ci/requirements.txt -r utils/python/requirements/base-requirements.txt -r utils/python/requirements/roles-requirements.txt
15+
python -m unittest discover -s tests/unit/plugins/modules
16+
17+
- uses: dtolnay/rust-toolchain@1.91.0
18+
- name: Run typos check
19+
run: |
20+
cargo install -f typos-cli --version=1.39.2
21+
typos
22+
23+
- uses: actions/checkout@v4
24+
with:
25+
path: ansible_collections/rudder/rudder
26+
- uses: actions/setup-python@v5
27+
with:
28+
python-version: '3.11'
29+
- run: pip install ansible-core
30+
- name: Run sanity tests
31+
working-directory: ansible_collections/rudder/rudder
32+
run: ansible-test sanity

plugins/inventory/nodes.py

Lines changed: 0 additions & 83 deletions
This file was deleted.

plugins/inventory/rudder.ini

Whitespace-only changes.

plugins/modules/node_settings.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ def main():
435435
module = AnsibleModule(
436436
argument_spec=dict(
437437
rudder_url=dict(type='str', required=False),
438-
rudder_token=dict(type='str', required=False),
438+
rudder_token=dict(type='str', required=False, no_log=True),
439439
node_id=dict(type='str', required=False),
440440
properties=dict(
441441
type='list',
@@ -449,6 +449,7 @@ def main():
449449
agent_key=dict(
450450
type='dict',
451451
required=False,
452+
no_log=True,
452453
options=dict(
453454
value=dict(required=False, type='str'),
454455
status=dict(

plugins/modules/server_settings.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,10 @@
7474
"""
7575

7676
import json
77-
import traceback
7877
from urllib.error import HTTPError
78+
from ansible.module_utils.urls import open_url
7979

8080
from ansible.module_utils.basic import AnsibleModule
81-
from ansible.module_utils.urls import basic_auth_header, fetch_url, open_url
82-
from ansible.module_utils.common.text.converters import to_native
8381

8482
__metaclass__ = type
8583

@@ -229,7 +227,7 @@ def main():
229227
'required': False,
230228
'default': 'https://localhost/rudder',
231229
},
232-
'rudder_token': {'type': 'str', 'required': False},
230+
'rudder_token': {'type': 'str', 'required': False, "no_log": True},
233231
'name': {'type': 'str', 'required': True},
234232
'value': {'type': 'raw', 'required': True},
235233
'validate_certs': {'type': 'bool', 'default': True},
@@ -245,7 +243,8 @@ def main():
245243
try:
246244
value = module.from_json(module.params['value'])
247245
except Exception:
248-
value = value
246+
# value = value
247+
pass
249248

250249
rudder_server_iface = RudderSettingsInterface(module)
251250

tests/unit/plugins/modules/test_node_settings_should_format_well_the_queries.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ class TestStringMethods(unittest.TestCase):
4141
'value': '1',
4242
},
4343
],
44-
'where=[{"objectType":"node","attribute":"OS","comparator":"eq","value":"Linux"},{"objectType":"node","attribute":"osFullName","comparator":"regex","value":".*Linux.*"},{"objectType":"memoryPhysicalElement","attribute":"quantity","comparator":"gteq","value":"1"}]',
44+
'where=[' +
45+
'{"objectType":"node","attribute":"OS","comparator":"eq","value":"Linux"},' +
46+
'{"objectType":"node","attribute":"osFullName","comparator":"regex","value":".*Linux.*"},' +
47+
'{"objectType":"memoryPhysicalElement","attribute":"quantity","comparator":"gteq","value":"1"}' +
48+
']'
4549
],
4650
]
4751
)

0 commit comments

Comments
 (0)