Add resources azurerm_virtual_network_gateway and azurerm_virtual_network_gateway_connection

azurerm/import_arm_virtual_network_gateway_connection_test.go

@@ -0,0 +1,32 @@
+package azurerm
+
+import (
+	"fmt"
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+	"testing"
+)
+
+func TestAccAzureRMVirtualNetworkGatewayConnection_importSiteToSite(t *testing.T) {
+	resourceName := "azurerm_virtual_network_gateway_connection.test"
+
+	ri := acctest.RandInt()
+	config := fmt.Sprintf(testAccAzureRMVirtualNetworkGatewayConnection_sitetosite, ri)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMVirtualNetworkGatewayConnectionDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+			},
+
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

azurerm/import_arm_virtual_network_gateway_test.go

@@ -0,0 +1,32 @@
+package azurerm
+
+import (
+	"fmt"
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+	"testing"
+)
+
+func TestAccAzureRMVirtualNetworkGateway_importBasic(t *testing.T) {
+	resourceName := "azurerm_virtual_network_gateway.test"
+
+	ri := acctest.RandInt()
+	config := fmt.Sprintf(testAccAzureRMVirtualNetworkGateway_basic, ri)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMVirtualNetworkGatewayDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+			},
+
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

azurerm/provider.go

@@ -92,34 +92,36 @@ func Provider() terraform.ResourceProvider {
 
 			"azurerm_managed_disk": resourceArmManagedDisk(),
 
-			"azurerm_key_vault":                 resourceArmKeyVault(),
-			"azurerm_local_network_gateway":     resourceArmLocalNetworkGateway(),
-			"azurerm_network_interface":         resourceArmNetworkInterface(),
-			"azurerm_network_security_group":    resourceArmNetworkSecurityGroup(),
-			"azurerm_network_security_rule":     resourceArmNetworkSecurityRule(),
-			"azurerm_public_ip":                 resourceArmPublicIp(),
-			"azurerm_redis_cache":               resourceArmRedisCache(),
-			"azurerm_route":                     resourceArmRoute(),
-			"azurerm_route_table":               resourceArmRouteTable(),
-			"azurerm_servicebus_namespace":      resourceArmServiceBusNamespace(),
-			"azurerm_servicebus_subscription":   resourceArmServiceBusSubscription(),
-			"azurerm_servicebus_topic":          resourceArmServiceBusTopic(),
-			"azurerm_sql_elasticpool":           resourceArmSqlElasticPool(),
-			"azurerm_storage_account":           resourceArmStorageAccount(),
-			"azurerm_storage_blob":              resourceArmStorageBlob(),
-			"azurerm_storage_container":         resourceArmStorageContainer(),
-			"azurerm_storage_share":             resourceArmStorageShare(),
-			"azurerm_storage_queue":             resourceArmStorageQueue(),
-			"azurerm_storage_table":             resourceArmStorageTable(),
-			"azurerm_subnet":                    resourceArmSubnet(),
-			"azurerm_template_deployment":       resourceArmTemplateDeployment(),
-			"azurerm_traffic_manager_endpoint":  resourceArmTrafficManagerEndpoint(),
-			"azurerm_traffic_manager_profile":   resourceArmTrafficManagerProfile(),
-			"azurerm_virtual_machine_extension": resourceArmVirtualMachineExtensions(),
-			"azurerm_virtual_machine":           resourceArmVirtualMachine(),
-			"azurerm_virtual_machine_scale_set": resourceArmVirtualMachineScaleSet(),
-			"azurerm_virtual_network":           resourceArmVirtualNetwork(),
-			"azurerm_virtual_network_peering":   resourceArmVirtualNetworkPeering(),
+			"azurerm_key_vault":                          resourceArmKeyVault(),
+			"azurerm_local_network_gateway":              resourceArmLocalNetworkGateway(),
+			"azurerm_network_interface":                  resourceArmNetworkInterface(),
+			"azurerm_network_security_group":             resourceArmNetworkSecurityGroup(),
+			"azurerm_network_security_rule":              resourceArmNetworkSecurityRule(),
+			"azurerm_public_ip":                          resourceArmPublicIp(),
+			"azurerm_redis_cache":                        resourceArmRedisCache(),
+			"azurerm_route":                              resourceArmRoute(),
+			"azurerm_route_table":                        resourceArmRouteTable(),
+			"azurerm_servicebus_namespace":               resourceArmServiceBusNamespace(),
+			"azurerm_servicebus_subscription":            resourceArmServiceBusSubscription(),
+			"azurerm_servicebus_topic":                   resourceArmServiceBusTopic(),
+			"azurerm_sql_elasticpool":                    resourceArmSqlElasticPool(),
+			"azurerm_storage_account":                    resourceArmStorageAccount(),
+			"azurerm_storage_blob":                       resourceArmStorageBlob(),
+			"azurerm_storage_container":                  resourceArmStorageContainer(),
+			"azurerm_storage_share":                      resourceArmStorageShare(),
+			"azurerm_storage_queue":                      resourceArmStorageQueue(),
+			"azurerm_storage_table":                      resourceArmStorageTable(),
+			"azurerm_subnet":                             resourceArmSubnet(),
+			"azurerm_template_deployment":                resourceArmTemplateDeployment(),
+			"azurerm_traffic_manager_endpoint":           resourceArmTrafficManagerEndpoint(),
+			"azurerm_traffic_manager_profile":            resourceArmTrafficManagerProfile(),
+			"azurerm_virtual_machine_extension":          resourceArmVirtualMachineExtensions(),
+			"azurerm_virtual_machine":                    resourceArmVirtualMachine(),
+			"azurerm_virtual_machine_scale_set":          resourceArmVirtualMachineScaleSet(),
+			"azurerm_virtual_network":                    resourceArmVirtualNetwork(),
+			"azurerm_virtual_network_gateway":            resourceArmVirtualNetworkGateway(),
+			"azurerm_virtual_network_gateway_connection": resourceArmVirtualNetworkGatewayConnection(),
+			"azurerm_virtual_network_peering":            resourceArmVirtualNetworkPeering(),
 
 			"azurerm_application_insights": resourceArmApplicationInsights(),
 

azurerm/resource_arm_local_network_gateway.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/Azure/azure-sdk-for-go/arm/network"
+	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
@@ -97,15 +98,10 @@ func resourceArmLocalNetworkGatewayCreate(d *schema.ResourceData, meta interface
 func resourceArmLocalNetworkGatewayRead(d *schema.ResourceData, meta interface{}) error {
 	lnetClient := meta.(*ArmClient).localNetConnClient
 
-	id, err := parseAzureResourceID(d.Id())
+	resGroup, name, err := resourceGroupAndLocalNetworkGatewayFromId(d.Id())
 	if err != nil {
 		return err
 	}
-	name := id.Path["localNetworkGateways"]
-	if name == "" {
-		return fmt.Errorf("Cannot find 'localNetworkGateways' in '%s', make sure it is specified in the ID parameter", d.Id())
-	}
-	resGroup := id.ResourceGroup
 
 	resp, err := lnetClient.Get(resGroup, name)
 	if err != nil {
@@ -134,12 +130,10 @@ func resourceArmLocalNetworkGatewayRead(d *schema.ResourceData, meta interface{}
 func resourceArmLocalNetworkGatewayDelete(d *schema.ResourceData, meta interface{}) error {
 	lnetClient := meta.(*ArmClient).localNetConnClient
 
-	id, err := parseAzureResourceID(d.Id())
+	resGroup, name, err := resourceGroupAndLocalNetworkGatewayFromId(d.Id())
 	if err != nil {
 		return err
 	}
-	name := id.Path["localNetworkGateways"]
-	resGroup := id.ResourceGroup
 
 	deleteResp, error := lnetClient.Delete(resGroup, name, make(chan struct{}))
 	resp := <-deleteResp
@@ -155,3 +149,33 @@ func resourceArmLocalNetworkGatewayDelete(d *schema.ResourceData, meta interface
 
 	return nil
 }
+
+func resourceGroupAndLocalNetworkGatewayFromId(localNetworkGatewayId string) (string, string, error) {
+	id, err := parseAzureResourceID(localNetworkGatewayId)
+	if err != nil {
+		return "", "", err
+	}
+	name := id.Path["localNetworkGateways"]
+	resGroup := id.ResourceGroup
+
+	return resGroup, name, nil
+}
+
+func retrieveLocalNetworkGatewayById(localNetworkGatewayId string, meta interface{}) (*network.LocalNetworkGateway, bool, error) {
+	lnetClient := meta.(*ArmClient).localNetConnClient
+
+	resGroup, name, err := resourceGroupAndLocalNetworkGatewayFromId(localNetworkGatewayId)
+	if err != nil {
+		return nil, false, errwrap.Wrapf("Error Getting LocalNetworkGateway Name and Group: {{err}}", err)
+	}
+
+	resp, err := lnetClient.Get(resGroup, name)
+	if err != nil {
+		if resp.StatusCode == http.StatusNotFound {
+			return nil, false, nil
+		}
+		return nil, false, fmt.Errorf("Error making Read request on Azure LocalNetworkGateway %s: %s", name, err)
+	}
+
+	return &resp, true, nil
+}

azurerm/resource_arm_subnet.go

@@ -6,7 +6,9 @@ import (
 	"net/http"
 
 	"github.com/Azure/azure-sdk-for-go/arm/network"
+	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
+	"time"
 )
 
 var subnetResourceName = "azurerm_subnet"
@@ -236,5 +238,48 @@ func resourceArmSubnetDelete(d *schema.ResourceData, meta interface{}) error {
 	_, error := subnetClient.Delete(resGroup, vnetName, name, make(chan struct{}))
 	err = <-error
 
+	// After deleting a gateway subnet, we check if the subnet has been deleted and
+	// retry if necessary. This is necessary as a workaround for scenarios in which
+	// a gateway subnet is deleted immediately after its previously associated
+	// virtual network gateway has been deleted. Unfortunately, the Azure Management
+	// API does not provide information on the state, therefore we try for a
+	// limited period of time.
+	if err != nil && name == "GatewaySubnet" {
+		err = resourceArmSubnetRetryDeleteGatewaySubnet(subnetClient, name, vnetName, resGroup)
+	}
+
 	return err
 }
+
+func resourceArmSubnetRetryDeleteGatewaySubnet(subnetClient network.SubnetsClient, name string, vnetName string, resGroup string) error {
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{"Deleting", "Failed"},
+		Target:  []string{"NotFound"},
+		Refresh: func() (interface{}, string, error) {
+			resp, err := subnetClient.Get(resGroup, vnetName, name, "")
+
+			if err != nil {
+				if resp.StatusCode == http.StatusNotFound {
+					return resp, "NotFound", nil
+				}
+
+				return nil, "", fmt.Errorf("Error issuing read request when retrying to delete Gateway Subnet %s/%s (resource group %s): %s", vnetName, name, resGroup, err)
+			}
+
+			// Retry deletion of gateway subnet if provisioning state is failed
+			if *resp.SubnetPropertiesFormat.ProvisioningState == "Failed" {
+				log.Printf("[DEBUG] Retry deleting Gateway Subnet %s/%s after failed provisioning state.", vnetName, name)
+				subnetClient.Delete(resGroup, vnetName, name, make(chan struct{}))
+			}
+
+			return resp, *resp.SubnetPropertiesFormat.ProvisioningState, nil
+		},
+		PollInterval: 30 * time.Second,
+		Timeout:      15 * time.Minute,
+	}
+	if _, err := stateConf.WaitForState(); err != nil {
+		return fmt.Errorf("Error waiting for Gateway Subnet %s/%s to be removed: %s", vnetName, name, err)
+	}
+
+	return nil
+}