Azure: Insights Analytics, fix possible panics and return error body (#26361)

missing return statements can result in panic

(cherry picked from commit c980f37509)
This commit is contained in:
Kyle Brandt
2020-07-16 13:04:17 +02:00
committed by Dominik Prokop
parent 8673bd4974
commit 7ac9057f71
@@ -105,7 +105,7 @@ func (e *InsightsAnalyticsDatasource) executeQuery(ctx context.Context, query *I
req, err := e.createRequest(ctx, e.dsInfo)
if err != nil {
queryResultError(err)
return queryResultError(err)
}
req.URL.Path = path.Join(req.URL.Path, "query")
req.URL.RawQuery = query.Params.Encode()
@@ -129,30 +129,30 @@ func (e *InsightsAnalyticsDatasource) executeQuery(ctx context.Context, query *I
azlog.Debug("ApplicationInsights", "Request URL", req.URL.String())
res, err := ctxhttp.Do(ctx, e.httpClient, req)
if err != nil {
queryResultError(err)
return queryResultError(err)
}
body, err := ioutil.ReadAll(res.Body)
defer res.Body.Close()
if err != nil {
queryResultError(err)
return queryResultError(err)
}
if res.StatusCode/100 != 2 {
azlog.Debug("Request failed", "status", res.Status, "body", string(body))
queryResultError(fmt.Errorf("Request failed status: %v", res.Status))
return queryResultError(fmt.Errorf("Request failed status: %v %w", res.Status, fmt.Errorf(string(body))))
}
var logResponse AzureLogAnalyticsResponse
d := json.NewDecoder(bytes.NewReader(body))
d.UseNumber()
err = d.Decode(&logResponse)
if err != nil {
queryResultError(err)
return queryResultError(err)
}
t, err := logResponse.GetPrimaryResultTable()
if err != nil {
queryResultError(err)
return queryResultError(err)
}
frame, err := LogTableToFrame(t)