2.0 Final Package Deprecations

azurerm/helpers/azure/app_service.go

@@ -3,17 +3,22 @@ package azure
 import (
 	"fmt"
 	"log"
-	"net"
 	"regexp"
 	"strings"
 
-	"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
+	"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
+const (
+	// TODO: switch back once https://github.com/Azure/azure-rest-api-specs/pull/8435 has been fixed
+	SystemAssignedUserAssigned web.ManagedServiceIdentityType = "SystemAssigned, UserAssigned"
+)
+
 func SchemaAppServiceAadAuthSettings() *schema.Schema {
 	return &schema.Schema{
 		Type:     schema.TypeList,
@@ -225,7 +230,7 @@ func SchemaAppServiceIdentity() *schema.Schema {
 					ValidateFunc: validation.StringInSlice([]string{
 						string(web.ManagedServiceIdentityTypeNone),
 						string(web.ManagedServiceIdentityTypeSystemAssigned),
-						string(web.ManagedServiceIdentityTypeSystemAssignedUserAssigned),
+						string(SystemAssignedUserAssigned),
 						string(web.ManagedServiceIdentityTypeUserAssigned),
 					}, true),
 					DiffSuppressFunc: suppress.CaseDifference,
@@ -302,25 +307,15 @@ func SchemaAppServiceSiteConfig() *schema.Schema {
 					Elem: &schema.Resource{
 						Schema: map[string]*schema.Schema{
 							"ip_address": {
-								Type:     schema.TypeString,
-								Optional: true,
+								Type:         schema.TypeString,
+								Optional:     true,
+								ValidateFunc: validate.CIDR,
 							},
 							"virtual_network_subnet_id": {
 								Type:         schema.TypeString,
 								Optional:     true,
 								ValidateFunc: validation.StringIsNotEmpty,
 							},
-							"subnet_mask": {
-								Type:     schema.TypeString,
-								Optional: true,
-								Computed: true,
-								// TODO we should fix this in 2.0
-								// This attribute was made with the assumption that `ip_address` was the only valid option
-								// but `virtual_network_subnet_id` is being added and doesn't need a `subnet_mask`.
-								// We'll assume a default of "255.255.255.255" in the expand code when `ip_address` is specified
-								// and `subnet_mask` is not.
-								// Default:  "255.255.255.255",
-							},
 						},
 					},
 				},
@@ -477,11 +472,6 @@ func SchemaAppServiceSiteConfig() *schema.Schema {
 					}, false),
 				},
 
-				"virtual_network_name": {
-					Type:     schema.TypeString,
-					Optional: true,
-				},
-
 				"cors": SchemaWebCorsSettings(),
 
 				"auto_swap_slot_name": {
@@ -689,10 +679,6 @@ func SchemaAppServiceDataSourceSiteConfig() *schema.Schema {
 								Type:     schema.TypeString,
 								Computed: true,
 							},
-							"subnet_mask": {
-								Type:     schema.TypeString,
-								Computed: true,
-							},
 						},
 					},
 				},
@@ -777,11 +763,6 @@ func SchemaAppServiceDataSourceSiteConfig() *schema.Schema {
 					Computed: true,
 				},
 
