From 8ce101c1747c1cee8864573db40dbe75c67921ed Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 11 Nov 2024 06:58:09 -0800 Subject: [PATCH] fix: LDAP service port number in tests --- buildscripts/minio-iam-ldap-upgrade-import-test.sh | 6 +++--- docs/distributed/iam-import-with-missing-entities.sh | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/buildscripts/minio-iam-ldap-upgrade-import-test.sh b/buildscripts/minio-iam-ldap-upgrade-import-test.sh index 92bab6252..e7da2b101 100755 --- a/buildscripts/minio-iam-ldap-upgrade-import-test.sh +++ b/buildscripts/minio-iam-ldap-upgrade-import-test.sh @@ -8,7 +8,7 @@ # # This script assumes that LDAP server is at: # -# `localhost:1389` +# `localhost:389` # # if this is not the case, set the environment variable # `_MINIO_LDAP_TEST_SERVER`. @@ -41,7 +41,7 @@ __init__() { fi if [ -z "$_MINIO_LDAP_TEST_SERVER" ]; then - export _MINIO_LDAP_TEST_SERVER=localhost:1389 + export _MINIO_LDAP_TEST_SERVER=localhost:389 echo "Using default LDAP endpoint: $_MINIO_LDAP_TEST_SERVER" fi @@ -58,7 +58,7 @@ create_iam_content_in_old_minio() { mc alias set old-minio http://localhost:9000 minioadmin minioadmin mc ready old-minio mc idp ldap add old-minio \ - server_addr=localhost:1389 \ + server_addr=localhost:389 \ server_insecure=on \ lookup_bind_dn=cn=admin,dc=min,dc=io \ lookup_bind_password=admin \ diff --git a/docs/distributed/iam-import-with-missing-entities.sh b/docs/distributed/iam-import-with-missing-entities.sh index 9b50c6baf..f6cc6ed4c 100755 --- a/docs/distributed/iam-import-with-missing-entities.sh +++ b/docs/distributed/iam-import-with-missing-entities.sh @@ -33,7 +33,11 @@ export CI=true sleep 30 ./mc ready myminio -./mc idp ldap add myminio server_addr=localhost:1389 server_insecure=on lookup_bind_dn=cn=admin,dc=min,dc=io lookup_bind_password=admin user_dn_search_base_dn=dc=min,dc=io user_dn_search_filter="(uid=%s)" group_search_base_dn=ou=swengg,dc=min,dc=io group_search_filter="(&(objectclass=groupOfNames)(member=%d))" +./mc idp ldap add myminio server_addr=localhost:389 server_insecure=on \ + lookup_bind_dn=cn=admin,dc=min,dc=io lookup_bind_password=admin \ + user_dn_search_base_dn=dc=min,dc=io user_dn_search_filter="(uid=%s)" \ + group_search_base_dn=ou=swengg,dc=min,dc=io group_search_filter="(&(objectclass=groupOfNames)(member=%d))" + ./mc admin service restart myminio --json ./mc ready myminio ./mc admin cluster iam import myminio docs/distributed/samples/myminio-iam-info.zip @@ -76,7 +80,11 @@ cd - sleep 30 ./mc ready myminio1 -./mc idp ldap add myminio1 server_addr=localhost:1389 server_insecure=on lookup_bind_dn=cn=admin,dc=min,dc=io lookup_bind_password=admin user_dn_search_base_dn=dc=min,dc=io user_dn_search_filter="(uid=%s)" group_search_base_dn=ou=hwengg,dc=min,dc=io group_search_filter="(&(objectclass=groupOfNames)(member=%d))" +./mc idp ldap add myminio1 server_addr=localhost:389 server_insecure=on \ + lookup_bind_dn=cn=admin,dc=min,dc=io lookup_bind_password=admin \ + user_dn_search_base_dn=dc=min,dc=io user_dn_search_filter="(uid=%s)" \ + group_search_base_dn=ou=hwengg,dc=min,dc=io group_search_filter="(&(objectclass=groupOfNames)(member=%d))" + ./mc admin service restart myminio1 --json ./mc ready myminio1 ./mc admin cluster iam import myminio1 docs/distributed/samples/myminio-iam-info.zip