Fix duplicate provider configuration in storage tests (#6748)

hashicorp · May 14, 2020 · 38d4961 · 38d4961
1 parent 0e33974
commit 38d4961
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 6 deletions.
diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go
@@ -313,14 +313,35 @@ resource "azurerm_storage_container" "test" {
 }
 
 func testAccAzureRMStorageContainer_basicAzureADAuth(data acceptance.TestData) string {
-	template := testAccAzureRMStorageContainer_basic(data)
 	return fmt.Sprintf(`
 provider "azurerm" {
   storage_use_azuread = true
+  features {}
 }
 
-%s
-`, template)
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
+
+resource "azurerm_storage_account" "test" {
+  name                     = "acctestacc%s"
+  resource_group_name      = azurerm_resource_group.test.name
+  location                 = azurerm_resource_group.test.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+
+  tags = {
+    environment = "staging"
+  }
+}
+
+resource "azurerm_storage_container" "test" {
+  name                  = "vhds"
+  storage_account_name  = azurerm_storage_account.test.name
+  container_access_type = "private"
+}
+`, data.RandomInteger, data.Locations.Primary, data.RandomString)
 }
 
 func testAccAzureRMStorageContainer_requiresImport(data acceptance.TestData) string {

diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go
@@ -226,14 +226,34 @@ resource "azurerm_storage_queue" "test" {
 }
 
 func testAccAzureRMStorageQueue_basicAzureADAuth(data acceptance.TestData) string {
-	template := testAccAzureRMStorageQueue_basic(data)
 	return fmt.Sprintf(`
 provider "azurerm" {
   storage_use_azuread = true
+  features {}
 }
 
-%s
-`, template)
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
+
+resource "azurerm_storage_account" "test" {
+  name                     = "acctestacc%s"
+  resource_group_name      = azurerm_resource_group.test.name
+  location                 = azurerm_resource_group.test.location
+  account_tier             = "Standard"
+  account_replication_type = "LRS"
+
+  tags = {
+    environment = "staging"
+  }
+}
+
+resource "azurerm_storage_queue" "test" {
+  name                 = "mysamplequeue-%d"
+  storage_account_name = azurerm_storage_account.test.name
+}
+`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomInteger)
 }
 
 func testAccAzureRMStorageQueue_requiresImport(data acceptance.TestData) string {