update ansible collections sops, docker and debops
This commit is contained in:
parent
f1135b818f
commit
e31ee5e39c
910 changed files with 27667 additions and 19786 deletions
|
|
@ -87,6 +87,7 @@ options:
|
|||
- name: ANSIBLE_VARS_SOPS_PLUGIN_HANDLE_UNENCRYPTED_FILES
|
||||
extends_documentation_fragment:
|
||||
- ansible.builtin.vars_plugin_staging
|
||||
- community.sops.sops.ansible_plugin # must come before community.sops.sops!
|
||||
- community.sops.sops
|
||||
- community.sops.sops.ansible_env
|
||||
- community.sops.sops.ansible_ini
|
||||
|
|
@ -101,6 +102,7 @@ seealso:
|
|||
"""
|
||||
|
||||
import os
|
||||
import typing as t
|
||||
from collections.abc import Sequence, Mapping
|
||||
|
||||
from ansible.errors import AnsibleParserError
|
||||
|
|
@ -111,6 +113,7 @@ from ansible.plugins.vars import BaseVarsPlugin
|
|||
from ansible.utils.display import Display
|
||||
from ansible.utils.vars import combine_vars
|
||||
from ansible_collections.community.sops.plugins.module_utils.sops import Sops, SopsError
|
||||
from ansible_collections.community.sops.plugins.plugin_utils._args import wrap_get_option_value_plugin_path
|
||||
|
||||
try:
|
||||
from ansible.template import trust_as_template as _trust_as_template
|
||||
|
|
@ -121,11 +124,11 @@ except ImportError:
|
|||
|
||||
display = Display()
|
||||
|
||||
FOUND = {}
|
||||
DECRYPTED = {}
|
||||
FOUND: dict[str, list[str]] = {}
|
||||
DECRYPTED: dict[str, bytes] = {}
|
||||
|
||||
|
||||
def _make_safe(value):
|
||||
def _make_safe(value: t.Any) -> t.Any:
|
||||
if isinstance(value, str):
|
||||
# must come *before* Sequence, as strings are also instances of Sequence
|
||||
if HAS_DATATAGGING and isinstance(value, str):
|
||||
|
|
@ -148,8 +151,17 @@ class VarsModule(BaseVarsPlugin):
|
|||
|
||||
super().get_vars(loader, path, entities)
|
||||
|
||||
def get_option_value(argument_name):
|
||||
return self.get_option(argument_name)
|
||||
try:
|
||||
sops_binary, sops_binary_origin = self.get_option_and_origin("sops_binary")
|
||||
except AttributeError:
|
||||
# Ansible-core 2.15 has no get_option_and_origin()!
|
||||
sops_binary = self.get_option("sops_binary")
|
||||
sops_binary_origin = "Direct"
|
||||
get_option_value = wrap_get_option_value_plugin_path(
|
||||
self.get_option,
|
||||
sops_binary=sops_binary,
|
||||
sops_binary_origin=sops_binary_origin,
|
||||
)
|
||||
|
||||
if cache is None:
|
||||
cache = self.get_option('cache')
|
||||
|
|
|
|||
Loading…
Reference in a new issue