From 74840defdf5974fd9fb1cd4abddc4ee80867dbd1 Mon Sep 17 00:00:00 2001
From: Brian Goff <cpuguy83@gmail.com>
Date: Wed, 19 Sep 2018 18:15:35 -0700
Subject: [PATCH] Fix NPE panic in ACI client

resp is nil when `Do()` has an error.

Also seems there was some gofmt issues in the file.
---
 providers/azure/aci.go            | 22 +++++++++++-----------
 providers/azure/client/aci/get.go |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/providers/azure/aci.go b/providers/azure/aci.go
index bd7dc4686..1e746fef4 100644
--- a/providers/azure/aci.go
+++ b/providers/azure/aci.go
@@ -372,9 +372,9 @@ func (p *ACIProvider) setupNetworkProfile(auth *client.Authentication) error {
 
 	// at this point, profile should be nil
 	profile = &network.Profile{
-		Name: p.nodeName,
+		Name:     p.nodeName,
 		Location: p.region,
-		Type: networkProfileType,
+		Type:     networkProfileType,
 	}
 
 	populateNetworkProfile(profile, subnet)
@@ -438,24 +438,24 @@ func getKubeProxyExtension(secretPath, masterURI, clusterCIDR string) (*aci.Exte
 	config := clientcmdv1.Config{
 		APIVersion: "v1",
 		Kind:       "Config",
-		Clusters:   []clientcmdv1.NamedCluster{
+		Clusters: []clientcmdv1.NamedCluster{
 			clientcmdv1.NamedCluster{
-				Name:    name,
+				Name: name,
 				Cluster: clientcmdv1.Cluster{
-					Server:                   masterURI,
+					Server: masterURI,
 					CertificateAuthorityData: ca,
 				},
 			},
 		},
-		AuthInfos:  []clientcmdv1.NamedAuthInfo{
+		AuthInfos: []clientcmdv1.NamedAuthInfo{
 			clientcmdv1.NamedAuthInfo{
-				Name:     name,
+				Name: name,
 				AuthInfo: clientcmdv1.AuthInfo{
 					Token: string(token),
 				},
 			},
 		},
-		Contexts:   []clientcmdv1.NamedContext{
+		Contexts: []clientcmdv1.NamedContext{
 			clientcmdv1.NamedContext{
 				Name: name,
 				Context: clientcmdv1.Context{
@@ -473,11 +473,11 @@ func getKubeProxyExtension(secretPath, masterURI, clusterCIDR string) (*aci.Exte
 	}
 
 	extension := aci.Extension{
-		Name:   "kube-proxy",
+		Name: "kube-proxy",
 		Properties: &aci.ExtensionProperties{
 			Type:    aci.ExtensionTypeKubeProxy,
 			Version: aci.ExtensionVersion1_0,
-			Settings:          map[string]string{
+			Settings: map[string]string{
 				aci.KubeProxyExtensionSettingClusterCIDR: clusterCIDR,
 				aci.KubeProxyExtensionSettingKubeVersion: aci.KubeProxyExtensionKubeVersion,
 			},
@@ -699,7 +699,7 @@ func (p *ACIProvider) DeletePod(ctx context.Context, pod *v1.Pod) error {
 func (p *ACIProvider) GetPod(ctx context.Context, namespace, name string) (*v1.Pod, error) {
 	cg, err, status := p.aciClient.GetContainerGroup(ctx, p.resourceGroup, fmt.Sprintf("%s-%s", namespace, name))
 	if err != nil {
-		if *status == http.StatusNotFound {
+		if status != nil && *status == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, err
diff --git a/providers/azure/client/aci/get.go b/providers/azure/client/aci/get.go
index f7f22fcbb..074bfff97 100644
--- a/providers/azure/client/aci/get.go
+++ b/providers/azure/client/aci/get.go
@@ -42,7 +42,7 @@ func (c *Client) GetContainerGroup(ctx context.Context, resourceGroup, container
 	// Send the request.
 	resp, err := c.hc.Do(req)
 	if err != nil {
-		return nil, fmt.Errorf("Sending get container group request failed: %v", err), &resp.StatusCode
+		return nil, fmt.Errorf("Sending get container group request failed: %v", err), nil
 	}
 	defer resp.Body.Close()