diff --git a/demo/infra/app/main.tf b/demo/infra/app/main.tf index 8df10c4bc..f59948931 100644 --- a/demo/infra/app/main.tf +++ b/demo/infra/app/main.tf @@ -13,7 +13,7 @@ terraform { } vault = { source = "hashicorp/vault" - version = "4.2.0" + version = "4.4.0" } } } diff --git a/test/integration/operator/terraform/main.tf b/test/integration/operator/terraform/main.tf index f434ed7d5..f694ff9c4 100644 --- a/test/integration/operator/terraform/main.tf +++ b/test/integration/operator/terraform/main.tf @@ -13,7 +13,7 @@ terraform { } vault = { source = "hashicorp/vault" - version = "4.2.0" + version = "4.4.0" } } } diff --git a/test/integration/revocation/terraform/main.tf b/test/integration/revocation/terraform/main.tf index a4620f494..69957ac07 100644 --- a/test/integration/revocation/terraform/main.tf +++ b/test/integration/revocation/terraform/main.tf @@ -11,7 +11,7 @@ terraform { } vault = { source = "hashicorp/vault" - version = "4.2.0" + version = "4.4.0" } helm = { source = "hashicorp/helm" diff --git a/test/integration/vaultauthmethods/terraform-gcp/main.tf b/test/integration/vaultauthmethods/terraform-gcp/main.tf index 19ebf7152..22a3ea987 100644 --- a/test/integration/vaultauthmethods/terraform-gcp/main.tf +++ b/test/integration/vaultauthmethods/terraform-gcp/main.tf @@ -9,7 +9,7 @@ terraform { } vault = { source = "hashicorp/vault" - version = "4.2.0" + version = "4.4.0" } google = { source = "hashicorp/google" diff --git a/test/integration/vaultauthmethods/terraform/main.tf b/test/integration/vaultauthmethods/terraform/main.tf index c994751fb..37e3c3a4d 100644 --- a/test/integration/vaultauthmethods/terraform/main.tf +++ b/test/integration/vaultauthmethods/terraform/main.tf @@ -9,7 +9,7 @@ terraform { } vault = { source = "hashicorp/vault" - version = "4.2.0" + version = "4.4.0" } helm = { source = "hashicorp/helm" diff --git a/test/integration/vaultdynamicsecret/terraform/main.tf b/test/integration/vaultdynamicsecret/terraform/main.tf index b290970a5..484e97e34 100644 --- a/test/integration/vaultdynamicsecret/terraform/main.tf +++ b/test/integration/vaultdynamicsecret/terraform/main.tf @@ -13,15 +13,16 @@ terraform { } vault = { source = "hashicorp/vault" - version = "4.2.0" + version = "4.4.0" } } } provider "vault" { # Configuration options - address = var.vault_address - token = var.vault_token + address = var.vault_address + token = var.vault_token + skip_child_token = true } provider "helm" { diff --git a/test/integration/vaultdynamicsecret_integration_test.go b/test/integration/vaultdynamicsecret_integration_test.go index fc2a0998f..9aff6606d 100644 --- a/test/integration/vaultdynamicsecret_integration_test.go +++ b/test/integration/vaultdynamicsecret_integration_test.go @@ -679,8 +679,7 @@ func TestVaultDynamicSecret_vaultClientCallback(t *testing.T) { // set a high default lease ttl to avoid renewals during the test "vault_db_default_lease_ttl": 600, "with_static_role_scheduled": withStaticRoleScheduled, - // disabling until https://github.com/hashicorp/terraform-provider-vault/pull/2289 is released - "with_xns": false, + "with_xns": true, }, } if entTests { @@ -851,10 +850,6 @@ func TestVaultDynamicSecret_vaultClientCallback(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - if tt.xns { - t.Skipf("skipping xns test %s, until https://github.com/hashicorp/terraform-provider-vault/pull/2289 is released", tt.name) - } - if tt.xns && !outputs.WithXns { t.Skipf("skipping xns test %s, test infrastructure not supported", tt.name) } diff --git a/test/integration/vaultpkisecret/terraform/main.tf b/test/integration/vaultpkisecret/terraform/main.tf index e88b99c0a..1c6b4cafb 100644 --- a/test/integration/vaultpkisecret/terraform/main.tf +++ b/test/integration/vaultpkisecret/terraform/main.tf @@ -9,7 +9,7 @@ terraform { } vault = { source = "hashicorp/vault" - version = "4.2.0" + version = "4.4.0" } helm = { source = "hashicorp/helm" diff --git a/test/integration/vaultstaticsecret/terraform/main.tf b/test/integration/vaultstaticsecret/terraform/main.tf index 03bd191f3..e3f736fe0 100644 --- a/test/integration/vaultstaticsecret/terraform/main.tf +++ b/test/integration/vaultstaticsecret/terraform/main.tf @@ -9,7 +9,7 @@ terraform { } vault = { source = "hashicorp/vault" - version = "4.2.0" + version = "4.4.0" } helm = { source = "hashicorp/helm"