Upgrade azure-sdk-for-go to v38.1.0 and frontdoor to 2019-11-01 (#5385)

azurerm/internal/services/frontdoor/client/client.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/Azure/azure-sdk-for-go/services/frontdoor/mgmt/2019-04-01/frontdoor"
+	"github.com/Azure/azure-sdk-for-go/services/frontdoor/mgmt/2019-11-01/frontdoor"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
 )
 

azurerm/internal/services/frontdoor/helper.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Azure/azure-sdk-for-go/services/frontdoor/mgmt/2019-04-01/frontdoor"
+	"github.com/Azure/azure-sdk-for-go/services/frontdoor/mgmt/2019-11-01/frontdoor"
 )
 
 func VerifyBackendPoolExists(backendPoolName string, backendPools []interface{}) error {

azurerm/internal/services/frontdoor/resource_arm_front_door.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/frontdoor/mgmt/2019-04-01/frontdoor"
+	"github.com/Azure/azure-sdk-for-go/services/frontdoor/mgmt/2019-11-01/frontdoor"
 	"github.com/hashicorp/go-azure-helpers/response"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
@@ -832,8 +832,11 @@ func expandArmFrontDoorFrontendEndpoint(input []interface{}, frontDoorPath strin
 
 func expandArmFrontDoorCustomHTTPSConfiguration(input []interface{}) *frontdoor.CustomHTTPSConfiguration {
 	if len(input) == 0 {
+		// https://github.com/Azure/azure-sdk-for-go/issues/6882
+		defaultProtocolType := "ServerNameIndication"
+
 		defaultHttpsConfiguration := frontdoor.CustomHTTPSConfiguration{
-			ProtocolType:      frontdoor.ServerNameIndication,
+			ProtocolType:      &defaultProtocolType,
 			CertificateSource: frontdoor.CertificateSourceFrontDoor,
 			CertificateSourceParameters: &frontdoor.CertificateSourceParameters{
 				CertificateType: frontdoor.Dedicated,
@@ -1435,8 +1438,11 @@ func flattenArmFrontDoorFrontendEndpointsSubResources(input *[]frontdoor.SubReso
 }
 
 func makeCustomHttpsConfiguration(customHttpsConfiguration map[string]interface{}) frontdoor.CustomHTTPSConfiguration {
+	// https://github.com/Azure/azure-sdk-for-go/issues/6882
+	defaultProtocolType := "ServerNameIndication"
+
 	customHTTPSConfigurationUpdate := frontdoor.CustomHTTPSConfiguration{
-		ProtocolType: frontdoor.ServerNameIndication,
+		ProtocolType: &defaultProtocolType,
 	}
 
 	if customHttpsConfiguration["certificate_source"].(string) == "AzureKeyVault" {

azurerm/internal/services/frontdoor/resource_arm_front_door_firewall_policy.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/frontdoor/mgmt/2019-04-01/frontdoor"
+	"github.com/Azure/azure-sdk-for-go/services/frontdoor/mgmt/2019-11-01/frontdoor"
 	"github.com/hashicorp/go-azure-helpers/response"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
@@ -180,18 +180,18 @@ func resourceArmFrontDoorFirewallPolicy() *schema.Resource {
 										Type:     schema.TypeString,
 										Required: true,
 										ValidateFunc: validation.StringInSlice([]string{
-											string(frontdoor.Any),
-											string(frontdoor.BeginsWith),
-											string(frontdoor.Contains),
-											string(frontdoor.EndsWith),
-											string(frontdoor.Equal),
-											string(frontdoor.GeoMatch),
-											string(frontdoor.GreaterThan),
-											string(frontdoor.GreaterThanOrEqual),
-											string(frontdoor.IPMatch),
-											string(frontdoor.LessThan),
-											string(frontdoor.LessThanOrEqual),
-											string(frontdoor.RegEx),
+											string(frontdoor.OperatorAny),
+											string(frontdoor.OperatorBeginsWith),
+											string(frontdoor.OperatorContains),
+											string(frontdoor.OperatorEndsWith),
+											string(frontdoor.OperatorEqual),
+											string(frontdoor.OperatorGeoMatch),
+											string(frontdoor.OperatorGreaterThan),
+											string(frontdoor.OperatorGreaterThanOrEqual),
+											string(frontdoor.OperatorIPMatch),
+											string(frontdoor.OperatorLessThan),
+											string(frontdoor.OperatorLessThanOrEqual),
+											string(frontdoor.OperatorRegEx),
 										}, false),
 									},
 

azurerm/internal/services/frontdoor/tests/resource_arm_front_door_firewall_policy_test.go

@@ -243,7 +243,7 @@ custom_rule {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
   name     = "testAccRG-%d"
-  location = "%s"
+  location = "%[2]s"
 }
 
 resource "azurerm_frontdoor_firewall_policy" "test" {
@@ -272,7 +272,7 @@ resource "azurerm_frontdoor_firewall_policy" "test" {
     }
   }
 
-  %s
+  %[3]s
 
   managed_rule {
     type    = "DefaultRuleSet"

go.mod

@@ -1,7 +1,7 @@
 module github.com/terraform-providers/terraform-provider-azurerm
 
 require (
-	github.com/Azure/azure-sdk-for-go v38.0.0+incompatible
+	github.com/Azure/azure-sdk-for-go v38.1.0+incompatible
 	github.com/Azure/go-autorest/autorest v0.9.3
 	github.com/Azure/go-autorest/autorest/date v0.2.0
 	github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0 // indirect

go.sum

@@ -13,8 +13,8 @@ contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrL
 github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v38.0.0+incompatible h1:3D2O4g8AwDwyWkM1HpMFVux/ccQJmGJHXsE004Wsu1Q=
-github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-sdk-for-go v38.1.0+incompatible h1:5AawcyRJqShKENbdf2ZWJsdOnr+dEt6bz91YStCUmT4=
+github.com/Azure/azure-sdk-for-go v38.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-autorest v10.15.4+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest v13.0.0+incompatible h1:56c11ykhsFSPNNQuS73Ri8h/ezqVhr2h6t9LJIEKVO0=
 github.com/Azure/go-autorest v13.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=