Merge branch 'master' of https://github.com/terraform-providers/terra…

…form-provider-azurerm into support_mysql_server_ver_8.0

CHANGELOG.md

@@ -4,6 +4,23 @@ FEATURES:
 
 * **New Resource:** `azurerm_iothub_fallback_route` [GH-4965]
 
+IMPROVEMENTS:
+
+* `azurerm_application_gateway` - updating the validation for `min_capacity` and `max_capacity` within the `autoscale_configuration` block [GH-4958]
+* `azurerm_dns_a_record` - exposing the `fqdn` [GH-5000]
+* `azurerm_dns_aaaa_record` - exposing the `fqdn` [GH-5000]
+* `azurerm_dns_caa_record` - exposing the `fqdn` [GH-5000]
+* `azurerm_dns_cname_record` - exposing the `fqdn` [GH-5000]
+* `azurerm_dns_mx_record` - exposing the `fqdn` [GH-5000]
+* `azurerm_dns_ns_record` - exposing the `fqdn` [GH-5000]
+* `azurerm_dns_ptr_record` - exposing the `fqdn` [GH-5000]
+* `azurerm_dns_srv_record` - exposing the `fqdn` [GH-5000]
+* `azurerm_dns_txt_record` - exposing the `fqdn` [GH-5000]
+
+BUG FIXES:
+
+* `azurerm_storage_account` - ensuring we only lock each Virtual Network once during deletion [GH-4908]
+
 ## 1.37.0 (November 26, 2019)
 
 NOTES

azurerm/resource_arm_application_gateway.go

@@ -633,12 +633,12 @@ func resourceArmApplicationGateway() *schema.Resource {
 						"min_capacity": {
 							Type:         schema.TypeInt,
 							Required:     true,
-							ValidateFunc: validation.IntBetween(2, 10),
+							ValidateFunc: validation.IntBetween(0, 100),
 						},
 						"max_capacity": {
 							Type:         schema.TypeInt,
 							Optional:     true,
-							ValidateFunc: validation.IntBetween(2, 100),
+							ValidateFunc: validation.IntBetween(2, 125),
 						},
 					},
 				},

azurerm/resource_arm_application_gateway_test.go

@@ -51,12 +51,12 @@ func TestAccAzureRMApplicationGateway_autoscaleConfiguration(t *testing.T) {
 		CheckDestroy: testCheckAzureRMApplicationGatewayDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAzureRMApplicationGateway_autoscaleConfiguration(ri, testLocation(), 2, 10),
+				Config: testAccAzureRMApplicationGateway_autoscaleConfiguration(ri, testLocation(), 0, 10),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMApplicationGatewayExists(resourceName),
 					resource.TestCheckResourceAttr(resourceName, "sku.0.name", "Standard_v2"),
 					resource.TestCheckResourceAttr(resourceName, "sku.0.tier", "Standard_v2"),
-					resource.TestCheckResourceAttr(resourceName, "autoscale_configuration.0.min_capacity", "2"),
+					resource.TestCheckResourceAttr(resourceName, "autoscale_configuration.0.min_capacity", "0"),
 					resource.TestCheckResourceAttr(resourceName, "autoscale_configuration.0.max_capacity", "10"),
 					resource.TestCheckResourceAttr(resourceName, "waf_configuration.#", "0"),
 				),

azurerm/resource_arm_dns_a_record.go

@@ -58,6 +58,11 @@ func resourceArmDnsARecord() *schema.Resource {
 				Required: true,
 			},
 
+			"fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -144,6 +149,7 @@ func resourceArmDnsARecordRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("resource_group_name", resGroup)
 	d.Set("zone_name", zoneName)
 	d.Set("ttl", resp.TTL)
