From bcc1d5d86da780a6d2af7af2d1207d0ee8726e80 Mon Sep 17 00:00:00 2001
From: Anton Averchenkov <84287187+averche@users.noreply.github.com>
Date: Tue, 28 Feb 2023 13:24:11 -0500
Subject: [PATCH] Remove 'openldap' from gen_openapi.sh (#19401)

---
 helper/builtinplugins/registry_test.go | 5 +++++
 scripts/gen_openapi.sh                 | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/helper/builtinplugins/registry_test.go b/helper/builtinplugins/registry_test.go
index 9732845dfd..e52a8a2fe3 100644
--- a/helper/builtinplugins/registry_test.go
+++ b/helper/builtinplugins/registry_test.go
@@ -289,6 +289,11 @@ func Test_RegistryMatchesGenOpenapi(t *testing.T) {
 	ensureInScript := func(t *testing.T, scriptBackends []string, name string) {
 		t.Helper()
 
+		// "openldap" is an alias for "ldap" secrets engine
+		if name == "openldap" {
+			return
+		}
+
 		if !slices.Contains(scriptBackends, name) {
 			t.Fatalf("%q backend could not be found in gen_openapi.sh, please add it there", name)
 		}
diff --git a/scripts/gen_openapi.sh b/scripts/gen_openapi.sh
index dedbd873e8..2ee5b12d09 100755
--- a/scripts/gen_openapi.sh
+++ b/scripts/gen_openapi.sh
@@ -21,7 +21,7 @@ then
 fi
 
 vault server -dev -dev-root-token-id=root &
-sleep 2
+sleep 5
 VAULT_PID=$!
 
 defer_stop_vault() {
@@ -71,7 +71,6 @@ vault secrets enable "kv"
 vault secrets enable "ldap"
 vault secrets enable "mongodbatlas"
 vault secrets enable "nomad"
-vault secrets enable "openldap"
 vault secrets enable "pki"
 vault secrets enable "rabbitmq"
 vault secrets enable "ssh"