From 7f88f6a0b2e8602458126ec35f69feae10d7ef5d Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 20 Apr 2020 10:12:26 -0700 Subject: [PATCH 1/3] Fix crash in application gateway --- .../services/network/resource_arm_application_gateway.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_application_gateway.go b/azurerm/internal/services/network/resource_arm_application_gateway.go index c9d718885d07..0bd90a9b32a2 100644 --- a/azurerm/internal/services/network/resource_arm_application_gateway.go +++ b/azurerm/internal/services/network/resource_arm_application_gateway.go @@ -1829,9 +1829,11 @@ func expandApplicationGatewayBackendAddressPools(d *schema.ResourceData) *[]netw backendAddresses := make([]network.ApplicationGatewayBackendAddress, 0) for _, ip := range v["fqdns"].([]interface{}) { - backendAddresses = append(backendAddresses, network.ApplicationGatewayBackendAddress{ - Fqdn: utils.String(ip.(string)), - }) + if ip != nil { + backendAddresses = append(backendAddresses, network.ApplicationGatewayBackendAddress{ + Fqdn: utils.String(ip.(string)), + }) + } } for _, ip := range v["ip_addresses"].([]interface{}) { backendAddresses = append(backendAddresses, network.ApplicationGatewayBackendAddress{ From dccab2ad3e460349682c98424856b749e0e5f1e3 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 20 Apr 2020 11:07:58 -0700 Subject: [PATCH 2/3] no empty values --- .../services/network/resource_arm_application_gateway.go | 1 + 1 file changed, 1 insertion(+) diff --git a/azurerm/internal/services/network/resource_arm_application_gateway.go b/azurerm/internal/services/network/resource_arm_application_gateway.go index 0bd90a9b32a2..d62ac247cd1b 100644 --- a/azurerm/internal/services/network/resource_arm_application_gateway.go +++ b/azurerm/internal/services/network/resource_arm_application_gateway.go @@ -117,6 +117,7 @@ func resourceArmApplicationGateway() *schema.Resource { MinItems: 1, Elem: &schema.Schema{ Type: schema.TypeString, + ValidateFunc: validation.NoZeroValues, }, }, From 16d72b00377965ae0315e91567261da703b0a85c Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 20 Apr 2020 11:08:29 -0700 Subject: [PATCH 3/3] Remove extra check --- .../network/resource_arm_application_gateway.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/azurerm/internal/services/network/resource_arm_application_gateway.go b/azurerm/internal/services/network/resource_arm_application_gateway.go index d62ac247cd1b..341126d93371 100644 --- a/azurerm/internal/services/network/resource_arm_application_gateway.go +++ b/azurerm/internal/services/network/resource_arm_application_gateway.go @@ -116,7 +116,7 @@ func resourceArmApplicationGateway() *schema.Resource { Optional: true, MinItems: 1, Elem: &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeString, ValidateFunc: validation.NoZeroValues, }, }, @@ -1830,11 +1830,9 @@ func expandApplicationGatewayBackendAddressPools(d *schema.ResourceData) *[]netw backendAddresses := make([]network.ApplicationGatewayBackendAddress, 0) for _, ip := range v["fqdns"].([]interface{}) { - if ip != nil { - backendAddresses = append(backendAddresses, network.ApplicationGatewayBackendAddress{ - Fqdn: utils.String(ip.(string)), - }) - } + backendAddresses = append(backendAddresses, network.ApplicationGatewayBackendAddress{ + Fqdn: utils.String(ip.(string)), + }) } for _, ip := range v["ip_addresses"].([]interface{}) { backendAddresses = append(backendAddresses, network.ApplicationGatewayBackendAddress{