fix: golangci-lint (#993)

* fix: golangci-lint - exclude G115 Signed-off-by: Matthieu MOREL <[email protected]>
envoyproxy · Aug 30, 2024 · 87f551d · 87f551d
1 parent 04879cf
commit 87f551d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -31,6 +31,9 @@ linters-settings:
     extra-rules: true
   goimports:
     local-prefixes: github.com/envoyproxy/go-control-plane
+  gosec:
+    excludes:
+      - G115
   misspell:
     locale: US
   testifylint:

diff --git a/pkg/server/delta/v3/server.go b/pkg/server/delta/v3/server.go
@@ -107,7 +107,7 @@ func (s *server) processDelta(str stream.DeltaStream, reqCh <-chan *discovery.De
 	process := func(resp cache.DeltaResponse) error {
 		typ := resp.GetDeltaRequest().GetTypeUrl()
 		if resp == deltaErrorResponse {
-			return status.Errorf(codes.Unavailable, typ+" watch failed")
+			return status.Errorf(codes.Unavailable, "%s watch failed", typ)
 		}
 
 		nonce, err := send(resp)

diff --git a/pkg/server/sotw/v3/ads.go b/pkg/server/sotw/v3/ads.go
@@ -65,7 +65,7 @@ func (s *server) processADS(sw *streamWrapper, reqCh chan *discovery.DiscoveryRe
 		// We only watch the multiplexed channel since all values will come through from process.
 		case res := <-sw.watches.responders[resource.AnyType].response:
 			if err := process(res); err != nil {
-				return status.Errorf(codes.Unavailable, err.Error())
+				return status.Errorf(codes.Unavailable, "%v", err)
 			}
 		case req, ok := <-reqCh:
 			// Input stream ended or failed.

diff --git a/pkg/server/v3/gateway.go b/pkg/server/v3/gateway.go
@@ -73,7 +73,7 @@ func (h *HTTPGateway) ServeHTTP(req *http.Request) ([]byte, int, error) {
 	out := &discovery.DiscoveryRequest{}
 	err = protojson.Unmarshal(body, out)
 	if err != nil {
-		return nil, http.StatusBadRequest, fmt.Errorf("cannot parse JSON body: " + err.Error())
+		return nil, http.StatusBadRequest, fmt.Errorf("cannot parse JSON body: %w", err)
 	}
 	out.TypeUrl = typeURL
 
@@ -86,12 +86,12 @@ func (h *HTTPGateway) ServeHTTP(req *http.Request) ([]byte, int, error) {
 		if ok := errors.As(err, &skip); ok {
 			return nil, http.StatusNotModified, nil
 		}
-		return nil, http.StatusInternalServerError, fmt.Errorf("fetch error: " + err.Error())
+		return nil, http.StatusInternalServerError, fmt.Errorf("fetch error: %w", err)
 	}
 
 	b, err := protojson.MarshalOptions{UseProtoNames: true}.Marshal(res)
 	if err != nil {
-		return nil, http.StatusInternalServerError, fmt.Errorf("marshal error: " + err.Error())
+		return nil, http.StatusInternalServerError, fmt.Errorf("marshal error: %w", err)
 	}
 
 	return b, http.StatusOK, nil