refactor(cloud-native): remove ldap occurences in cloud-native (#9920)

* refactor(cloud-native): remove ldap occurences in cloud-native Signed-off-by: iromli <[email protected]> * docs(cloud-native): remove ldap occurences in cloud-native Signed-off-by: iromli <[email protected]> --------- Signed-off-by: iromli <[email protected]> Co-authored-by: Mohammad Abudayyeh <[email protected]>
JanssenProject · Oct 30, 2024 · 5d2a1e9 · 5d2a1e9
1 parent 873cf86
commit 5d2a1e9
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 199 deletions.
diff --git a/charts/janssen/values.schema.json b/charts/janssen/values.schema.json
@@ -654,7 +654,7 @@
                     }
                 },
                 "storageClass": {
-                    "description": "StorageClass section for OpenDJ charts. This is not currently used by the openbanking distribution. You may specify custom parameters as needed.",
+                    "description": "StorageClass section. This is not currently used by the openbanking distribution. You may specify custom parameters as needed.",
                     "type": "object",
                     "properties": {
                         "allowVolumeExpansion": {

diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/requirements.txt b/demos/benchmarking/docker-jans-loadtesting-jmeter/requirements.txt
@@ -1,6 +1,5 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 joblib
-ldap3
 pygtail
 psycopg2-binary
 PyMySQL

diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/add_users_ldap.py b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/add_users_ldap.py
diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/entrypoint.sh b/demos/benchmarking/docker-jans-loadtesting-jmeter/scripts/entrypoint.sh
@@ -8,12 +8,6 @@ if [[ "$LOAD_USERS_TO_COUCHBASE" = "true" ]]; then
   /usr/bin/python3 /scripts/add_users_couchbase.py
   exit 0
 # ================================================================================================ #
-# Check if this is a  user loading job to  the backend ldap                                        #
-# ================================================================================================ #
-elif [[ "$LOAD_USERS_TO_LDAP" = "true" ]]; then
-  /usr/bin/python3 /scripts/add_users_ldap.py
-  exit 0
-# ================================================================================================ #
 # Check if this is a  user loading job to  the backend spanner                                     #
 # ================================================================================================ #
 elif [[ "$LOAD_USERS_TO_SPANNER" = "true" ]]; then
@@ -92,4 +86,4 @@ then
   # Add -o modules.console.disable=true to disable TUI
   bzt /scripts/client_credentials.jmx
   exit 0
-fi
+fi
diff --git a/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_ldap_job.yaml b/demos/benchmarking/docker-jans-loadtesting-jmeter/yaml/load-users/load_users_ldap_job.yaml
diff --git a/docker-jans-monolith/Dockerfile b/docker-jans-monolith/Dockerfile
@@ -15,10 +15,9 @@ RUN echo 'APT::Install-Suggests "0";' >> /etc/apt/apt.conf.d/00-docker \
     && echo 'APT::Install-Recommends "0";' >> /etc/apt/apt.conf.d/00-docker
 
 # Prevent prompt errors during package installation
-# @TODO: remove python-ldap3 after ldap support removed
 RUN DEBIAN_FRONTEND=noninteractive \
     apt-get update \
-    && apt-get install -y python3 tini curl ca-certificates dbus systemd iproute2 gpg python3-pip python3-dev libpq-dev gcc python3-psycopg2 python3-ldap3 git maven \
+    && apt-get install -y python3 tini curl ca-certificates dbus systemd iproute2 gpg python3-pip python3-dev libpq-dev gcc python3-psycopg2 git maven \
     # install certbot
     && apt-get -y install libaugeas0 \
     && pip install ruamel.yaml certbot certbot-apache \

diff --git a/docker-jans-monolith/scripts/entrypoint.sh b/docker-jans-monolith/scripts/entrypoint.sh
@@ -32,8 +32,6 @@ install_jans() {
   echo "state=${CN_STATE}" | tee -a setup.properties > /dev/null
   echo "countryCode=${CN_COUNTRY}" | tee -a setup.properties > /dev/null
   # shellcheck disable=SC2016
-  echo "ldapPass=${CN_ADMIN_PASS}" | tee -a setup.properties > /dev/null  # @TODO: remove ldapPass after ldap support removed
-  echo "installLdap=False" | tee -a setup.properties > /dev/null  # @TODO: remove installLdap after ldap support removed
   echo "install_config_api=""$([[ ${CN_INSTALL_CONFIG_API} == true ]] && echo True || echo False)" | tee -a setup.properties > /dev/null
   echo "install_scim_server=""$([[ ${CN_INSTALL_SCIM} == true ]] && echo True || echo False)" | tee -a setup.properties > /dev/null
   echo "installFido2=""$([[ ${CN_INSTALL_FIDO2} == true ]] && echo True || echo False)" | tee -a setup.properties > /dev/null

diff --git a/docs/janssen-server/kubernetes-ops/logs.md b/docs/janssen-server/kubernetes-ops/logs.md
@@ -51,8 +51,6 @@ CN_AUTH_APP_LOGGERS:
 "auth_log_target":"STDOUT",
 "http_log_level":"INFO",
 "http_log_target":"FILE",
-"ldap_stats_log_level":"INFO",
-"ldap_stats_log_target":"FILE",
 "persistence_duration_log_level":"INFO",
 "persistence_duration_log_target":"FILE",
 "persistence_log_level":"INFO",
@@ -79,7 +77,6 @@ global:
       httpLogLevel: "TRACE"
       persistenceLogLevel: "TRACE"
       persistenceDurationLogLevel: "TRACE"
-      ldapStatsLogLevel: "TRACE"
       scriptLogLevel: "TRACE"
       auditStatsLogLevel: "TRACE"
 ............
@@ -108,17 +105,16 @@ kubectl get configmap -n <namspace> <helm-release-name>-config-cm -o yaml | grep
 Example output:
 ```yaml
 CN_CONFIG_API_APP_LOGGERS: 
-'{"
-config_api_log_level":"INFO",
+'{
+"config_api_log_level":"INFO",
 "config_api_log_target":"STDOUT",
-"ldap_stats_log_level":"INFO",
-"ldap_stats_log_target":"FILE",
 "persistence_duration_log_level":"INFO",
 "persistence_duration_log_target":"FILE",
 "persistence_log_level":"INFO",
 "persistence_log_target":"FILE",
 "script_log_level":"INFO",
-"script_log_target":"FILE"}'
+"script_log_target":"FILE"
+}'
 ```
 
 To override the current logging level in config-api, you can either add the desired changes to a yaml file and apply it using `helm`, or
@@ -137,7 +133,6 @@ global:
       configApiLogLevel: "TRACE"
       persistenceLogLevel: "TRACE"
       persistenceDurationLogLevel: "TRACE"
-      ldapStatsLogLevel: "TRACE"
       scriptLogLevel: "TRACE"
 ............
 ............      
@@ -165,11 +160,12 @@ kubectl get configmap -n <namespace> <helm-release-name>-config-cm -o yaml | gre
 Example output:
 ```yaml
 CN_FIDO2_APP_LOGGERS: 
-'{"
-fido2_log_level":"INFO",
+'{
+"fido2_log_level":"INFO",
 "fido2_log_target":"STDOUT",
 "persistence_log_level":"INFO",
-"persistence_log_target":"FILE"}'
+"persistence_log_target":"FILE"
+}'
 ```
 
 
@@ -214,17 +210,16 @@ kubectl get configmap -n <namespace> <helm-release-name>-config-cm -o yaml | gre
 Example output:
 ```yaml
 CN_SCIM_APP_LOGGERS: 
-'{"
-ldap_stats_log_level":"INFO",
-"ldap_stats_log_target":"FILE",
+'{
 "persistence_duration_log_level":"INFO",
 "persistence_duration_log_target":"FILE",
 "persistence_log_level":"INFO",
 "persistence_log_target":"FILE",
 "scim_log_level":"INFO",
 "scim_log_target":"STDOUT",
 "script_log_level":"INFO",
-"script_log_target":"FILE"}'
+"script_log_target":"FILE"
+}'
 ```
 
 To override the current logging level in scim, you can either add the desired changes to a yaml file and apply it using `helm`, or
@@ -243,7 +238,6 @@ global:
       scimLogLevel: "TRACE"
       persistenceLogLevel: "TRACE"
       persistenceDurationLogLevel: "TRACE"
-      ldapStatsLogLevel: "TRACE"
       scriptLogLevel: "TRACE"
 ............
 ............      

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -82,7 +82,7 @@ nav:
       - Using Rancher Marketplace: janssen-server/install/helm-install/rancher.md
     - Docker Deployments:
       - Quick Start: janssen-server/install/docker-install/quick-start.md
-      - Docker compose: janssen-server/install/docker-install/compose.md  
+      - Docker compose: janssen-server/install/docker-install/compose.md
     - Setup Instructions: janssen-server/install/setup.md
     - FAQ: janssen-server/install/install-faq.md
   - Kubernetes Operation Guide:
@@ -110,7 +110,7 @@ nav:
     - Managing Key Rotation: janssen-server/vm-ops/managing-key-rotation.md
     - Certificates: janssen-server/vm-ops/certificates.md
   - Terraform and IaC:
-    - janssen-server/terraform/README.md   
+    - janssen-server/terraform/README.md
   - Configuration Guide:
     - Configuration Tools:
       - TUI - Text-Based UI:
@@ -128,7 +128,7 @@ nav:
         - Monitoring: janssen-server/config-guide/config-tools/config-api/monitoring.md
         - Plugins: janssen-server/config-guide/config-tools/config-api/plugins.md
       - CURL: janssen-server/config-guide/config-tools/curl-guide.md
-    - Auth Server Configuration: 
+    - Auth Server Configuration:
       - OpenID Connect Client Configuration: janssen-server/config-guide/auth-server-config/openid-connect-client-configuration.md
       - OAuth Scope Management: janssen-server/config-guide/auth-server-config/oauth-scopes-config.md
       - JSON Web Key: janssen-server/config-guide/auth-server-config/json-web-key-config.md
@@ -145,7 +145,7 @@ nav:
     - FIDO2 Configuration: janssen-server/config-guide/fido2-config/janssen-fido2-configuration.md
     - SCIM Configuration:
       - SCIM User Resources: janssen-server/config-guide/scim-config/user-config.md
-      - SCIM Group Management: janssen-server/config-guide/scim-config/scim-group-config.md  
+      - SCIM Group Management: janssen-server/config-guide/scim-config/scim-group-config.md
     - Custom Scripts: janssen-server/config-guide/custom-scripts-config.md
     - SMTP Configuration: janssen-server/config-guide/smtp-configuration.md
     - Link Configuration: janssen-server/config-guide/link-configuration.md
@@ -288,7 +288,7 @@ nav:
       - Agama Best Practices:  janssen-server/developer/agama/agama-best-practices.md
       - Advanced usages: janssen-server/developer/agama/advanced-usages.md
       - Engine and bridge configurations: janssen-server/developer/agama/engine-bridge-config.md
-      - FAQ: janssen-server/developer/agama/faq.md      
+      - FAQ: janssen-server/developer/agama/faq.md
       - Quick Start Using Agama Lab: janssen-server/developer/agama/quick-start-using-agama-lab.md
     - External Libraries: janssen-server/developer/external-libraries.md
     - CORS: janssen-server/developer/cors.md
@@ -366,7 +366,6 @@ nav:
         - Monolith: janssen-server/reference/kubernetes/docker-jans-monolith.md
         - Persistence: janssen-server/reference/kubernetes/docker-jans-persistence-loader.md
         - SCIM: janssen-server/reference/kubernetes/docker-jans-scim.md
-        - Gluu OpenDJ: janssen-server/reference/kubernetes/docker-opendj.md
     - Learning Reference: janssen-server/reference/learning-reference.md
   - FIDO Admin Guide:
     - janssen-server/fido/README.md
@@ -418,7 +417,7 @@ nav:
   - JWT: 'cedarling/cedarling-jwt.md'
   - Logs: 'cedarling/cedarling-logs.md'
   - Properties: 'cedarling/cedarling-properties.md'
-  - Python: 
+  - Python:
       - cedarling/python/README.md
       - How to use: cedarling/python/usage.md
   - WASM: 'cedarling/cedarling-wasm.md'