-				"virtual_network_name": {
-					Type:     schema.TypeString,
-					Computed: true,
-				},
-
 				"cors": {
 					Type:     schema.TypeList,
 					Computed: true,
@@ -1334,7 +1315,7 @@ func ExpandAppServiceIdentity(input []interface{}) *web.ManagedServiceIdentity {
 		Type: identityType,
 	}
 
-	if managedServiceIdentity.Type == web.ManagedServiceIdentityTypeUserAssigned || managedServiceIdentity.Type == web.ManagedServiceIdentityTypeSystemAssignedUserAssigned {
+	if managedServiceIdentity.Type == web.ManagedServiceIdentityTypeUserAssigned || managedServiceIdentity.Type == SystemAssignedUserAssigned {
 		managedServiceIdentity.UserAssignedIdentities = identityIds
 	}
 
@@ -1439,31 +1420,20 @@ func ExpandAppServiceSiteConfig(input interface{}) (*web.SiteConfig, error) {
 			ipAddress := restriction["ip_address"].(string)
 			vNetSubnetID := restriction["virtual_network_subnet_id"].(string)
 			if vNetSubnetID != "" && ipAddress != "" {
-				return siteConfig, fmt.Errorf(fmt.Sprintf("only one of `ip_address` or `virtual_network_subnet_id` can set set for `site_config.0.ip_restriction.%d`", i))
+				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))
 			}
 
 			if vNetSubnetID == "" && ipAddress == "" {
-				return siteConfig, fmt.Errorf(fmt.Sprintf("one of `ip_address` or `virtual_network_subnet_id` must be set set for `site_config.0.ip_restriction.%d`", i))
+				return siteConfig, fmt.Errorf(fmt.Sprintf("one of `ip_address` or `virtual_network_subnet_id` must be set for `site_config.0.ip_restriction.%d`", i))
 			}
 
 			ipSecurityRestriction := web.IPSecurityRestriction{}
+			if ipAddress == "Any" {
+				continue
+			}
+
 			if ipAddress != "" {
-				mask := restriction["subnet_mask"].(string)
-				if mask == "" {
-					mask = "255.255.255.255"
-				}
-				// the 2018-02-01 API expects a blank subnet mask and an IP address in CIDR format: a.b.c.d/x
-				// so translate the IP and mask if necessary
-				restrictionMask := ""
-				cidrAddress := ipAddress
-				if mask != "" {
-					ipNet := net.IPNet{IP: net.ParseIP(ipAddress), Mask: net.IPMask(net.ParseIP(mask))}
-					cidrAddress = ipNet.String()
-				} else if !strings.Contains(ipAddress, "/") {
-					cidrAddress += "/32"
-				}
-				ipSecurityRestriction.IPAddress = &cidrAddress
-				ipSecurityRestriction.SubnetMask = &restrictionMask
+				ipSecurityRestriction.IPAddress = &ipAddress
 			}
 
 			if vNetSubnetID != "" {
@@ -1519,10 +1489,6 @@ func ExpandAppServiceSiteConfig(input interface{}) (*web.SiteConfig, error) {
 		siteConfig.MinTLSVersion = web.SupportedTLSVersions(v.(string))
 	}
 
-	if v, ok := config["virtual_network_name"]; ok {
-		siteConfig.VnetName = utils.String(v.(string))
-	}
-
 	if v, ok := config["cors"]; ok {
 		corsSettings := v.(interface{})
 		expand := ExpandWebCorsSettings(corsSettings)
@@ -1587,20 +1553,14 @@ func FlattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} {
 	if vs := input.IPSecurityRestrictions; vs != nil {
 		for _, v := range *vs {
 			block := make(map[string]interface{})
+
 			if ip := v.IPAddress; ip != nil {
-				// the 2018-02-01 API uses CIDR format (a.b.c.d/x), so translate that back to IP and mask
-				if strings.Contains(*ip, "/") {
-					ipAddr, ipNet, _ := net.ParseCIDR(*ip)
-					block["ip_address"] = ipAddr.String()
-					mask := net.IP(ipNet.Mask)
-					block["subnet_mask"] = mask.String()
+				if *ip == "Any" {
+					continue
 				} else {
 					block["ip_address"] = *ip
 				}
 			}
-			if subnet := v.SubnetMask; subnet != nil {
-				block["subnet_mask"] = *subnet
-			}
 			if vNetSubnetID := v.VnetSubnetResourceID; vNetSubnetID != nil {
 				block["virtual_network_subnet_id"] = *vNetSubnetID
 			}
@@ -1643,10 +1603,6 @@ func FlattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} {
 		result["windows_fx_version"] = *input.WindowsFxVersion
 	}
 
-	if input.VnetName != nil {
-		result["virtual_network_name"] = *input.VnetName
-	}
-
 	result["scm_type"] = string(input.ScmType)
 	result["ftps_state"] = string(input.FtpsState)
 	result["min_tls_version"] = string(input.MinTLSVersion)

azurerm/helpers/azure/app_service_schedule_backup.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/Azure/go-autorest/autorest/date"
 
-	"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
+	"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 )

azurerm/helpers/azure/location.go

@@ -35,17 +35,6 @@ func SchemaLocationForDataSource() *schema.Schema {
 	}
 }
 
-func SchemaLocationDeprecated() *schema.Schema {
-	return &schema.Schema{
-		Type:             schema.TypeString,
-		ForceNew:         true,
-		Optional:         true,
-		StateFunc:        NormalizeLocation,
-		DiffSuppressFunc: SuppressLocationDiff,
-		Deprecated:       "location is no longer used",
-	}
-}
-
 // azure.NormalizeLocation is a function which normalises human-readable region/location
 // names (e.g. "West US") to the values used and returned by the Azure API (e.g. "westus").
 // In state we track the API internal version as it is easier to go from the human form

azurerm/helpers/azure/resource_group.go

@@ -18,15 +18,6 @@ func SchemaResourceGroupName() *schema.Schema {
 	}
 }
 
-func SchemaResourceGroupNameDeprecated() *schema.Schema {
-	return &schema.Schema{
-		Type:       schema.TypeString,
-		Optional:   true,
-		Computed:   true,
-		Deprecated: "This field has been deprecated and is no longer used - will be removed in 2.0 of the Azure Provider",
-	}
-}
-
 func SchemaResourceGroupNameDiffSuppress() *schema.Schema {
 	return &schema.Schema{
 		Type:             schema.TypeString,

azurerm/helpers/azure/web.go

@@ -1,7 +1,7 @@
 package azure
 
 import (
-	"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2018-02-01/web"
+	"github.com/Azure/azure-sdk-for-go/services/web/mgmt/2019-08-01/web"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )

azurerm/internal/provider/provider.go

@@ -136,10 +136,9 @@ func AzureProvider() terraform.ResourceProvider {
 			},
 
 			"disable_correlation_request_id": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				// TODO: add an ARM_ prefix in 2.0w
-				DefaultFunc: schema.EnvDefaultFunc("DISABLE_CORRELATION_REQUEST_ID", false),
+				Type:        schema.TypeBool,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("ARM_DISABLE_CORRELATION_REQUEST_ID", false),
 				Description: "This will disable the x-ms-correlation-request-id header.",
 			},
 

azurerm/internal/services/authorization/data_source_client_config.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
@@ -38,17 +37,6 @@ func dataSourceArmClientConfig() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-
-			"service_principal_application_id": {
-				Type:       schema.TypeString,
-				Computed:   true,
-				Deprecated: "This has been deprecated in favour of the `client_id` property",
-			},
-			"service_principal_object_id": {
-				Type:       schema.TypeString,
-				Computed:   true,
-				Deprecated: "This has been deprecated in favour of the unified `authenticated_object_id` property",
-			},
 		},
 	}
 }
@@ -58,7 +46,6 @@ func dataSourceArmClientConfigRead(d *schema.ResourceData, meta interface{}) err
 	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	var servicePrincipal *graphrbac.ServicePrincipal
 	if client.Account.AuthenticatedAsAServicePrincipal {
 		spClient := client.Authorization.ServicePrincipalsClient
 		// Application & Service Principal is 1:1 per tenant. Since we know the appId (client_id)
@@ -73,8 +60,6 @@ func dataSourceArmClientConfigRead(d *schema.ResourceData, meta interface{}) err
 		if listResult.Values() == nil || len(listResult.Values()) != 1 {
 			return fmt.Errorf("Unexpected Service Principal query result: %#v", listResult.Values())
 		}
-
-		servicePrincipal = &(listResult.Values())[0]
 	}
 
 	d.SetId(time.Now().UTC().String())
@@ -83,13 +68,5 @@ func dataSourceArmClientConfigRead(d *schema.ResourceData, meta interface{}) err
 	d.Set("subscription_id", client.Account.SubscriptionId)
 	d.Set("tenant_id", client.Account.TenantId)
 
-	if principal := servicePrincipal; principal != nil {
-		d.Set("service_principal_application_id", client.Account.ClientId)
-		d.Set("service_principal_object_id", principal.ObjectID)
-	} else {
-		d.Set("service_principal_application_id", "")
-		d.Set("service_principal_object_id", "")
-	}
-
 	return nil
 }

