Replace unwelcoming words (#82413)

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
pull/82439/head
Abhijeet Kasurde 5 months ago committed by GitHub
parent 4479c9df13
commit fa92228b50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -61,8 +61,8 @@ display = Display()
b_HEADER = b'$ANSIBLE_VAULT'
CIPHER_WHITELIST = frozenset((u'AES256',))
CIPHER_WRITE_WHITELIST = frozenset((u'AES256',))
CIPHER_ALLOWLIST = frozenset((u'AES256',))
CIPHER_WRITE_ALLOWLIST = frozenset((u'AES256',))
# See also CIPHER_MAPPING at the bottom of the file which maps cipher strings
# (used in VaultFile header) to a cipher class
@ -606,7 +606,7 @@ class VaultLib:
if is_encrypted(b_plaintext):
raise AnsibleError("input is already encrypted")
if not self.cipher_name or self.cipher_name not in CIPHER_WRITE_WHITELIST:
if not self.cipher_name or self.cipher_name not in CIPHER_WRITE_ALLOWLIST:
self.cipher_name = u"AES256"
try:
@ -671,7 +671,7 @@ class VaultLib:
# create the cipher object, note that the cipher used for decrypt can
# be different than the cipher used for encrypt
if cipher_name in CIPHER_WHITELIST:
if cipher_name in CIPHER_ALLOWLIST:
this_cipher = CIPHER_MAPPING[cipher_name]()
else:
raise AnsibleError("{0} cipher could not be found".format(cipher_name))
@ -958,7 +958,7 @@ class VaultEditor:
# (vault_id=default, while a different vault-id decrypted)
# we want to get rid of files encrypted with the AES cipher
force_save = (cipher_name not in CIPHER_WRITE_WHITELIST)
force_save = (cipher_name not in CIPHER_WRITE_ALLOWLIST)
# Keep the same vault-id (and version) as in the header
self._edit_file_helper(filename, vault_secret_used, existing_data=plaintext, force_save=force_save, vault_id=vault_id)

@ -22,7 +22,7 @@ DOCUMENTATION = '''
version_added: "2.10"
short_description: load host and group vars
description:
- 3rd party vars plugin to test loading host and group vars without requiring whitelisting and without a plugin-specific stage option
- Third-party vars plugin to test loading host and group vars without enabling and without a plugin-specific stage option
options:
'''

@ -22,7 +22,7 @@ DOCUMENTATION = '''
version_added: "2.10"
short_description: load host and group vars
description:
- 3rd party vars plugin to test loading host and group vars without requiring whitelisting and with a plugin-specific stage option
- Third party vars plugin to test loading host and group vars without enabling and with a plugin-specific stage option
options:
stage:
choices: ['all', 'inventory', 'task']

@ -15,7 +15,7 @@ DOCUMENTATION = '''
- File MUST have a valid extension, defined in configuration.
notes:
- If you want to set vars for the C(all) group inside the inventory file, the C(all) group must be the first entry in the file.
- Whitelisted in configuration by default.
- Enabled in configuration by default.
options:
yaml_extensions:
description: list of 'valid' extensions for files containing YAML

Loading…
Cancel
Save