allow env to override unspecified unsafe_writes (#73282)

* allow env var for fallback value for unspecified unsafe_writes
pull/73392/head
Brian Coca 4 years ago committed by GitHub
parent 2b0cd2c13f
commit c7d4acc12f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
minor_changes:
- Allow unsafe_writes to be set on target via env var, for those targets that need a blanket setting.

@ -240,6 +240,15 @@ _literal_eval = literal_eval
# is an internal implementation detail # is an internal implementation detail
_ANSIBLE_ARGS = None _ANSIBLE_ARGS = None
def env_fallback(*args, **kwargs):
''' Load value from environment '''
for arg in args:
if arg in os.environ:
return os.environ[arg]
raise AnsibleFallbackNotFound
FILE_COMMON_ARGUMENTS = dict( FILE_COMMON_ARGUMENTS = dict(
# These are things we want. About setting metadata (mode, ownership, permissions in general) on # These are things we want. About setting metadata (mode, ownership, permissions in general) on
# created files (these are used by set_fs_attributes_if_different and included in # created files (these are used by set_fs_attributes_if_different and included in
@ -252,7 +261,7 @@ FILE_COMMON_ARGUMENTS = dict(
selevel=dict(type='str'), selevel=dict(type='str'),
setype=dict(type='str'), setype=dict(type='str'),
attributes=dict(type='str', aliases=['attr']), attributes=dict(type='str', aliases=['attr']),
unsafe_writes=dict(type='bool', default=False), # should be available to any module using atomic_move unsafe_writes=dict(type='bool', default=False, fallback=(env_fallback, ['ANSIBLE_UNSAFE_WRITES'])), # should be available to any module using atomic_move
) )
PASSWD_ARG_RE = re.compile(r'^[-]{0,2}pass[-]?(word|wd)?') PASSWD_ARG_RE = re.compile(r'^[-]{0,2}pass[-]?(word|wd)?')
@ -638,14 +647,6 @@ def _load_params():
sys.exit(1) sys.exit(1)
def env_fallback(*args, **kwargs):
''' Load value from environment '''
for arg in args:
if arg in os.environ:
return os.environ[arg]
raise AnsibleFallbackNotFound
def missing_required_lib(library, reason=None, url=None): def missing_required_lib(library, reason=None, url=None):
hostname = platform.node() hostname = platform.node()
msg = "Failed to import the required Python library (%s) on %s's Python %s." % (library, hostname, sys.executable) msg = "Failed to import the required Python library (%s) on %s's Python %s." % (library, hostname, sys.executable)

@ -38,7 +38,7 @@
- copy_without is failed - copy_without is failed
- name: test overwriting file with unsafe - name: test overwriting file with unsafe
copy: content=NEW dest={{testufile}} unsafe_writes=True copy: content=NEWNOREALLY dest={{testufile}} unsafe_writes=True
register: copy_with register: copy_with
- name: ensure we properly changed - name: ensure we properly changed
@ -46,6 +46,21 @@
that: that:
- copy_with is changed - copy_with is changed
- name: test fallback env var
when: lookup('env', 'ANSIBLE_UNSAFE_WRITES') not in ('', None)
vars:
env_enabled: "{{lookup('env', 'ANSIBLE_UNSAFE_WRITES')|bool}}"
block:
- name: test overwriting file with unsafe depending on fallback environment setting
copy: content=NEWBUTNOTDIFFERENT dest={{testufile}}
register: copy_with_env
ignore_errors: True
- name: ensure we properly follow env var
assert:
msg: "Failed with envvar: {{env_enabled}}, due AUW: to {{q('env', 'ANSIBLE_UNSAFE_WRITES')}}"
that:
- env_enabled and copy_with_env is changed or not env_enabled and copy_with_env is failed
always: always:
- name: remove immutable flag from dir to prevent issues with cleanup - name: remove immutable flag from dir to prevent issues with cleanup
file: path={{testudir}} state=directory attributes="-i" file: path={{testudir}} state=directory attributes="-i"

@ -2,4 +2,11 @@
set -eux set -eux
# test w/o fallback env var
ansible-playbook basic.yml -i ../../inventory -e "output_dir=${OUTPUT_DIR}" "$@" ansible-playbook basic.yml -i ../../inventory -e "output_dir=${OUTPUT_DIR}" "$@"
# test enabled fallback env var
ANSIBLE_UNSAFE_WRITES=1 ansible-playbook basic.yml -i ../../inventory -e "output_dir=${OUTPUT_DIR}" "$@"
# test disnabled fallback env var
ANSIBLE_UNSAFE_WRITES=0 ansible-playbook basic.yml -i ../../inventory -e "output_dir=${OUTPUT_DIR}" "$@"

Loading…
Cancel
Save