azurerm/internal/services/authorization/tests/data_source_client_config_test.go

@@ -27,8 +27,6 @@ func TestAccDataSourceAzureRMClientConfig_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(data.ResourceName, "tenant_id", tenantId),
 					resource.TestCheckResourceAttr(data.ResourceName, "subscription_id", subscriptionId),
 					testAzureRMClientConfigGUIDAttr(data.ResourceName, "object_id"),
-					testAzureRMClientConfigGUIDAttr(data.ResourceName, "service_principal_application_id"),
-					testAzureRMClientConfigGUIDAttr(data.ResourceName, "service_principal_object_id"),
 				),
 			},
 		},

azurerm/internal/services/compute/resource_arm_virtual_machine_extension.go

@@ -96,24 +96,19 @@ func resourceArmVirtualMachineExtensionsCreateUpdate(d *schema.ResourceData, met
 	defer cancel()
 
 	name := d.Get("name").(string)
-	virtualMachineId := d.Get("virtual_machine_id").(string)
-	v, err := ParseVirtualMachineID(virtualMachineId)
+	virtualMachineId, err := ParseVirtualMachineID(d.Get("virtual_machine_id").(string))
 	if err != nil {
 		return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", virtualMachineId, err)
 	}
-
-	virtualMachineName := v.Name
-	resourceGroup := v.ResourceGroup
+	virtualMachineName := virtualMachineId.Name
+	resourceGroup := virtualMachineId.ResourceGroup
 
 	virtualMachine, err := vmClient.Get(ctx, resourceGroup, virtualMachineName, "")
 	if err != nil {
 		return fmt.Errorf("Error getting Virtual Machine %q (Resource Group %q): %+v", name, resourceGroup, err)
 	}
 
-	location := ""
-	if virtualMachine.Location != nil {
-		location = *virtualMachine.Location
-	}
+	location := *virtualMachine.Location
 	if location == "" {
 		return fmt.Errorf("Error reading location of Virtual Machine %q", virtualMachineName)
 	}

azurerm/internal/services/compute/tests/resource_arm_virtual_machine_extension_test.go

@@ -121,13 +121,12 @@ func testCheckAzureRMVirtualMachineExtensionExists(resourceName string) resource
 		}
 
 		name := rs.Primary.Attributes["name"]
