From ddca20ad2f695a7a5558e3d2a37cb9b65450e0f6 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 28 Dec 2019 15:40:51 -0800 Subject: [PATCH 01/14] fix `TestAccAzureRMApplicationInsightsAnalyticsItem_multiple` test --- ...pplication_insights_analytics_item_test.go | 55 ++++++++----------- 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go index 49a8d00a82ac..923f3cd678de 100644 --- a/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go +++ b/azurerm/internal/services/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go @@ -73,10 +73,9 @@ func TestAccAzureRMApplicationInsightsAnalyticsItem_update(t *testing.T) { } func TestAccAzureRMApplicationInsightsAnalyticsItem_multiple(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_application_insights_analytics_item", "test") - resourceName2 := "azurerm_application_insights_analytics_item.test2" - resourceName3 := "azurerm_application_insights_analytics_item.test3" - config := testAccAzureRMApplicationInsightsAnalyticsItem_multiple(data) + r1 := acceptance.BuildTestData(t, "azurerm_application_insights_analytics_item", "test1") + r2 := acceptance.BuildTestData(t, "azurerm_application_insights_analytics_item", "test2") + r3 := acceptance.BuildTestData(t, "azurerm_application_insights_analytics_item", "test3") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -84,37 +83,29 @@ func TestAccAzureRMApplicationInsightsAnalyticsItem_multiple(t *testing.T) { CheckDestroy: testCheckAzureRMApplicationInsightAnalyticsItemDestroy(), Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMApplicationInsightsAnalyticsItem_multiple(r1), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMApplicationInsightsAnalyticsItemExists(data.ResourceName), - testCheckAzureRMApplicationInsightsAnalyticsItemExists(resourceName2), - testCheckAzureRMApplicationInsightsAnalyticsItemExists(resourceName3), - resource.TestCheckResourceAttr(data.ResourceName, "name", "testquery1"), - resource.TestCheckResourceAttr(data.ResourceName, "scope", "shared"), - resource.TestCheckResourceAttr(data.ResourceName, "type", "query"), - resource.TestCheckResourceAttr(data.ResourceName, "content", "requests #test1"), - resource.TestCheckResourceAttr(resourceName2, "name", "testquery2"), - resource.TestCheckResourceAttr(resourceName2, "scope", "user"), - resource.TestCheckResourceAttr(resourceName2, "type", "query"), - resource.TestCheckResourceAttr(resourceName2, "content", "requests #test2"), - resource.TestCheckResourceAttr(resourceName3, "name", "testfunction1"), - resource.TestCheckResourceAttr(resourceName3, "scope", "shared"), - resource.TestCheckResourceAttr(resourceName3, "type", "function"), - resource.TestCheckResourceAttr(resourceName3, "content", "requests #test3"), - resource.TestCheckResourceAttr(resourceName3, "function_alias", "myfunction"), + testCheckAzureRMApplicationInsightsAnalyticsItemExists(r1.ResourceName), + testCheckAzureRMApplicationInsightsAnalyticsItemExists(r1.ResourceName), + testCheckAzureRMApplicationInsightsAnalyticsItemExists(r1.ResourceName), + resource.TestCheckResourceAttr(r1.ResourceName, "name", "testquery1"), + resource.TestCheckResourceAttr(r1.ResourceName, "scope", "shared"), + resource.TestCheckResourceAttr(r1.ResourceName, "type", "query"), + resource.TestCheckResourceAttr(r1.ResourceName, "content", "requests #test1"), + resource.TestCheckResourceAttr(r2.ResourceName, "name", "testquery2"), + resource.TestCheckResourceAttr(r2.ResourceName, "scope", "user"), + resource.TestCheckResourceAttr(r2.ResourceName, "type", "query"), + resource.TestCheckResourceAttr(r2.ResourceName, "content", "requests #test2"), + resource.TestCheckResourceAttr(r3.ResourceName, "name", "testfunction1"), + resource.TestCheckResourceAttr(r3.ResourceName, "scope", "shared"), + resource.TestCheckResourceAttr(r3.ResourceName, "type", "function"), + resource.TestCheckResourceAttr(r3.ResourceName, "content", "requests #test3"), + resource.TestCheckResourceAttr(r3.ResourceName, "function_alias", "myfunction"), ), }, - data.ImportStep(), - { - ResourceName: resourceName2, - ImportState: true, - ImportStateVerify: true, - }, - { - ResourceName: resourceName3, - ImportState: true, - ImportStateVerify: true, - }, + r1.ImportStep(), + r2.ImportStep(), + r3.ImportStep(), }, }) } From 27b329b5d14184872d3e1ac3542fa6be2e7c0bee Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 28 Dec 2019 15:41:10 -0800 Subject: [PATCH 02/14] fix `TestAccAzureRMBackupProtectionPolicyFileShare_basicDaily` test --- .../tests/resource_arm_backup_policy_file_share_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go index a212d4b91005..983eb0d13610 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go @@ -140,12 +140,12 @@ resource "azurerm_resource_group" "test" { } resource "azurerm_recovery_services_vault" "test" { - name = "acctest-RSV-%s" + name = "acctest-RSV-%d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku = "Standard" } -`, data.RandomInteger, data.Locations.Primary, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) } func testAccAzureRMBackupProtectionPolicyFileShare_basicDaily(data acceptance.TestData) string { From 734472d522971e1dcbb5210367017ba5b8e6f245 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 28 Dec 2019 15:43:09 -0800 Subject: [PATCH 03/14] fix `TestAccAzureRMBatchAccount`tests --- .../tests/resource_arm_batch_account_test.go | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go b/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go index 069205d40060..e22e356e0e68 100644 --- a/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go +++ b/azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go @@ -43,9 +43,7 @@ func TestValidateBatchAccountName(t *testing.T) { } func TestAccAzureRMBatchAccount_basic(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_batch_account", "test") - - config := testAccAzureRMBatchAccount_basic(data) + data := acceptance.BuildTestData(t, "azurerm_batch_account", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -53,7 +51,7 @@ func TestAccAzureRMBatchAccount_basic(t *testing.T) { CheckDestroy: testCheckAzureRMBatchAccountDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMBatchAccount_basic(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMBatchAccountExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "pool_allocation_mode", "BatchService"), @@ -68,7 +66,7 @@ func TestAccAzureRMBatchAccount_requiresImport(t *testing.T) { t.Skip("Skipping since resources aren't required to be imported") return } - data := acceptance.BuildTestData(t, "data.azurerm_batch_account", "test") + data := acceptance.BuildTestData(t, "azurerm_batch_account", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -90,10 +88,7 @@ func TestAccAzureRMBatchAccount_requiresImport(t *testing.T) { } func TestAccAzureRMBatchAccount_complete(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_batch_account", "test") - - config := testAccAzureRMBatchAccount_complete(data) - configUpdate := testAccAzureRMBatchAccount_completeUpdated(data) + data := acceptance.BuildTestData(t, "azurerm_batch_account", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -101,7 +96,7 @@ func TestAccAzureRMBatchAccount_complete(t *testing.T) { CheckDestroy: testCheckAzureRMBatchAccountDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMBatchAccount_complete(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMBatchAccountExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "pool_allocation_mode", "BatchService"), @@ -110,7 +105,7 @@ func TestAccAzureRMBatchAccount_complete(t *testing.T) { ), }, { - Config: configUpdate, + Config: testAccAzureRMBatchAccount_completeUpdated(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMBatchAccountExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "pool_allocation_mode", "BatchService"), @@ -124,9 +119,8 @@ func TestAccAzureRMBatchAccount_complete(t *testing.T) { } func TestAccAzureRMBatchAccount_userSubscription(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_batch_account", "test") + data := acceptance.BuildTestData(t, "azurerm_batch_account", "test") tenantID := os.Getenv("ARM_TENANT_ID") - config := testAccAzureRMBatchAccount_userSubscription(data, tenantID) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -134,7 +128,7 @@ func TestAccAzureRMBatchAccount_userSubscription(t *testing.T) { CheckDestroy: testCheckAzureRMBatchAccountDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMBatchAccount_userSubscription(data, tenantID), Check: resource.ComposeTestCheckFunc( testCheckAzureRMBatchAccountExists(data.ResourceName), resource.TestCheckResourceAttr(data.ResourceName, "pool_allocation_mode", "UserSubscription"), From aca668580652f676be4d2e5050db0e757a9baf28 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 28 Dec 2019 16:13:55 -0800 Subject: [PATCH 04/14] fix TestAccAzureRMDevTestLabSchedule tests & resource handling of uppercase resource groups --- .../devtestlabs/resource_arm_dev_test_lab_schedule.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/azurerm/internal/services/devtestlabs/resource_arm_dev_test_lab_schedule.go b/azurerm/internal/services/devtestlabs/resource_arm_dev_test_lab_schedule.go index cd40a4a0e0ca..b62214ad12af 100644 --- a/azurerm/internal/services/devtestlabs/resource_arm_dev_test_lab_schedule.go +++ b/azurerm/internal/services/devtestlabs/resource_arm_dev_test_lab_schedule.go @@ -46,7 +46,9 @@ func resourceArmDevTestLabSchedules() *schema.Resource { "location": azure.SchemaLocation(), - "resource_group_name": azure.SchemaResourceGroupName(), + // There's a bug in the Azure API where this is returned in lower-case + // BUG: https://github.com/Azure/azure-rest-api-specs/issues/3964 + "resource_group_name": azure.SchemaResourceGroupNameDiffSuppress(), "lab_name": { Type: schema.TypeString, From e9d64457bf3a52afe35677513a6db214c06fa3e7 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 28 Dec 2019 16:29:15 -0800 Subject: [PATCH 05/14] fix TestAccAzureRMDnsCNameRecord_RecordToAlias test checks (fail for real reason now) --- .../tests/resource_arm_dns_cname_record_test.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go b/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go index fa380ec0c32f..cb16e81023ac 100644 --- a/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go +++ b/azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go @@ -170,9 +170,7 @@ func TestAccAzureRMDnsCNameRecord_withAlias(t *testing.T) { func TestAccAzureRMDnsCNameRecord_RecordToAlias(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_dns_cname_record", "test") - targetResourceName := "azurerm_public_ip.test" - preConfig := testAccAzureRMDnsCNameRecord_AliasToRecordUpdate(data) - postConfig := testAccAzureRMDnsCNameRecord_AliasToRecord(data) + targetResourceName := "azurerm_dns_cname_record.target2" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -180,13 +178,13 @@ func TestAccAzureRMDnsCNameRecord_RecordToAlias(t *testing.T) { CheckDestroy: testCheckAzureRMDnsCNameRecordDestroy, Steps: []resource.TestStep{ { - Config: preConfig, + Config: testAccAzureRMDnsCNameRecord_AliasToRecordUpdate(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsCNameRecordExists(data.ResourceName), ), }, { - Config: postConfig, + Config: testAccAzureRMDnsCNameRecord_AliasToRecord(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsCNameRecordExists(data.ResourceName), resource.TestCheckResourceAttrPair(data.ResourceName, "target_resource_id", targetResourceName, "id"), @@ -200,9 +198,7 @@ func TestAccAzureRMDnsCNameRecord_RecordToAlias(t *testing.T) { func TestAccAzureRMDnsCNameRecord_AliasToRecord(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_dns_cname_record", "test") - targetResourceName := "azurerm_public_ip.test" - preConfig := testAccAzureRMDnsCNameRecord_AliasToRecord(data) - postConfig := testAccAzureRMDnsCNameRecord_AliasToRecordUpdate(data) + targetResourceName := "azurerm_dns_cname_record.target2" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -210,14 +206,14 @@ func TestAccAzureRMDnsCNameRecord_AliasToRecord(t *testing.T) { CheckDestroy: testCheckAzureRMDnsCNameRecordDestroy, Steps: []resource.TestStep{ { - Config: preConfig, + Config: testAccAzureRMDnsCNameRecord_AliasToRecord(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsCNameRecordExists(data.ResourceName), resource.TestCheckResourceAttrPair(data.ResourceName, "target_resource_id", targetResourceName, "id"), ), }, { - Config: postConfig, + Config: testAccAzureRMDnsCNameRecord_AliasToRecordUpdate(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMDnsCNameRecordExists(data.ResourceName), resource.TestCheckNoResourceAttr(data.ResourceName, "target_resource_id"), From 04a7c04845d918e037056a7bd74be1e8e011f2d0 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 28 Dec 2019 16:29:36 -0800 Subject: [PATCH 06/14] Fix errant )s in tf config arrays --- .../services/compute/tests/resource_arm_snapshot_test.go | 5 ++--- ...urce_arm_windows_virtual_machine_scale_set_images_test.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go b/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go index 74eac579643f..8d30b7f5f0d4 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go @@ -191,7 +191,6 @@ func TestAccAzureRMSnapshot_fromExistingSnapshot(t *testing.T) { func TestAccAzureRMSnapshot_fromUnmanagedDisk(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_snapshot", "test") - config := testAccAzureRMSnapshot_fromUnmanagedDisk(data) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -199,7 +198,7 @@ func TestAccAzureRMSnapshot_fromUnmanagedDisk(t *testing.T) { CheckDestroy: testCheckAzureRMSnapshotDestroy, Steps: []resource.TestStep{ { - Config: config, + Config: testAccAzureRMSnapshot_fromUnmanagedDisk(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMSnapshotExists(data.ResourceName), ), @@ -584,7 +583,7 @@ resource "azurerm_snapshot" "test" { resource_group_name = "${azurerm_resource_group.test.name}" create_option = "Import" source_uri = "${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}/myosdisk1.vhd" - depends_on = ["azurerm_virtual_machine", "test")] + depends_on = ["azurerm_virtual_machine", "test"] } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomString, data.RandomInteger, data.RandomInteger, data.RandomInteger) } diff --git a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_images_test.go b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_images_test.go index a61933a574ec..e0298e697cac 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_images_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_images_test.go @@ -709,7 +709,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" { publisher = "plesk" } - depends_on = ["azurerm_marketplace_agreement", "test")] + depends_on = ["azurerm_marketplace_agreement", "test"] } `, template) } From 63c0d1513fc4aaf519e8ed3ccffaa34d7642408f Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 28 Dec 2019 16:50:22 -0800 Subject: [PATCH 07/14] fix TestAccAzureRMMonitorDiagnosticSetting tests --- ...rce_arm_monitor_diagnostic_setting_test.go | 65 ++++++++----------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go index 58e91e181982..f3861bb6ccb4 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go @@ -198,19 +198,19 @@ func testAccAzureRMMonitorDiagnosticSetting_eventhub(data acceptance.TestData) s data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctest%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_eventhub_namespace" "test" { - name = "acctesteventhubnamespace-%d" + name = "acctest-EHN-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku = "Basic" } resource "azurerm_eventhub" "test" { - name = "acctesteventhub-%d" + name = "acctest-EH-%[1]d" namespace_name = "${azurerm_eventhub_namespace.test.name}" resource_group_name = "${azurerm_resource_group.test.name}" partition_count = 2 @@ -227,18 +227,15 @@ resource "azurerm_eventhub_namespace_authorization_rule" "test" { } resource "azurerm_key_vault" "test" { - name = "acctestkv%d" + name = "acctest%[3]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - sku { - name = "standard" - } + sku_name = "standard" } resource "azurerm_monitor_diagnostic_setting" "test" { - name = "acctestds%d" + name = "acctest-DS-%[1]d" target_resource_id = "${azurerm_key_vault.test.id}" eventhub_authorization_rule_id = "${azurerm_eventhub_namespace_authorization_rule.test.id}" eventhub_name = "${azurerm_eventhub.test.name}" @@ -260,7 +257,7 @@ resource "azurerm_monitor_diagnostic_setting" "test" { } } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger/10) } func testAccAzureRMMonitorDiagnosticSetting_requiresImport(data acceptance.TestData) string { @@ -299,12 +296,12 @@ func testAccAzureRMMonitorDiagnosticSetting_logAnalyticsWorkspace(data acceptanc data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctest%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_log_analytics_workspace" "test" { - name = "acctestlaw%d" + name = "acctest-LAW-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku = "PerGB2018" @@ -312,18 +309,15 @@ resource "azurerm_log_analytics_workspace" "test" { } resource "azurerm_key_vault" "test" { - name = "acctestkv%d" + name = "acctest%[3]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - sku { - name = "standard" - } + sku_name = "standard" } resource "azurerm_monitor_diagnostic_setting" "test" { - name = "acctestds%d" + name = "acctest-DS-%[1]d" target_resource_id = "${azurerm_key_vault.test.id}" log_analytics_workspace_id = "${azurerm_log_analytics_workspace.test.id}" @@ -344,7 +338,7 @@ resource "azurerm_monitor_diagnostic_setting" "test" { } } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger/10) } func testAccAzureRMMonitorDiagnosticSetting_logAnalyticsWorkspaceDedicated(data acceptance.TestData) string { @@ -352,12 +346,12 @@ func testAccAzureRMMonitorDiagnosticSetting_logAnalyticsWorkspaceDedicated(data data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctest%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_log_analytics_workspace" "test" { - name = "acctestlaw%d" + name = "acctest-LAW-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" sku = "PerGB2018" @@ -365,13 +359,13 @@ resource "azurerm_log_analytics_workspace" "test" { } resource "azurerm_data_factory" "test" { - name = "acctestdf%d" + name = "acctest-DF-%[1]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_monitor_diagnostic_setting" "test" { - name = "acctestds%d" + name = "acctest-DS-%[1]d" target_resource_id = "${azurerm_data_factory.test.id}" log_analytics_workspace_id = "${azurerm_log_analytics_workspace.test.id}" @@ -412,7 +406,7 @@ resource "azurerm_monitor_diagnostic_setting" "test" { } } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, data.RandomInteger, data.Locations.Primary) } func testAccAzureRMMonitorDiagnosticSetting_storageAccount(data acceptance.TestData) string { @@ -420,12 +414,12 @@ func testAccAzureRMMonitorDiagnosticSetting_storageAccount(data acceptance.TestD data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctest%d" - location = "%s" + name = "acctestRG-%[1]d" + location = "%[2]s" } resource "azurerm_storage_account" "test" { - name = "acctestlogs%d" + name = "acctest%[3]d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" account_replication_type = "LRS" @@ -433,18 +427,15 @@ resource "azurerm_storage_account" "test" { } resource "azurerm_key_vault" "test" { - name = "acctestkv%d" + name = "acctest%[3]d" location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" tenant_id = "${data.azurerm_client_config.current.tenant_id}" - - sku { - name = "standard" - } + sku_name = "standard" } resource "azurerm_monitor_diagnostic_setting" "test" { - name = "acctestds%d" + name = "acctest-DS-%[1]d" target_resource_id = "${azurerm_key_vault.test.id}" storage_account_id = "${azurerm_storage_account.test.id}" @@ -465,5 +456,5 @@ resource "azurerm_monitor_diagnostic_setting" "test" { } } } -`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger) +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger/10) } From cbf54e0a1c0cc8f675475faf673712862fa7fd9a Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 28 Dec 2019 17:32:46 -0800 Subject: [PATCH 08/14] fix `TestAccDataSourceAzureRMImage_localFilter` data object --- .../services/compute/tests/data_source_image_test.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/azurerm/internal/services/compute/tests/data_source_image_test.go b/azurerm/internal/services/compute/tests/data_source_image_test.go index 92d8c72df277..42414e19d92a 100644 --- a/azurerm/internal/services/compute/tests/data_source_image_test.go +++ b/azurerm/internal/services/compute/tests/data_source_image_test.go @@ -37,7 +37,7 @@ func TestAccDataSourceAzureRMImage_basic(t *testing.T) { } func TestAccDataSourceAzureRMImage_localFilter(t *testing.T) { - data := acceptance.BuildTestData(t, "data.azurerm_image", "test") + data := acceptance.BuildTestData(t, "data.azurerm_image", "test1") descDataSourceName := "data.azurerm_image.test2" resource.ParallelTest(t, resource.TestCase{ @@ -337,8 +337,5 @@ data "azurerm_image" "test2" { resource_group_name = "${azurerm_resource_group.test.name}" } -output "location" { - value = "${data.azurerm_image.test1.location}" -} `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomString, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } From 9c461a70ed7fdda41dbd794855809b0512014170 Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 28 Dec 2019 17:42:21 -0800 Subject: [PATCH 09/14] make `TestAccAzureRMKeyVault_accessPolicyUpperLimit` more consistent with rest of test cfgs --- .../services/keyvault/tests/resource_arm_key_vault_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go index 1fc99cc8d0ff..73f6e350197c 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_test.go @@ -899,7 +899,7 @@ resource "azurerm_key_vault" "test" { func testAccAzureRMKeyVault_generateStorageAccountConfigs(accountNum int, rs string) string { return fmt.Sprintf(` -resource "azurerm_storage_account" "testsa%d" { +resource "azurerm_storage_account" "test%d" { name = "testsa%s%d" resource_group_name = "${azurerm_resource_group.test.name}" location = "${azurerm_resource_group.test.location}" @@ -921,7 +921,7 @@ func testAccAzureRMKeyVault_generateAccessPolicyConfigs(accountNum int) string { return fmt.Sprintf(` access_policy { tenant_id = "${data.azurerm_client_config.current.tenant_id}" - object_id = "${azurerm_storage_account.testsa%d.identity.0.principal_id}" + object_id = "${azurerm_storage_account.test%d.identity.0.principal_id}" key_permissions = ["get", "create", "delete", "list", "restore", "recover", "unwrapkey", "wrapkey", "purge", "encrypt", "decrypt", "sign", "verify"] secret_permissions = ["get"] From a81f36aa2dc8a7718fa3401418c288d81c65d74d Mon Sep 17 00:00:00 2001 From: kt Date: Sat, 28 Dec 2019 17:42:43 -0800 Subject: [PATCH 10/14] fix various storage tests & make tf more consistant with rest of tests --- ...m_backup_container_storage_account_test.go | 16 +- .../data_source_storage_account_sas_test.go | 2 +- ...a_source_storage_management_policy_test.go | 16 +- ..._arm_storage_account_network_rules_test.go | 60 ++-- .../resource_arm_storage_account_test.go | 326 +++++++++--------- ...urce_arm_storage_management_policy_test.go | 36 +- ...torage_account_network_rules.html.markdown | 4 +- 7 files changed, 228 insertions(+), 232 deletions(-) diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_container_storage_account_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_container_storage_account_test.go index a60156c06319..1f3fa087a0c9 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_container_storage_account_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_container_storage_account_test.go @@ -33,31 +33,31 @@ func TestAccAzureRMBackupProtectionContainerStorageAccount_basic(t *testing.T) { func testAccAzureRMBackupProtectionContainerStorageAccount_basic(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-backup-%d" location = "%s" } resource "azurerm_recovery_services_vault" "testvlt" { name = "acctest-vault-%d" - location = "${azurerm_resource_group.testrg.location}" - resource_group_name = "${azurerm_resource_group.testrg.name}" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" sku = "Standard" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" } resource "azurerm_backup_container_storage_account" "test" { - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" recovery_vault_name = "${azurerm_recovery_services_vault.testvlt.name}" - storage_account_id = "${azurerm_storage_account.testsa.id}" + storage_account_id = "${azurerm_storage_account.test.id}" } `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomString) } diff --git a/azurerm/internal/services/storage/tests/data_source_storage_account_sas_test.go b/azurerm/internal/services/storage/tests/data_source_storage_account_sas_test.go index c788115bb7ec..15161389c63a 100644 --- a/azurerm/internal/services/storage/tests/data_source_storage_account_sas_test.go +++ b/azurerm/internal/services/storage/tests/data_source_storage_account_sas_test.go @@ -85,7 +85,7 @@ data "azurerm_storage_account_sas" "test" { process = false } } -`, data.RandomInteger, data.Locations, data.RandomString, startDate, endDate) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, startDate, endDate) } func TestAccDataSourceArmStorageAccountSas_resourceTypesString(t *testing.T) { diff --git a/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go b/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go index ed74d532f990..581eee0877f6 100644 --- a/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go +++ b/azurerm/internal/services/storage/tests/data_source_storage_management_policy_test.go @@ -42,23 +42,23 @@ func TestAccDataSourceAzureRMStorageManagementPolicy_basic(t *testing.T) { func testAccDataSourceAzureRMStorageManagementPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" account_kind = "BlobStorage" } -resource "azurerm_storage_management_policy" "testpolicy" { - storage_account_id = "${azurerm_storage_account.testsa.id}" +resource "azurerm_storage_management_policy" "test" { + storage_account_id = "${azurerm_storage_account.test.id}" rule { name = "rule1" @@ -80,8 +80,8 @@ resource "azurerm_storage_management_policy" "testpolicy" { } } -data "azurerm_storage_management_policy" "testpolicy" { - storage_account_id = "${azurerm_storage_management_policy.testpolicy.storage_account_id}" +data "azurerm_storage_management_policy" "test" { + storage_account_id = "${azurerm_storage_management_policy.test.storage_account_id}" } `, data.RandomInteger, data.Locations.Primary, data.RandomString) } diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_network_rules_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_network_rules_test.go index efa6216b8198..8bdca89ff93e 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_network_rules_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_network_rules_test.go @@ -19,7 +19,7 @@ func TestAccAzureRMStorageAccountNetworkRules_basic(t *testing.T) { { Config: testAccAzureRMStorageAccountNetworkRules_basic(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExists("azurerm_storage_account.testsa"), + testCheckAzureRMStorageAccountExists("azurerm_storage_account.test"), ), }, data.ImportStep(), @@ -38,21 +38,21 @@ func TestAccAzureRMStorageAccountNetworkRules_update(t *testing.T) { { Config: testAccAzureRMStorageAccountNetworkRules_basic(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExists("azurerm_storage_account.testsa"), + testCheckAzureRMStorageAccountExists("azurerm_storage_account.test"), ), }, data.ImportStep(), { Config: testAccAzureRMStorageAccountNetworkRules_update(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExists("azurerm_storage_account.testsa"), + testCheckAzureRMStorageAccountExists("azurerm_storage_account.test"), ), }, data.ImportStep(), { Config: testAccAzureRMStorageAccountNetworkRules_basic(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExists("azurerm_storage_account.testsa"), + testCheckAzureRMStorageAccountExists("azurerm_storage_account.test"), ), }, data.ImportStep(), @@ -71,7 +71,7 @@ func TestAccAzureRMStorageAccountNetworkRules_empty(t *testing.T) { { Config: testAccAzureRMStorageAccountNetworkRules_empty(data), Check: resource.ComposeTestCheckFunc( - testCheckAzureRMStorageAccountExists("azurerm_storage_account.testsa"), + testCheckAzureRMStorageAccountExists("azurerm_storage_account.test"), ), }, data.ImportStep(), @@ -81,7 +81,7 @@ func TestAccAzureRMStorageAccountNetworkRules_empty(t *testing.T) { func testAccAzureRMStorageAccountNetworkRules_basic(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } @@ -89,22 +89,22 @@ resource "azurerm_resource_group" "testrg" { resource "azurerm_virtual_network" "test" { name = "acctestvirtnet%d" address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.testrg.location}" - resource_group_name = "${azurerm_resource_group.testrg.name}" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" service_endpoints = ["Microsoft.Storage"] } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" @@ -114,8 +114,8 @@ resource "azurerm_storage_account" "testsa" { } resource "azurerm_storage_account_network_rules" "test" { - resource_group_name = "${azurerm_resource_group.testrg.name}" - storage_account_name = "${azurerm_storage_account.testsa.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.test.name}" default_action = "Deny" ip_rules = ["127.0.0.1"] @@ -126,7 +126,7 @@ resource "azurerm_storage_account_network_rules" "test" { func testAccAzureRMStorageAccountNetworkRules_update(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } @@ -134,13 +134,13 @@ resource "azurerm_resource_group" "testrg" { resource "azurerm_virtual_network" "test" { name = "acctestvirtnet%d" address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.testrg.location}" - resource_group_name = "${azurerm_resource_group.testrg.name}" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" service_endpoints = ["Microsoft.Storage"] @@ -148,16 +148,16 @@ resource "azurerm_subnet" "test" { resource "azurerm_subnet" "test2" { name = "acctestsubnet2%d" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.3.0/24" service_endpoints = ["Microsoft.Storage"] } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" @@ -167,8 +167,8 @@ resource "azurerm_storage_account" "testsa" { } resource "azurerm_storage_account_network_rules" "test" { - resource_group_name = "${azurerm_resource_group.testrg.name}" - storage_account_name = "${azurerm_storage_account.testsa.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.test.name}" default_action = "Allow" ip_rules = ["127.0.0.2", "127.0.0.3"] @@ -180,15 +180,15 @@ resource "azurerm_storage_account_network_rules" "test" { func testAccAzureRMStorageAccountNetworkRules_empty(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" @@ -198,8 +198,8 @@ resource "azurerm_storage_account" "testsa" { } resource "azurerm_storage_account_network_rules" "test" { - resource_group_name = "${azurerm_resource_group.testrg.name}" - storage_account_name = "${azurerm_storage_account.testsa.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.test.name}" default_action = "Deny" bypass = ["Metrics"] diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index 1e00104a8db6..2bf8140d2273 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -210,7 +210,7 @@ func TestAccAzureRMStorageAccount_blobConnectionString(t *testing.T) { { Config: preConfig, Check: resource.ComposeTestCheckFunc(testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttrSet("azurerm_storage_account.testsa", "primary_blob_connection_string"), + resource.TestCheckResourceAttrSet(data.ResourceName, "primary_blob_connection_string"), ), }, }, @@ -235,7 +235,7 @@ func TestAccAzureRMStorageAccount_blobEncryption(t *testing.T) { Config: preConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "enable_blob_encryption", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_blob_encryption", "true"), ), }, data.ImportStep(), @@ -243,7 +243,7 @@ func TestAccAzureRMStorageAccount_blobEncryption(t *testing.T) { Config: postConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "enable_blob_encryption", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_blob_encryption", "false"), ), }, }, @@ -268,7 +268,7 @@ func TestAccAzureRMStorageAccount_fileEncryption(t *testing.T) { Config: preConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "enable_file_encryption", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_file_encryption", "true"), ), }, data.ImportStep(), @@ -276,7 +276,7 @@ func TestAccAzureRMStorageAccount_fileEncryption(t *testing.T) { Config: postConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "enable_file_encryption", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_file_encryption", "false"), ), }, }, @@ -297,7 +297,7 @@ func TestAccAzureRMStorageAccount_enableHttpsTrafficOnly(t *testing.T) { Config: preConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "enable_https_traffic_only", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_https_traffic_only", "true"), ), }, data.ImportStep(), @@ -305,7 +305,7 @@ func TestAccAzureRMStorageAccount_enableHttpsTrafficOnly(t *testing.T) { Config: postConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "enable_https_traffic_only", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_https_traffic_only", "false"), ), }, }, @@ -326,7 +326,7 @@ func TestAccAzureRMStorageAccount_isHnsEnabled(t *testing.T) { Config: preConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "is_hns_enabled", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "is_hns_enabled", "true"), ), }, data.ImportStep(), @@ -334,7 +334,7 @@ func TestAccAzureRMStorageAccount_isHnsEnabled(t *testing.T) { Config: postConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "is_hns_enabled", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "is_hns_enabled", "false"), ), }, }, @@ -355,8 +355,8 @@ func TestAccAzureRMStorageAccount_blobStorageWithUpdate(t *testing.T) { Config: preConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "account_kind", "BlobStorage"), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "access_tier", "Hot"), + resource.TestCheckResourceAttr(data.ResourceName, "account_kind", "BlobStorage"), + resource.TestCheckResourceAttr(data.ResourceName, "access_tier", "Hot"), ), }, data.ImportStep(), @@ -364,7 +364,7 @@ func TestAccAzureRMStorageAccount_blobStorageWithUpdate(t *testing.T) { Config: postConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "access_tier", "Cool"), + resource.TestCheckResourceAttr(data.ResourceName, "access_tier", "Cool"), ), }, }, @@ -383,8 +383,8 @@ func TestAccAzureRMStorageAccount_blockBlobStorage(t *testing.T) { Config: testAccAzureRMStorageAccount_blockBlobStorage(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "account_kind", "BlockBlobStorage"), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "access_tier", ""), + resource.TestCheckResourceAttr(data.ResourceName, "account_kind", "BlockBlobStorage"), + resource.TestCheckResourceAttr(data.ResourceName, "access_tier", ""), ), }, data.ImportStep(), @@ -406,9 +406,9 @@ func TestAccAzureRMStorageAccount_fileStorageWithUpdate(t *testing.T) { Config: preConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "account_kind", "FileStorage"), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "account_tier", "Premium"), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "access_tier", "Hot"), + resource.TestCheckResourceAttr(data.ResourceName, "account_kind", "FileStorage"), + resource.TestCheckResourceAttr(data.ResourceName, "account_tier", "Premium"), + resource.TestCheckResourceAttr(data.ResourceName, "access_tier", "Hot"), ), }, data.ImportStep(), @@ -416,8 +416,8 @@ func TestAccAzureRMStorageAccount_fileStorageWithUpdate(t *testing.T) { Config: postConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "account_tier", "Premium"), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "access_tier", "Cool"), + resource.TestCheckResourceAttr(data.ResourceName, "account_tier", "Premium"), + resource.TestCheckResourceAttr(data.ResourceName, "access_tier", "Cool"), ), }, }, @@ -437,8 +437,8 @@ func TestAccAzureRMStorageAccount_storageV2WithUpdate(t *testing.T) { Config: preConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "account_kind", "StorageV2"), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "access_tier", "Hot"), + resource.TestCheckResourceAttr(data.ResourceName, "account_kind", "StorageV2"), + resource.TestCheckResourceAttr(data.ResourceName, "access_tier", "Hot"), ), }, data.ImportStep(), @@ -446,7 +446,7 @@ func TestAccAzureRMStorageAccount_storageV2WithUpdate(t *testing.T) { Config: postConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "access_tier", "Cool"), + resource.TestCheckResourceAttr(data.ResourceName, "access_tier", "Cool"), ), }, }, @@ -610,7 +610,7 @@ func TestAccAzureRMStorageAccount_enableAdvancedThreatProtection(t *testing.T) { Config: preConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "enable_advanced_threat_protection", "true"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_advanced_threat_protection", "true"), ), }, data.ImportStep(), @@ -618,7 +618,7 @@ func TestAccAzureRMStorageAccount_enableAdvancedThreatProtection(t *testing.T) { Config: postConfig, Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "enable_advanced_threat_protection", "false"), + resource.TestCheckResourceAttr(data.ResourceName, "enable_advanced_threat_protection", "false"), ), }, data.ImportStep(), @@ -628,8 +628,6 @@ func TestAccAzureRMStorageAccount_enableAdvancedThreatProtection(t *testing.T) { func TestAccAzureRMStorageAccount_blobProperties(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") - preConfig := testAccAzureRMStorageAccount_blobProperties(data) - postConfig := testAccAzureRMStorageAccount_blobPropertiesUpdated(data) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -637,18 +635,18 @@ func TestAccAzureRMStorageAccount_blobProperties(t *testing.T) { CheckDestroy: testCheckAzureRMStorageAccountDestroy, Steps: []resource.TestStep{ { - Config: preConfig, + Config: testAccAzureRMStorageAccount_blobProperties(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "blob_properties.0.delete_retention_policy.0.days", "300"), + resource.TestCheckResourceAttr(data.ResourceName, "blob_properties.0.delete_retention_policy.0.days", "300"), ), }, data.ImportStep(), { - Config: postConfig, + Config: testAccAzureRMStorageAccount_blobPropertiesUpdated(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), - resource.TestCheckResourceAttr("azurerm_storage_account.testsa", "blob_properties.0.delete_retention_policy.0.days", "7"), + resource.TestCheckResourceAttr(data.ResourceName, "blob_properties.0.delete_retention_policy.0.days", "7"), ), }, data.ImportStep(), @@ -658,8 +656,6 @@ func TestAccAzureRMStorageAccount_blobProperties(t *testing.T) { func TestAccAzureRMStorageAccount_queueProperties(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") - preConfig := testAccAzureRMStorageAccount_queueProperties(data) - postConfig := testAccAzureRMStorageAccount_queuePropertiesUpdated(data) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, @@ -667,14 +663,14 @@ func TestAccAzureRMStorageAccount_queueProperties(t *testing.T) { CheckDestroy: testCheckAzureRMStorageAccountDestroy, Steps: []resource.TestStep{ { - Config: preConfig, + Config: testAccAzureRMStorageAccount_queueProperties(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), ), }, data.ImportStep(), { - Config: postConfig, + Config: testAccAzureRMStorageAccount_queuePropertiesUpdated(data), Check: resource.ComposeTestCheckFunc( testCheckAzureRMStorageAccountExists(data.ResourceName), ), @@ -762,16 +758,16 @@ func testCheckAzureRMStorageAccountDestroy(s *terraform.State) error { func testAccAzureRMStorageAccount_basic(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" @@ -788,11 +784,11 @@ func testAccAzureRMStorageAccount_requiresImport(data acceptance.TestData) strin %s resource "azurerm_storage_account" "import" { - name = "${azurerm_storage_account.testsa.name}" - resource_group_name = "${azurerm_storage_account.testrg.resource_group_name}" - location = "${azurerm_storage_account.testrg.location}" - account_tier = "${azurerm_storage_account.testrg.account_tier}" - account_replication_type = "${azurerm_storage_account.testrg.account_replication_type}" + name = "${azurerm_storage_account.test.name}" + resource_group_name = "${azurerm_storage_account.test.resource_group_name}" + location = "${azurerm_storage_account.test.location}" + account_tier = "${azurerm_storage_account.test.account_tier}" + account_replication_type = "${azurerm_storage_account.test.account_replication_type}" } `, template) } @@ -804,7 +800,7 @@ func testAccAzureRMStorageAccount_writeLock(data acceptance.TestData) string { resource "azurerm_management_lock" "test" { name = "acctestlock-%d" - scope = "${azurerm_storage_account.testsa.id}" + scope = "${azurerm_storage_account.test.id}" lock_level = "ReadOnly" } `, template, data.RandomInteger) @@ -812,16 +808,16 @@ resource "azurerm_management_lock" "test" { func testAccAzureRMStorageAccount_premium(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Premium" account_replication_type = "LRS" @@ -834,16 +830,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_update(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "GRS" @@ -856,16 +852,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_blobEncryption(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" enable_blob_encryption = true @@ -879,16 +875,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_blobEncryptionDisabled(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" enable_blob_encryption = false @@ -902,16 +898,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_fileEncryption(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" enable_file_encryption = true @@ -925,16 +921,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_fileEncryptionDisabled(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" enable_file_encryption = false @@ -948,16 +944,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_enableHttpsTrafficOnly(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" enable_https_traffic_only = true @@ -971,16 +967,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_enableHttpsTrafficOnlyDisabled(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" enable_https_traffic_only = false @@ -994,16 +990,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_isHnsEnabledTrue(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_kind = "StorageV2" account_tier = "Standard" account_replication_type = "LRS" @@ -1014,16 +1010,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_isHnsEnabledFalse(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_kind = "StorageV2" account_tier = "Standard" account_replication_type = "LRS" @@ -1034,16 +1030,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_blobStorage(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_kind = "BlobStorage" account_tier = "Standard" account_replication_type = "LRS" @@ -1057,16 +1053,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_blobStorageUpdate(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_kind = "BlobStorage" account_tier = "Standard" account_replication_type = "LRS" @@ -1081,16 +1077,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_blockBlobStorage(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_kind = "BlockBlobStorage" account_tier = "Premium" account_replication_type = "LRS" @@ -1104,16 +1100,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_fileStorage(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_kind = "FileStorage" account_tier = "Premium" account_replication_type = "LRS" @@ -1128,16 +1124,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_fileStorageUpdate(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_kind = "FileStorage" account_tier = "Premium" account_replication_type = "LRS" @@ -1152,16 +1148,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_storageV2(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_kind = "StorageV2" account_tier = "Standard" account_replication_type = "LRS" @@ -1175,16 +1171,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_storageV2Update(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_kind = "StorageV2" account_tier = "Standard" account_replication_type = "LRS" @@ -1199,15 +1195,15 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_nonStandardCasing(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" account_tier = "standard" account_replication_type = "lrs" @@ -1220,16 +1216,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_identity(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" @@ -1246,7 +1242,7 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_networkRules(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } @@ -1254,22 +1250,22 @@ resource "azurerm_resource_group" "testrg" { resource "azurerm_virtual_network" "test" { name = "acctestvirtnet%d" address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.testrg.location}" - resource_group_name = "${azurerm_resource_group.testrg.name}" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" service_endpoints = ["Microsoft.Storage"] } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" @@ -1288,7 +1284,7 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_networkRulesUpdate(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } @@ -1296,22 +1292,22 @@ resource "azurerm_resource_group" "testrg" { resource "azurerm_virtual_network" "test" { name = "acctestvirtnet%d" address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.testrg.location}" - resource_group_name = "${azurerm_resource_group.testrg.name}" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" service_endpoints = ["Microsoft.Storage"] } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" @@ -1330,7 +1326,7 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_networkRulesReverted(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } @@ -1338,22 +1334,22 @@ resource "azurerm_resource_group" "testrg" { resource "azurerm_virtual_network" "test" { name = "acctestvirtnet%d" address_space = ["10.0.0.0/16"] - location = "${azurerm_resource_group.testrg.location}" - resource_group_name = "${azurerm_resource_group.testrg.name}" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" } resource "azurerm_subnet" "test" { name = "acctestsubnet%d" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" virtual_network_name = "${azurerm_virtual_network.test.name}" address_prefix = "10.0.2.0/24" service_endpoints = ["Microsoft.Storage"] } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" @@ -1372,15 +1368,15 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_enableAdvancedThreatProtection(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" enable_advanced_threat_protection = true @@ -1390,15 +1386,15 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_enableAdvancedThreatProtectionDisabled(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" - location = "${azurerm_resource_group.testrg.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" enable_advanced_threat_protection = false @@ -1408,16 +1404,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_blobProperties(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestAzureRMSA-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" @@ -1432,16 +1428,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_blobPropertiesUpdated(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestAzureRMSA-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" @@ -1455,16 +1451,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_queueProperties(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" @@ -1503,16 +1499,16 @@ resource "azurerm_storage_account" "testsa" { func testAccAzureRMStorageAccount_queuePropertiesUpdated(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_management_policy_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_management_policy_test.go index a815457d23d8..35fece30eb31 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_management_policy_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_management_policy_test.go @@ -262,23 +262,23 @@ func testCheckAzureRMStorageAccountManagementPolicyExistsInternal(storageAccount func testAccAzureRMStorageManagementPolicy_basic(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" account_kind = "BlobStorage" } -resource "azurerm_storage_management_policy" "testpolicy" { - storage_account_id = "${azurerm_storage_account.testsa.id}" +resource "azurerm_storage_management_policy" "test" { + storage_account_id = "${azurerm_storage_account.test.id}" rule { name = "rule1" @@ -304,23 +304,23 @@ resource "azurerm_storage_management_policy" "testpolicy" { func testAccAzureRMStorageManagementPolicy_multipleRule(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" account_kind = "BlobStorage" } -resource "azurerm_storage_management_policy" "testpolicy" { - storage_account_id = "${azurerm_storage_account.testsa.id}" +resource "azurerm_storage_management_policy" "test" { + storage_account_id = "${azurerm_storage_account.test.id}" rule { name = "rule1" @@ -364,23 +364,23 @@ resource "azurerm_storage_management_policy" "testpolicy" { func testAccAzureRMStorageManagementPolicy_multipleRuleUpdated(data acceptance.TestData) string { return fmt.Sprintf(` -resource "azurerm_resource_group" "testrg" { +resource "azurerm_resource_group" "test" { name = "acctestRG-storage-%d" location = "%s" } -resource "azurerm_storage_account" "testsa" { +resource "azurerm_storage_account" "test" { name = "unlikely23exst2acct%s" - resource_group_name = "${azurerm_resource_group.testrg.name}" + resource_group_name = "${azurerm_resource_group.test.name}" - location = "${azurerm_resource_group.testrg.location}" + location = "${azurerm_resource_group.test.location}" account_tier = "Standard" account_replication_type = "LRS" account_kind = "BlobStorage" } -resource "azurerm_storage_management_policy" "testpolicy" { - storage_account_id = "${azurerm_storage_account.testsa.id}" +resource "azurerm_storage_management_policy" "test" { + storage_account_id = "${azurerm_storage_account.test.id}" rule { name = "rule1" diff --git a/website/docs/r/storage_account_network_rules.html.markdown b/website/docs/r/storage_account_network_rules.html.markdown index 970d8cce1101..14bf812d3a61 100644 --- a/website/docs/r/storage_account_network_rules.html.markdown +++ b/website/docs/r/storage_account_network_rules.html.markdown @@ -53,8 +53,8 @@ resource "azurerm_storage_account" "example" { } resource "azurerm_storage_account_network_rules" "test" { - resource_group_name = "${azurerm_resource_group.testrg.name}" - storage_account_name = "${azurerm_storage_account.testsa.name}" + resource_group_name = "${azurerm_resource_group.test.name}" + storage_account_name = "${azurerm_storage_account.test.name}" default_action = "Allow" ip_rules = ["127.0.0.1"] From a7166227d038ec1b0f2fc00269dbb7b94e561572 Mon Sep 17 00:00:00 2001 From: kt Date: Sun, 29 Dec 2019 13:32:19 -0800 Subject: [PATCH 11/14] fix vmss test cfg depends on --- .../resource_arm_linux_virtual_machine_scale_set_images_test.go | 2 +- ...esource_arm_windows_virtual_machine_scale_set_images_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_images_test.go b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_images_test.go index fe954ed6bc0a..c3288d152149 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_images_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_images_test.go @@ -721,7 +721,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" { publisher = "cloudbees" } - depends_on = ["azurerm_marketplace_agreement", "test"] + depends_on = ["azurerm_marketplace_agreement.test"] } `, template, data.RandomInteger) } diff --git a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_images_test.go b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_images_test.go index e0298e697cac..3f317d560160 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_images_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_images_test.go @@ -709,7 +709,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" { publisher = "plesk" } - depends_on = ["azurerm_marketplace_agreement", "test"] + depends_on = ["azurerm_marketplace_agreement.test"] } `, template) } From d1e542c848e65b649b7b07cf6230204ec6c0013f Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 31 Dec 2019 16:40:59 -0800 Subject: [PATCH 12/14] ensure acctest resource groups follow the format acctestRG-1234567890 --- ...rtual_machine_data_disk_attachment_test.go | 2 +- ...rm_virtual_machine_unmanaged_disks_test.go | 8 ++--- ...source_arm_key_vault_access_policy_test.go | 8 ++--- ...resource_arm_key_vault_certificate_test.go | 28 ++++++++-------- .../tests/resource_arm_key_vault_key_test.go | 32 +++++++++---------- .../resource_arm_key_vault_secret_test.go | 16 +++++----- ...urce_monitor_diagnostic_categories_test.go | 4 +-- .../resource_arm_virtual_network_test.go | 4 +-- 8 files changed, 51 insertions(+), 51 deletions(-) diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_data_disk_attachment_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_data_disk_attachment_test.go index 4551578067b9..d0fb6ddbe286 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_data_disk_attachment_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_data_disk_attachment_test.go @@ -638,7 +638,7 @@ resource "azurerm_managed_disk" "test" { func testAccAzureRMVirtualMachineDataDiskAttachment_virtualMachineExtensionPrep(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go index 058b0c82effc..fe5914a75447 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go @@ -2615,7 +2615,7 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_linuxMachineWithSSH(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG%s" + name = "acctestRG-%d" location = "%s" } @@ -2697,13 +2697,13 @@ resource "azurerm_virtual_machine" "test" { } } } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString) } func testAccAzureRMVirtualMachine_linuxMachineWithSSHRemoved(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG%s" + name = "acctestRG-%d" location = "%s" } @@ -2780,7 +2780,7 @@ resource "azurerm_virtual_machine" "test" { disable_password_authentication = true } } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString) } func testAccAzureRMVirtualMachine_primaryNetworkInterfaceId(data acceptance.TestData) string { diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go index 473e3f224466..ac90732b7bd7 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go @@ -386,7 +386,7 @@ func testAccAzureRMKeyVaultAccessPolicy_template(data acceptance.TestData) strin data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -402,7 +402,7 @@ resource "azurerm_key_vault" "test" { environment = "Production" } } -`, data.RandomString, data.Locations.Primary, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString) } func testAccAzureRMKeyVaultAccessPolicy_nonExistentVault(data acceptance.TestData) string { @@ -410,7 +410,7 @@ func testAccAzureRMKeyVaultAccessPolicy_nonExistentVault(data acceptance.TestDat data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -442,5 +442,5 @@ resource "azurerm_key_vault_access_policy" "test" { "get", ] } -`, data.RandomString, data.Locations.Primary, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString) } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go index 27043f51fd45..920c245ec9ad 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_certificate_test.go @@ -355,7 +355,7 @@ func testAccAzureRMKeyVaultCertificate_basicImportPFX(data acceptance.TestData) data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -413,7 +413,7 @@ resource "azurerm_key_vault_certificate" "test" { } } } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultCertificate_basicImportPFXClassic(data acceptance.TestData) string { @@ -421,7 +421,7 @@ func testAccAzureRMKeyVaultCertificate_basicImportPFXClassic(data acceptance.Tes data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -483,7 +483,7 @@ resource "azurerm_key_vault_certificate" "test" { } } } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultCertificate_requiresImport(data acceptance.TestData) string { @@ -525,7 +525,7 @@ func testAccAzureRMKeyVaultCertificate_basicGenerate(data acceptance.TestData) s data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -607,7 +607,7 @@ resource "azurerm_key_vault_certificate" "test" { } } } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultCertificate_basicGenerateSans(data acceptance.TestData) string { @@ -615,7 +615,7 @@ func testAccAzureRMKeyVaultCertificate_basicGenerateSans(data acceptance.TestDat data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -704,7 +704,7 @@ resource "azurerm_key_vault_certificate" "test" { } } } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultCertificate_basicGenerateTags(data acceptance.TestData) string { @@ -712,7 +712,7 @@ func testAccAzureRMKeyVaultCertificate_basicGenerateTags(data acceptance.TestDat data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -794,7 +794,7 @@ resource "azurerm_key_vault_certificate" "test" { "hello" = "world" } } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultCertificate_basicExtendedKeyUsage(data acceptance.TestData) string { @@ -802,7 +802,7 @@ func testAccAzureRMKeyVaultCertificate_basicExtendedKeyUsage(data acceptance.Tes data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -890,7 +890,7 @@ resource "azurerm_key_vault_certificate" "test" { } } } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultCertificate_emptyExtendedKeyUsage(data acceptance.TestData) string { @@ -898,7 +898,7 @@ func testAccAzureRMKeyVaultCertificate_emptyExtendedKeyUsage(data acceptance.Tes data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -982,5 +982,5 @@ resource "azurerm_key_vault_certificate" "test" { } } } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go index cf5f2b45e3d4..f26c8986bd2a 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_key_test.go @@ -368,7 +368,7 @@ func testAccAzureRMKeyVaultKey_basicEC(data acceptance.TestData) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -413,7 +413,7 @@ resource "azurerm_key_vault_key" "test" { "verify", ] } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultKey_basicECClassic(data acceptance.TestData) string { @@ -421,7 +421,7 @@ func testAccAzureRMKeyVaultKey_basicECClassic(data acceptance.TestData) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -466,7 +466,7 @@ resource "azurerm_key_vault_key" "test" { "verify", ] } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultKey_requiresImport(data acceptance.TestData) string { @@ -493,7 +493,7 @@ func testAccAzureRMKeyVaultKey_basicRSA(data acceptance.TestData) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -543,7 +543,7 @@ resource "azurerm_key_vault_key" "test" { "wrapKey", ] } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultKey_basicRSAHSM(data acceptance.TestData) string { @@ -551,7 +551,7 @@ func testAccAzureRMKeyVaultKey_basicRSAHSM(data acceptance.TestData) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -600,7 +600,7 @@ resource "azurerm_key_vault_key" "test" { "wrapKey", ] } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultKey_complete(data acceptance.TestData) string { @@ -608,7 +608,7 @@ func testAccAzureRMKeyVaultKey_complete(data acceptance.TestData) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -661,7 +661,7 @@ resource "azurerm_key_vault_key" "test" { "hello" = "world" } } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultKey_basicUpdated(data acceptance.TestData) string { @@ -669,7 +669,7 @@ func testAccAzureRMKeyVaultKey_basicUpdated(data acceptance.TestData) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -718,7 +718,7 @@ resource "azurerm_key_vault_key" "test" { "wrapKey", ] } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultKey_curveEC(data acceptance.TestData) string { @@ -726,7 +726,7 @@ func testAccAzureRMKeyVaultKey_curveEC(data acceptance.TestData) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -773,7 +773,7 @@ resource "azurerm_key_vault_key" "test" { "verify", ] } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultKey_basicECHSM(data acceptance.TestData) string { @@ -781,7 +781,7 @@ func testAccAzureRMKeyVaultKey_basicECHSM(data acceptance.TestData) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -828,5 +828,5 @@ resource "azurerm_key_vault_key" "test" { "verify", ] } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } diff --git a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go index fe0ffade324d..99f6fadfb0d4 100644 --- a/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go +++ b/azurerm/internal/services/keyvault/tests/resource_arm_key_vault_secret_test.go @@ -293,7 +293,7 @@ func testAccAzureRMKeyVaultSecret_basic(data acceptance.TestData) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -330,7 +330,7 @@ resource "azurerm_key_vault_secret" "test" { value = "rick-and-morty" key_vault_id = "${azurerm_key_vault.test.id}" } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultSecret_basicClasic(data acceptance.TestData) string { @@ -338,7 +338,7 @@ func testAccAzureRMKeyVaultSecret_basicClasic(data acceptance.TestData) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -375,7 +375,7 @@ resource "azurerm_key_vault_secret" "test" { value = "rick-and-morty" vault_uri = "${azurerm_key_vault.test.vault_uri}" } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultSecret_requiresImport(data acceptance.TestData) string { @@ -396,7 +396,7 @@ func testAccAzureRMKeyVaultSecret_complete(data acceptance.TestData) string { data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -440,7 +440,7 @@ resource "azurerm_key_vault_secret" "test" { "hello" = "world" } } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } func testAccAzureRMKeyVaultSecret_basicUpdated(data acceptance.TestData) string { @@ -448,7 +448,7 @@ func testAccAzureRMKeyVaultSecret_basicUpdated(data acceptance.TestData) string data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -485,5 +485,5 @@ resource "azurerm_key_vault_secret" "test" { value = "szechuan" vault_uri = "${azurerm_key_vault.test.vault_uri}" } -`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString) } diff --git a/azurerm/internal/services/monitor/tests/data_source_monitor_diagnostic_categories_test.go b/azurerm/internal/services/monitor/tests/data_source_monitor_diagnostic_categories_test.go index 81f78a3eb8c3..7c1ed10a5e2a 100644 --- a/azurerm/internal/services/monitor/tests/data_source_monitor_diagnostic_categories_test.go +++ b/azurerm/internal/services/monitor/tests/data_source_monitor_diagnostic_categories_test.go @@ -78,7 +78,7 @@ data "azurerm_monitor_diagnostic_categories" "test" { func testAccDataSourceArmMonitorDiagnosticCategories_storageAccount(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctestRG-%s" + name = "acctestRG-%d" location = "%s" } @@ -97,5 +97,5 @@ resource "azurerm_storage_account" "test" { data "azurerm_monitor_diagnostic_categories" "test" { resource_id = "${azurerm_storage_account.test.id}" } -`, data.RandomString, data.Locations.Primary, data.RandomString) +`, data.RandomInteger, data.Locations.Primary, data.RandomString) } diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go index baab252e43d7..f283b3a227d9 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go @@ -434,7 +434,7 @@ variable "network_cidr" { } resource "azurerm_resource_group" "test" { - name = "acctestRG%s" + name = "acctestRG-%d" location = "%s" } @@ -486,5 +486,5 @@ resource "azurerm_network_security_group" "test" { environment = "${var.environment}" } } -`, data.RandomString, data.Locations.Primary) +`, data.RandomInteger, data.Locations.Primary) } From 4c44c9ff556bffaebd781fc2f2afb9848c9b3246 Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 31 Dec 2019 16:43:53 -0800 Subject: [PATCH 13/14] ensure doc examples use example-resources for rg name --- .../r/app_service_virtual_network_association.html.markdown | 2 +- website/docs/r/bot_channel_email.markdown | 2 +- website/docs/r/bot_channel_ms_teams.markdown | 2 +- website/docs/r/bot_channel_slack.markdown | 2 +- website/docs/r/bot_channels_registration.markdown | 2 +- website/docs/r/bot_connection.markdown | 2 +- website/docs/r/bot_web_app.markdown | 2 +- website/docs/r/container_service.html.markdown | 6 +++--- website/docs/r/data_factory.html.markdown | 2 +- website/docs/r/data_factory_dataset_mysql.html.markdown | 2 +- .../docs/r/data_factory_dataset_postgresql.html.markdown | 2 +- .../r/data_factory_dataset_sql_server_table.html.markdown | 2 +- .../data_factory_integration_runtime_managed.html.markdown | 2 +- ...tory_linked_service_data_lake_storage_gen2.html.markdown | 2 +- .../docs/r/data_factory_linked_service_mysql.html.markdown | 2 +- .../r/data_factory_linked_service_postgresql.html.markdown | 2 +- .../r/data_factory_linked_service_sql_server.html.markdown | 2 +- website/docs/r/data_factory_pipeline.html.markdown | 2 +- website/docs/r/data_factory_trigger_schedule.html.markdown | 2 +- website/docs/r/data_lake_store.html.markdown | 2 +- website/docs/r/data_lake_store_file.html.markdown | 2 +- website/docs/r/data_lake_store_firewall_rule.html.markdown | 2 +- website/docs/r/dev_test_schedule.html.markdown | 2 +- website/docs/r/image.html.markdown | 4 ++-- website/docs/r/iothub_endpoint_eventhub.html.markdown | 2 +- .../docs/r/iothub_endpoint_servicebus_queue.html.markdown | 2 +- .../docs/r/iothub_endpoint_servicebus_topic.html.markdown | 2 +- website/docs/r/iothub_fallback_route.html.markdown | 2 +- website/docs/r/iothub_route.html.markdown | 2 +- website/docs/r/log_analytics_workspace.html.markdown | 2 +- website/docs/r/managed_disk.html.markdown | 4 ++-- website/docs/r/network_watcher_flow_log.html.markdown | 2 +- website/docs/r/sql_failover_group.html.markdown | 2 +- website/docs/r/template_deployment.html.markdown | 2 +- website/docs/r/virtual_machine_extension.html.markdown | 2 +- website/docs/r/virtual_machine_scale_set.html.markdown | 4 ++-- 36 files changed, 41 insertions(+), 41 deletions(-) diff --git a/website/docs/r/app_service_virtual_network_association.html.markdown b/website/docs/r/app_service_virtual_network_association.html.markdown index 3946b1fb1bbd..16108c53bc48 100644 --- a/website/docs/r/app_service_virtual_network_association.html.markdown +++ b/website/docs/r/app_service_virtual_network_association.html.markdown @@ -16,7 +16,7 @@ Manages an App Service Virtual Network Association (this is for the [Regional VN ```hcl resource "azurerm_resource_group" "test" { - name = "acctestRG" + name = "example-resources" location = "uksouth" } diff --git a/website/docs/r/bot_channel_email.markdown b/website/docs/r/bot_channel_email.markdown index f7c10cc3a31b..44605c6649fa 100644 --- a/website/docs/r/bot_channel_email.markdown +++ b/website/docs/r/bot_channel_email.markdown @@ -19,7 +19,7 @@ Manages a Email integration for a Bot Channel data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/bot_channel_ms_teams.markdown b/website/docs/r/bot_channel_ms_teams.markdown index 99761651d8cb..a8f7fa51e9a8 100644 --- a/website/docs/r/bot_channel_ms_teams.markdown +++ b/website/docs/r/bot_channel_ms_teams.markdown @@ -19,7 +19,7 @@ Manages a MS Teams integration for a Bot Channel data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/bot_channel_slack.markdown b/website/docs/r/bot_channel_slack.markdown index fc52d6cd1c48..e2a3d879f67f 100644 --- a/website/docs/r/bot_channel_slack.markdown +++ b/website/docs/r/bot_channel_slack.markdown @@ -19,7 +19,7 @@ Manages a Slack integration for a Bot Channel data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/bot_channels_registration.markdown b/website/docs/r/bot_channels_registration.markdown index 0d1f43aea6a1..2e78078c7e01 100644 --- a/website/docs/r/bot_channels_registration.markdown +++ b/website/docs/r/bot_channels_registration.markdown @@ -17,7 +17,7 @@ Manages a Bot Channels Registration. data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/bot_connection.markdown b/website/docs/r/bot_connection.markdown index cbbcb4c59820..3b745316c05c 100644 --- a/website/docs/r/bot_connection.markdown +++ b/website/docs/r/bot_connection.markdown @@ -17,7 +17,7 @@ Manages a Bot Connection. data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/bot_web_app.markdown b/website/docs/r/bot_web_app.markdown index 26c0dab4a1cd..0403f66e8f06 100644 --- a/website/docs/r/bot_web_app.markdown +++ b/website/docs/r/bot_web_app.markdown @@ -17,7 +17,7 @@ Manages a Web App Bot. data "azurerm_client_config" "current" {} resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/container_service.html.markdown b/website/docs/r/container_service.html.markdown index fb52395de669..72b2ad0f871a 100644 --- a/website/docs/r/container_service.html.markdown +++ b/website/docs/r/container_service.html.markdown @@ -20,7 +20,7 @@ Manages an Azure Container Service Instance ```hcl resource "azurerm_resource_group" "example" { - name = "acctestRG1" + name = "example-resources" location = "West US" } @@ -64,7 +64,7 @@ resource "azurerm_container_service" "example" { ```hcl resource "azurerm_resource_group" "example" { - name = "acctestRG1" + name = "example-resources" location = "West US" } @@ -113,7 +113,7 @@ resource "azurerm_container_service" "example" { ```hcl resource "azurerm_resource_group" "example" { - name = "acctestRG1" + name = "example-resources" location = "West US" } diff --git a/website/docs/r/data_factory.html.markdown b/website/docs/r/data_factory.html.markdown index 3b59f597e323..4f7b4ced69e8 100644 --- a/website/docs/r/data_factory.html.markdown +++ b/website/docs/r/data_factory.html.markdown @@ -15,7 +15,7 @@ Manages an Azure Data Factory (Version 2). ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_factory_dataset_mysql.html.markdown b/website/docs/r/data_factory_dataset_mysql.html.markdown index 65ae6d14fcbb..351edb7cebaa 100644 --- a/website/docs/r/data_factory_dataset_mysql.html.markdown +++ b/website/docs/r/data_factory_dataset_mysql.html.markdown @@ -15,7 +15,7 @@ Manages a MySQL Dataset inside a Azure Data Factory. ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_factory_dataset_postgresql.html.markdown b/website/docs/r/data_factory_dataset_postgresql.html.markdown index c26bcecad1bb..65ebe9f32218 100644 --- a/website/docs/r/data_factory_dataset_postgresql.html.markdown +++ b/website/docs/r/data_factory_dataset_postgresql.html.markdown @@ -15,7 +15,7 @@ Manages a PostgreSQL Dataset inside a Azure Data Factory. ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_factory_dataset_sql_server_table.html.markdown b/website/docs/r/data_factory_dataset_sql_server_table.html.markdown index 7402cbb1c4c6..479cf7ba942c 100644 --- a/website/docs/r/data_factory_dataset_sql_server_table.html.markdown +++ b/website/docs/r/data_factory_dataset_sql_server_table.html.markdown @@ -15,7 +15,7 @@ Manages a SQL Server Table Dataset inside a Azure Data Factory. ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_factory_integration_runtime_managed.html.markdown b/website/docs/r/data_factory_integration_runtime_managed.html.markdown index e68af30d7de2..5a0c7bc7017b 100644 --- a/website/docs/r/data_factory_integration_runtime_managed.html.markdown +++ b/website/docs/r/data_factory_integration_runtime_managed.html.markdown @@ -15,7 +15,7 @@ Manages an Azure Data Factory Managed Integration Runtime. ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_factory_linked_service_data_lake_storage_gen2.html.markdown b/website/docs/r/data_factory_linked_service_data_lake_storage_gen2.html.markdown index 91ed740e8b12..8c1515ec80ef 100644 --- a/website/docs/r/data_factory_linked_service_data_lake_storage_gen2.html.markdown +++ b/website/docs/r/data_factory_linked_service_data_lake_storage_gen2.html.markdown @@ -17,7 +17,7 @@ Manages a Linked Service (connection) between Data Lake Storage Gen2 and Azure D ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_factory_linked_service_mysql.html.markdown b/website/docs/r/data_factory_linked_service_mysql.html.markdown index 2faff32559e4..ad8333c48950 100644 --- a/website/docs/r/data_factory_linked_service_mysql.html.markdown +++ b/website/docs/r/data_factory_linked_service_mysql.html.markdown @@ -17,7 +17,7 @@ Manages a Linked Service (connection) between MySQL and Azure Data Factory. ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_factory_linked_service_postgresql.html.markdown b/website/docs/r/data_factory_linked_service_postgresql.html.markdown index 09ae69aee735..e82087e8a5ba 100644 --- a/website/docs/r/data_factory_linked_service_postgresql.html.markdown +++ b/website/docs/r/data_factory_linked_service_postgresql.html.markdown @@ -17,7 +17,7 @@ Manages a Linked Service (connection) between PostgreSQL and Azure Data Factory. ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_factory_linked_service_sql_server.html.markdown b/website/docs/r/data_factory_linked_service_sql_server.html.markdown index faac7c8d4390..f90f76cee91f 100644 --- a/website/docs/r/data_factory_linked_service_sql_server.html.markdown +++ b/website/docs/r/data_factory_linked_service_sql_server.html.markdown @@ -17,7 +17,7 @@ Manages a Linked Service (connection) between a SQL Server and Azure Data Factor ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_factory_pipeline.html.markdown b/website/docs/r/data_factory_pipeline.html.markdown index 805951f4896f..a240da07321f 100644 --- a/website/docs/r/data_factory_pipeline.html.markdown +++ b/website/docs/r/data_factory_pipeline.html.markdown @@ -15,7 +15,7 @@ Manages a Pipeline inside a Azure Data Factory. ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_factory_trigger_schedule.html.markdown b/website/docs/r/data_factory_trigger_schedule.html.markdown index 6649fda086dc..9f7fff02247b 100644 --- a/website/docs/r/data_factory_trigger_schedule.html.markdown +++ b/website/docs/r/data_factory_trigger_schedule.html.markdown @@ -15,7 +15,7 @@ Manages a Trigger Schedule inside a Azure Data Factory. ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_lake_store.html.markdown b/website/docs/r/data_lake_store.html.markdown index 47507003c00d..ef0d46d85645 100644 --- a/website/docs/r/data_lake_store.html.markdown +++ b/website/docs/r/data_lake_store.html.markdown @@ -15,7 +15,7 @@ Manages an Azure Data Lake Store. ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_lake_store_file.html.markdown b/website/docs/r/data_lake_store_file.html.markdown index c5e329cf6ad6..5afca4300ae1 100644 --- a/website/docs/r/data_lake_store_file.html.markdown +++ b/website/docs/r/data_lake_store_file.html.markdown @@ -18,7 +18,7 @@ taint the resource so the `azurerm_data_lake_store_file` gets recreated with the ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/data_lake_store_firewall_rule.html.markdown b/website/docs/r/data_lake_store_firewall_rule.html.markdown index 4d32639ffd2e..19f69efb40be 100644 --- a/website/docs/r/data_lake_store_firewall_rule.html.markdown +++ b/website/docs/r/data_lake_store_firewall_rule.html.markdown @@ -15,7 +15,7 @@ Manages a Azure Data Lake Store Firewall Rule. ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "northeurope" } diff --git a/website/docs/r/dev_test_schedule.html.markdown b/website/docs/r/dev_test_schedule.html.markdown index 39b5e50e4118..5e794cbdd733 100644 --- a/website/docs/r/dev_test_schedule.html.markdown +++ b/website/docs/r/dev_test_schedule.html.markdown @@ -16,7 +16,7 @@ Manages automated startup and shutdown schedules for Azure Dev Test Lab. ```hcl resource "azurerm_resource_group" "sample" { - name = "acctestRG" + name = "example-resources" location = "West US" } diff --git a/website/docs/r/image.html.markdown b/website/docs/r/image.html.markdown index a8b8fba41dec..b6859e975d76 100644 --- a/website/docs/r/image.html.markdown +++ b/website/docs/r/image.html.markdown @@ -15,7 +15,7 @@ Manages a custom virtual machine image that can be used to create virtual machin ```hcl resource "azurerm_resource_group" "example" { - name = "acctest" + name = "example-resources" location = "West US" } @@ -37,7 +37,7 @@ resource "azurerm_image" "example" { ```hcl resource "azurerm_resource_group" "example" { - name = "acctest" + name = "example-resources" location = "West US" } diff --git a/website/docs/r/iothub_endpoint_eventhub.html.markdown b/website/docs/r/iothub_endpoint_eventhub.html.markdown index f2e3630ed535..0013d8eb73c5 100644 --- a/website/docs/r/iothub_endpoint_eventhub.html.markdown +++ b/website/docs/r/iothub_endpoint_eventhub.html.markdown @@ -17,7 +17,7 @@ Manages an IotHub EventHub Endpoint ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "East US" } diff --git a/website/docs/r/iothub_endpoint_servicebus_queue.html.markdown b/website/docs/r/iothub_endpoint_servicebus_queue.html.markdown index fa1529c5f835..d8068fec4528 100644 --- a/website/docs/r/iothub_endpoint_servicebus_queue.html.markdown +++ b/website/docs/r/iothub_endpoint_servicebus_queue.html.markdown @@ -17,7 +17,7 @@ Manages an IotHub ServiceBus Queue Endpoint ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "East US" } diff --git a/website/docs/r/iothub_endpoint_servicebus_topic.html.markdown b/website/docs/r/iothub_endpoint_servicebus_topic.html.markdown index 677b35135407..3d0111114151 100644 --- a/website/docs/r/iothub_endpoint_servicebus_topic.html.markdown +++ b/website/docs/r/iothub_endpoint_servicebus_topic.html.markdown @@ -17,7 +17,7 @@ Manages an IotHub ServiceBus Topic Endpoint ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "East US" } diff --git a/website/docs/r/iothub_fallback_route.html.markdown b/website/docs/r/iothub_fallback_route.html.markdown index 166add51a053..921fc3eb6010 100644 --- a/website/docs/r/iothub_fallback_route.html.markdown +++ b/website/docs/r/iothub_fallback_route.html.markdown @@ -17,7 +17,7 @@ Manages an IotHub Fallback Route ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "West US" } diff --git a/website/docs/r/iothub_route.html.markdown b/website/docs/r/iothub_route.html.markdown index db60240e4de0..94f71ed5e174 100644 --- a/website/docs/r/iothub_route.html.markdown +++ b/website/docs/r/iothub_route.html.markdown @@ -17,7 +17,7 @@ Manages an IotHub Route ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "West US" } diff --git a/website/docs/r/log_analytics_workspace.html.markdown b/website/docs/r/log_analytics_workspace.html.markdown index 913655a3322d..9eddc01b7a24 100644 --- a/website/docs/r/log_analytics_workspace.html.markdown +++ b/website/docs/r/log_analytics_workspace.html.markdown @@ -15,7 +15,7 @@ Manages a Log Analytics (formally Operational Insights) Workspace. ```hcl resource "azurerm_resource_group" "example" { - name = "acctestRG-01" + name = "example-resources" location = "East US" } diff --git a/website/docs/r/managed_disk.html.markdown b/website/docs/r/managed_disk.html.markdown index e423f3445719..ea3d441f9c2f 100644 --- a/website/docs/r/managed_disk.html.markdown +++ b/website/docs/r/managed_disk.html.markdown @@ -15,7 +15,7 @@ Manages a managed disk. ```hcl resource "azurerm_resource_group" "example" { - name = "acctestRG" + name = "example-resources" location = "West US 2" } @@ -37,7 +37,7 @@ resource "azurerm_managed_disk" "example" { ```hcl resource "azurerm_resource_group" "example" { - name = "acctestRG" + name = "example-resources" location = "West US 2" } diff --git a/website/docs/r/network_watcher_flow_log.html.markdown b/website/docs/r/network_watcher_flow_log.html.markdown index b790af2ff8f3..679ea9b9c291 100644 --- a/website/docs/r/network_watcher_flow_log.html.markdown +++ b/website/docs/r/network_watcher_flow_log.html.markdown @@ -16,7 +16,7 @@ Manages a Network Watcher Flow Log. ```hcl resource "azurerm_resource_group" "test" { - name = "acctestRG" + name = "example-resources" location = "eastus" } diff --git a/website/docs/r/sql_failover_group.html.markdown b/website/docs/r/sql_failover_group.html.markdown index 26c058129f8f..eb5161e9e803 100644 --- a/website/docs/r/sql_failover_group.html.markdown +++ b/website/docs/r/sql_failover_group.html.markdown @@ -15,7 +15,7 @@ Create a failover group of databases on a collection of Azure SQL servers. ```hcl resource "azurerm_resource_group" "example" { - name = "example" + name = "example-resources" location = "uksouth" } diff --git a/website/docs/r/template_deployment.html.markdown b/website/docs/r/template_deployment.html.markdown index 87acd6bb35fa..3aea22e32f06 100644 --- a/website/docs/r/template_deployment.html.markdown +++ b/website/docs/r/template_deployment.html.markdown @@ -21,7 +21,7 @@ One workaround for this is to use a unique Resource Group for each ARM Template ```hcl resource "azurerm_resource_group" "example" { - name = "acctestRG-01" + name = "example-resources" location = "West US" } diff --git a/website/docs/r/virtual_machine_extension.html.markdown b/website/docs/r/virtual_machine_extension.html.markdown index 537c5b410599..3666fe6d6bc5 100644 --- a/website/docs/r/virtual_machine_extension.html.markdown +++ b/website/docs/r/virtual_machine_extension.html.markdown @@ -21,7 +21,7 @@ and run automated tasks. ```hcl resource "azurerm_resource_group" "example" { - name = "acctestRG" + name = "example-resources" location = "West US" } diff --git a/website/docs/r/virtual_machine_scale_set.html.markdown b/website/docs/r/virtual_machine_scale_set.html.markdown index e8d58cb4bd63..9a7090fa05e1 100644 --- a/website/docs/r/virtual_machine_scale_set.html.markdown +++ b/website/docs/r/virtual_machine_scale_set.html.markdown @@ -20,7 +20,7 @@ Manages a virtual machine scale set. ```hcl resource "azurerm_resource_group" "example" { - name = "acctestRG" + name = "example-resources" location = "West US 2" } @@ -170,7 +170,7 @@ resource "azurerm_virtual_machine_scale_set" "example" { ```hcl resource "azurerm_resource_group" "example" { - name = "acctestRG" + name = "example-resources" location = "West US" } From b22d85ce10919236b1a73185ea2904016e8a5850 Mon Sep 17 00:00:00 2001 From: kt Date: Wed, 1 Jan 2020 18:43:00 -0800 Subject: [PATCH 14/14] acctest-rg -> acctestRG --- ..._arm_virtual_machine_managed_disks_test.go | 4 +-- ...ce_application_gateway_association_test.go | 2 +- ...e_backend_address_pool_association_test.go | 2 +- ...ork_interface_nat_rule_association_test.go | 2 +- .../resource_arm_network_interface_test.go | 28 +++++++++---------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go index 0005af912d5d..87c823ea2b71 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go @@ -2420,7 +2420,7 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_anWithVM(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -2494,7 +2494,7 @@ resource "azurerm_virtual_machine" "test" { func testAccAzureRMVirtualMachine_hasDiskInfoWhenStopped(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go index fc9e1ff2c6e5..1b3fa4666e1f 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go @@ -187,7 +187,7 @@ func testCheckAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssocia func testAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_basic(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go index c467627086f4..7ab05e3521da 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go @@ -187,7 +187,7 @@ func testCheckAzureRMNetworkInterfaceBackendAddressPoolAssociationDisappears(res func testAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_basic(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go index 052a5af49249..bc6cbf026bc1 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go @@ -187,7 +187,7 @@ func testCheckAzureRMNetworkInterfaceNATRuleAssociationDisappears(resourceName s func testAccAzureRMNetworkInterfaceNATRuleAssociation_basic(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go index e8f21dfc0ea0..a107e7c91aff 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go @@ -475,7 +475,7 @@ func testCheckAzureRMNetworkInterfaceDestroy(s *terraform.State) error { func testAccAzureRMNetworkInterface_basic(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -529,7 +529,7 @@ resource "azurerm_network_interface" "import" { func testAccAzureRMNetworkInterface_basicWithNetworkSecurityGroup(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -571,7 +571,7 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_multipleSubnets(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -613,7 +613,7 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_multipleSubnetsUpdatedPrimary(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -655,7 +655,7 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_ipForwarding(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -691,7 +691,7 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_acceleratedNetworking(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -728,7 +728,7 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_withTags(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -768,7 +768,7 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_withTagsUpdate(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -807,7 +807,7 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_withIPAddresses(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -852,7 +852,7 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_withIPAddressesUpdate(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -895,7 +895,7 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_withIPv6Addresses(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -945,7 +945,7 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_multipleLoadBalancers(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -1293,7 +1293,7 @@ resource "azurerm_network_interface" "test2" { func testAccAzureRMNetworkInterface_publicIP(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" } @@ -1336,7 +1336,7 @@ resource "azurerm_network_interface" "test" { func testAccAzureRMNetworkInterface_applicationSecurityGroup(data acceptance.TestData) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { - name = "acctest-rg-%d" + name = "acctestRG-%d" location = "%s" }