Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/filter_plugins/foremanctl.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ def list_all_features(enabled_features, only_enabled=False):

return "\n".join(output)

def invalid_features(features):
"""Return a list of unknown features not defined in features.yaml."""
return [feature for feature in features if feature not in FEATURE_MAP]

def foreman_proxy_plugins(value):
dependencies = list(get_dependencies(filter_features(value)))
plugins = [FEATURE_MAP.get(feature, {}).get('foreman_proxy', {}).get('plugin_name') for feature in filter_features(value + dependencies)]
Expand All @@ -94,4 +98,5 @@ def filters(self):
'features_to_foreman_proxy_plugins': foreman_proxy_plugins,
'available_foreman_proxy_plugins': available_foreman_proxy_plugins,
'list_all_features': list_all_features,
'invalid_features': invalid_features,
}
15 changes: 15 additions & 0 deletions src/roles/check_features/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
- name: Validate requested features
ansible.builtin.assert:
that:
- found_invalid_features | length == 0
fail_msg: |
ERROR: Unknown feature(s) requested: {{ found_invalid_features | join(', ') }}

To remove them, run:
foremanctl deploy {% for feature in found_invalid_features %}--remove-feature={{ feature }} {% endfor %}

Run 'foremanctl features' to list all available features.
vars:
found_invalid_features: "{{ features | invalid_features }}"
when: features | length > 0
1 change: 1 addition & 0 deletions src/roles/checks/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
- name: Execute checks
ansible.builtin.include_tasks: execute_check.yml
loop:
- check_features
- check_hostname
- check_database_connection
- check_system_requirements
Expand Down
10 changes: 10 additions & 0 deletions tests/features_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,13 @@ def test_foremanctl_features_list_enabled():

assert 'enabled' in result.stdout
assert 'available' not in result.stdout

def test_invalid_feature_rejected():
command = ['./foremanctl', 'deploy', '--add-feature', 'invalid-feature']
result = subprocess.run(command, capture_output=True, text=True)

assert result.returncode == 2

assert 'Unknown feature(s) requested: invalid-feature' in result.stdout
assert '--remove-feature=invalid' in result.stdout
assert "Run 'foremanctl features' to list all available features." in result.stdout