docker_context_info: fix some aspects (#1043)

* Extend docker_context_info tests.

* Fix a bug in the context code.

* Fix TLS handling for contexts.

* Adjust code to fix tests.
This commit is contained in:
Felix Fontein
2025-02-10 23:54:36 +01:00
committed by GitHub
parent 20042ea780
commit 22ab85fe2b
4 changed files with 64 additions and 13 deletions
+5 -4
View File
@@ -229,7 +229,6 @@ def context_to_json(context, current):
# Create config for the modules
module_config['docker_host'] = host_str
module_config['tls'] = not to_bool(endpoint.get('SkipTLSVerify'))
if context.tls_cfg.get('docker'):
tls_cfg = context.tls_cfg['docker']
if tls_cfg.ca_cert:
@@ -238,7 +237,9 @@ def context_to_json(context, current):
module_config['client_cert'] = tls_cfg.cert[0]
module_config['client_key'] = tls_cfg.cert[1]
module_config['validate_certs'] = tls_cfg.verify
module_config['tls'] = to_bool(tls_cfg.verify)
module_config['tls'] = True
else:
module_config['tls'] = to_bool(endpoint.get('SkipTLSVerify'))
return {
'current': current,
'name': context.name,
@@ -285,10 +286,10 @@ def main():
else:
contexts = ContextAPI.contexts()
json_contexts = [
json_contexts = sorted([
context_to_json(context, context.name == current_context_name)
for context in contexts
]
], key=lambda entry: entry['name'])
module.exit_json(
changed=False,