Merge pull request #316 from prometheus/mem/fix_linter_errors

Fix linter errors
prometheus · Jul 23, 2021 · 5f27aa2 · 5f27aa2
2 parents a1b6ede + 08ac5ff
commit 5f27aa2
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/config/http_config_test.go b/config/http_config_test.go
@@ -335,11 +335,11 @@ func TestNewClientFromConfig(t *testing.T) {
 			handler: func(w http.ResponseWriter, r *http.Request) {
 				switch r.URL.Path {
 				case "/redirected":
-					fmt.Fprintf(w, ExpectedMessage)
+					fmt.Fprint(w, ExpectedMessage)
 				default:
 					w.Header().Set("Location", "/redirected")
 					w.WriteHeader(http.StatusFound)
-					fmt.Fprintf(w, "It should follow the redirect.")
+					fmt.Fprint(w, "It should follow the redirect.")
 				}
 			},
 		}, {
@@ -359,7 +359,7 @@ func TestNewClientFromConfig(t *testing.T) {
 				default:
 					w.Header().Set("Location", "/redirected")
 					w.WriteHeader(http.StatusFound)
-					fmt.Fprintf(w, ExpectedMessage)
+					fmt.Fprint(w, ExpectedMessage)
 				}
 			},
 		},

diff --git a/expfmt/decode_test.go b/expfmt/decode_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
 	dto "github.com/prometheus/client_model/go"
 
 	"github.com/prometheus/common/model"

diff --git a/expfmt/encode.go b/expfmt/encode.go
@@ -18,7 +18,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
 	"github.com/matttproud/golang_protobuf_extensions/pbutil"
 	"github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg"
 

diff --git a/expfmt/encode_test.go b/expfmt/encode_test.go
@@ -15,10 +15,11 @@ package expfmt
 
 import (
 	"bytes"
-	"github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_model/go"
 	"net/http"
 	"testing"
+
+	"github.com/golang/protobuf/proto" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
+	dto "github.com/prometheus/client_model/go"
 )
 
 func TestNegotiate(t *testing.T) {

diff --git a/expfmt/openmetrics_create_test.go b/expfmt/openmetrics_create_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
 	"github.com/golang/protobuf/ptypes"
 
 	dto "github.com/prometheus/client_model/go"

diff --git a/expfmt/text_create_test.go b/expfmt/text_create_test.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
 
 	dto "github.com/prometheus/client_model/go"
 )

diff --git a/expfmt/text_parse.go b/expfmt/text_parse.go
@@ -24,7 +24,7 @@ import (
 
 	dto "github.com/prometheus/client_model/go"
 
-	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
 	"github.com/prometheus/common/model"
 )
 

diff --git a/expfmt/text_parse_test.go b/expfmt/text_parse_test.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
 	dto "github.com/prometheus/client_model/go"
 )