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.

Sign up for GitHub

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

azurerm_lb_backend_address_pool_address - support for the backend_address_ip_configuration_id property #17770

Merged
merged 18 commits into from
Aug 18, 2022
+340 −47
Merged

azurerm_lb_backend_address_pool_address - support for the backend_address_ip_configuration_id property #17770

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7d8c0d4
cross region lb
xiaxyi Jan 13, 2022
293384a
cross-region lb acc test
xiaxyi Jan 14, 2022
811d57e
rm test folder
xiaxyi Jan 14, 2022
f2904dd
Merge branch 'main' of https://github.com/hashicorp/terraform-provide…
xiaxyi Jan 15, 2022
55bd76d
lb on track
xiaxyi Jan 19, 2022
3e74c53
Merge branch 'main' of https://github.com/hashicorp/terraform-provide…
xiaxyi Jan 19, 2022
8cb7c87
Merge branch 'main' of https://github.com/hashicorp/terraform-provide…
xiaxyi Feb 14, 2022
ab739d3
Merge branch 'main' of https://github.com/hashicorp/terraform-provide…
xiaxyi Mar 25, 2022
3bf9b97
cross region lb
xiaxyi Mar 29, 2022
8015123
merging upstream
xiaxyi Jul 14, 2022
4f4b08d
adding support for cross region load balancer
xiaxyi Jul 27, 2022
6a9ed63
update
xiaxyi Jul 27, 2022
14c4d19
Merge remote-tracking branch 'upstream/main' into lb/crossRegionLB
xiaxyi Jul 27, 2022
e9aa960
remove test folder
xiaxyi Jul 27, 2022
c2bf2d2
Merge remote-tracking branch 'upstream' into lb/crossRegionLB
xiaxyi Aug 3, 2022
bcde78f
update per comment
xiaxyi Aug 3, 2022
5024e3f
update fmt
xiaxyi Aug 3, 2022
68556d2
update
xiaxyi Aug 3, 2022
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
107 changes: 79 additions & 28 deletions internal/services/loadbalancer/backend_address_pool_address_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"time"

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-08-01/network"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/loadbalancer/parse"
Expand All @@ -24,11 +25,12 @@ var (
type BackendAddressPoolAddressResource struct{}

type BackendAddressPoolAddressModel struct {
Name string `tfschema:"name"`
BackendAddressPoolId string `tfschema:"backend_address_pool_id"`
VirtualNetworkId string `tfschema:"virtual_network_id"`
IPAddress string `tfschema:"ip_address"`
PortMapping []inboundNATRulePortMapping `tfschema:"inbound_nat_rule_port_mapping"`
Name string `tfschema:"name"`
BackendAddressPoolId string `tfschema:"backend_address_pool_id"`
VirtualNetworkId string `tfschema:"virtual_network_id"`
IPAddress string `tfschema:"ip_address"`
FrontendIPConfiguration string `tfschema:"backend_address_ip_config_id"`
PortMapping []inboundNATRulePortMapping `tfschema:"inbound_nat_rule_port_mapping"`
}

type inboundNATRulePortMapping struct {
Expand Down Expand Up @@ -78,15 +80,21 @@ func (r BackendAddressPoolAddressResource) Arguments() map[string]*pluginsdk.Sch

"virtual_network_id": {
Type: pluginsdk.TypeString,
Required: true,
Optional: true,
ValidateFunc: networkValidate.VirtualNetworkID,
},

"ip_address": {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these required with each other? if so we sould use a RequiredWith here?

Type: pluginsdk.TypeString,
Required: true,
Optional: true,
ValidateFunc: validation.IsIPAddress,
},

"backend_address_ip_config_id": {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be

Suggested change
"backend_address_ip_config_id": {
"backend_address_ip_configuration_id": {

to match the resource?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you set both of these or should they conflict?

Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: azure.ValidateResourceID,
},
}
}

Expand Down Expand Up @@ -135,6 +143,9 @@ func (r BackendAddressPoolAddressResource) Create() sdk.ResourceFunc {
if isBasicSku {
return fmt.Errorf("Backend Addresses are not supported on Basic SKU Load Balancers")
}
if lb.Sku != nil && lb.Sku.Tier != network.LoadBalancerSkuTierGlobal && model.FrontendIPConfiguration != "" {
return fmt.Errorf("Regional Backend Address Pool Addresses can only be set under the Global SKU tier")
}

id := parse.NewBackendAddressPoolAddressID(subscriptionId, poolId.ResourceGroup, poolId.LoadBalancerName, poolId.BackendAddressPoolName, model.Name)
pool, err := client.Get(ctx, poolId.ResourceGroup, poolId.LoadBalancerName, poolId.BackendAddressPoolName)
Expand All @@ -161,15 +172,26 @@ func (r BackendAddressPoolAddressResource) Create() sdk.ResourceFunc {
}
}

addresses = append(addresses, network.LoadBalancerBackendAddress{
LoadBalancerBackendAddressPropertiesFormat: &network.LoadBalancerBackendAddressPropertiesFormat{
IPAddress: utils.String(model.IPAddress),
VirtualNetwork: &network.SubResource{
ID: utils.String(model.VirtualNetworkId),
if lb.Sku.Tier == network.LoadBalancerSkuTierGlobal {
addresses = append(addresses, network.LoadBalancerBackendAddress{
Name: utils.String(id.AddressName),
LoadBalancerBackendAddressPropertiesFormat: &network.LoadBalancerBackendAddressPropertiesFormat{
LoadBalancerFrontendIPConfiguration: &network.SubResource{
ID: utils.String(model.FrontendIPConfiguration),
},
},
},
Name: utils.String(id.AddressName),
})
})
} else {
addresses = append(addresses, network.LoadBalancerBackendAddress{
LoadBalancerBackendAddressPropertiesFormat: &network.LoadBalancerBackendAddressPropertiesFormat{
IPAddress: utils.String(model.IPAddress),
VirtualNetwork: &network.SubResource{
ID: utils.String(model.VirtualNetworkId),
},
},
Name: utils.String(id.AddressName),
})
}
pool.BackendAddressPoolPropertiesFormat.LoadBalancerBackendAddresses = &addresses

metadata.Logger.Infof("adding %s..", id)
Expand All @@ -192,6 +214,7 @@ func (r BackendAddressPoolAddressResource) Read() sdk.ResourceFunc {
return sdk.ResourceFunc{
Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
client := metadata.Client.LoadBalancers.LoadBalancerBackendAddressPoolsClient
lbClient := metadata.Client.LoadBalancers.LoadBalancersClient
id, err := parse.BackendAddressPoolAddressID(metadata.ResourceData.Id())
if err != nil {
return err
Expand All @@ -205,6 +228,11 @@ func (r BackendAddressPoolAddressResource) Read() sdk.ResourceFunc {
return fmt.Errorf("retrieving %s: `properties` was nil", *id)
}

lb, err := lbClient.Get(ctx, id.ResourceGroup, id.LoadBalancerName, "")
if err != nil {
return fmt.Errorf("retrieving Load Balancer %q (Resource Group %q): %+v", id.LoadBalancerName, id.ResourceGroup, err)
}

var backendAddress *network.LoadBalancerBackendAddress
if pool.BackendAddressPoolPropertiesFormat.LoadBalancerBackendAddresses != nil {
for _, address := range *pool.BackendAddressPoolPropertiesFormat.LoadBalancerBackendAddresses {
Expand All @@ -229,12 +257,18 @@ func (r BackendAddressPoolAddressResource) Read() sdk.ResourceFunc {
}

if props := backendAddress.LoadBalancerBackendAddressPropertiesFormat; props != nil {
if props.IPAddress != nil {
model.IPAddress = *props.IPAddress
}
if lb.Sku.Tier == network.LoadBalancerSkuTierGlobal {
if props.LoadBalancerFrontendIPConfiguration != nil && props.LoadBalancerFrontendIPConfiguration.ID != nil {
model.FrontendIPConfiguration = *props.LoadBalancerFrontendIPConfiguration.ID
}
} else {
if props.IPAddress != nil {
model.IPAddress = *props.IPAddress
}

if props.VirtualNetwork != nil && props.VirtualNetwork.ID != nil {
model.VirtualNetworkId = *props.VirtualNetwork.ID
if props.VirtualNetwork != nil && props.VirtualNetwork.ID != nil {
model.VirtualNetworkId = *props.VirtualNetwork.ID
}
}
}

Expand Down Expand Up @@ -359,6 +393,11 @@ func (r BackendAddressPoolAddressResource) Update() sdk.ResourceFunc {
return fmt.Errorf("retrieving %s: `properties` was nil", *id)
}

lb, err := lbClient.Get(ctx, id.ResourceGroup, id.LoadBalancerName, "")
if err != nil {
return fmt.Errorf("retrieving Load Balancer %q (Resource Group %q): %+v", id.LoadBalancerName, id.ResourceGroup, err)
}

addresses := make([]network.LoadBalancerBackendAddress, 0)
if pool.BackendAddressPoolPropertiesFormat.LoadBalancerBackendAddresses != nil {
addresses = *pool.BackendAddressPoolPropertiesFormat.LoadBalancerBackendAddresses
Expand All @@ -378,22 +417,34 @@ func (r BackendAddressPoolAddressResource) Update() sdk.ResourceFunc {
return fmt.Errorf("%s was not found", *id)
}

addresses[index] = network.LoadBalancerBackendAddress{
LoadBalancerBackendAddressPropertiesFormat: &network.LoadBalancerBackendAddressPropertiesFormat{
IPAddress: utils.String(model.IPAddress),
VirtualNetwork: &network.SubResource{
ID: utils.String(model.VirtualNetworkId),
if lb.Sku.Tier == network.LoadBalancerSkuTierGlobal {
addresses[index] = network.LoadBalancerBackendAddress{
Name: utils.String(model.Name),
LoadBalancerBackendAddressPropertiesFormat: &network.LoadBalancerBackendAddressPropertiesFormat{
LoadBalancerFrontendIPConfiguration: &network.SubResource{
ID: utils.String(model.FrontendIPConfiguration),
},
},
},
Name: utils.String(id.AddressName),
}
} else {
addresses[index] = network.LoadBalancerBackendAddress{
LoadBalancerBackendAddressPropertiesFormat: &network.LoadBalancerBackendAddressPropertiesFormat{
IPAddress: utils.String(model.IPAddress),
VirtualNetwork: &network.SubResource{
ID: utils.String(model.VirtualNetworkId),
},
},
Name: utils.String(id.AddressName),
}
}
pool.BackendAddressPoolPropertiesFormat.LoadBalancerBackendAddresses = &addresses

timeout, _ := ctx.Deadline()
lbStatus := &pluginsdk.StateChangeConf{
Pending: []string{string(network.ProvisioningStateUpdating)},
Target: []string{string(network.ProvisioningStateSucceeded)},
MinTimeout: 5 * time.Minute,
Delay: 30 * time.Second,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you explain why there is this delay ona. comment?

PollInterval: 10 * time.Second,
Refresh: loadbalacnerProvisioningStatusRefreshFunc(ctx, lbClient, *id),
ContinuousTargetOccurence: 10,
Timeout: time.Until(timeout),
Expand Down
Loading