-		vmId := rs.Primary.Attributes["virtual_machine_id"]
-		v, err := compute.ParseVirtualMachineID(vmId)
+		virtualMachineId, err := compute.ParseVirtualMachineID(rs.Primary.Attributes["virtual_machine_id"])
 		if err != nil {
-			return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", vmId, err)
+			return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", virtualMachineId, err)
 		}
-		vmName := v.Name
-		resourceGroup := rs.Primary.Attributes["resource_group_name"]
+		vmName := virtualMachineId.Name
+		resourceGroup := virtualMachineId.ResourceGroup
 
 		resp, err := client.Get(ctx, resourceGroup, vmName, name, "")
 		if err != nil {
@@ -152,13 +151,12 @@ func testCheckAzureRMVirtualMachineExtensionDestroy(s *terraform.State) error {
 		}
 
 		name := rs.Primary.Attributes["name"]
-		vmId := rs.Primary.Attributes["virtual_machine_id"]
-		v, err := compute.ParseVirtualMachineID(vmId)
+		virtualMachineId, err := compute.ParseVirtualMachineID(rs.Primary.Attributes["virtual_machine_id"])
 		if err != nil {
-			return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", vmId, err)
+			return fmt.Errorf("Error parsing Virtual Machine ID %q: %+v", virtualMachineId, err)
 		}
-		vmName := v.Name
-		resourceGroup := rs.Primary.Attributes["resource_group_name"]
+		vmName := virtualMachineId.Name
+		resourceGroup := virtualMachineId.ResourceGroup
 
 		resp, err := client.Get(ctx, resourceGroup, vmName, name, "")