Skip to content

Commit

Permalink
container login utils - fix truthy/falsy logic
Browse files Browse the repository at this point in the history
  • Loading branch information
itewk committed Jul 21, 2021
1 parent 99bcd28 commit d3523c4
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/ploigos_step_runner/utils/containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ def container_registries_login( #pylint: disable=too-many-branches
else:
registry_uri = registry_key

if containers_config_tls_verify is False:
registry_tls_verify = False
else:
if containers_config_tls_verify:
if 'tls-verify' in registry_conf:
registry_tls_verify = registry_conf['tls-verify']
else:
registry_tls_verify = True
else:
registry_tls_verify = False

container_registry_login(
container_registry_uri=registry_uri,
Expand All @@ -140,13 +140,13 @@ def container_registries_login( #pylint: disable=too-many-branches
f"Configuration for container registry " \
f"must specify a 'password': {registry_conf}"

if containers_config_tls_verify is False:
registry_tls_verify = False
else:
if containers_config_tls_verify:
if 'tls-verify' in registry_conf:
registry_tls_verify = registry_conf['tls-verify']
else:
registry_tls_verify = True
else:
registry_tls_verify = False

container_registry_login(
container_registry_uri=registry_conf['uri'],
Expand Down
75 changes: 75 additions & 0 deletions tests/utils/test_containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -917,3 +917,78 @@ def test_list_of_dicts(self, container_registry_login_mock):
)
]
container_registry_login_mock.assert_has_calls(calls)


@patch('ploigos_step_runner.utils.containers.container_registry_login')
def test_list_of_dicts_truthy(self, container_registry_login_mock):
registries = [
{
'uri': 'registry.redhat.io',
'username': '[email protected]',
'password': 'nope1'
},
{
'uri': 'registry.internal.example.xyz',
'username': '[email protected]',
'password': 'nope2'
}
]

container_registries_login(registries, containers_config_tls_verify=1)

calls = [
call(
container_registry_uri='registry.redhat.io',
container_registry_username='[email protected]',
container_registry_password='nope1',
container_registry_tls_verify=True,
containers_config_auth_file=None,
container_command_short_name=None
),
call(
container_registry_uri='registry.internal.example.xyz',
container_registry_username='[email protected]',
container_registry_password='nope2',
container_registry_tls_verify=True,
containers_config_auth_file=None,
container_command_short_name=None
)
]
container_registry_login_mock.assert_has_calls(calls)

@patch('ploigos_step_runner.utils.containers.container_registry_login')
def test_list_of_dicts_falsey(self, container_registry_login_mock):
registries = [
{
'uri': 'registry.redhat.io',
'username': '[email protected]',
'password': 'nope1'
},
{
'uri': 'registry.internal.example.xyz',
'username': '[email protected]',
'password': 'nope2'
}
]

container_registries_login(registries, containers_config_tls_verify=0)

calls = [
call(
container_registry_uri='registry.redhat.io',
container_registry_username='[email protected]',
container_registry_password='nope1',
container_registry_tls_verify=False,
containers_config_auth_file=None,
container_command_short_name=None
),
call(
container_registry_uri='registry.internal.example.xyz',
container_registry_username='[email protected]',
container_registry_password='nope2',
container_registry_tls_verify=False,
containers_config_auth_file=None,
container_command_short_name=None
)
]
container_registry_login_mock.assert_has_calls(calls)

0 comments on commit d3523c4

Please sign in to comment.