From e351e6e211bd2bd4ea44cab8aa0da7eba13dcf8f Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Fri, 9 Nov 2018 19:40:07 +0100 Subject: [PATCH] pkg/tsdb/influxdb/influxdb.go: Fix surrounding loop is unconditionally terminated. See, $ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./... pkg/tsdb/influxdb/influxdb.go:106:3:warning: the surrounding loop is unconditionally terminated (SA4004) (megacheck) --- pkg/tsdb/influxdb/influxdb.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/tsdb/influxdb/influxdb.go b/pkg/tsdb/influxdb/influxdb.go index 6100d3b401e..ec1e9ff01bd 100644 --- a/pkg/tsdb/influxdb/influxdb.go +++ b/pkg/tsdb/influxdb/influxdb.go @@ -96,16 +96,15 @@ func (e *InfluxDBExecutor) Query(ctx context.Context, dsInfo *models.DataSource, } func (e *InfluxDBExecutor) getQuery(dsInfo *models.DataSource, queries []*tsdb.Query, context *tsdb.TsdbQuery) (*Query, error) { - for _, v := range queries { - - query, err := e.QueryParser.Parse(v.Model, dsInfo) + // The model supports multiple queries, but right now this is only used from + // alerting so we only needed to support batch executing 1 query at a time. + if len(queries) > 0 { + query, err := e.QueryParser.Parse(queries[0].Model, dsInfo) if err != nil { return nil, err } - return query, nil } - return nil, fmt.Errorf("query request contains no queries") }