diff --git a/vault/resource_azure_auth_backend_config_test.go b/vault/resource_azure_auth_backend_config_test.go index c975c807..4f9fe69b 100644 --- a/vault/resource_azure_auth_backend_config_test.go +++ b/vault/resource_azure_auth_backend_config_test.go @@ -5,12 +5,12 @@ package vault import ( "fmt" - "testing" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-provider-vault/internal/consts" "github.com/hashicorp/terraform-provider-vault/internal/provider" "github.com/hashicorp/terraform-provider-vault/testutil" @@ -60,23 +60,23 @@ func TestAccAzureAuthBackend_wif(t *testing.T) { backend := acctest.RandomWithPrefix("tf-test-azure") updatedBackend := acctest.RandomWithPrefix("tf-test-azure-updated") - resourceType := "vault_azure_auth_backend" - resourceName := resourceType + ".test" + resourceType := "vault_azure_auth_backend_config" + resourceName := resourceType + ".config" resource.Test(t, resource.TestCase{ ProviderFactories: providerFactories, PreCheck: func() { testutil.TestEntPreCheck(t) SkipIfAPIVersionLT(t, testProvider.Meta(), provider.VaultVersion117) }, - CheckDestroy: testCheckMountDestroyed(resourceType, consts.MountTypeAzure, consts.FieldPath), + CheckDestroy: testCheckMountDestroyed(resourceType, consts.MountTypeAzure, consts.FieldBackend), Steps: []resource.TestStep{ { Config: testAccAzureAuthBackendConfig_wifBasic(backend), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceName, consts.FieldPath, backend), - resource.TestCheckResourceAttr(resourceName, consts.FieldSubscriptionID, "11111111-2222-3333-4444-111111111111"), + resource.TestCheckResourceAttr(resourceName, consts.FieldBackend, backend), resource.TestCheckResourceAttr(resourceName, consts.FieldTenantID, "11111111-2222-3333-4444-222222222222"), resource.TestCheckResourceAttr(resourceName, consts.FieldClientID, "11111111-2222-3333-4444-333333333333"), + resource.TestCheckResourceAttr(resourceName, consts.FieldResource, "http://vault.hashicorp.com"), resource.TestCheckResourceAttr(resourceName, consts.FieldIdentityTokenAudience, "wif-audience"), resource.TestCheckResourceAttr(resourceName, consts.FieldIdentityTokenTTL, "600"), ), @@ -84,10 +84,10 @@ func TestAccAzureAuthBackend_wif(t *testing.T) { { Config: testAccAzureAuthBackendConfig_wifUpdated(updatedBackend), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(resourceName, consts.FieldPath, updatedBackend), - resource.TestCheckResourceAttr(resourceName, consts.FieldSubscriptionID, "11111111-2222-3333-4444-111111111111"), + resource.TestCheckResourceAttr(resourceName, consts.FieldBackend, updatedBackend), resource.TestCheckResourceAttr(resourceName, consts.FieldTenantID, "22222222-3333-4444-5555-333333333333"), resource.TestCheckResourceAttr(resourceName, consts.FieldClientID, "22222222-3333-4444-5555-444444444444"), + resource.TestCheckResourceAttr(resourceName, consts.FieldResource, "http://vault.hashicorp.com"), resource.TestCheckResourceAttr(resourceName, consts.FieldIdentityTokenAudience, "wif-audience-updated"), resource.TestCheckResourceAttr(resourceName, consts.FieldIdentityTokenTTL, "1800"), ), @@ -202,9 +202,9 @@ resource "vault_auth_backend" "azure" { resource "vault_azure_auth_backend_config" "config" { backend = vault_auth_backend.azure.path - subscription_id = "11111111-2222-3333-4444-111111111111" tenant_id = "11111111-2222-3333-4444-222222222222" client_id = "11111111-2222-3333-4444-333333333333" + resource = "http://vault.hashicorp.com" identity_token_audience = "wif-audience" identity_token_ttl = 600 }`, backend) @@ -219,9 +219,9 @@ resource "vault_auth_backend" "azure" { resource "vault_azure_auth_backend_config" "config" { backend = vault_auth_backend.azure.path - subscription_id = "11111111-2222-3333-4444-111111111111" tenant_id = "22222222-3333-4444-5555-333333333333" client_id = "22222222-3333-4444-5555-444444444444" + resource = "http://vault.hashicorp.com" identity_token_audience = "wif-audience-updated" identity_token_ttl = 1800 }`, backend)