Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Resource: azurerm_express_route_circuit_peering #1033

Merged
merged 5 commits into from
Mar 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions azurerm/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ type ArmClient struct {
applicationSecurityGroupsClient network.ApplicationSecurityGroupsClient
expressRouteAuthsClient network.ExpressRouteCircuitAuthorizationsClient
expressRouteCircuitClient network.ExpressRouteCircuitsClient
expressRoutePeeringsClient network.ExpressRouteCircuitPeeringsClient
ifaceClient network.InterfacesClient
loadBalancerClient network.LoadBalancersClient
localNetConnClient network.LocalNetworkGatewaysClient
Expand Down Expand Up @@ -698,6 +699,10 @@ func (c *ArmClient) registerNetworkingClients(endpoint, subscriptionId string, a
c.configureClient(&expressRouteCircuitsClient.Client, auth)
c.expressRouteCircuitClient = expressRouteCircuitsClient

expressRoutePeeringsClient := network.NewExpressRouteCircuitPeeringsClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&expressRoutePeeringsClient.Client, auth)
c.expressRoutePeeringsClient = expressRoutePeeringsClient

interfacesClient := network.NewInterfacesClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&interfacesClient.Client, auth)
c.ifaceClient = interfacesClient
Expand Down
76 changes: 76 additions & 0 deletions azurerm/import_arm_express_route_circuit_peering_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
package azurerm

import (
"testing"

"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
)

func testAccAzureRMExpressRouteCircuitPeering_importAzurePrivatePeering(t *testing.T) {
rInt := acctest.RandInt()
location := testLocation()
resourceName := "azurerm_express_route_circuit_peering.test"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMExpressRouteCircuitPeeringDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMExpressRouteCircuitPeering_privatePeering(rInt, location),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"shared_key"},
},
},
})
}

func testAccAzureRMExpressRouteCircuitPeering_importAzurePublicPeering(t *testing.T) {
rInt := acctest.RandInt()
location := testLocation()
resourceName := "azurerm_express_route_circuit_peering.test"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMExpressRouteCircuitPeeringDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMExpressRouteCircuitPeering_publicPeering(rInt, location),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"shared_key"},
},
},
})
}

func testAccAzureRMExpressRouteCircuitPeering_importMicrosoftPeering(t *testing.T) {
rInt := acctest.RandInt()
location := testLocation()
resourceName := "azurerm_express_route_circuit_peering.test"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMExpressRouteCircuitPeeringDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMExpressRouteCircuitPeering_msPeering(rInt, location),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}
1 change: 1 addition & 0 deletions azurerm/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ func Provider() terraform.ResourceProvider {
"azurerm_eventhub_namespace": resourceArmEventHubNamespace(),
"azurerm_express_route_circuit": resourceArmExpressRouteCircuit(),
"azurerm_express_route_circuit_authorization": resourceArmExpressRouteCircuitAuthorization(),
"azurerm_express_route_circuit_peering": resourceArmExpressRouteCircuitPeering(),
"azurerm_function_app": resourceArmFunctionApp(),
"azurerm_image": resourceArmImage(),
"azurerm_iothub": resourceArmIotHub(),
Expand Down
275 changes: 275 additions & 0 deletions azurerm/resource_arm_express_route_circuit_peering.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
package azurerm

import (
"fmt"
"log"
"strings"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2017-09-01/network"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)

func resourceArmExpressRouteCircuitPeering() *schema.Resource {
return &schema.Resource{
Create: resourceArmExpressRouteCircuitPeeringCreateUpdate,
Read: resourceArmExpressRouteCircuitPeeringRead,
Update: resourceArmExpressRouteCircuitPeeringCreateUpdate,
Delete: resourceArmExpressRouteCircuitPeeringDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},

Schema: map[string]*schema.Schema{
"peering_type": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
string(network.AzurePrivatePeering),
string(network.AzurePublicPeering),
string(network.MicrosoftPeering),
}, false),
},

"express_route_circuit_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},

"resource_group_name": resourceGroupNameSchema(),

"primary_peer_address_prefix": {
Type: schema.TypeString,
Required: true,
},

"secondary_peer_address_prefix": {
Type: schema.TypeString,
Required: true,
},

"vlan_id": {
Type: schema.TypeInt,
Required: true,
},

"shared_key": {
Type: schema.TypeString,
Optional: true,
Sensitive: true,
ValidateFunc: validation.StringLenBetween(1, 25),
},

"peer_asn": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
},

"microsoft_peering_config": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"advertised_public_prefixes": {
Type: schema.TypeList,
Required: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
},
},
},

"azure_asn": {
Type: schema.TypeInt,
Computed: true,
},

"primary_azure_port": {
Type: schema.TypeString,
Computed: true,
},

"secondary_azure_port": {
Type: schema.TypeString,
Computed: true,
},
},
}
}

func resourceArmExpressRouteCircuitPeeringCreateUpdate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*ArmClient).expressRoutePeeringsClient
ctx := meta.(*ArmClient).StopContext

log.Printf("[INFO] preparing arguments for Express Route Peering create/update.")

peeringType := d.Get("peering_type").(string)
circuitName := d.Get("express_route_circuit_name").(string)
resourceGroup := d.Get("resource_group_name").(string)

sharedKey := d.Get("shared_key").(string)
primaryPeerAddressPrefix := d.Get("primary_peer_address_prefix").(string)
secondaryPeerAddressPrefix := d.Get("secondary_peer_address_prefix").(string)
vlanId := d.Get("vlan_id").(int)
azureASN := d.Get("azure_asn").(int)
peerASN := d.Get("peer_asn").(int)

