Merge remote-tracking branch 'origin/master' into fix-6714

.teamcity/components/build_components.kt

@@ -7,7 +7,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
 
 // unfortunately TeamCity's Go Test Json parser appears to be broken
 // as such for the moment let's use the old method with a feature-flag
-const val useTeamCityGoTest = false
+const val useTeamCityGoTest = true
 
 fun BuildFeatures.Golang() {
     if (useTeamCityGoTest) {
@@ -81,4 +81,4 @@ fun Triggers.RunNightly(nightlyTestsEnabled: Boolean, startHour: Int) {
             timezone = "SERVER"
         }
     }
-}
+}

.teamcity/components/generated/services.kt

@@ -21,6 +21,7 @@ var services = mapOf(
         "datafactory" to "Data Factory",
         "datalake" to "Data Lake",
         "databasemigration" to "Database Migration",
+        "datashare" to "Data Share",
         "devspace" to "DevSpaces",
         "devtestlabs" to "Dev Test",
         "dns" to "DNS",

CHANGELOG.md

@@ -1,17 +1,40 @@
 ## 2.9.0 (Unreleased)
 
+FEATURES:
+
+* **New Data Source:** `azurerm_data_share_account` [GH-6575]
+* **New Resource:** `azurerm_data_share_account` [GH-6575]
+* **New Resource:** `azurerm_function_app_slot` [GH-6435]
+* **New Resource:** `azurerm_sentinel_alert_rule_scheduled` [GH-6650]
+
 IMPROVEMENTS:
 
+* Data Source: `azurerm_eventhub_authorization_rule` - support for the `primary_connection_string_alias` an `secondary_connection_string_alias` propeties  [GH-6708]
+* Data Source: `azurerm_eventhub_namespace_authorization_rule` - support for the `primary_connection_string_alias` an `secondary_connection_string_alias` propeties  [GH-6708]
+* Data Source: `azurerm_eventhub_namespace` - support for the `default_primary_connection_string_alias` an `_defaultsecondary_connection_string_alias` propeties  [GH-6708]
+* `azurerm_analysis_services_server` - support updating when the Server is paused [GH-6786]
+* `azurerm_app_service` - support for health_check_path preview feature added [GH-6661]
+* `azurerm_app_service` - support for `name` and `priority` on `ip_restrictions` [GH-6705]
 * `azurerm_application_gateway` - support for SSL Certificates without passwords [GH-6742]
+* `azurerm_eventhub_authorization_rule` - support for the `primary_connection_string_alias` an `secondary_connection_string_alias` propeties  [GH-6708]
+* `azurerm_eventhub_namespace_authorization_rule` - support for the `primary_connection_string_alias` an `secondary_connection_string_alias` propeties  [GH-6708]
+* `azurerm_eventhub_namespace` - support for the `default_primary_connection_string_alias` an `_defaultsecondary_connection_string_alias` propeties  [GH-6708]
+* `azurerm_hdinsight_hadoop_cluster` - support for metastores on cluster creation [GH-6145]
 * `azurerm_key_vault_certificate` - support for recovering a soft-deleted certificate if the `features` flag `recover_soft_deleted_key_vaults` is set to `true` [GH-6716]
 * `azurerm_key_vault_key` - support for recovering a soft-deleted key if the `features` flag `recover_soft_deleted_key_vaults` is set to `true` [GH-6716]
 * `azurerm_key_vault_secret` - support for recovering a soft-deleted secret if the `features` flag `recover_soft_deleted_key_vaults` is set to `true` [GH-6716]
-* `azurerm_linux_virtual_machine_scale_set - support for configuring `create_mode` for data disks [GH-6744]
-* `azurerm_windows_virtual_machine_scale_set - support for configuring `create_mode` for data disks [GH-6744]
+* `azurerm_linux_virtual_machine_scale_set` - support for configuring `create_mode` for data disks [GH-6744]
+* `azurerm_monitor_diagnostic_setting` - `log_analytics_destination_type` supports `AzureDiagnostics` [GH-6769]
+* `azurerm_windows_virtual_machine_scale_set` - support for configuring `create_mode` for data disks [GH-6744]
 
 BUG FIXES:
 
+* provider: raising an error when the environment is set to `AZURESTACKCLOUD` [GH-6817]
+* `azurerm_analysis_services_server` - ip restriction name field no longer case sensitive [GH-6774]
+* `azurerm_eventhub_namespace_authorization_rule` - lock to prevent multiple resources won't clash [GH-6701]
+* `azurerm_network_interface` - changes to dns servers no longer use incremental update [GH-6624]
 * `azurerm_policy_definition` - changes to the dynamic fields (`createdBy`, `createdOn`, `updatedBy`, `updatedOn`) keys in the `metadata` field are excluded from diff's [GH-6734]
+* `azurerm_site_recovery_network_mapping` - handling an API Error when checking for the presence of an existing Network Mapping [GH-6747]
 
 ## 2.8.0 (April 30, 2020)
 

azurerm/helpers/azure/app_service.go

@@ -316,6 +316,18 @@ func SchemaAppServiceSiteConfig() *schema.Schema {
 								Optional:     true,
 								ValidateFunc: validation.StringIsNotEmpty,
 							},
+							"name": {
+								Type:         schema.TypeString,
+								Optional:     true,
+								Computed:     true,
+								ValidateFunc: validation.StringIsNotEmpty,
+							},
+							"priority": {
+								Type:         schema.TypeInt,
+								Optional:     true,
+								Computed:     true,
+								ValidateFunc: validation.IntBetween(1, 2147483647),
+							},
 						},
 					},
 				},
