Skip to content

Commit ea0da98

Browse files
Update tool github.com/golangci/golangci-lint/cmd/golangci-lint to v1.62.2 (#3538)
* Update tool github.com/golangci/golangci-lint/cmd/golangci-lint to v1.62.2 * Fix some lint errors (cherry picked from commit bd23b8d) * Fix remaining lint error --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Mikołaj Świątek <[email protected]>
1 parent 8061478 commit ea0da98

File tree

8 files changed

+15
-14
lines changed

8 files changed

+15
-14
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ KUSTOMIZE_VERSION ?= v5.5.0
496496
# renovate: datasource=go depName=sigs.k8s.io/controller-tools/cmd/controller-gen
497497
CONTROLLER_TOOLS_VERSION ?= v0.16.5
498498
# renovate: datasource=go depName=github.com/golangci/golangci-lint/cmd/golangci-lint
499-
GOLANGCI_LINT_VERSION ?= v1.57.2
499+
GOLANGCI_LINT_VERSION ?= v1.62.2
500500
# renovate: datasource=go depName=sigs.k8s.io/kind
501501
KIND_VERSION ?= v0.26.0
502502
# renovate: datasource=go depName=github.com/kyverno/chainsaw

apis/v1beta1/config.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package v1beta1
1717
import (
1818
"bytes"
1919
"encoding/json"
20+
"errors"
2021
"fmt"
2122
"reflect"
2223
"regexp"
@@ -452,7 +453,7 @@ func (s *Service) MetricsEndpoint(logger logr.Logger) (string, int32, error) {
452453
errMsg := fmt.Sprintf("couldn't determine metrics port from configuration: %s",
453454
telemetry.Metrics.Address)
454455
logger.Info(errMsg)
455-
return "", 0, fmt.Errorf(errMsg)
456+
return "", 0, errors.New(errMsg)
456457
}
457458

458459
// The regex below matches on strings that end with a colon followed by 1 or more numbers (representing the port).

cmd/operator-opamp-bridge/metrics/reporter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func NewMetricReporter(logger logr.Logger, dest *protobufs.TelemetryConnectionSe
107107

108108
reporter.meter = provider.Meter("opamp")
109109

110-
reporter.process, err = process.NewProcess(int32(os.Getpid()))
110+
reporter.process, err = process.NewProcess(int32(os.Getpid())) //nolint: gosec // this is guaranteed to not overflow
111111
if err != nil {
112112
return nil, fmt.Errorf("cannot query own process: %w", err)
113113
}

cmd/operator-opamp-bridge/operator/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func (c Client) Apply(name string, namespace string, configmap *protobufs.AgentC
117117
}
118118

119119
func (c Client) validateComponents(collectorConfig *v1beta1.Config) error {
120-
if c.componentsAllowed == nil || len(c.componentsAllowed) == 0 {
120+
if len(c.componentsAllowed) == 0 {
121121
return nil
122122
}
123123

internal/components/component.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func PortFromEndpoint(endpoint string) (int32, error) {
8989
return UnsetPort, PortNotFoundErr
9090
}
9191

92-
return int32(port), err
92+
return int32(port), err //nolint: gosec // disable G115, this is guaranteed to not overflow due to the bitSize in the ParseInt call
9393
}
9494

9595
type ParserRetriever func(string) Parser

internal/components/exporters/helpers_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func TestExporterComponentParsers(t *testing.T) {
5454
for _, tt := range []struct {
5555
exporterName string
5656
parserName string
57-
defaultPort int
57+
defaultPort int32
5858
}{
5959
{"prometheus", "__prometheus", 8888},
6060
} {
@@ -88,7 +88,7 @@ func TestExporterComponentParsers(t *testing.T) {
8888
assert.NoError(t, err)
8989
assert.Len(t, ports, 1)
9090
assert.EqualValues(t, tt.defaultPort, ports[0].Port)
91-
assert.Equal(t, naming.PortName(tt.exporterName, int32(tt.defaultPort)), ports[0].Name)
91+
assert.Equal(t, naming.PortName(tt.exporterName, tt.defaultPort), ports[0].Name)
9292
})
9393

9494
t.Run("allows port to be overridden", func(t *testing.T) {
@@ -104,7 +104,7 @@ func TestExporterComponentParsers(t *testing.T) {
104104
assert.NoError(t, err)
105105
assert.Len(t, ports, 1)
106106
assert.EqualValues(t, 65535, ports[0].Port)
107-
assert.Equal(t, naming.PortName(tt.exporterName, int32(tt.defaultPort)), ports[0].Name)
107+
assert.Equal(t, naming.PortName(tt.exporterName, tt.defaultPort), ports[0].Name)
108108
})
109109
})
110110
}

internal/components/extensions/helpers_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func TestExtensionsComponentParsers(t *testing.T) {
5454
for _, tt := range []struct {
5555
exporterName string
5656
parserName string
57-
defaultPort int
57+
defaultPort int32
5858
}{
5959
{"health_check", "__health_check", 13133},
6060
} {
@@ -88,7 +88,7 @@ func TestExtensionsComponentParsers(t *testing.T) {
8888
assert.NoError(t, err)
8989
assert.Len(t, ports, 1)
9090
assert.EqualValues(t, tt.defaultPort, ports[0].Port)
91-
assert.Equal(t, naming.PortName(tt.exporterName, int32(tt.defaultPort)), ports[0].Name)
91+
assert.Equal(t, naming.PortName(tt.exporterName, tt.defaultPort), ports[0].Name)
9292
})
9393

9494
t.Run("allows port to be overridden", func(t *testing.T) {
@@ -104,7 +104,7 @@ func TestExtensionsComponentParsers(t *testing.T) {
104104
assert.NoError(t, err)
105105
assert.Len(t, ports, 1)
106106
assert.EqualValues(t, 65535, ports[0].Port)
107-
assert.Equal(t, naming.PortName(tt.exporterName, int32(tt.defaultPort)), ports[0].Name)
107+
assert.Equal(t, naming.PortName(tt.exporterName, tt.defaultPort), ports[0].Name)
108108
})
109109
})
110110
}

internal/components/receivers/single_endpoint_receiver_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func TestDownstreamParsers(t *testing.T) {
6464
desc string
6565
receiverName string
6666
parserName string
67-
defaultPort int
67+
defaultPort int32
6868
listenAddrParser bool
6969
}{
7070
{"zipkin", "zipkin", "__zipkin", 9411, false},
@@ -118,7 +118,7 @@ func TestDownstreamParsers(t *testing.T) {
118118
assert.NoError(t, err)
119119
assert.Len(t, ports, 1)
120120
assert.EqualValues(t, tt.defaultPort, ports[0].Port)
121-
assert.Equal(t, naming.PortName(tt.receiverName, int32(tt.defaultPort)), ports[0].Name)
121+
assert.Equal(t, naming.PortName(tt.receiverName, tt.defaultPort), ports[0].Name)
122122
})
123123

124124
t.Run("allows port to be overridden", func(t *testing.T) {
@@ -142,7 +142,7 @@ func TestDownstreamParsers(t *testing.T) {
142142
assert.NoError(t, err)
143143
assert.Len(t, ports, 1)
144144
assert.EqualValues(t, 65535, ports[0].Port)
145-
assert.Equal(t, naming.PortName(tt.receiverName, int32(tt.defaultPort)), ports[0].Name)
145+
assert.Equal(t, naming.PortName(tt.receiverName, tt.defaultPort), ports[0].Name)
146146
})
147147

148148
t.Run("returns a default config", func(t *testing.T) {

0 commit comments

Comments
 (0)