parameters := network.ExpressRouteCircuitPeering{
ExpressRouteCircuitPeeringPropertiesFormat: &network.ExpressRouteCircuitPeeringPropertiesFormat{
PeeringType: network.ExpressRouteCircuitPeeringType(peeringType),
SharedKey: utils.String(sharedKey),
PrimaryPeerAddressPrefix: utils.String(primaryPeerAddressPrefix),
SecondaryPeerAddressPrefix: utils.String(secondaryPeerAddressPrefix),
AzureASN: utils.Int32(int32(azureASN)),
PeerASN: utils.Int32(int32(peerASN)),
VlanID: utils.Int32(int32(vlanId)),
},
}

if strings.EqualFold(peeringType, string(network.MicrosoftPeering)) {
peerings := d.Get("microsoft_peering_config").([]interface{})
if len(peerings) == 0 {
return fmt.Errorf("`microsoft_peering_config` must be specified when `peering_type` is set to `MicrosoftPeering`")
}

peeringConfig := expandExpressRouteCircuitPeeringMicrosoftConfig(peerings)
parameters.ExpressRouteCircuitPeeringPropertiesFormat.MicrosoftPeeringConfig = peeringConfig
}

azureRMLockByName(circuitName, expressRouteCircuitResourceName)
defer azureRMUnlockByName(circuitName, expressRouteCircuitResourceName)

future, err := client.CreateOrUpdate(ctx, resourceGroup, circuitName, peeringType, parameters)
if err != nil {
return err
}

err = future.WaitForCompletion(ctx, client.Client)
if err != nil {
return err
}

read, err := client.Get(ctx, resourceGroup, circuitName, peeringType)
if err != nil {
return err
}

d.SetId(*read.ID)

return resourceArmExpressRouteCircuitPeeringRead(d, meta)
}

func resourceArmExpressRouteCircuitPeeringRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*ArmClient).expressRoutePeeringsClient
ctx := meta.(*ArmClient).StopContext

id, err := parseAzureResourceID(d.Id())
if err != nil {
return err
}
resourceGroup := id.ResourceGroup
circuitName := id.Path["expressRouteCircuits"]
peeringType := id.Path["peerings"]

resp, err := client.Get(ctx, resourceGroup, circuitName, peeringType)
if err != nil {
if utils.ResponseWasNotFound(resp.Response) {
d.SetId("")
return nil
}
return fmt.Errorf("Error making Read request on Express Route Circuit Peering %q (Circuit %q / Resource Group %q): %+v", peeringType, circuitName, resourceGroup, err)
}

d.Set("peering_type", peeringType)
d.Set("express_route_circuit_name", circuitName)
d.Set("resource_group_name", resourceGroup)

if props := resp.ExpressRouteCircuitPeeringPropertiesFormat; props != nil {
d.Set("azure_asn", props.AzureASN)
d.Set("peer_asn", props.PeerASN)
d.Set("primary_azure_port", props.PrimaryAzurePort)
d.Set("secondary_azure_port", props.SecondaryAzurePort)
d.Set("primary_peer_address_prefix", props.PrimaryPeerAddressPrefix)
d.Set("secondary_peer_address_prefix", props.SecondaryPeerAddressPrefix)
d.Set("vlan_id", props.VlanID)

config := flattenExpressRouteCircuitPeeringMicrosoftConfig(props.MicrosoftPeeringConfig)
if err := d.Set("microsoft_peering_config", config); err != nil {
return fmt.Errorf("Error flattening `microsoft_peering_config`: %+v", err)
}
}

return nil
}

func resourceArmExpressRouteCircuitPeeringDelete(d *schema.ResourceData, meta interface{}) error {
client := meta.(*ArmClient).expressRoutePeeringsClient
ctx := meta.(*ArmClient).StopContext

id, err := parseAzureResourceID(d.Id())
if err != nil {
return err
}

resourceGroup := id.ResourceGroup
circuitName := id.Path["expressRouteCircuits"]
peeringType := id.Path["peerings"]

azureRMLockByName(circuitName, expressRouteCircuitResourceName)
defer azureRMUnlockByName(circuitName, expressRouteCircuitResourceName)

future, err := client.Delete(ctx, resourceGroup, circuitName, peeringType)
if err != nil {
if response.WasNotFound(future.Response()) {
return nil
}
return fmt.Errorf("Error issuing delete request for Express Route Circuit Peering %q (Circuit %q / Resource Group %q): %+v", peeringType, circuitName, resourceGroup, err)
}

err = future.WaitForCompletion(ctx, client.Client)
if err != nil {
if response.WasNotFound(future.Response()) {
return nil
}
return fmt.Errorf("Error waiting for Express Route Circuit Peering %q (Circuit %q / Resource Group %q) to be deleted: %+v", peeringType, circuitName, resourceGroup, err)
}

return err
}

func expandExpressRouteCircuitPeeringMicrosoftConfig(input []interface{}) *network.ExpressRouteCircuitPeeringConfig {
peering := input[0].(map[string]interface{})

prefixes := make([]string, 0)
inputPrefixes := peering["advertised_public_prefixes"].([]interface{})
for _, v := range inputPrefixes {
prefixes = append(prefixes, v.(string))
}

return &network.ExpressRouteCircuitPeeringConfig{
AdvertisedPublicPrefixes: &prefixes,
}
}

func flattenExpressRouteCircuitPeeringMicrosoftConfig(input *network.ExpressRouteCircuitPeeringConfig) interface{} {
if input == nil {
return []interface{}{}
}

config := make(map[string]interface{}, 0)
prefixes := make([]string, 0)
if ps := input.AdvertisedPublicPrefixes; ps != nil {
for _, p := range *ps {
prefixes = append(prefixes, p)
}
}

config["advertised_public_prefixes"] = prefixes

return []interface{}{config}
}
Loading