Remove 'openldap' from gen_openapi.sh (hashicorp#19401)

fopina · Feb 28, 2023 · bcc1d5d · bcc1d5d
1 parent 52bbf65
commit bcc1d5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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"