summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2019-09-16 21:01:37 -0700
committerToshio Kuratomi <a.badger@gmail.com>2019-09-17 18:10:43 -0700
commit34b1ded2cbf6d91ba35bd47dfd15b51206c58c10 (patch)
tree7497d601eaf568344e1945c7a35478d5c75e1880
parent23c33ccb3830fa0b29df898eb34c305df6419163 (diff)
downloadansible-34b1ded2cbf6d91ba35bd47dfd15b51206c58c10.tar.gz
[stable-2.7] Mark ansible-test cloud credentials as sensitive..
(cherry picked from commit 9f7b124a6fe616c3fd06d500c1a6f6969c57ba2d) Co-authored-by: Matt Clay <matt@mystile.com>.
-rw-r--r--test/runner/lib/cloud/azure.py5
-rw-r--r--test/runner/lib/cloud/cs.py2
-rw-r--r--test/runner/lib/cloud/tower.py2
3 files changed, 9 insertions, 0 deletions
diff --git a/test/runner/lib/cloud/azure.py b/test/runner/lib/cloud/azure.py
index 03297fc9d7..f643d52222 100644
--- a/test/runner/lib/cloud/azure.py
+++ b/test/runner/lib/cloud/azure.py
@@ -122,6 +122,8 @@ class AzureCloudProvider(CloudProvider):
RESOURCE_GROUP_SECONDARY=response['resourceGroupNames'][1],
)
+ display.sensitive.add(values['AZURE_SECRET'])
+
config = '\n'.join('%s: %s' % (key, values[key]) for key in sorted(values))
self._write_config(config)
@@ -142,6 +144,9 @@ class AzureCloudEnvironment(CloudEnvironment):
"""
config = get_config(self.config_path)
+ display.sensitive.add(config.get('AZURE_SECRET'))
+ display.sensitive.add(config.get('AZURE_PASSWORD'))
+
cmd.append('-e')
cmd.append('resource_prefix=%s' % self.resource_prefix)
cmd.append('-e')
diff --git a/test/runner/lib/cloud/cs.py b/test/runner/lib/cloud/cs.py
index 0b0e3fee95..e0429682b0 100644
--- a/test/runner/lib/cloud/cs.py
+++ b/test/runner/lib/cloud/cs.py
@@ -199,6 +199,8 @@ class CsCloudProvider(CloudProvider):
SECRET=credentials['secretkey'],
)
+ display.sensitive.add(values['SECRET'])
+
config = self._populate_config_template(config, values)
self._write_config(config)
diff --git a/test/runner/lib/cloud/tower.py b/test/runner/lib/cloud/tower.py
index ded9ec1fe2..bef03228dc 100644
--- a/test/runner/lib/cloud/tower.py
+++ b/test/runner/lib/cloud/tower.py
@@ -117,6 +117,8 @@ class TowerCloudProvider(CloudProvider):
PASSWORD=connection.password,
)
+ display.sensitive.add(values['PASSWORD'])
+
config = self._populate_config_template(config, values)
self._write_config(config)