@@ -394,10 +406,11 @@ func SchemaAppServiceSiteConfig() *schema.Schema {
 					Optional: true,
 					Computed: true,
 					ValidateFunc: validation.StringInSlice([]string{
-						"VS2012",
+						"VS2012", // TODO for 3.0 - remove VS2012, VS2013, VS2015
 						"VS2013",
 						"VS2015",
 						"VS2017",
+						"VS2019",
 					}, true),
 					DiffSuppressFunc: suppress.CaseDifference,
 				},
@@ -449,6 +462,11 @@ func SchemaAppServiceSiteConfig() *schema.Schema {
 					}, false),
 				},
 
+				"health_check_path": {
+					Type:     schema.TypeString,
+					Optional: true,
+				},
+
 				"linux_fx_version": {
 					Type:     schema.TypeString,
 					Optional: true,
@@ -679,6 +697,14 @@ func SchemaAppServiceDataSourceSiteConfig() *schema.Schema {
 								Type:     schema.TypeString,
 								Computed: true,
 							},
+							"name": {
+								Type:     schema.TypeString,
+								Computed: true,
+							},
+							"priority": {
+								Type:     schema.TypeInt,
+								Computed: true,
+							},
 						},
 					},
 				},
@@ -748,6 +774,11 @@ func SchemaAppServiceDataSourceSiteConfig() *schema.Schema {
 					Computed: true,
 				},
 
+				"health_check_path": {
+					Type:     schema.TypeString,
+					Computed: true,
+				},
+
 				"linux_fx_version": {
 					Type:     schema.TypeString,
 					Computed: true,
@@ -1419,6 +1450,8 @@ func ExpandAppServiceSiteConfig(input interface{}) (*web.SiteConfig, error) {
 
 			ipAddress := restriction["ip_address"].(string)
 			vNetSubnetID := restriction["virtual_network_subnet_id"].(string)
+			name := restriction["name"].(string)
+			priority := restriction["priority"].(int)
 			if vNetSubnetID != "" && ipAddress != "" {
 				return siteConfig, fmt.Errorf(fmt.Sprintf("only one of `ip_address` or `virtual_network_subnet_id` can be set for `site_config.0.ip_restriction.%d`", i))
 			}
@@ -1440,6 +1473,14 @@ func ExpandAppServiceSiteConfig(input interface{}) (*web.SiteConfig, error) {
 				ipSecurityRestriction.VnetSubnetResourceID = &vNetSubnetID
 			}
 
+			if name != "" {
+				ipSecurityRestriction.Name = &name
+			}
+
+			if priority != 0 {
+				ipSecurityRestriction.Priority = utils.Int32(int32(priority))
+			}
+
 			restrictions = append(restrictions, ipSecurityRestriction)
 		}
 		siteConfig.IPSecurityRestrictions = &restrictions
@@ -1485,6 +1526,10 @@ func ExpandAppServiceSiteConfig(input interface{}) (*web.SiteConfig, error) {
 		siteConfig.FtpsState = web.FtpsState(v.(string))
 	}
 
+	if v, ok := config["health_check_path"]; ok {
+		siteConfig.HealthCheckPath = utils.String(v.(string))
+	}
+
 	if v, ok := config["min_tls_version"]; ok {
 		siteConfig.MinTLSVersion = web.SupportedTLSVersions(v.(string))
 	}
@@ -1564,6 +1609,12 @@ func FlattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} {
 			if vNetSubnetID := v.VnetSubnetResourceID; vNetSubnetID != nil {
 				block["virtual_network_subnet_id"] = *vNetSubnetID
 			}
+			if name := v.Name; name != nil {
+				block["name"] = *name
+			}
+			if priority := v.Priority; priority != nil {
+				block["priority"] = *priority
+			}
 			restrictions = append(restrictions, block)
 		}
 	}
@@ -1605,6 +1656,11 @@ func FlattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} {
 
 	result["scm_type"] = string(input.ScmType)
 	result["ftps_state"] = string(input.FtpsState)
+
+	if input.HealthCheckPath != nil {
+		result["health_check_path"] = *input.HealthCheckPath
+	}
+
 	result["min_tls_version"] = string(input.MinTLSVersion)
 
 	result["cors"] = FlattenWebCorsSettings(input.Cors)

azurerm/helpers/azure/eventhub.go

@@ -88,16 +88,22 @@ func EventHubAuthorizationRuleSchemaFrom(s map[string]*schema.Schema) map[string
 			Default:  false,
 		},
 
-		"send": {
+		"manage": {
 			Type:     schema.TypeBool,
 			Optional: true,
 			Default:  false,
 		},
 
-		"manage": {
-			Type:     schema.TypeBool,
-			Optional: true,
-			Default:  false,
+		"primary_connection_string": {
+			Type:      schema.TypeString,
+			Computed:  true,
+			Sensitive: true,
+		},
+
+		"primary_connection_string_alias": {
+			Type:      schema.TypeString,
+			Computed:  true,
+			Sensitive: true,
 		},
 
 		"primary_key": {
@@ -106,23 +112,29 @@ func EventHubAuthorizationRuleSchemaFrom(s map[string]*schema.Schema) map[string
 			Sensitive: true,
 		},
 
-		"primary_connection_string": {
+		"secondary_connection_string": {
 			Type:      schema.TypeString,
 			Computed:  true,
 			Sensitive: true,
 		},
 
-		"secondary_key": {
+		"secondary_connection_string_alias": {
 			Type:      schema.TypeString,
 			Computed:  true,
 			Sensitive: true,
 		},
 
-		"secondary_connection_string": {
+		"secondary_key": {
 			Type:      schema.TypeString,
 			Computed:  true,
 			Sensitive: true,
 		},
+
+		"send": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Default:  false,
+		},
 	}
 	return MergeSchema(s, authSchema)
 }