mssql: fix test, use relative expiry for service principal password

hashicorp · Jan 11, 2021 · a23c07e · a23c07e
1 parent 7ad427c
commit a23c07e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/azurerm/internal/services/mssql/mssql_virtual_machine_resource_test.go b/azurerm/internal/services/mssql/mssql_virtual_machine_resource_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
-
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
@@ -95,6 +94,7 @@ func TestAccMsSqlVirtualMachine_updateAutoPatching(t *testing.T) {
 
 func TestAccMsSqlVirtualMachine_updateKeyVault(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_mssql_virtual_machine", "test")
+
 	r := MsSqlVirtualMachineResource{}
 	value, err := uuid.GenerateUUID()
 	if err != nil {
@@ -106,7 +106,7 @@ func TestAccMsSqlVirtualMachine_updateKeyVault(t *testing.T) {
 			Config: r.withKeyVault(data, value),
 			Check: resource.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("r_services_enabled").MatchesRegex(regexp.MustCompile("/*:acctestkv")),
+				check.That(data.ResourceName).Key("key_vault_credential.0.name").MatchesRegex(regexp.MustCompile("/*:acctestkv")),
 			),
 		},
 		data.ImportStep("key_vault_credential.0.key_vault_url", "key_vault_credential.0.service_principal_name", "key_vault_credential.0.service_principal_secret"),
@@ -115,7 +115,7 @@ func TestAccMsSqlVirtualMachine_updateKeyVault(t *testing.T) {
 			Config: r.withKeyVaultUpdated(data, value),
 			Check: resource.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("r_services_enabled").MatchesRegex(regexp.MustCompile("/*:acctestkv2")),
+				check.That(data.ResourceName).Key("key_vault_credential.0.name").MatchesRegex(regexp.MustCompile("/*:acctestkv2")),
 			),
 		},
 		data.ImportStep("key_vault_credential.0.key_vault_url", "key_vault_credential.0.service_principal_name", "key_vault_credential.0.service_principal_secret"),
@@ -434,7 +434,7 @@ resource "azuread_service_principal" "test" {
 resource "azuread_service_principal_password" "test" {
   service_principal_id = azuread_service_principal.test.id
   value                = "%[3]s"
-  end_date             = "2021-01-01T01:02:03Z"
+  end_date_relative    = "240h"
 }
 
 resource "azurerm_mssql_virtual_machine" "test" {
@@ -514,7 +514,7 @@ resource "azuread_service_principal" "test" {
 resource "azuread_service_principal_password" "test" {
   service_principal_id = azuread_service_principal.test.id
   value                = "%[3]s"
-  end_date             = "2021-01-01T01:02:03Z"
+  end_date_relative    = "240h"
 }
 
 resource "azurerm_mssql_virtual_machine" "test" {