fix golangci-lint

phbnf · Feb 13, 2025 · 1006b3f · 1006b3f
1 parent 8bf3fae
commit 1006b3f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/monitoring/testonly/metrics.go b/monitoring/testonly/metrics.go
@@ -71,7 +71,7 @@ func TestCounter(t *testing.T, factory monitoring.MetricFactory) {
 			// Use a different set of label values
 			// Metrics with different valued label values, are distinct
 			// This test is only applicable when a Metric has labels
-			if test.labelVals != nil && len(test.labelVals) >= 1 {
+			if len(test.labelVals) >= 1 {
 				altLabels := make([]string, len(test.labelVals))
 				copy(altLabels, test.labelVals)
 				altLabels[0] = "alt-val1"
@@ -151,7 +151,7 @@ func TestGauge(t *testing.T, factory monitoring.MetricFactory) {
 			// Use a different set of label values
 			// Metrics with different valued label values, are distinct
 			// This test is only applicable when a Metric has labels
-			if test.labelVals != nil && len(test.labelVals) >= 1 {
+			if len(test.labelVals) >= 1 {
 				altLabels := make([]string, len(test.labelVals))
 				copy(altLabels, test.labelVals)
 				altLabels[0] = "alt-val1"
@@ -223,7 +223,7 @@ func TestHistogram(t *testing.T, factory monitoring.MetricFactory) {
 			// Use a different set of label values
 			// Metrics with different valued label values, are distinct
 			// This test is only applicable when a Metric has labels
-			if test.labelVals != nil && len(test.labelVals) >= 1 {
+			if len(test.labelVals) >= 1 {
 				altLabels := make([]string, len(test.labelVals))
 				copy(altLabels, test.labelVals)
 				altLabels[0] = "alt-val1"

diff --git a/server/errors/errors.go b/server/errors/errors.go
@@ -25,7 +25,8 @@ import (
 // (such as canonical SQL errors), else err is returned unmodified.
 func WrapError(err error) error {
 	if err == sql.ErrNoRows {
-		return status.Errorf(codes.NotFound, err.Error())
+		e := err.Error()
+		return status.Errorf(codes.NotFound, e)
 	}
 
 	return err

diff --git a/server/errors/errors_test.go b/server/errors/errors_test.go
@@ -27,6 +27,7 @@ import (
 func TestWrapError(t *testing.T) {
 	grpcErr := status.Errorf(codes.NotFound, "not found err")
 	err := errors.New("generic error")
+	noRowsErr := sql.ErrNoRows.Error()
 
 	tests := []struct {
 		err     error
@@ -42,7 +43,7 @@ func TestWrapError(t *testing.T) {
 		},
 		{
 			err:     sql.ErrNoRows,
-			wantErr: status.Errorf(codes.NotFound, sql.ErrNoRows.Error()),
+			wantErr: status.Errorf(codes.NotFound, noRowsErr),
 		},
 	}
 	for _, test := range tests {