Fix the fmt issue and the nil continue issue.

hashicorp · Apr 25, 2019 · 06235af · 06235af
1 parent b5f0b78
commit 06235af
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 27 deletions.
diff --git a/azurerm/provider.go b/azurerm/provider.go
@@ -323,14 +323,14 @@ func Provider() terraform.ResourceProvider {
 			"azurerm_mysql_firewall_rule":                    resourceArmMySqlFirewallRule(),
 			"azurerm_mysql_server":                           resourceArmMySqlServer(),
 			"azurerm_mysql_virtual_network_rule":             resourceArmMySqlVirtualNetworkRule(),
-			"azurerm_network_interface":                                                      resourceArmNetworkInterface(),
-      "azurerm_network_interface_application_gateway_backend_address_pool_association": resourceArmNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation(),
+			"azurerm_network_interface":                      resourceArmNetworkInterface(),
+			"azurerm_network_interface_application_gateway_backend_address_pool_association": resourceArmNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation(),
 			"azurerm_network_interface_application_security_group_association":               resourceArmNetworkInterfaceApplicationSecurityGroupAssociation(),
 			"azurerm_network_interface_backend_address_pool_association":                     resourceArmNetworkInterfaceBackendAddressPoolAssociation(),
 			"azurerm_network_interface_nat_rule_association":                                 resourceArmNetworkInterfaceNatRuleAssociation(),
 			"azurerm_network_connection_monitor":                                             resourceArmNetworkConnectionMonitor(),
 			"azurerm_network_ddos_protection_plan":                                           resourceArmNetworkDDoSProtectionPlan(),
-      "azurerm_network_packet_capture":                                                 resourceArmNetworkPacketCapture(),
+			"azurerm_network_packet_capture":                                                 resourceArmNetworkPacketCapture(),
 			"azurerm_network_profile":                                                        resourceArmNetworkProfile(),
 			"azurerm_network_security_group":                                                 resourceArmNetworkSecurityGroup(),
 			"azurerm_network_security_rule":                                                  resourceArmNetworkSecurityRule(),

diff --git a/azurerm/resource_arm_network_profile.go b/azurerm/resource_arm_network_profile.go
@@ -2,13 +2,13 @@ package azurerm
 
 import (
 	"fmt"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"log"
 
-	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-08-01/network"
+	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-12-01/network"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
@@ -323,40 +323,30 @@ func flattenArmContainerNetworkInterfaceConfigurations(input *[]network.Containe
 	// if-continue is used to simplify the deeply nested if-else statement.
 	for _, cniConfig := range *input {
 		retCNIConfig := make(map[string]interface{})
-		cniProps := cniConfig.ContainerNetworkInterfaceConfigurationPropertiesFormat
-		if cniProps == nil {
-			continue
-		}
 
 		if cniConfig.Name != nil {
 			retCNIConfig["name"] = *cniConfig.Name
 		}
 
-		if cniProps.IPConfigurations == nil {
-			continue
-		}
+		if cniProps := cniConfig.ContainerNetworkInterfaceConfigurationPropertiesFormat; cniProps != nil && cniProps.IPConfigurations != nil {
+			retIPConfigs := make([]interface{}, 0)
+			for _, ipConfig := range *cniProps.IPConfigurations {
+				retIPConfig := make(map[string]interface{})
 
-		retIPConfigs := make([]interface{}, 0)
-		for _, ipConfig := range *cniProps.IPConfigurations {
-			retIPConfig := make(map[string]interface{})
-			ipProps := ipConfig.IPConfigurationProfilePropertiesFormat
-			if ipProps == nil {
-				continue
-			}
+				if ipConfig.Name != nil {
+					retIPConfig["name"] = *ipConfig.Name
+				}
 
-			if ipConfig.Name != nil {
-				retIPConfig["name"] = *ipConfig.Name
-			}
+				if ipProps := ipConfig.IPConfigurationProfilePropertiesFormat; ipProps != nil && ipProps.Subnet != nil && ipProps.Subnet.ID != nil {
+					retIPConfig["subnet_id"] = *ipProps.Subnet.ID
+				}
 
-			if ipProps.Subnet != nil && ipProps.Subnet.ID != nil {
-				retIPConfig["subnet_id"] = *ipProps.Subnet.ID
+				retIPConfigs = append(retIPConfigs, retIPConfig)
 			}
 
-			retIPConfigs = append(retIPConfigs, retIPConfig)
+			retCNIConfig["ip_configuration"] = retIPConfigs
 		}
 
-		retCNIConfig["ip_configuration"] = retIPConfigs
-
 		retCNIConfigs = append(retCNIConfigs, retCNIConfig)
 	}