feat(docker-jans): change persistence entry check to read configurati…

…on (#3618)
JanssenProject · Jan 13, 2023 · d465c19 · d465c19
1 parent 322f752
commit d465c19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/docker-jans-persistence-loader/scripts/utils.py b/docker-jans-persistence-loader/scripts/utils.py
@@ -253,9 +253,9 @@ def default_files():
             ]
 
         files += [
-            "jans-auth/configuration.ldif",
             "jans-auth/role-scope-mappings.ldif",
             "jans-cli/client.ldif",
+            "jans-auth/configuration.ldif",
         ]
 
         return files

diff --git a/jans-pycloudlib/jans/pycloudlib/wait.py b/jans-pycloudlib/jans/pycloudlib/wait.py
@@ -183,9 +183,8 @@ def wait_for_ldap(manager: Manager, **kwargs: _t.Any) -> None:
         manager: An instance of manager class.
         **kwargs: Arbitrary keyword arguments (see Other Parameters section, if any).
     """
-    client_id = manager.config.get("role_based_client_id")
     search_mapping = {
-        "default": (f"inum={client_id},ou=clients,o=jans", "(objectClass=jansClnt)"),
+        "default": ("ou=jans-auth,ou=configuration,o=jans", "(objectClass=jansAppConf)"),
         "user": (_ADMIN_GROUP_DN, "(objectClass=jansGrp)"),
         "site": ("ou=cache-refresh,o=site", "(ou=cache-refresh)"),
         "cache": ("ou=cache,o=jans", "(ou=cache)"),
@@ -228,9 +227,8 @@ def wait_for_couchbase(manager: Manager, **kwargs: _t.Any) -> None:
         **kwargs: Arbitrary keyword arguments (see Other Parameters section, if any).
     """
     bucket_prefix = os.environ.get("CN_COUCHBASE_BUCKET_PREFIX", "jans")
-    client_id = manager.config.get("role_based_client_id")
     search_mapping = {
-        "default": (id_from_dn(f"inum={client_id},ou=clients,o=jans"), f"{bucket_prefix}"),
+        "default": (id_from_dn("ou=jans-auth,ou=configuration,o=jans"), f"{bucket_prefix}"),
         "user": (id_from_dn(_ADMIN_GROUP_DN), f"{bucket_prefix}_user"),
     }
 
@@ -284,9 +282,8 @@ def wait_for_sql(manager: Manager, **kwargs: _t.Any) -> None:
         manager: An instance of manager class.
         **kwargs: Arbitrary keyword arguments (see Other Parameters section, if any).
     """
-    client_id = manager.config.get("role_based_client_id")
     search_mapping = {
-        "default": (doc_id_from_dn(f"inum={client_id},ou=clients,o=jans"), "jansClnt"),
+        "default": (doc_id_from_dn("ou=jans-auth,ou=configuration,o=jans"), "jansAppConf"),
         "user": (doc_id_from_dn(_ADMIN_GROUP_DN), "jansGrp"),
     }
 
@@ -325,9 +322,8 @@ def wait_for_spanner(manager: Manager, **kwargs: _t.Any) -> None:
         manager: An instance of manager class.
         **kwargs: Arbitrary keyword arguments (see Other Parameters section, if any).
     """
-    client_id = manager.config.get("role_based_client_id")
     search_mapping = {
-        "default": (doc_id_from_dn(f"inum={client_id},ou=clients,o=jans"), "jansClnt"),
+        "default": (doc_id_from_dn("ou=jans-auth,ou=configuration,o=jans"), "jansAppConf"),
         "user": (doc_id_from_dn(_ADMIN_GROUP_DN), "jansGrp"),
     }