From 9f41d7834656352529dd3827bd00ab88d218853e Mon Sep 17 00:00:00 2001 From: Rene Moser Date: Wed, 13 May 2015 23:26:27 +0200 Subject: [PATCH] cloudstack: avoid logging of secrets --- cloud/cloudstack/cs_account.py | 2 +- cloud/cloudstack/cs_affinitygroup.py | 2 +- cloud/cloudstack/cs_firewall.py | 2 +- cloud/cloudstack/cs_instance.py | 2 +- cloud/cloudstack/cs_instancegroup.py | 2 +- cloud/cloudstack/cs_iso.py | 2 +- cloud/cloudstack/cs_portforward.py | 2 +- cloud/cloudstack/cs_securitygroup.py | 2 +- cloud/cloudstack/cs_securitygroup_rule.py | 2 +- cloud/cloudstack/cs_sshkeypair.py | 2 +- cloud/cloudstack/cs_vmsnapshot.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cloud/cloudstack/cs_account.py b/cloud/cloudstack/cs_account.py index ccb29e1015f..dd47a3f93d3 100644 --- a/cloud/cloudstack/cs_account.py +++ b/cloud/cloudstack/cs_account.py @@ -366,7 +366,7 @@ def main(): timezone = dict(default=None), poll_async = dict(choices=BOOLEANS, default=True), api_key = dict(default=None), - api_secret = dict(default=None), + api_secret = dict(default=None, no_log=True), api_url = dict(default=None), api_http_method = dict(default='get'), ), diff --git a/cloud/cloudstack/cs_affinitygroup.py b/cloud/cloudstack/cs_affinitygroup.py index 1a11fb537db..617a50ee010 100644 --- a/cloud/cloudstack/cs_affinitygroup.py +++ b/cloud/cloudstack/cs_affinitygroup.py @@ -201,7 +201,7 @@ def main(): state = dict(choices=['present', 'absent'], default='present'), poll_async = dict(choices=BOOLEANS, default=True), api_key = dict(default=None), - api_secret = dict(default=None), + api_secret = dict(default=None, no_log=True), api_url = dict(default=None), api_http_method = dict(default='get'), ), diff --git a/cloud/cloudstack/cs_firewall.py b/cloud/cloudstack/cs_firewall.py index 5c96d606e68..de38233a12f 100644 --- a/cloud/cloudstack/cs_firewall.py +++ b/cloud/cloudstack/cs_firewall.py @@ -303,7 +303,7 @@ def main(): account = dict(default=None), project = dict(default=None), api_key = dict(default=None), - api_secret = dict(default=None), + api_secret = dict(default=None, no_log=True), api_url = dict(default=None), api_http_method = dict(default='get'), ), diff --git a/cloud/cloudstack/cs_instance.py b/cloud/cloudstack/cs_instance.py index 82d33725250..1d7e2492216 100644 --- a/cloud/cloudstack/cs_instance.py +++ b/cloud/cloudstack/cs_instance.py @@ -785,7 +785,7 @@ def main(): tags = dict(type='list', aliases=[ 'tag' ], default=None), poll_async = dict(choices=BOOLEANS, default=True), api_key = dict(default=None), - api_secret = dict(default=None), + api_secret = dict(default=None, no_log=True), api_url = dict(default=None), api_http_method = dict(default='get'), ), diff --git a/cloud/cloudstack/cs_instancegroup.py b/cloud/cloudstack/cs_instancegroup.py index 71aa4bfa38b..d74648d2313 100644 --- a/cloud/cloudstack/cs_instancegroup.py +++ b/cloud/cloudstack/cs_instancegroup.py @@ -197,7 +197,7 @@ def main(): account = dict(default=None), project = dict(default=None), api_key = dict(default=None), - api_secret = dict(default=None), + api_secret = dict(default=None, no_log=True), api_url = dict(default=None), api_http_method = dict(default='get'), ), diff --git a/cloud/cloudstack/cs_iso.py b/cloud/cloudstack/cs_iso.py index 1bdb2ee75cc..9dcd46ea539 100644 --- a/cloud/cloudstack/cs_iso.py +++ b/cloud/cloudstack/cs_iso.py @@ -293,7 +293,7 @@ def main(): is_dynamically_scalable = dict(choices=BOOLEANS, default=False), state = dict(choices=['present', 'absent'], default='present'), api_key = dict(default=None), - api_secret = dict(default=None), + api_secret = dict(default=None, no_log=True), api_url = dict(default=None), api_http_method = dict(default='get'), ), diff --git a/cloud/cloudstack/cs_portforward.py b/cloud/cloudstack/cs_portforward.py index 74519fccb28..dd5ecb12bda 100644 --- a/cloud/cloudstack/cs_portforward.py +++ b/cloud/cloudstack/cs_portforward.py @@ -402,7 +402,7 @@ def main(): project = dict(default=None), poll_async = dict(choices=BOOLEANS, default=True), api_key = dict(default=None), - api_secret = dict(default=None), + api_secret = dict(default=None, no_log=True), api_url = dict(default=None), api_http_method = dict(default='get'), ), diff --git a/cloud/cloudstack/cs_securitygroup.py b/cloud/cloudstack/cs_securitygroup.py index 88908e559e5..2964a918f1f 100644 --- a/cloud/cloudstack/cs_securitygroup.py +++ b/cloud/cloudstack/cs_securitygroup.py @@ -167,7 +167,7 @@ def main(): state = dict(choices=['present', 'absent'], default='present'), project = dict(default=None), api_key = dict(default=None), - api_secret = dict(default=None), + api_secret = dict(default=None, no_log=True), api_url = dict(default=None), api_http_method = dict(default='get'), ), diff --git a/cloud/cloudstack/cs_securitygroup_rule.py b/cloud/cloudstack/cs_securitygroup_rule.py index 100a92df4ef..76ddf7207fc 100644 --- a/cloud/cloudstack/cs_securitygroup_rule.py +++ b/cloud/cloudstack/cs_securitygroup_rule.py @@ -401,7 +401,7 @@ def main(): project = dict(default=None), poll_async = dict(choices=BOOLEANS, default=True), api_key = dict(default=None), - api_secret = dict(default=None), + api_secret = dict(default=None, no_log=True), api_url = dict(default=None), api_http_method = dict(default='get'), ), diff --git a/cloud/cloudstack/cs_sshkeypair.py b/cloud/cloudstack/cs_sshkeypair.py index f24faee41d6..1e3233dd76e 100644 --- a/cloud/cloudstack/cs_sshkeypair.py +++ b/cloud/cloudstack/cs_sshkeypair.py @@ -219,7 +219,7 @@ def main(): project = dict(default=None), state = dict(choices=['present', 'absent'], default='present'), api_key = dict(default=None), - api_secret = dict(default=None), + api_secret = dict(default=None, no_log=True), api_url = dict(default=None), api_http_method = dict(default='get'), ), diff --git a/cloud/cloudstack/cs_vmsnapshot.py b/cloud/cloudstack/cs_vmsnapshot.py index fc11790579f..1321d35da82 100644 --- a/cloud/cloudstack/cs_vmsnapshot.py +++ b/cloud/cloudstack/cs_vmsnapshot.py @@ -292,7 +292,7 @@ def main(): project = dict(default=None), poll_async = dict(choices=BOOLEANS, default=True), api_key = dict(default=None), - api_secret = dict(default=None), + api_secret = dict(default=None, no_log=True), api_url = dict(default=None), api_http_method = dict(default='get'), ),