mirror of
https://github.com/openshift/community.okd.git
synced 2026-05-07 13:42:38 +00:00
* Upgrade Ansible and OKD versions for CI * Use ubi9 and fix sanity * Use correct pip install * Try using quotes * Ensure python3.9 * Upgrade ansible and molecule versions * Remove DeploymentConfig DeploymentConfigs are deprecated and seem to now be causing idempotence problems. Replacing them with Deployments fixes it. * Attempt to fix ldap integration tests Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Move sanity and unit tests to GH actions Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Firt round of sanity fixes Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add kubernetes.core collection as sanity requirement Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add ignore-2.16.txt Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Attempt to fix units Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add ignore-2.17 Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Attempt to fix unit tests Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add pytest-ansible to test-requirements.txt Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add changelog fragment Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add workflow for ansible-lint Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Apply black Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Fix linters Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add # fmt: skip Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Yet another round of linting Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Yet another round of linting Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Remove setup.cfg Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Revert #fmt Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Use ansible-core 2.14 Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Cleanup ansible-lint ignores Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Try using service instead of pod IP * Fix typo * Actually use the correct port * See if NetworkPolicy is preventing connection * using Pod internal IP * fix adm prune auth roles syntax * adding some retry steps * fix: openshift_builds target * add flag --force-with-deps when building downstream collection * Remove yamllint from tox linters, bump minimum python supported version to 3.9, Remove support for ansible-core < 2.14 --------- Signed-off-by: Alina Buzachis <abuzachis@redhat.com> Co-authored-by: Mike Graves <mgraves@redhat.com> Co-authored-by: Alina Buzachis <abuzachis@redhat.com>
This commit is contained in:
@@ -9,28 +9,26 @@ from ansible_collections.community.okd.plugins.module_utils.openshift_ldap impor
|
||||
|
||||
|
||||
def test_missing_url():
|
||||
config = dict(
|
||||
kind="LDAPSyncConfig",
|
||||
apiVersion="v1",
|
||||
insecure=True
|
||||
)
|
||||
config = dict(kind="LDAPSyncConfig", apiVersion="v1", insecure=True)
|
||||
err = validate_ldap_sync_config(config)
|
||||
assert err == "url should be non empty attribute."
|
||||
|
||||
|
||||
def test_binddn_and_bindpwd_linked():
|
||||
"""
|
||||
one of bind_dn and bind_pwd cannot be set alone
|
||||
one of bind_dn and bind_pwd cannot be set alone
|
||||
"""
|
||||
config = dict(
|
||||
kind="LDAPSyncConfig",
|
||||
apiVersion="v1",
|
||||
url="ldap://LDAP_SERVICE_IP:389",
|
||||
insecure=True,
|
||||
bindDN="cn=admin,dc=example,dc=org"
|
||||
bindDN="cn=admin,dc=example,dc=org",
|
||||
)
|
||||
|
||||
credentials_error = "bindDN and bindPassword must both be specified, or both be empty."
|
||||
credentials_error = (
|
||||
"bindDN and bindPassword must both be specified, or both be empty."
|
||||
)
|
||||
|
||||
assert validate_ldap_sync_config(config) == credentials_error
|
||||
|
||||
@@ -39,7 +37,7 @@ def test_binddn_and_bindpwd_linked():
|
||||
apiVersion="v1",
|
||||
url="ldap://LDAP_SERVICE_IP:389",
|
||||
insecure=True,
|
||||
bindPassword="testing1223"
|
||||
bindPassword="testing1223",
|
||||
)
|
||||
|
||||
assert validate_ldap_sync_config(config) == credentials_error
|
||||
@@ -53,11 +51,13 @@ def test_insecure_connection():
|
||||
insecure=True,
|
||||
)
|
||||
|
||||
assert validate_ldap_sync_config(config) == "Cannot use ldaps scheme with insecure=true."
|
||||
assert (
|
||||
validate_ldap_sync_config(config)
|
||||
== "Cannot use ldaps scheme with insecure=true."
|
||||
)
|
||||
|
||||
config.update(dict(
|
||||
url="ldap://LDAP_SERVICE_IP:389",
|
||||
ca="path/to/ca/file"
|
||||
))
|
||||
config.update(dict(url="ldap://LDAP_SERVICE_IP:389", ca="path/to/ca/file"))
|
||||
|
||||
assert validate_ldap_sync_config(config) == "Cannot specify a ca with insecure=true."
|
||||
assert (
|
||||
validate_ldap_sync_config(config) == "Cannot specify a ca with insecure=true."
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user