Merge pull request kubernetes#94078 from DataDog/armclient-errors-handling

k8s-ci-robot · web-flow · commit e7420a483f29 · 2020-09-06T20:55:42.000-07:00
ARM client: survive empty response and error
diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/clients/armclient/azure_armclient.go b/staging/src/k8s.io/legacy-cloud-providers/azure/clients/armclient/azure_armclient.go
@@ -110,6 +110,11 @@ func (c *Client) sendRequest(ctx context.Context, request *http.Request) (*http.
 		request,
 		retry.DoExponentialBackoffRetry(&sendBackoff),
 	)
+
+	if response == nil && err == nil {
+		return response, retry.NewError(false, fmt.Errorf("Empty response and no HTTP code"))
+	}
+
 	return response, retry.GetError(response, err)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,11 @@ func (c Client) sendRequest(ctx context.Context, request http.Request) (*http.`
`110`	`110`	`request,`
`111`	`111`	`retry.DoExponentialBackoffRetry(&sendBackoff),`
`112`	`112`	`)`
	`113`	`+`
	`114`	`+ if response == nil && err == nil {`
	`115`	`+ return response, retry.NewError(false, fmt.Errorf("Empty response and no HTTP code"))`
	`116`	`+ }`
	`117`	`+`
`113`	`118`	`return response, retry.GetError(response, err)`
`114`	`119`	`}`
`115`	`120`