ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-04 16:21:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

removing libcloud secrets support for legacy gcp modules (#44932)

Browse source 
* removing libcloud secrets support for legacy gcp modules

* test fixes
This commit is contained in:
Alex Stephen 2018-08-31 08:28:32 -04:00 • committed by Ryan Brown
parent 5b358db83f
commit 276ad32a45
2 changed files with 1 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

60
test/units/module_utils/gcp/test_auth.py
View file

@ -22,7 +22,7 @@ import pytest
from ansible.compat.tests import mock, unittest
from ansible.module_utils.gcp import (_get_gcp_ansible_credentials, _get_gcp_credentials, _get_gcp_environ_var,
_get_gcp_libcloud_credentials, _get_gcp_environment_credentials,
_get_gcp_environment_credentials,
_validate_credentials_file)
# Fake data/function used for testing
@ -90,64 +90,6 @@ class GCPAuthTestCase(unittest.TestCase):
self.assertEqual('default_value', _get_gcp_environ_var(
non_existing_var_name, 'default_value'))
def test_get_gcp_libcloud_credentials_no_import(self):
"""No secrets imported. Whatever is sent in should come out."""
module = FakeModule()
actual = _get_gcp_libcloud_credentials(module,
service_account_email=None,
credentials_file=None,
project_id=None)
expected = (None, None, None)
self.assertEqual(expected, actual)
# no libcloud, with values
actual = _get_gcp_libcloud_credentials(module,
service_account_email='sa-email',
credentials_file='creds-file',
project_id='proj-id')
expected = ('sa-email', 'creds-file', 'proj-id')
self.assertEqual(expected, actual)
def test_get_gcp_libcloud_credentials_import(self):
"""secrets is imported and those values should be used."""
# Note: Opted for a real class here rather than MagicMock as
# __getitem__ comes for free.
class FakeSecrets:
def __init__(self):
# 2 element list, service account email and creds file
self.GCE_PARAMS = ['secrets-sa', 'secrets-file.json']
# dictionary with project_id, optionally auth_type
self.GCE_KEYWORD_PARAMS = {}
self.__file__ = 'THIS_IS_A_FAKEFILE_FOR_TESTING'
# patch in module
fake_secrets = FakeSecrets()
patcher = mock.patch.dict(sys.modules, {'secrets': fake_secrets})
patcher.start()
# obtain sa and creds from secrets
module = FakeModule()
actual = _get_gcp_libcloud_credentials(module,
service_account_email=None,
credentials_file=None,
project_id='proj-id')
expected = ('secrets-sa', 'secrets-file.json', 'proj-id')
self.assertEqual(expected, actual)
# fetch project id. Current logic requires sa-email or creds to be
# set.
fake_secrets.GCE_KEYWORD_PARAMS['project'] = 'new-proj-id'
fake_secrets.GCE_PARAMS[1] = 'my-creds.json'
module = FakeModule()
actual = _get_gcp_libcloud_credentials(module,
service_account_email='my-sa',
credentials_file=None,
project_id=None)
expected = ('my-sa', 'my-creds.json', 'new-proj-id')
self.assertEqual(expected, actual)
# stop patching
patcher.stop()
def test_validate_credentials_file(self):
# TODO(supertom): Only dealing with p12 here, check the other states
# of this function