diff --git a/builtin/providers/azurerm/import_arm_availability_set_test.go b/builtin/providers/azurerm/import_arm_availability_set_test.go index 2b6cef679..edeb3e0f4 100644 --- a/builtin/providers/azurerm/import_arm_availability_set_test.go +++ b/builtin/providers/azurerm/import_arm_availability_set_test.go @@ -25,11 +25,9 @@ func TestAccAzureRMAvailabilitySet_importBasic(t *testing.T) { }, resource.TestStep{ - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"resource_group_name"}, - //this isn't returned from the API! + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) diff --git a/builtin/providers/azurerm/import_arm_dns_zone_test.go b/builtin/providers/azurerm/import_arm_dns_zone_test.go index 51af139d8..0cee95522 100644 --- a/builtin/providers/azurerm/import_arm_dns_zone_test.go +++ b/builtin/providers/azurerm/import_arm_dns_zone_test.go @@ -24,10 +24,9 @@ func TestAccAzureRMDnsZone_importBasic(t *testing.T) { }, resource.TestStep{ - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"resource_group_name"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) diff --git a/builtin/providers/azurerm/import_arm_local_network_gateway_test.go b/builtin/providers/azurerm/import_arm_local_network_gateway_test.go index b5f9f77d0..8d8695bf6 100644 --- a/builtin/providers/azurerm/import_arm_local_network_gateway_test.go +++ b/builtin/providers/azurerm/import_arm_local_network_gateway_test.go @@ -19,11 +19,9 @@ func TestAccAzureRMLocalNetworkGateway_importBasic(t *testing.T) { }, resource.TestStep{ - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"resource_group_name"}, - //this isn't returned from the API! + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) diff --git a/builtin/providers/azurerm/import_arm_network_security_group_test.go b/builtin/providers/azurerm/import_arm_network_security_group_test.go index 70ed829c0..fa1884809 100644 --- a/builtin/providers/azurerm/import_arm_network_security_group_test.go +++ b/builtin/providers/azurerm/import_arm_network_security_group_test.go @@ -19,10 +19,9 @@ func TestAccAzureRMNetworkSecurityGroup_importBasic(t *testing.T) { }, resource.TestStep{ - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"resource_group_name"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) diff --git a/builtin/providers/azurerm/import_arm_network_security_rule_test.go b/builtin/providers/azurerm/import_arm_network_security_rule_test.go index 8e871767e..f69c88322 100644 --- a/builtin/providers/azurerm/import_arm_network_security_rule_test.go +++ b/builtin/providers/azurerm/import_arm_network_security_rule_test.go @@ -22,7 +22,7 @@ func TestAccAzureRMNetworkSecurityRule_importBasic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"resource_group_name", "network_security_group_name"}, + ImportStateVerifyIgnore: []string{"network_security_group_name"}, }, }, }) diff --git a/builtin/providers/azurerm/import_arm_public_ip_test.go b/builtin/providers/azurerm/import_arm_public_ip_test.go index f911aa309..6cd116687 100644 --- a/builtin/providers/azurerm/import_arm_public_ip_test.go +++ b/builtin/providers/azurerm/import_arm_public_ip_test.go @@ -24,10 +24,9 @@ func TestAccAzureRMPublicIpStatic_importBasic(t *testing.T) { }, resource.TestStep{ - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"resource_group_name"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) diff --git a/builtin/providers/azurerm/import_arm_sql_firewall_rule_test.go b/builtin/providers/azurerm/import_arm_sql_firewall_rule_test.go index efdb3c131..9c59c78b8 100644 --- a/builtin/providers/azurerm/import_arm_sql_firewall_rule_test.go +++ b/builtin/providers/azurerm/import_arm_sql_firewall_rule_test.go @@ -27,7 +27,7 @@ func TestAccAzureRMSqlFirewallRule_importBasic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"resource_group_name", "server_name"}, + ImportStateVerifyIgnore: []string{"server_name"}, }, }, }) diff --git a/builtin/providers/azurerm/import_arm_storage_account_test.go b/builtin/providers/azurerm/import_arm_storage_account_test.go index 47dd6ede7..89a4e9599 100644 --- a/builtin/providers/azurerm/import_arm_storage_account_test.go +++ b/builtin/providers/azurerm/import_arm_storage_account_test.go @@ -26,10 +26,9 @@ func TestAccAzureRMStorageAccount_importBasic(t *testing.T) { }, resource.TestStep{ - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"resource_group_name"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) diff --git a/builtin/providers/azurerm/import_arm_traffic_manager_endpoint_test.go b/builtin/providers/azurerm/import_arm_traffic_manager_endpoint_test.go index d8778a2c4..533ed11f8 100644 --- a/builtin/providers/azurerm/import_arm_traffic_manager_endpoint_test.go +++ b/builtin/providers/azurerm/import_arm_traffic_manager_endpoint_test.go @@ -27,9 +27,6 @@ func TestAccAzureRMTrafficManagerEndpoint_importBasic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "resource_group_name", - }, }, }, }) diff --git a/builtin/providers/azurerm/import_arm_traffic_manager_profile_test.go b/builtin/providers/azurerm/import_arm_traffic_manager_profile_test.go index 08be702e4..6e55347a9 100644 --- a/builtin/providers/azurerm/import_arm_traffic_manager_profile_test.go +++ b/builtin/providers/azurerm/import_arm_traffic_manager_profile_test.go @@ -24,10 +24,9 @@ func TestAccAzureRMTrafficManagerProfile_importBasic(t *testing.T) { }, resource.TestStep{ - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"resource_group_name"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) diff --git a/builtin/providers/azurerm/import_arm_virtual_network_peering_test.go b/builtin/providers/azurerm/import_arm_virtual_network_peering_test.go index 8269294f8..ab2561d2f 100644 --- a/builtin/providers/azurerm/import_arm_virtual_network_peering_test.go +++ b/builtin/providers/azurerm/import_arm_virtual_network_peering_test.go @@ -24,10 +24,9 @@ func TestAccAzureRMVirtualNetworkPeering_importBasic(t *testing.T) { }, resource.TestStep{ - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"resource_group_name"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) diff --git a/builtin/providers/azurerm/import_arm_virtual_network_test.go b/builtin/providers/azurerm/import_arm_virtual_network_test.go index d6e594e7a..1f06ca05d 100644 --- a/builtin/providers/azurerm/import_arm_virtual_network_test.go +++ b/builtin/providers/azurerm/import_arm_virtual_network_test.go @@ -24,10 +24,9 @@ func TestAccAzureRMVirtualNetwork_importBasic(t *testing.T) { }, resource.TestStep{ - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"resource_group_name"}, + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, }, }, }) diff --git a/builtin/providers/azurerm/provider.go b/builtin/providers/azurerm/provider.go index 6558a721d..fb5d28217 100644 --- a/builtin/providers/azurerm/provider.go +++ b/builtin/providers/azurerm/provider.go @@ -237,3 +237,9 @@ func azureStateRefreshFunc(resourceURI string, client *ArmClient, command rivier panic(fmt.Errorf("azureStateRefreshFunc called on structure %T with no mapstructure:provisioningState tag. This is a bug", res.Parsed)) } } + +// Resource group names can be capitalised, but we store them in lowercase. +// Use a custom diff function to avoid creation of new resources. +func resourceAzurermResourceGroupNameDiffSuppress(k, old, new string, d *schema.ResourceData) bool { + return strings.ToLower(old) == strings.ToLower(new) +} diff --git a/builtin/providers/azurerm/resource_arm_availability_set.go b/builtin/providers/azurerm/resource_arm_availability_set.go index e56fb1b7f..04510c512 100644 --- a/builtin/providers/azurerm/resource_arm_availability_set.go +++ b/builtin/providers/azurerm/resource_arm_availability_set.go @@ -126,6 +126,7 @@ func resourceArmAvailabilitySetRead(d *schema.ResourceData, meta interface{}) er } availSet := *resp.Properties + d.Set("resource_group_name", resGroup) d.Set("platform_update_domain_count", availSet.PlatformUpdateDomainCount) d.Set("platform_fault_domain_count", availSet.PlatformFaultDomainCount) d.Set("name", resp.Name) diff --git a/builtin/providers/azurerm/resource_arm_availability_set_test.go b/builtin/providers/azurerm/resource_arm_availability_set_test.go index 961a1a541..235133fd2 100644 --- a/builtin/providers/azurerm/resource_arm_availability_set_test.go +++ b/builtin/providers/azurerm/resource_arm_availability_set_test.go @@ -203,7 +203,7 @@ func testCheckAzureRMAvailabilitySetDestroy(s *terraform.State) error { var testAccAzureRMVAvailabilitySet_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_availability_set" "test" { @@ -215,7 +215,7 @@ resource "azurerm_availability_set" "test" { var testAccAzureRMVAvailabilitySet_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_availability_set" "test" { @@ -232,7 +232,7 @@ resource "azurerm_availability_set" "test" { var testAccAzureRMVAvailabilitySet_withUpdatedTags = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_availability_set" "test" { @@ -248,7 +248,7 @@ resource "azurerm_availability_set" "test" { var testAccAzureRMVAvailabilitySet_withDomainCounts = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_availability_set" "test" { diff --git a/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go b/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go index 4ef48ea35..dde2d0299 100644 --- a/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go +++ b/builtin/providers/azurerm/resource_arm_cdn_endpoint_test.go @@ -171,7 +171,7 @@ func testCheckAzureRMCdnEndpointDestroy(s *terraform.State) error { var testAccAzureRMCdnEndpoint_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_cdn_profile" "test" { @@ -198,7 +198,7 @@ resource "azurerm_cdn_endpoint" "test" { var testAccAzureRMCdnEndpoint_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_cdn_profile" "test" { @@ -230,7 +230,7 @@ resource "azurerm_cdn_endpoint" "test" { var testAccAzureRMCdnEndpoint_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_cdn_profile" "test" { diff --git a/builtin/providers/azurerm/resource_arm_cdn_profile_test.go b/builtin/providers/azurerm/resource_arm_cdn_profile_test.go index 01afe35f3..7718ac974 100644 --- a/builtin/providers/azurerm/resource_arm_cdn_profile_test.go +++ b/builtin/providers/azurerm/resource_arm_cdn_profile_test.go @@ -164,7 +164,7 @@ func testCheckAzureRMCdnProfileDestroy(s *terraform.State) error { var testAccAzureRMCdnProfile_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_cdn_profile" "test" { @@ -177,7 +177,7 @@ resource "azurerm_cdn_profile" "test" { var testAccAzureRMCdnProfile_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_cdn_profile" "test" { @@ -195,7 +195,7 @@ resource "azurerm_cdn_profile" "test" { var testAccAzureRMCdnProfile_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_cdn_profile" "test" { diff --git a/builtin/providers/azurerm/resource_arm_dns_a_record_test.go b/builtin/providers/azurerm/resource_arm_dns_a_record_test.go index 0db25e2e9..41724cf14 100644 --- a/builtin/providers/azurerm/resource_arm_dns_a_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_a_record_test.go @@ -142,7 +142,7 @@ func testCheckAzureRMDnsARecordDestroy(s *terraform.State) error { var testAccAzureRMDnsARecord_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -161,7 +161,7 @@ resource "azurerm_dns_a_record" "test" { var testAccAzureRMDnsARecord_updateRecords = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -180,7 +180,7 @@ resource "azurerm_dns_a_record" "test" { var testAccAzureRMDnsARecord_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -204,7 +204,7 @@ resource "azurerm_dns_a_record" "test" { var testAccAzureRMDnsARecord_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { diff --git a/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go b/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go index 489048617..a0e3dafc7 100644 --- a/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_aaaa_record_test.go @@ -142,7 +142,7 @@ func testCheckAzureRMDnsAAAARecordDestroy(s *terraform.State) error { var testAccAzureRMDnsAAAARecord_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -161,7 +161,7 @@ resource "azurerm_dns_aaaa_record" "test" { var testAccAzureRMDnsAAAARecord_updateRecords = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -180,7 +180,7 @@ resource "azurerm_dns_aaaa_record" "test" { var testAccAzureRMDnsAAAARecord_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -204,7 +204,7 @@ resource "azurerm_dns_aaaa_record" "test" { var testAccAzureRMDnsAAAARecord_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { diff --git a/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go b/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go index 7c29ced9f..0207a2dc0 100644 --- a/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_cname_record_test.go @@ -159,7 +159,7 @@ func testCheckAzureRMDnsCNameRecordDestroy(s *terraform.State) error { var testAccAzureRMDnsCNameRecord_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -178,7 +178,7 @@ resource "azurerm_dns_cname_record" "test" { var testAccAzureRMDnsCNameRecord_subdomain = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -197,7 +197,7 @@ resource "azurerm_dns_cname_record" "test" { var testAccAzureRMDnsCNameRecord_updateRecords = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -216,7 +216,7 @@ resource "azurerm_dns_cname_record" "test" { var testAccAzureRMDnsCNameRecord_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -240,7 +240,7 @@ resource "azurerm_dns_cname_record" "test" { var testAccAzureRMDnsCNameRecord_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { diff --git a/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go b/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go index b7b4cc403..e3ef8b836 100644 --- a/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_mx_record_test.go @@ -142,7 +142,7 @@ func testCheckAzureRMDnsMxRecordDestroy(s *terraform.State) error { var testAccAzureRMDnsMxRecord_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -170,7 +170,7 @@ resource "azurerm_dns_mx_record" "test" { var testAccAzureRMDnsMxRecord_updateRecords = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -203,7 +203,7 @@ resource "azurerm_dns_mx_record" "test" { var testAccAzureRMDnsMxRecord_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -236,7 +236,7 @@ resource "azurerm_dns_mx_record" "test" { var testAccAzureRMDnsMxRecord_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { diff --git a/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go b/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go index 4fb2cd903..2636c5ed2 100644 --- a/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_ns_record_test.go @@ -142,7 +142,7 @@ func testCheckAzureRMDnsNsRecordDestroy(s *terraform.State) error { var testAccAzureRMDnsNsRecord_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -168,7 +168,7 @@ resource "azurerm_dns_ns_record" "test" { var testAccAzureRMDnsNsRecord_updateRecords = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -198,7 +198,7 @@ resource "azurerm_dns_ns_record" "test" { var testAccAzureRMDnsNsRecord_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -229,7 +229,7 @@ resource "azurerm_dns_ns_record" "test" { var testAccAzureRMDnsNsRecord_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { diff --git a/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go b/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go index 35d860191..15b30b29b 100644 --- a/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_srv_record_test.go @@ -142,7 +142,7 @@ func testCheckAzureRMDnsSrvRecordDestroy(s *terraform.State) error { var testAccAzureRMDnsSrvRecord_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -174,7 +174,7 @@ resource "azurerm_dns_srv_record" "test" { var testAccAzureRMDnsSrvRecord_updateRecords = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -213,7 +213,7 @@ resource "azurerm_dns_srv_record" "test" { var testAccAzureRMDnsSrvRecord_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -250,7 +250,7 @@ resource "azurerm_dns_srv_record" "test" { var testAccAzureRMDnsSrvRecord_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { diff --git a/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go b/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go index 99fbfaedf..a80385bd5 100644 --- a/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_txt_record_test.go @@ -142,7 +142,7 @@ func testCheckAzureRMDnsTxtRecordDestroy(s *terraform.State) error { var testAccAzureRMDnsTxtRecord_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -168,7 +168,7 @@ resource "azurerm_dns_txt_record" "test" { var testAccAzureRMDnsTxtRecord_updateRecords = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -198,7 +198,7 @@ resource "azurerm_dns_txt_record" "test" { var testAccAzureRMDnsTxtRecord_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { @@ -229,7 +229,7 @@ resource "azurerm_dns_txt_record" "test" { var testAccAzureRMDnsTxtRecord_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { diff --git a/builtin/providers/azurerm/resource_arm_dns_zone.go b/builtin/providers/azurerm/resource_arm_dns_zone.go index 2a1bfdef5..7696fa8f8 100644 --- a/builtin/providers/azurerm/resource_arm_dns_zone.go +++ b/builtin/providers/azurerm/resource_arm_dns_zone.go @@ -26,9 +26,10 @@ func resourceArmDnsZone() *schema.Resource { }, "resource_group_name": &schema.Schema{ - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + DiffSuppressFunc: resourceAzurermResourceGroupNameDiffSuppress, }, "number_of_record_sets": &schema.Schema{ @@ -96,6 +97,12 @@ func resourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient) rivieraClient := client.rivieraClient + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + readRequest := rivieraClient.NewRequestForURI(d.Id()) readRequest.Command = &dns.GetDNSZone{} @@ -111,6 +118,7 @@ func resourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error { resp := readResponse.Parsed.(*dns.GetDNSZoneResponse) + d.Set("resource_group_name", resGroup) d.Set("number_of_record_sets", resp.NumberOfRecordSets) d.Set("max_number_of_record_sets", resp.MaxNumberOfRecordSets) d.Set("name", resp.Name) diff --git a/builtin/providers/azurerm/resource_arm_dns_zone_test.go b/builtin/providers/azurerm/resource_arm_dns_zone_test.go index 87b7b8758..2e59cf96e 100644 --- a/builtin/providers/azurerm/resource_arm_dns_zone_test.go +++ b/builtin/providers/azurerm/resource_arm_dns_zone_test.go @@ -80,7 +80,7 @@ func testCheckAzureRMDnsZoneDestroy(s *terraform.State) error { var testAccAzureRMDnsZone_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_dns_zone" "test" { diff --git a/builtin/providers/azurerm/resource_arm_local_network_gateway.go b/builtin/providers/azurerm/resource_arm_local_network_gateway.go index 9cff34635..82ea38e5e 100644 --- a/builtin/providers/azurerm/resource_arm_local_network_gateway.go +++ b/builtin/providers/azurerm/resource_arm_local_network_gateway.go @@ -117,6 +117,7 @@ func resourceArmLocalNetworkGatewayRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("Error reading the state of Azure ARM local network gateway '%s': %s", name, err) } + d.Set("resource_group_name", resGroup) d.Set("name", resp.Name) d.Set("location", resp.Location) d.Set("gateway_address", resp.Properties.GatewayIPAddress) diff --git a/builtin/providers/azurerm/resource_arm_network_security_group.go b/builtin/providers/azurerm/resource_arm_network_security_group.go index 84049b886..e7344b10a 100644 --- a/builtin/providers/azurerm/resource_arm_network_security_group.go +++ b/builtin/providers/azurerm/resource_arm_network_security_group.go @@ -203,6 +203,7 @@ func resourceArmNetworkSecurityGroupRead(d *schema.ResourceData, meta interface{ d.Set("security_rule", flattenNetworkSecurityRules(resp.Properties.SecurityRules)) } + d.Set("resource_group_name", resGroup) d.Set("name", resp.Name) d.Set("location", resp.Location) flattenAndSetTags(d, resp.Tags) diff --git a/builtin/providers/azurerm/resource_arm_network_security_rule.go b/builtin/providers/azurerm/resource_arm_network_security_rule.go index be6f75a59..ca5e4cbfe 100644 --- a/builtin/providers/azurerm/resource_arm_network_security_rule.go +++ b/builtin/providers/azurerm/resource_arm_network_security_rule.go @@ -183,6 +183,7 @@ func resourceArmNetworkSecurityRuleRead(d *schema.ResourceData, meta interface{} return fmt.Errorf("Error making Read request on Azure Network Security Rule %s: %s", sgRuleName, err) } + d.Set("resource_group_name", resGroup) d.Set("access", resp.Properties.Access) d.Set("destination_address_prefix", resp.Properties.DestinationAddressPrefix) d.Set("destination_port_range", resp.Properties.DestinationPortRange) diff --git a/builtin/providers/azurerm/resource_arm_public_ip.go b/builtin/providers/azurerm/resource_arm_public_ip.go index db721a787..e0dadf816 100644 --- a/builtin/providers/azurerm/resource_arm_public_ip.go +++ b/builtin/providers/azurerm/resource_arm_public_ip.go @@ -173,6 +173,7 @@ func resourceArmPublicIpRead(d *schema.ResourceData, meta interface{}) error { return fmt.Errorf("Error making Read request on Azure public ip %s: %s", name, err) } + d.Set("resource_group_name", resGroup) d.Set("location", resp.Location) d.Set("name", resp.Name) d.Set("public_ip_address_allocation", strings.ToLower(string(resp.Properties.PublicIPAllocationMethod))) diff --git a/builtin/providers/azurerm/resource_arm_public_ip_test.go b/builtin/providers/azurerm/resource_arm_public_ip_test.go index 2a3758e1e..892dcc168 100644 --- a/builtin/providers/azurerm/resource_arm_public_ip_test.go +++ b/builtin/providers/azurerm/resource_arm_public_ip_test.go @@ -314,7 +314,7 @@ func testCheckAzureRMPublicIpDestroy(s *terraform.State) error { var testAccAzureRMVPublicIpStatic_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_public_ip" "test" { @@ -327,7 +327,7 @@ resource "azurerm_public_ip" "test" { var testAccAzureRMVPublicIpStatic_update = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_public_ip" "test" { @@ -341,7 +341,7 @@ resource "azurerm_public_ip" "test" { var testAccAzureRMVPublicIpStatic_idleTimeout = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_public_ip" "test" { @@ -355,7 +355,7 @@ resource "azurerm_public_ip" "test" { var testAccAzureRMVPublicIpDynamic_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_public_ip" "test" { @@ -368,7 +368,7 @@ resource "azurerm_public_ip" "test" { var testAccAzureRMVPublicIpStatic_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_public_ip" "test" { @@ -386,7 +386,7 @@ resource "azurerm_public_ip" "test" { var testAccAzureRMVPublicIpStatic_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_public_ip" "test" { diff --git a/builtin/providers/azurerm/resource_arm_resource_group_test.go b/builtin/providers/azurerm/resource_arm_resource_group_test.go index 08f001623..ce1bf1450 100644 --- a/builtin/providers/azurerm/resource_arm_resource_group_test.go +++ b/builtin/providers/azurerm/resource_arm_resource_group_test.go @@ -160,14 +160,14 @@ func testCheckAzureRMResourceGroupDestroy(s *terraform.State) error { var testAccAzureRMResourceGroup_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } ` var testAccAzureRMResourceGroup_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" tags { @@ -179,7 +179,7 @@ resource "azurerm_resource_group" "test" { var testAccAzureRMResourceGroup_withTagsUpdated = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" tags { diff --git a/builtin/providers/azurerm/resource_arm_route_table_test.go b/builtin/providers/azurerm/resource_arm_route_table_test.go index 41a03568a..4079ebce8 100644 --- a/builtin/providers/azurerm/resource_arm_route_table_test.go +++ b/builtin/providers/azurerm/resource_arm_route_table_test.go @@ -251,7 +251,7 @@ func testCheckAzureRMRouteTableDestroy(s *terraform.State) error { var testAccAzureRMRouteTable_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -270,7 +270,7 @@ resource "azurerm_route_table" "test" { var testAccAzureRMRouteTable_multipleRoutes = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -295,7 +295,7 @@ resource "azurerm_route_table" "test" { var testAccAzureRMRouteTable_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -319,7 +319,7 @@ resource "azurerm_route_table" "test" { var testAccAzureRMRouteTable_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } diff --git a/builtin/providers/azurerm/resource_arm_route_test.go b/builtin/providers/azurerm/resource_arm_route_test.go index 12fba4576..d26f1ccbc 100644 --- a/builtin/providers/azurerm/resource_arm_route_test.go +++ b/builtin/providers/azurerm/resource_arm_route_test.go @@ -164,7 +164,7 @@ func testCheckAzureRMRouteDestroy(s *terraform.State) error { var testAccAzureRMRoute_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -186,7 +186,7 @@ resource "azurerm_route" "test" { var testAccAzureRMRoute_multipleRoutes = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } diff --git a/builtin/providers/azurerm/resource_arm_search_service_test.go b/builtin/providers/azurerm/resource_arm_search_service_test.go index 51f9c4bf7..133b90396 100644 --- a/builtin/providers/azurerm/resource_arm_search_service_test.go +++ b/builtin/providers/azurerm/resource_arm_search_service_test.go @@ -117,7 +117,7 @@ func testCheckAzureRMSearchServiceDestroy(s *terraform.State) error { var testAccAzureRMSearchService_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_search_service" "test" { @@ -135,7 +135,7 @@ resource "azurerm_search_service" "test" { var testAccAzureRMSearchService_updated = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_search_service" "test" { diff --git a/builtin/providers/azurerm/resource_arm_servicebus_namespace_test.go b/builtin/providers/azurerm/resource_arm_servicebus_namespace_test.go index 549188379..9ebfe6717 100644 --- a/builtin/providers/azurerm/resource_arm_servicebus_namespace_test.go +++ b/builtin/providers/azurerm/resource_arm_servicebus_namespace_test.go @@ -178,7 +178,7 @@ func testCheckAzureRMServiceBusNamespaceExists(name string) resource.TestCheckFu var testAccAzureRMServiceBusNamespace_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } resource "azurerm_servicebus_namespace" "test" { diff --git a/builtin/providers/azurerm/resource_arm_sql_database_test.go b/builtin/providers/azurerm/resource_arm_sql_database_test.go index a1513b458..9f80eb426 100644 --- a/builtin/providers/azurerm/resource_arm_sql_database_test.go +++ b/builtin/providers/azurerm/resource_arm_sql_database_test.go @@ -165,7 +165,7 @@ func testCheckAzureRMSqlDatabaseDestroy(s *terraform.State) error { var testAccAzureRMSqlDatabase_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_sql_server" "test" { @@ -191,7 +191,7 @@ resource "azurerm_sql_database" "test" { var testAccAzureRMSqlDatabase_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_sql_server" "test" { @@ -222,7 +222,7 @@ resource "azurerm_sql_database" "test" { var testAccAzureRMSqlDatabase_withTagsUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_sql_server" "test" { diff --git a/builtin/providers/azurerm/resource_arm_sql_firewall_rule.go b/builtin/providers/azurerm/resource_arm_sql_firewall_rule.go index 1ae4db4cc..680cec74e 100644 --- a/builtin/providers/azurerm/resource_arm_sql_firewall_rule.go +++ b/builtin/providers/azurerm/resource_arm_sql_firewall_rule.go @@ -94,6 +94,12 @@ func resourceArmSqlFirewallRuleCreate(d *schema.ResourceData, meta interface{}) } func resourceArmSqlFirewallRuleRead(d *schema.ResourceData, meta interface{}) error { + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + client := meta.(*ArmClient) rivieraClient := client.rivieraClient @@ -112,6 +118,7 @@ func resourceArmSqlFirewallRuleRead(d *schema.ResourceData, meta interface{}) er resp := readResponse.Parsed.(*sql.GetFirewallRuleResponse) + d.Set("resource_group_name", resGroup) d.Set("name", resp.Name) d.Set("start_ip_address", resp.StartIPAddress) d.Set("end_ip_address", resp.EndIPAddress) diff --git a/builtin/providers/azurerm/resource_arm_sql_firewall_rule_test.go b/builtin/providers/azurerm/resource_arm_sql_firewall_rule_test.go index 63d19dae6..9770a10e6 100644 --- a/builtin/providers/azurerm/resource_arm_sql_firewall_rule_test.go +++ b/builtin/providers/azurerm/resource_arm_sql_firewall_rule_test.go @@ -92,7 +92,7 @@ func testCheckAzureRMSqlFirewallRuleDestroy(s *terraform.State) error { var testAccAzureRMSqlFirewallRule_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_sql_server" "test" { @@ -115,7 +115,7 @@ resource "azurerm_sql_firewall_rule" "test" { var testAccAzureRMSqlFirewallRule_withUpdates = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_sql_server" "test" { diff --git a/builtin/providers/azurerm/resource_arm_sql_server_test.go b/builtin/providers/azurerm/resource_arm_sql_server_test.go index 1236c154c..fb0a44f10 100644 --- a/builtin/providers/azurerm/resource_arm_sql_server_test.go +++ b/builtin/providers/azurerm/resource_arm_sql_server_test.go @@ -111,7 +111,7 @@ func testCheckAzureRMSqlServerDestroy(s *terraform.State) error { var testAccAzureRMSqlServer_basic = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_sql_server" "test" { @@ -126,7 +126,7 @@ resource "azurerm_sql_server" "test" { var testAccAzureRMSqlServer_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_sql_server" "test" { @@ -146,7 +146,7 @@ resource "azurerm_sql_server" "test" { var testAccAzureRMSqlServer_withTagsUpdated = ` resource "azurerm_resource_group" "test" { - name = "acctest_rg_%d" + name = "acctestRG_%d" location = "West US" } resource "azurerm_sql_server" "test" { diff --git a/builtin/providers/azurerm/resource_arm_storage_account.go b/builtin/providers/azurerm/resource_arm_storage_account.go index a510f33b0..5c1f9b9b9 100644 --- a/builtin/providers/azurerm/resource_arm_storage_account.go +++ b/builtin/providers/azurerm/resource_arm_storage_account.go @@ -37,9 +37,10 @@ func resourceArmStorageAccount() *schema.Resource { }, "resource_group_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + DiffSuppressFunc: resourceAzurermResourceGroupNameDiffSuppress, }, "location": { @@ -312,6 +313,7 @@ func resourceArmStorageAccountRead(d *schema.ResourceData, meta interface{}) err } accessKeys := *keys.Keys + d.Set("resource_group_name", resGroup) d.Set("primary_access_key", accessKeys[0].Value) d.Set("secondary_access_key", accessKeys[1].Value) d.Set("location", resp.Location) diff --git a/builtin/providers/azurerm/resource_arm_storage_blob_test.go b/builtin/providers/azurerm/resource_arm_storage_blob_test.go index 38e13a39c..4714b2b9f 100644 --- a/builtin/providers/azurerm/resource_arm_storage_blob_test.go +++ b/builtin/providers/azurerm/resource_arm_storage_blob_test.go @@ -482,7 +482,7 @@ func testCheckAzureRMStorageBlobDestroy(s *terraform.State) error { var testAccAzureRMStorageBlob_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "westus" } @@ -518,7 +518,7 @@ resource "azurerm_storage_blob" "test" { var testAccAzureRMStorageBlobBlock_source = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "westus" } @@ -556,7 +556,7 @@ resource "azurerm_storage_blob" "source" { var testAccAzureRMStorageBlobPage_source = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "westus" } @@ -594,7 +594,7 @@ resource "azurerm_storage_blob" "source" { var testAccAzureRMStorageBlob_source_uri = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "westus" } diff --git a/builtin/providers/azurerm/resource_arm_storage_container_test.go b/builtin/providers/azurerm/resource_arm_storage_container_test.go index ee92b14bd..522b82b26 100644 --- a/builtin/providers/azurerm/resource_arm_storage_container_test.go +++ b/builtin/providers/azurerm/resource_arm_storage_container_test.go @@ -217,7 +217,7 @@ func TestValidateArmStorageContainerName(t *testing.T) { var testAccAzureRMStorageContainer_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "westus" } diff --git a/builtin/providers/azurerm/resource_arm_storage_queue_test.go b/builtin/providers/azurerm/resource_arm_storage_queue_test.go index a71f6e5a7..f561eadf7 100644 --- a/builtin/providers/azurerm/resource_arm_storage_queue_test.go +++ b/builtin/providers/azurerm/resource_arm_storage_queue_test.go @@ -145,7 +145,7 @@ func testCheckAzureRMStorageQueueDestroy(s *terraform.State) error { var testAccAzureRMStorageQueue_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "westus" } diff --git a/builtin/providers/azurerm/resource_arm_storage_table_test.go b/builtin/providers/azurerm/resource_arm_storage_table_test.go index ca184d72d..3da97168f 100644 --- a/builtin/providers/azurerm/resource_arm_storage_table_test.go +++ b/builtin/providers/azurerm/resource_arm_storage_table_test.go @@ -214,7 +214,7 @@ func TestValidateArmStorageTableName(t *testing.T) { var testAccAzureRMStorageTable_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "westus" } diff --git a/builtin/providers/azurerm/resource_arm_subnet_test.go b/builtin/providers/azurerm/resource_arm_subnet_test.go index 621906969..d3406718a 100644 --- a/builtin/providers/azurerm/resource_arm_subnet_test.go +++ b/builtin/providers/azurerm/resource_arm_subnet_test.go @@ -136,7 +136,7 @@ func testCheckAzureRMSubnetDestroy(s *terraform.State) error { var testAccAzureRMSubnet_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } diff --git a/builtin/providers/azurerm/resource_arm_template_deployment_test.go b/builtin/providers/azurerm/resource_arm_template_deployment_test.go index ae9836b9a..d8aae46f2 100644 --- a/builtin/providers/azurerm/resource_arm_template_deployment_test.go +++ b/builtin/providers/azurerm/resource_arm_template_deployment_test.go @@ -165,7 +165,7 @@ func testCheckAzureRMTemplateDeploymentDestroy(s *terraform.State) error { var testAccAzureRMTemplateDeployment_basicExample = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -230,7 +230,7 @@ DEPLOY var testAccAzureRMTemplateDeployment_withParams = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -315,7 +315,7 @@ DEPLOY // StorageAccount name is too long, forces error var testAccAzureRMTemplateDeployment_withError = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } diff --git a/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint.go b/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint.go index ff341a52c..ccaabd9c5 100644 --- a/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint.go +++ b/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint.go @@ -86,9 +86,10 @@ func resourceArmTrafficManagerEndpoint() *schema.Resource { }, "resource_group_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + DiffSuppressFunc: resourceAzurermResourceGroupNameDiffSuppress, }, }, } @@ -162,6 +163,7 @@ func resourceArmTrafficManagerEndpointRead(d *schema.ResourceData, meta interfac endpoint := *resp.Properties + d.Set("resource_group_name", resGroup) d.Set("name", resp.Name) d.Set("type", endpointType) d.Set("profile_name", profileName) diff --git a/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint_test.go b/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint_test.go index 21e3f01b2..2d0629868 100644 --- a/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint_test.go +++ b/builtin/providers/azurerm/resource_arm_traffic_manager_endpoint_test.go @@ -263,7 +263,7 @@ func testCheckAzureRMTrafficManagerEndpointDestroy(s *terraform.State) error { var testAccAzureRMTrafficManagerEndpoint_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -313,7 +313,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternal" { var testAccAzureRMTrafficManagerEndpoint_basicDisableExternal = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -364,7 +364,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternal" { var testAccAzureRMTrafficManagerEndpoint_weight = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -406,7 +406,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { var testAccAzureRMTrafficManagerEndpoint_updateWeight = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -448,7 +448,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { var testAccAzureRMTrafficManagerEndpoint_priority = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -490,7 +490,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { var testAccAzureRMTrafficManagerEndpoint_updatePriority = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -532,7 +532,7 @@ resource "azurerm_traffic_manager_endpoint" "testExternalNew" { var testAccAzureRMTrafficManagerEndpoint_nestedEndpoints = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } diff --git a/builtin/providers/azurerm/resource_arm_traffic_manager_profile.go b/builtin/providers/azurerm/resource_arm_traffic_manager_profile.go index 38834b2a9..c8fc02057 100644 --- a/builtin/providers/azurerm/resource_arm_traffic_manager_profile.go +++ b/builtin/providers/azurerm/resource_arm_traffic_manager_profile.go @@ -93,9 +93,10 @@ func resourceArmTrafficManagerProfile() *schema.Resource { }, "resource_group_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + DiffSuppressFunc: resourceAzurermResourceGroupNameDiffSuppress, }, "tags": tagsSchema(), @@ -161,6 +162,7 @@ func resourceArmTrafficManagerProfileRead(d *schema.ResourceData, meta interface profile := *resp.Properties // update appropriate values + d.Set("resource_group_name", resGroup) d.Set("name", resp.Name) d.Set("profile_status", profile.ProfileStatus) d.Set("traffic_routing_method", profile.TrafficRoutingMethod) diff --git a/builtin/providers/azurerm/resource_arm_traffic_manager_profile_test.go b/builtin/providers/azurerm/resource_arm_traffic_manager_profile_test.go index 66e4caf82..f5282c825 100644 --- a/builtin/providers/azurerm/resource_arm_traffic_manager_profile_test.go +++ b/builtin/providers/azurerm/resource_arm_traffic_manager_profile_test.go @@ -175,7 +175,7 @@ func testCheckAzureRMTrafficManagerProfileDestroy(s *terraform.State) error { var testAccAzureRMTrafficManagerProfile_weighted = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -199,7 +199,7 @@ resource "azurerm_traffic_manager_profile" "test" { var testAccAzureRMTrafficManagerProfile_performance = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -223,7 +223,7 @@ resource "azurerm_traffic_manager_profile" "test" { var testAccAzureRMTrafficManagerProfile_priority = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -247,7 +247,7 @@ resource "azurerm_traffic_manager_profile" "test" { var testAccAzureRMTrafficManagerProfile_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -276,7 +276,7 @@ resource "azurerm_traffic_manager_profile" "test" { var testAccAzureRMTrafficManagerProfile_withTagsUpdated = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } diff --git a/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go b/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go index a6b1b08a4..7a5c7d629 100644 --- a/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go +++ b/builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go @@ -148,7 +148,7 @@ func testCheckAzureRMVirtualMachineScaleSetDestroy(s *terraform.State) error { var testAccAzureRMVirtualMachineScaleSet_basicLinux = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -241,7 +241,7 @@ resource "azurerm_virtual_machine_scale_set" "test" { var testAccAzureRMVirtualMachineScaleSet_basicWindows = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } diff --git a/builtin/providers/azurerm/resource_arm_virtual_machine_test.go b/builtin/providers/azurerm/resource_arm_virtual_machine_test.go index d2a5bdeab..d6a1bfe6c 100644 --- a/builtin/providers/azurerm/resource_arm_virtual_machine_test.go +++ b/builtin/providers/azurerm/resource_arm_virtual_machine_test.go @@ -457,7 +457,7 @@ func testCheckAzureRMVirtualMachineDisappears(name string, vm *compute.VirtualMa var testAccAzureRMVirtualMachine_basicLinuxMachine = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -545,7 +545,7 @@ resource "azurerm_virtual_machine" "test" { var testAccAzureRMVirtualMachine_machineNameBeforeUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -634,7 +634,7 @@ resource "azurerm_virtual_machine" "test" { var testAccAzureRMVirtualMachine_basicLinuxMachineDestroyDisks = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -734,7 +734,7 @@ resource "azurerm_virtual_machine" "test" { var testAccAzureRMVirtualMachine_basicLinuxMachineDeleteVM = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -785,7 +785,7 @@ resource "azurerm_storage_container" "test" { var testAccAzureRMVirtualMachine_withDataDisk = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -881,7 +881,7 @@ resource "azurerm_virtual_machine" "test" { var testAccAzureRMVirtualMachine_basicLinuxMachineUpdated = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -968,7 +968,7 @@ resource "azurerm_virtual_machine" "test" { var testAccAzureRMVirtualMachine_updatedLinuxMachine = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -1051,7 +1051,7 @@ resource "azurerm_virtual_machine" "test" { var testAccAzureRMVirtualMachine_basicWindowsMachine = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -1135,7 +1135,7 @@ resource "azurerm_virtual_machine" "test" { var testAccAzureRMVirtualMachine_windowsUnattendedConfig = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -1225,7 +1225,7 @@ resource "azurerm_virtual_machine" "test" { var testAccAzureRMVirtualMachine_diagnosticsProfile = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -1311,7 +1311,7 @@ resource "azurerm_virtual_machine" "test" { var testAccAzureRMVirtualMachine_winRMConfig = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -1396,7 +1396,7 @@ resource "azurerm_virtual_machine" "test" { var testAccAzureRMVirtualMachine_withAvailabilitySet = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -1487,7 +1487,7 @@ var testAccAzureRMVirtualMachine_withAvailabilitySet = ` var testAccAzureRMVirtualMachine_updateAvailabilitySet = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -1578,7 +1578,7 @@ var testAccAzureRMVirtualMachine_updateAvailabilitySet = ` var testAccAzureRMVirtualMachine_updateMachineName = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } diff --git a/builtin/providers/azurerm/resource_arm_virtual_network.go b/builtin/providers/azurerm/resource_arm_virtual_network.go index 71daad909..f2a36484a 100644 --- a/builtin/providers/azurerm/resource_arm_virtual_network.go +++ b/builtin/providers/azurerm/resource_arm_virtual_network.go @@ -143,6 +143,7 @@ func resourceArmVirtualNetworkRead(d *schema.ResourceData, meta interface{}) err vnet := *resp.Properties // update appropriate values + d.Set("resource_group_name", resGroup) d.Set("name", resp.Name) d.Set("location", resp.Location) d.Set("address_space", vnet.AddressSpace.AddressPrefixes) diff --git a/builtin/providers/azurerm/resource_arm_virtual_network_peering.go b/builtin/providers/azurerm/resource_arm_virtual_network_peering.go index 28e9d07c1..5954882d5 100644 --- a/builtin/providers/azurerm/resource_arm_virtual_network_peering.go +++ b/builtin/providers/azurerm/resource_arm_virtual_network_peering.go @@ -134,6 +134,7 @@ func resourceArmVirtualNetworkPeeringRead(d *schema.ResourceData, meta interface peer := *resp.Properties // update appropriate values + d.Set("resource_group_name", resGroup) d.Set("name", resp.Name) d.Set("virtual_network_name", vnetName) d.Set("allow_virtual_network_access", peer.AllowVirtualNetworkAccess) diff --git a/builtin/providers/azurerm/resource_arm_virtual_network_peering_test.go b/builtin/providers/azurerm/resource_arm_virtual_network_peering_test.go index e84eddac7..d7031c698 100644 --- a/builtin/providers/azurerm/resource_arm_virtual_network_peering_test.go +++ b/builtin/providers/azurerm/resource_arm_virtual_network_peering_test.go @@ -190,7 +190,7 @@ func testCheckAzureRMVirtualNetworkPeeringDestroy(s *terraform.State) error { var testAccAzureRMVirtualNetworkPeering_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -227,7 +227,7 @@ resource "azurerm_virtual_network_peering" "test2" { var testAccAzureRMVirtualNetworkPeering_basicUpdate = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } diff --git a/builtin/providers/azurerm/resource_arm_virtual_network_test.go b/builtin/providers/azurerm/resource_arm_virtual_network_test.go index 1cedb803b..ef1454840 100644 --- a/builtin/providers/azurerm/resource_arm_virtual_network_test.go +++ b/builtin/providers/azurerm/resource_arm_virtual_network_test.go @@ -173,7 +173,7 @@ func testCheckAzureRMVirtualNetworkDestroy(s *terraform.State) error { var testAccAzureRMVirtualNetwork_basic = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -192,7 +192,7 @@ resource "azurerm_virtual_network" "test" { var testAccAzureRMVirtualNetwork_withTags = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" } @@ -216,7 +216,7 @@ resource "azurerm_virtual_network" "test" { var testAccAzureRMVirtualNetwork_withTagsUpdated = ` resource "azurerm_resource_group" "test" { - name = "acctestrg-%d" + name = "acctestRG-%d" location = "West US" }