fix assorted oddities found by golangci-lint (#1040)

* fix assorted oddities found by golangci-lint Signed-off-by: Christoph Mewes <[email protected]> * permanently enable the linters Signed-off-by: Christoph Mewes <[email protected]> * post-rebase blues Signed-off-by: Christoph Mewes <[email protected]>
prometheus · Aug 3, 2022 · 618194d · 618194d
1 parent c7488be
commit 618194d
Show file tree

Hide file tree

Showing 19 changed files with 111 additions and 246 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -8,10 +8,26 @@ output:
 
 linters:
   enable:
+    - deadcode
+    - depguard
+    - durationcheck
+    - errorlint
+    - exportloopref
+    - gofmt
     - gofumpt
     - goimports
-    - revive
+    - gosimple
+    - ineffassign
     - misspell
+    - nolintlint
+    - predeclared
+    - revive
+    - staticcheck
+    - structcheck
+    - unconvert
+    - unused
+    - varcheck
+    - wastedassign
 
 issues:
   max-same-issues: 0

diff --git a/api/client.go b/api/client.go
@@ -109,7 +109,7 @@ func (c *httpClient) URL(ep string, args map[string]string) *url.URL {
 
 	for arg, val := range args {
 		arg = ":" + arg
-		p = strings.Replace(p, arg, val, -1)
+		p = strings.ReplaceAll(p, arg, val)
 	}
 
 	u := *c.endpoint

diff --git a/api/prometheus/v1/api.go b/api/prometheus/v1/api.go
@@ -856,7 +856,7 @@ func (h *httpAPI) Query(ctx context.Context, query string, ts time.Time, opts ..
 	}
 
 	var qres queryResult
-	return model.Value(qres.v), warnings, json.Unmarshal(body, &qres)
+	return qres.v, warnings, json.Unmarshal(body, &qres)
 }
 
 func (h *httpAPI) QueryRange(ctx context.Context, query string, r Range, opts ...Option) (model.Value, Warnings, error) {
@@ -885,7 +885,7 @@ func (h *httpAPI) QueryRange(ctx context.Context, query string, r Range, opts ..
 
 	var qres queryResult
 
-	return model.Value(qres.v), warnings, json.Unmarshal(body, &qres)
+	return qres.v, warnings, json.Unmarshal(body, &qres)
 }
 
 func (h *httpAPI) Series(ctx context.Context, matches []string, startTime, endTime time.Time) ([]model.LabelSet, Warnings, error) {