Deploy

tests/validate.py

@@ -31,6 +31,8 @@ for fixture_run in (1,):
     assert resolved['dex_ldap_group_user_attribute'] == 'cn'
     assert resolved['dex_theme_enabled'] is True
     assert resolved['dex_postgres_manage'] is False
+    assert resolved['dex_additional_connectors'] == []
+    assert resolved['dex_ldap_user_filter'] == '(|(&(objectClass=posixAccount)(memberOf=cn=Dex Users,ou=Dex,ou=Services,dc=eom,dc=dev))(objectClass=inetOrgPerson))'
     clients = {client['id']: client for client in resolved['dex_static_clients']}
     assert len(clients) == len(resolved['dex_static_clients']) == 7
     assert resolved['dex_matrix_client_enabled'] is False
@@ -42,7 +44,6 @@ for fixture_run in (1,):
     assert clients['mastodon']['redirectURIs'] == ['https://mastodon.eom.dev/auth/auth/openid_connect/callback']
     assert clients['nextcloud']['redirectURIs'] == ['https://nextcloud.eom.dev/index.php/apps/user_oidc/code']
     assert all(client['secret'] and len(client['redirectURIs']) == 1 for client in clients.values())
-    assert resolved['dex_additional_connectors'][0]['config']['userSearch']['idAttr'] == 'entryUUID'
 
 values = yaml.safe_load(Path('/tmp/dex-values.yml').read_text())
 config = values['config']
@@ -53,6 +54,7 @@ ldap = config['connectors'][0]
 assert ldap['id'] == 'ldap'
 assert ldap['config']['insecureNoSSL'] is True
 assert ldap['config']['startTLS'] is False
+assert len(config['connectors']) == 1
 assert ldap['config']['userSearch']['idAttr'] == 'uid'
 assert ldap['config']['groupSearch']['userMatchers'][0]['userAttr'] == 'DN'
 assert config['staticClients'][0]['id'] == 'matrix-fixture'