From 8d2cb89704d8d9da6beb1f93f25c45d4f28e4287 Mon Sep 17 00:00:00 2001 From: Vault Automation Date: Tue, 26 Aug 2025 13:46:36 -0600 Subject: [PATCH] VAULT-38463: Addressing ldap pipeline failure (#8817) (#8911) * VAULT-38463: Addressing ldap pipeline failure * testing ldap tests * testing ldap tests * debugging ldap issue * testing pipeline * testing pipeline * testing pipeline * testing pipeline * testing pipeline * testing pipeline * testing pipeline * debugging ldap failure * debugging ldap failure * debugging pipeline * adding dependency for verify secrets * removing extra code * undo changes * undo changes Co-authored-by: Tin Vo --- .github/workflows/test-run-enos-scenario-matrix.yml | 2 +- enos/enos-scenario-agent.hcl | 3 ++- enos/enos-scenario-dr-replication.hcl | 3 +++ enos/enos-scenario-pr-replication.hcl | 2 ++ enos/enos-scenario-proxy.hcl | 3 ++- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-run-enos-scenario-matrix.yml b/.github/workflows/test-run-enos-scenario-matrix.yml index 6a98870cf0..753fdbfcfb 100644 --- a/.github/workflows/test-run-enos-scenario-matrix.yml +++ b/.github/workflows/test-run-enos-scenario-matrix.yml @@ -197,7 +197,7 @@ jobs: echo 'ENOS_VAR_vault_revision=${{ inputs.vault-revision }}' echo 'ENOS_VAR_vault_upgrade_initial_version=${{ matrix.attributes.upgrade_initial_version }}' echo 'ENOS_VAR_verify_aws_secrets_engine=false' - echo 'ENOS_VAR_verify_ldap_secrets_engine=false' + echo 'ENOS_VAR_verify_ldap_secrets_engine=true' echo 'ENOS_VAR_verify_log_secrets=true' } | tee -a "$GITHUB_ENV" - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2 diff --git a/enos/enos-scenario-agent.hcl b/enos/enos-scenario-agent.hcl index 26a72908c1..1e86a13847 100644 --- a/enos/enos-scenario-agent.hcl +++ b/enos/enos-scenario-agent.hcl @@ -516,7 +516,8 @@ scenario "agent" { description = global.description.verify_secrets_engines_create module = module.vault_verify_secrets_engines_create depends_on = [ - step.verify_vault_unsealed + step.verify_vault_unsealed, + step.get_vault_cluster_ips ] providers = { diff --git a/enos/enos-scenario-dr-replication.hcl b/enos/enos-scenario-dr-replication.hcl index 871c9ee90a..40f627fc17 100644 --- a/enos/enos-scenario-dr-replication.hcl +++ b/enos/enos-scenario-dr-replication.hcl @@ -747,6 +747,7 @@ scenario "dr_replication" { hosts = step.create_primary_cluster_targets.hosts ip_version = matrix.ip_version integration_host_state = step.set_up_external_integration_target.state + ldap_enabled = false leader_host = step.get_primary_cluster_ips.leader_host ports = global.ports ipv4_cidr = step.create_vpc.ipv4_cidr @@ -1154,6 +1155,7 @@ scenario "dr_replication" { create_state = step.verify_secrets_engines_on_primary.state hosts = step.get_secondary_cluster_ips.follower_hosts ip_version = matrix.ip_version + ldap_enabled = false vault_addr = step.create_secondary_cluster.api_addr_localhost vault_edition = matrix.edition vault_install_dir = global.vault_install_dir[matrix.artifact_type] @@ -1296,6 +1298,7 @@ scenario "dr_replication" { create_state = step.verify_secrets_engines_on_primary.state hosts = step.get_secondary_cluster_ips.follower_hosts ip_version = matrix.ip_version + ldap_enabled = false vault_addr = step.create_secondary_cluster.api_addr_localhost vault_edition = matrix.edition vault_install_dir = global.vault_install_dir[matrix.artifact_type] diff --git a/enos/enos-scenario-pr-replication.hcl b/enos/enos-scenario-pr-replication.hcl index 36e395ce82..a6ad897a8e 100644 --- a/enos/enos-scenario-pr-replication.hcl +++ b/enos/enos-scenario-pr-replication.hcl @@ -769,6 +769,7 @@ scenario "pr_replication" { hosts = step.create_primary_cluster_targets.hosts ip_version = matrix.ip_version integration_host_state = step.set_up_external_integration_target.state + ldap_enabled = false leader_host = step.get_primary_cluster_ips.leader_host ports = global.ports ipv4_cidr = step.create_vpc.ipv4_cidr @@ -986,6 +987,7 @@ scenario "pr_replication" { create_state = step.verify_secrets_engines_on_primary.state hosts = step.get_secondary_cluster_ips.follower_hosts ip_version = matrix.ip_version + ldap_enabled = false vault_addr = step.create_secondary_cluster.api_addr_localhost vault_edition = matrix.edition vault_install_dir = global.vault_install_dir[matrix.artifact_type] diff --git a/enos/enos-scenario-proxy.hcl b/enos/enos-scenario-proxy.hcl index b6ceac6364..6a03a1c4bf 100644 --- a/enos/enos-scenario-proxy.hcl +++ b/enos/enos-scenario-proxy.hcl @@ -492,7 +492,8 @@ scenario "proxy" { description = global.description.verify_secrets_engines_create module = module.vault_verify_secrets_engines_create depends_on = [ - step.verify_vault_unsealed + step.verify_vault_unsealed, + step.get_vault_cluster_ips ] providers = {