Added Virtual Network Integration to the API Management service

azurerm/resource_arm_api_management.go

@@ -260,6 +260,31 @@ func resourceArmApiManagementService() *schema.Resource {
 				},
 			},
 
+			"virtual_network_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ValidateFunc: validation.StringInSlice([]string{
+					string(apimanagement.VirtualNetworkTypeInternal),
+					string(apimanagement.VirtualNetworkTypeExternal),
+					string(apimanagement.VirtualNetworkTypeNone),
+				}, false),
+			},
+
+			"virtual_network_configuration": {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"subnet_id": {
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: azure.ValidateResourceID,
+						},
+					},
+				},
+			},
+
 			"tags": tagsSchema(),
 
 			"gateway_url": {
@@ -325,14 +350,19 @@ func resourceArmApiManagementServiceCreateUpdate(d *schema.ResourceData, meta in
 	certificates := expandAzureRmApiManagementCertificates(d)
 	hostnameConfigurations := expandAzureRmApiManagementHostnameConfigurations(d)
 
+	virtualNetworkType := apimanagement.VirtualNetworkType(d.Get("virtual_network_type").(string))
+	virtualNetworkConfiguration := expandAzureRmApiManagementVirtualNetworkConfiguration(d)
+
 	properties := apimanagement.ServiceResource{
 		Location: utils.String(location),
 		ServiceProperties: &apimanagement.ServiceProperties{
-			PublisherName:          utils.String(publisherName),
-			PublisherEmail:         utils.String(publisherEmail),
-			CustomProperties:       customProperties,
-			Certificates:           certificates,
-			HostnameConfigurations: hostnameConfigurations,
+			PublisherName:               utils.String(publisherName),
+			PublisherEmail:              utils.String(publisherEmail),
+			CustomProperties:            customProperties,
+			Certificates:                certificates,
+			HostnameConfigurations:      hostnameConfigurations,
+			VirtualNetworkType:          virtualNetworkType,
+			VirtualNetworkConfiguration: virtualNetworkConfiguration,
 		},
 		Tags: expandTags(tags),
 		Sku:  sku,
@@ -428,6 +458,12 @@ func resourceArmApiManagementServiceRead(d *schema.ResourceData, meta interface{
 			return fmt.Errorf("Error setting `hostname_configuration`: %+v", err)
 		}
 
+		d.Set("virtual_network_type", props.VirtualNetworkType)
+
+		if err := d.Set("virtual_network_configuration", flattenApiManagementVirtualNetworkConfiguration(props.VirtualNetworkConfiguration)); err != nil {
+			return fmt.Errorf("Error setting `virtual_network_configuration`: %+v", err)
+		}
+
 		if err := d.Set("additional_location", flattenApiManagementAdditionalLocations(props.AdditionalLocations)); err != nil {
 			return fmt.Errorf("Error setting `additional_location`: %+v", err)
 		}
@@ -740,6 +776,34 @@ func flattenApiManagementServiceSku(input *apimanagement.ServiceSkuProperties) [
 	return []interface{}{sku}
 }
 
+func expandAzureRmApiManagementVirtualNetworkConfiguration(d *schema.ResourceData) *apimanagement.VirtualNetworkConfiguration {
+	vs := d.Get("virtual_network_configuration").([]interface{})
+	// guaranteed by MinItems in the schema
+	v := vs[0].(map[string]interface{})
+
+	subnetid := v["subnet_id"].(string)
+
+	vnetConfig := &apimanagement.VirtualNetworkConfiguration{
+		SubnetResourceID: utils.String(subnetid),
+	}
+
+	return vnetConfig
+}
+
+func flattenApiManagementVirtualNetworkConfiguration(input *apimanagement.VirtualNetworkConfiguration) []interface{} {
+	if input == nil {
+		return []interface{}{}
+	}
+
+	vnetConfig := make(map[string]interface{})
+
+	if id := input.SubnetResourceID; id != nil {
+		vnetConfig["subnet_id"] = *id
+	}
+
+	return []interface{}{vnetConfig}
+}
+
 func expandApiManagementCustomProperties(d *schema.ResourceData) map[string]*string {
 	vs := d.Get("security").([]interface{})
 

azurerm/resource_arm_api_management_test.go

@@ -251,7 +251,10 @@ resource "azurerm_api_management" "test" {
 }
 
 func testAccAzureRMApiManagement_complete(rInt int, location string, altLocation string) string {
+	template := testAccAzureRMApiManagement_template(rInt, location)
 	return fmt.Sprintf(`
+%s
+
 resource "azurerm_resource_group" "test1" {
   name     = "acctestRG-%d"
   location = "%s"
@@ -309,7 +312,13 @@ resource "azurerm_api_management" "test" {
       certificate          = "${base64encode(file("testdata/api_management_portal_test.pfx"))}"
       certificate_password = "terraform"
     }
-  }
+	}
+
+	virtual_network_type	= "External"
+
+	virtual_network_configuration {
+		subnet_id	= "${azurerm_subnet.test.id}"
+	}
 
   sku {
     name     = "Premium"
@@ -323,5 +332,28 @@ resource "azurerm_api_management" "test" {
   location            = "${azurerm_resource_group.test1.location}"
   resource_group_name = "${azurerm_resource_group.test1.name}"
 }
-`, rInt, location, rInt, altLocation, rInt)
+`, template, rInt, location, rInt, altLocation, rInt)
+}
+
+func testAccAzureRMApiManagement_template(rInt int, location string) string {
+	return fmt.Sprintf(`
+resource "azurerm_resource_group" "test" {
+  name     = "acctestRG-%d"
+  location = "%s"
+}
+
+resource "azurerm_virtual_network" "test" {
+  name                = "acctest-vnet-%d"
+  resource_group_name = "${azurerm_resource_group.test.name}"
+  address_space       = ["10.0.0.0/16"]
+  location            = "${azurerm_resource_group.test.location}"
+}
+
+resource "azurerm_subnet" "test" {
+  name                 = "subnet-%d"
+  resource_group_name  = "${azurerm_resource_group.test.name}"
+  virtual_network_name = "${azurerm_virtual_network.test.name}"
+  address_prefix       = "10.0.0.0/24"
+}
+`, rInt, location, rInt, rInt)
 }

website/docs/r/api_management.html.markdown

@@ -62,6 +62,10 @@ The following arguments are supported:
 
 * `security` - (Optional) A `security` block as defined below.
 
+* `virtual_network_type` - (Optional) Specifies the Virtual Network Integration for the API Management Service. Possible values include: `None`, `External`, and `Internal`.
+
+* `virtual_network_configuration` - (Optional) A `virtual_network_configuration` block as defined below.
+
 * `tags` - (Optional) A mapping of tags assigned to the resource.
 
 ---
@@ -120,6 +124,12 @@ A `security` block supports the following:
 
 ---
 
+A `virtual_network_configuration` block supports the following:
+
+* `subnet_id` - (Required) Specifies the resource id of the subnet to integrate the API management service with.
+
+---
+
 A `sku` block supports the following:
 
 * `name` - (Required) Specifies the Pricing Tier for the API Management Service. Possible values include: `Developer`, `Basic`, `Standard` and `Premium`.