External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-07 14:28:08 -02:30
Code Issues Packages Projects Releases Wiki Activity

Finish converting the runner strings

Browse Source
This commit is contained in:
Alan Rominger
2021-04-22 10:56:48 -04:00
parent 623cf0b4cd
commit fd466c5cff
3 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
awx/main/tests/unit/test_tasks.py
View File

@@ -37,6 +37,7 @@ from awx.main.models.credential import ManagedCredentialType
from awx.main import tasks
from awx.main.utils import encrypt_field, encrypt_value
from awx.main.utils.safe_yaml import SafeLoader
from awx.main.utils.execution_environments import CONTAINER_ROOT, to_container_path, to_host_path
from awx.main.utils.licensing import Licenser
@@ -341,8 +342,8 @@ def pytest_generate_tests(metafunc):
def parse_extra_vars(args, private_data_dir):
extra_vars = {}
for chunk in args:
if chunk.startswith('@/runner/'):
local_path = chunk[len('@') :].replace('/runner', private_data_dir) # container path to host path
if chunk.startswith(f'@{CONTAINER_ROOT}'):
local_path = chunk[len('@') :].replace(CONTAINER_ROOT, private_data_dir) # container path to host path
with open(local_path, 'r') as f:
extra_vars.update(yaml.load(f, Loader=SafeLoader))
return extra_vars
@@ -892,10 +893,7 @@ class TestJobCredentials(TestJobExecution):
if verify:
assert env['K8S_AUTH_VERIFY_SSL'] == 'True'
# local_path = os.path.join(private_data_dir, os.path.basename(env['K8S_AUTH_SSL_CA_CERT']))
local_path = env['K8S_AUTH_SSL_CA_CERT'].replace('/runner', private_data_dir) # container path to host path
print('env')
print(env['K8S_AUTH_SSL_CA_CERT'])
local_path = to_host_path(env['K8S_AUTH_SSL_CA_CERT'], private_data_dir)
cert = open(local_path, 'r').read()
assert cert == 'CERTDATA'
else:
@@ -945,7 +943,7 @@ class TestJobCredentials(TestJobExecution):
safe_env = {}
credential.credential_type.inject_credential(credential, env, safe_env, [], private_data_dir)
runner_path = env['GCE_CREDENTIALS_FILE_PATH']
local_path = runner_path.replace('/runner', private_data_dir) # container path to host path
local_path = to_host_path(runner_path, private_data_dir)
json_data = json.load(open(local_path, 'rb'))
assert json_data['type'] == 'service_account'
assert json_data['private_key'] == self.EXAMPLE_PRIVATE_KEY
@@ -1017,8 +1015,7 @@ class TestJobCredentials(TestJobExecution):
env = task.build_env(job, private_data_dir, private_data_files=private_data_files)
credential.credential_type.inject_credential(credential, env, {}, [], private_data_dir)
# convert container path to host machine path
config_loc = env['OS_CLIENT_CONFIG_FILE'].replace('/runner', private_data_dir) # container path to host path
config_loc = to_host_path(env['OS_CLIENT_CONFIG_FILE'], private_data_dir)
shade_config = open(config_loc, 'r').read()
assert shade_config == '\n'.join(
[
@@ -1053,7 +1050,7 @@ class TestJobCredentials(TestJobExecution):
credential.credential_type.inject_credential(credential, env, safe_env, [], private_data_dir)
config = configparser.ConfigParser()
host_path = env['OVIRT_INI_PATH'].replace('/runner', private_data_dir) # container path to host path
host_path = to_host_path(env['OVIRT_INI_PATH'], private_data_dir)
config.read(host_path)
assert config.get('ovirt', 'ovirt_url') == 'some-ovirt-host.example.org'
assert config.get('ovirt', 'ovirt_username') == 'bob'
@@ -1267,7 +1264,7 @@ class TestJobCredentials(TestJobExecution):
env = {}
credential.credential_type.inject_credential(credential, env, {}, [], private_data_dir)
path = env['MY_CLOUD_INI_FILE'].replace('/runner', private_data_dir) # container path to host path
path = to_host_path(env['MY_CLOUD_INI_FILE'], private_data_dir)
assert open(path, 'r').read() == '[mycloud]\nABC123'
def test_custom_environment_injectors_with_unicode_content(self, private_data_dir):
@@ -1287,7 +1284,7 @@ class TestJobCredentials(TestJobExecution):
env = {}
credential.credential_type.inject_credential(credential, env, {}, [], private_data_dir)
path = env['MY_CLOUD_INI_FILE'].replace('/runner', private_data_dir) # container path to host path
path = to_host_path(env['MY_CLOUD_INI_FILE'], private_data_dir)
assert open(path, 'r').read() == value
def test_custom_environment_injectors_with_files(self, private_data_dir):
@@ -1306,8 +1303,8 @@ class TestJobCredentials(TestJobExecution):
env = {}
credential.credential_type.inject_credential(credential, env, {}, [], private_data_dir)
cert_path = env['MY_CERT_INI_FILE'].replace('/runner', private_data_dir) # container path to host path
key_path = env['MY_KEY_INI_FILE'].replace('/runner', private_data_dir) # container path to host path
cert_path = to_host_path(env['MY_CERT_INI_FILE'], private_data_dir)
key_path = to_host_path(env['MY_KEY_INI_FILE'], private_data_dir)
assert open(cert_path, 'r').read() == '[mycert]\nCERT123'
assert open(key_path, 'r').read() == '[mykey]\nKEY123'
@@ -1330,7 +1327,7 @@ class TestJobCredentials(TestJobExecution):
assert env['AZURE_AD_USER'] == 'bob'
assert env['AZURE_PASSWORD'] == 'secret'
path = env['GCE_CREDENTIALS_FILE_PATH'].replace('/runner', private_data_dir) # container path to host path
path = to_host_path(env['GCE_CREDENTIALS_FILE_PATH'], private_data_dir)
json_data = json.load(open(path, 'rb'))
assert json_data['type'] == 'service_account'
assert json_data['private_key'] == self.EXAMPLE_PRIVATE_KEY
@@ -1711,7 +1708,7 @@ class TestInventoryUpdateCredentials(TestJobExecution):
private_data_files = task.build_private_data_files(inventory_update, private_data_dir)
env = task.build_env(inventory_update, private_data_dir, private_data_files)
path = env['OS_CLIENT_CONFIG_FILE'].replace('/runner', private_data_dir) # container path to host path
path = to_host_path(env['OS_CLIENT_CONFIG_FILE'], private_data_dir)
shade_config = open(path, 'r').read()
assert (
'\n'.join(