Skip to content

Commit

Permalink
Merge branch 'dev' into bugfix/531/add_parameter_to_tolerate_enqueue
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreMarcel99 authored Aug 12, 2024
2 parents dbee125 + fa19159 commit 42540b7
Show file tree
Hide file tree
Showing 9 changed files with 616 additions and 321 deletions.
4 changes: 4 additions & 0 deletions changelogs/fragments/1633-zos_mvs_raw_tests_portability.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
trivial:
- test_zos_mvs_raw_func.py - Remove the use of hard coded dataset
names.
(https://github.com/ansible-collections/ibm_zos_core/pull/1633).
3 changes: 3 additions & 0 deletions changelogs/fragments/1635-backup_restore_portability.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
trivial:
- test_zos_backup_restore - Remove the use of hard coded hlq and files names.
(https://github.com/ansible-collections/ibm_zos_core/pull/1635).
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
bugfixes:
- zos_copy - module would fail when an internal SFTP command wrote output to
stderr. Fix sets default value of existing module option `ignore_sftp_error` to True
(https://github.com/ansible-collections/ibm_zos_core/pull/1640).
- zos_fetch - module would fail when an internal SFTP command wrote output to
stderr. Fix sets default value of existing module option `ignore_sftp_error` to True
(https://github.com/ansible-collections/ibm_zos_core/pull/1640).
2 changes: 1 addition & 1 deletion plugins/action/zos_copy.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def run(self, tmp=None, task_vars=None):
force_lock = _process_boolean(task_args.get('force_lock'), default=False)
executable = _process_boolean(task_args.get('executable'), default=False)
asa_text = _process_boolean(task_args.get('asa_text'), default=False)
ignore_sftp_stderr = _process_boolean(task_args.get("ignore_sftp_stderr"), default=False)
ignore_sftp_stderr = _process_boolean(task_args.get("ignore_sftp_stderr"), default=True)
backup_name = task_args.get("backup_name", None)
encoding = task_args.get("encoding", None)
mode = task_args.get("mode", None)
Expand Down
2 changes: 1 addition & 1 deletion plugins/action/zos_fetch.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def run(self, tmp=None, task_vars=None):
flat = _process_boolean(self._task.args.get('flat'), default=False)
is_binary = _process_boolean(self._task.args.get('is_binary'))
ignore_sftp_stderr = _process_boolean(
self._task.args.get("ignore_sftp_stderr"), default=False
self._task.args.get("ignore_sftp_stderr"), default=True
)
validate_checksum = _process_boolean(
self._task.args.get("validate_checksum"), default=True
Expand Down
15 changes: 8 additions & 7 deletions plugins/modules/zos_copy.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,18 +201,19 @@
required: false
ignore_sftp_stderr:
description:
- During data transfer through SFTP, the module fails if the SFTP command
directs any content to stderr. The user is able to override this
behavior by setting this parameter to C(true). By doing so, the module
would essentially ignore the stderr stream produced by SFTP and continue
execution.
- During data transfer through SFTP, the SFTP command directs content to
stderr. By default, the module essentially ignores the stderr stream
produced by SFTP and continues execution. The user is able to override
this behavior by setting this parameter to C(false). By doing so, any
content written to stderr is considered an error by Ansible and will
have module fail.
- When Ansible verbosity is set to greater than 3, either through the
command line interface (CLI) using B(-vvvv) or through environment
variables such as B(verbosity = 4), then this parameter will
automatically be set to C(true).
type: bool
required: false
default: false
default: true
version_added: "1.4.0"
is_binary:
description:
Expand Down Expand Up @@ -3822,7 +3823,7 @@ def main():
backup_name=dict(type='str'),
local_follow=dict(type='bool', default=True),
remote_src=dict(type='bool', default=False),
ignore_sftp_stderr=dict(type='bool', default=False),
ignore_sftp_stderr=dict(type='bool', default=True),
validate=dict(type='bool', default=False),
volume=dict(type='str', required=False),
dest_data_set=dict(
Expand Down
15 changes: 8 additions & 7 deletions plugins/modules/zos_fetch.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,18 +122,19 @@
type: str
ignore_sftp_stderr:
description:
- During data transfer through sftp, the module fails if the sftp command
directs any content to stderr. The user is able to override this
behavior by setting this parameter to C(true). By doing so, the module
would essentially ignore the stderr stream produced by sftp and continue
execution.
- During data transfer through SFTP, the SFTP command directs content to
stderr. By default, the module essentially ignores the stderr stream
produced by SFTP and continues execution. The user is able to override
this behavior by setting this parameter to C(false). By doing so, any
content written to stderr is considered an error by Ansible and will
have module fail.
- When Ansible verbosity is set to greater than 3, either through the
command line interface (CLI) using B(-vvvv) or through environment
variables such as B(verbosity = 4), then this parameter will
automatically be set to C(true).
type: bool
required: false
default: false
default: true
notes:
- When fetching PDSE and VSAM data sets, temporary storage will be used
on the remote z/OS system. After the PDSE or VSAM data set is
Expand Down Expand Up @@ -821,7 +822,7 @@ def run_module():
use_qualifier=dict(required=False, default=False, type="bool"),
validate_checksum=dict(required=False, default=True, type="bool"),
encoding=dict(required=False, type="dict"),
ignore_sftp_stderr=dict(type="bool", default=False, required=False),
ignore_sftp_stderr=dict(type="bool", default=True, required=False),
tmp_hlq=dict(required=False, type="str", default=None),
)
)
Expand Down
Loading

0 comments on commit 42540b7

Please sign in to comment.