ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix dataloader using deprecated version of is_encrypted (#17615)

Browse source
This commit is contained in:
Toshio Kuratomi 2016-09-17 00:45:29 -07:00 committed by GitHub
parent 6826ed3879
commit 2989527cd9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/parsing/dataloader.py
View file

@ -31,7 +31,7 @@ from ansible.errors import AnsibleFileNotFound, AnsibleParserError, AnsibleError
from ansible.errors.yaml_strings import YAML_SYNTAX_ERROR from ansible.errors.yaml_strings import YAML_SYNTAX_ERROR
from ansible.module_utils.basic import is_executable from ansible.module_utils.basic import is_executable
from ansible.module_utils._text import to_bytes, to_native, to_text from ansible.module_utils._text import to_bytes, to_native, to_text
from ansible.parsing.vault import VaultLib from ansible.parsing.vault import VaultLib, is_encrypted, is_encrypted_file
from ansible.parsing.quoting import unquote from ansible.parsing.quoting import unquote
from ansible.parsing.yaml.loader import AnsibleLoader from ansible.parsing.yaml.loader import AnsibleLoader
from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject, AnsibleUnicode from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject, AnsibleUnicode
@ -174,7 +174,7 @@ class DataLoader():
try: try:
with open(b_file_name, 'rb') as f: with open(b_file_name, 'rb') as f:
data = f.read() data = f.read()
if self._vault.is_encrypted(data): if is_encrypted(data):
data = self._vault.decrypt(data, filename=b_file_name) data = self._vault.decrypt(data, filename=b_file_name)
show_content = False show_content = False
@ -395,7 +395,7 @@ class DataLoader():
try: try:
with open(to_bytes(real_path), 'rb') as f: with open(to_bytes(real_path), 'rb') as f:
if self._vault.is_encrypted_file(f): if is_encrypted_file(f):
# if the file is encrypted and no password was specified, # if the file is encrypted and no password was specified,
# the decrypt call would throw an error, but we check first # the decrypt call would throw an error, but we check first
# since the decrypt function doesn't know the file name # since the decrypt function doesn't know the file name