+	d.Set("fqdn", resp.Fqdn)
 
 	if err := d.Set("records", flattenAzureRmDnsARecords(resp.ARecords)); err != nil {
 		return err

azurerm/resource_arm_dns_a_record_test.go

@@ -26,6 +26,7 @@ func TestAccAzureRMDnsARecord_basic(t *testing.T) {
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMDnsARecordExists(resourceName),
+					resource.TestCheckResourceAttrSet(resourceName, "fqdn"),
 				),
 			},
 			{

azurerm/resource_arm_dns_aaaa_record.go

@@ -58,6 +58,11 @@ func resourceArmDnsAAAARecord() *schema.Resource {
 				Required: true,
 			},
 
+			"fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -144,6 +149,7 @@ func resourceArmDnsAaaaRecordRead(d *schema.ResourceData, meta interface{}) erro
 	d.Set("resource_group_name", resGroup)
 	d.Set("zone_name", zoneName)
 	d.Set("ttl", resp.TTL)
+	d.Set("fqdn", resp.Fqdn)
 
 	if err := d.Set("records", flattenAzureRmDnsAaaaRecords(resp.AaaaRecords)); err != nil {
 		return err

azurerm/resource_arm_dns_aaaa_record_test.go

@@ -26,6 +26,7 @@ func TestAccAzureRMDnsAAAARecord_basic(t *testing.T) {
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMDnsAaaaRecordExists(resourceName),
+					resource.TestCheckResourceAttrSet(resourceName, "fqdn"),
 				),
 			},
 			{

azurerm/resource_arm_dns_caa_record.go

@@ -85,6 +85,11 @@ func resourceArmDnsCaaRecord() *schema.Resource {
 				Required: true,
 			},
 
+			"fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -171,6 +176,7 @@ func resourceArmDnsCaaRecordRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("resource_group_name", resGroup)
 	d.Set("zone_name", zoneName)
 	d.Set("ttl", resp.TTL)
+	d.Set("fqdn", resp.Fqdn)
 
 	if err := d.Set("record", flattenAzureRmDnsCaaRecords(resp.CaaRecords)); err != nil {
 		return err

azurerm/resource_arm_dns_caa_record_test.go

@@ -26,6 +26,7 @@ func TestAccAzureRMDnsCaaRecord_basic(t *testing.T) {
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMDnsCaaRecordExists(resourceName),
+					resource.TestCheckResourceAttrSet(resourceName, "fqdn"),
 				),
 			},
 			{

azurerm/resource_arm_dns_cname_record.go

@@ -63,6 +63,11 @@ func resourceArmDnsCNameRecord() *schema.Resource {
 				Required: true,
 			},
 
+			"fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -152,6 +157,7 @@ func resourceArmDnsCNameRecordRead(d *schema.ResourceData, meta interface{}) err
 	d.Set("resource_group_name", resGroup)
 	d.Set("zone_name", zoneName)
 	d.Set("ttl", resp.TTL)
+	d.Set("fqdn", resp.Fqdn)
 
 	if props := resp.RecordSetProperties; props != nil {
 		if record := props.CnameRecord; record != nil {

azurerm/resource_arm_dns_cname_record_test.go

@@ -26,6 +26,7 @@ func TestAccAzureRMDnsCNameRecord_basic(t *testing.T) {
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMDnsCNameRecordExists(resourceName),
+					resource.TestCheckResourceAttrSet(resourceName, "fqdn"),
 				),
 			},
 			{

azurerm/resource_arm_dns_mx_record.go

@@ -74,6 +74,11 @@ func resourceArmDnsMxRecord() *schema.Resource {
 				Required: true,
 			},
 
+			"fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -160,6 +165,7 @@ func resourceArmDnsMxRecordRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("resource_group_name", resGroup)
 	d.Set("zone_name", zoneName)
 	d.Set("ttl", resp.TTL)
+	d.Set("fqdn", resp.Fqdn)
 
 	if err := d.Set("record", flattenAzureRmDnsMxRecords(resp.MxRecords)); err != nil {
 		return err

azurerm/resource_arm_dns_mx_record_test.go

@@ -26,6 +26,7 @@ func TestAccAzureRMDnsMxRecord_basic(t *testing.T) {
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMDnsMxRecordExists(resourceName),
+					resource.TestCheckResourceAttrSet(resourceName, "fqdn"),
 				),
 			},
 			{

azurerm/resource_arm_dns_ns_record.go

@@ -76,6 +76,11 @@ func resourceArmDnsNsRecord() *schema.Resource {
 				Required: true,
 			},
 
+			"fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -162,6 +167,7 @@ func resourceArmDnsNsRecordRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("resource_group_name", resGroup)
 	d.Set("zone_name", zoneName)
 	d.Set("ttl", resp.TTL)
+	d.Set("fqdn", resp.Fqdn)
 
 	if err := d.Set("records", flattenAzureRmDnsNsRecords(resp.NsRecords)); err != nil {
 		return fmt.Errorf("Error settings `records`: %+v", err)

azurerm/resource_arm_dns_ns_record_test.go

@@ -47,6 +47,7 @@ func TestAccAzureRMDnsNsRecord_basic(t *testing.T) {
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMDnsNsRecordExists(resourceName),
+					resource.TestCheckResourceAttrSet(resourceName, "fqdn"),
 				),
 			},
 			{

azurerm/resource_arm_dns_ptr_record.go

@@ -58,6 +58,11 @@ func resourceArmDnsPtrRecord() *schema.Resource {
 				Required: true,
 			},
 
+			"fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -145,6 +150,7 @@ func resourceArmDnsPtrRecordRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("resource_group_name", resGroup)
 	d.Set("zone_name", zoneName)
 	d.Set("ttl", resp.TTL)
+	d.Set("fqdn", resp.Fqdn)
 
 	if err := d.Set("records", flattenAzureRmDnsPtrRecords(resp.PtrRecords)); err != nil {
 		return err

azurerm/resource_arm_dns_ptr_record_test.go

@@ -26,6 +26,7 @@ func TestAccAzureRMDnsPtrRecord_basic(t *testing.T) {
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMDnsPtrRecordExists(resourceName),
+					resource.TestCheckResourceAttrSet(resourceName, "fqdn"),
 				),
 			},
 			{

azurerm/resource_arm_dns_srv_record.go

@@ -82,6 +82,11 @@ func resourceArmDnsSrvRecord() *schema.Resource {
 				Required: true,
 			},
 
+			"fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -168,6 +173,7 @@ func resourceArmDnsSrvRecordRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("resource_group_name", resGroup)
 	d.Set("zone_name", zoneName)
 	d.Set("ttl", resp.TTL)
+	d.Set("fqdn", resp.Fqdn)
 
 	if err := d.Set("record", flattenAzureRmDnsSrvRecords(resp.SrvRecords)); err != nil {
 		return err

azurerm/resource_arm_dns_srv_record_test.go

@@ -26,6 +26,7 @@ func TestAccAzureRMDnsSrvRecord_basic(t *testing.T) {
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMDnsSrvRecordExists(resourceName),
+					resource.TestCheckResourceAttrSet(resourceName, "fqdn"),
 				),
 			},
 			{

azurerm/resource_arm_dns_txt_record.go

@@ -64,6 +64,11 @@ func resourceArmDnsTxtRecord() *schema.Resource {
 				Required: true,
 			},
 
+			"fqdn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -150,6 +155,7 @@ func resourceArmDnsTxtRecordRead(d *schema.ResourceData, meta interface{}) error
 	d.Set("resource_group_name", resGroup)
 	d.Set("zone_name", zoneName)
 	d.Set("ttl", resp.TTL)
+	d.Set("fqdn", resp.Fqdn)
 
 	if err := d.Set("record", flattenAzureRmDnsTxtRecords(resp.TxtRecords)); err != nil {
 		return err

azurerm/resource_arm_dns_txt_record_test.go

@@ -26,6 +26,7 @@ func TestAccAzureRMDnsTxtRecord_basic(t *testing.T) {
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMDnsTxtRecordExists(resourceName),
+					resource.TestCheckResourceAttrSet(resourceName, "fqdn"),
 				),
 			},
 			{

azurerm/resource_arm_storage_account.go

@@ -1213,6 +1213,11 @@ func resourceArmStorageAccountDelete(d *schema.ResourceData, meta interface{}) e
 					}
 
 					networkName := id.Path["virtualNetworks"]
+					for _, virtualNetworkName := range virtualNetworkNames {
+						if networkName == virtualNetworkName {
+							continue
+						}
+					}
 					virtualNetworkNames = append(virtualNetworkNames, networkName)
 				}
 			}