Skip to content

Commit

Permalink
fixed failing sanity tests when no_log was missing (#345)
Browse files Browse the repository at this point in the history
* fixed failing sanity tests for possible secrets found without no_log option

* another set of no_log options corrected
  • Loading branch information
D3DeFi authored Mar 13, 2021
1 parent 75bc7cc commit 331c3c4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions plugins/modules/zabbix_action.py
Original file line number Diff line number Diff line change
Expand Up @@ -1776,7 +1776,7 @@ def main():
required=False,
choices=['agent', 'server', 'proxy']
),
password=dict(type='str', required=False),
password=dict(type='str', required=False, no_log=True),
port=dict(type='int', required=False),
run_on_groups=dict(type='list', required=False),
run_on_hosts=dict(type='list', required=False),
Expand Down Expand Up @@ -1849,7 +1849,7 @@ def main():
required=False,
choices=['agent', 'server', 'proxy']
),
password=dict(type='str', required=False),
password=dict(type='str', required=False, no_log=True),
port=dict(type='int', required=False),
run_on_groups=dict(type='list', required=False),
run_on_hosts=dict(type='list', required=False),
Expand Down Expand Up @@ -1918,7 +1918,7 @@ def main():
required=False,
choices=['agent', 'server', 'proxy']
),
password=dict(type='str', required=False),
password=dict(type='str', required=False, no_log=True),
port=dict(type='int', required=False),
run_on_groups=dict(type='list', required=False),
run_on_hosts=dict(type='list', required=False),
Expand Down
6 changes: 3 additions & 3 deletions plugins/modules/zabbix_discovery_rule.py
Original file line number Diff line number Diff line change
Expand Up @@ -586,12 +586,12 @@ def main():
'Telnet']
),
ports=dict(type='str'),
key=dict(type='str'),
key=dict(type='str', no_log=False),
snmp_community=dict(type='str'),
snmpv3_authpassphrase=dict(type='str'),
snmpv3_authpassphrase=dict(type='str', no_log=True),
snmpv3_authprotocol=dict(type='str', choices=['MD5', 'SHA']),
snmpv3_contextname=dict(type='str'),
snmpv3_privpassphrase=dict(type='str'),
snmpv3_privpassphrase=dict(type='str', no_log=True),
snmpv3_privprotocol=dict(type='str', choices=['DES', 'AES']),
snmpv3_securitylevel=dict(type='str', choices=['noAuthNoPriv', 'authNoPriv', 'authPriv']),
snmpv3_securityname=dict(type='str'),
Expand Down
4 changes: 2 additions & 2 deletions plugins/modules/zabbix_host.py
Original file line number Diff line number Diff line change
Expand Up @@ -972,9 +972,9 @@ def main():
contextname=dict(type='str', default=''),
securitylevel=dict(type='int', choices=[0, 1, 2], default=0),
authprotocol=dict(type='int', choices=[0, 1], default=0),
authpassphrase=dict(type='str', default=''),
authpassphrase=dict(type='str', default='', no_log=True),
privprotocol=dict(type='int', choices=[0, 1], default=0),
privpassphrase=dict(type='str', default='')
privpassphrase=dict(type='str', default='', no_log=True)
)
)
),
Expand Down

0 comments on commit 331c3c4

Please sign in to comment.