mantle: clean up platform/api/azure/network

bh7cw · openshift-merge-robot · commit 7bf455a17d70 · 2020-12-03T09:20:57.000-05:00
This cleans up platform/api/azure/network.go. Fixes part of #1813
diff --git a/mantle/platform/api/azure/network.go b/mantle/platform/api/azure/network.go
@@ -109,11 +109,13 @@ func (a *API) GetIPAddresses(name, publicIPName, resourceGroup string) (string,
 	}
 
 	configs := *nic.InterfacePropertiesFormat.IPConfigurations
+
 	for _, conf := range configs {
 		if conf.PrivateIPAddress == nil {
 			return "", "", fmt.Errorf("PrivateIPAddress is nil")
+		} else {
+			return publicIP, *conf.PrivateIPAddress, nil
 		}
-		return publicIP, *conf.PrivateIPAddress, nil
 	}
 	return "", "", fmt.Errorf("no ip configurations found")
 }

Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,13 @@ func (a *API) GetIPAddresses(name, publicIPName, resourceGroup string) (string,`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`configs := *nic.InterfacePropertiesFormat.IPConfigurations`
	`112`	`+`
`112`	`113`	`for _, conf := range configs {`
`113`	`114`	`if conf.PrivateIPAddress == nil {`
`114`	`115`	`return "", "", fmt.Errorf("PrivateIPAddress is nil")`
	`116`	`+ } else {`
	`117`	`+ return publicIP, *conf.PrivateIPAddress, nil`
`115`	`118`	`}`
`116`		`- return publicIP, *conf.PrivateIPAddress, nil`
`117`	`119`	`}`
`118`	`120`	`return "", "", fmt.Errorf("no ip configurations found")`
`119`	`121`	`}`