Skip to content

Commit c770f97

Browse files
loafoeloafoe
authored
Merge branch 'main' into dependabot/github_actions/golangci/golangci-lint-action-8
2 parents 7de7366 + 867b3a3 commit c770f97

File tree

10 files changed

+27
-24
lines changed

10 files changed

+27
-24
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ profile_file.out
1111
config.yml
1212
/build/
1313
/.scannerwork/
14+
env.sh

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24.1-alpine as builder
1+
FROM golang:1.24.5-alpine as builder
22
RUN apk --no-cache add git
33
WORKDIR /build
44
COPY go.mod .
@@ -11,7 +11,7 @@ RUN git rev-parse --short HEAD
1111
RUN GIT_COMMIT=$(git rev-parse --short HEAD) && \
1212
CGO_ENABLED=0 go build -o app -ldflags "-X main.GitCommit=${GIT_COMMIT}"
1313

14-
FROM alpine:3.21.3
14+
FROM alpine:3.22.1
1515
RUN apk --no-cache add ca-certificates
1616
ENV HOME /root
1717
WORKDIR /app

‎Dockerfile.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24.1-alpine
1+
FROM golang:1.24.5-alpine
22
RUN apk add --no-cache git openssh gcc musl-dev
33

44
WORKDIR /src

‎Dockerfile.dist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.21.3
1+
FROM alpine:3.22.1
22
LABEL maintainer="Andy Lo-A-Foe <[email protected]>"
33

44
RUN apk --no-cache add ca-certificates

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ require (
1515
github.com/openzipkin/zipkin-go v0.4.3
1616
github.com/prometheus/client_golang v1.21.1
1717
github.com/sirupsen/logrus v1.9.3
18-
github.com/spf13/viper v1.20.0
18+
github.com/spf13/viper v1.20.1
1919
github.com/streadway/amqp v1.1.0
2020
github.com/stretchr/testify v1.10.0
21-
golang.org/x/sync v0.12.0
21+
golang.org/x/sync v0.16.0
2222
google.golang.org/grpc v1.71.0
23-
google.golang.org/protobuf v1.36.5
23+
google.golang.org/protobuf v1.36.6
2424
)
2525

2626
require (
@@ -38,7 +38,7 @@ require (
3838
github.com/go-playground/locales v0.14.1 // indirect
3939
github.com/go-playground/universal-translator v0.18.1 // indirect
4040
github.com/go-playground/validator/v10 v10.24.0 // indirect
41-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
41+
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
4242
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
4343
github.com/golang/mock v1.6.0 // indirect
4444
github.com/golang/protobuf v1.5.4 // indirect
@@ -70,7 +70,7 @@ require (
7070
github.com/valyala/fasttemplate v1.2.2 // indirect
7171
go.uber.org/multierr v1.11.0 // indirect
7272
golang.org/x/crypto v0.36.0 // indirect
73-
golang.org/x/net v0.37.0 // indirect
73+
golang.org/x/net v0.38.0 // indirect
7474
golang.org/x/sys v0.31.0 // indirect
7575
golang.org/x/text v0.23.0 // indirect
7676
golang.org/x/time v0.8.0 // indirect

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
4242
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
4343
github.com/go-playground/validator/v10 v10.24.0 h1:KHQckvo8G6hlWnrPX4NJJ+aBfWNAE/HH+qdL2cBpCmg=
4444
github.com/go-playground/validator/v10 v10.24.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
45-
github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
46-
github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
45+
github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
46+
github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
4747
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
4848
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
4949
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
@@ -156,8 +156,8 @@ github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
156156
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
157157
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
158158
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
159-
github.com/spf13/viper v1.20.0 h1:zrxIyR3RQIOsarIrgL8+sAvALXul9jeEPa06Y0Ph6vY=
160-
github.com/spf13/viper v1.20.0/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
159+
github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4=
160+
github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
161161
github.com/streadway/amqp v1.1.0 h1:py12iX8XSyI7aN/3dUT8DFIDJazNJsVJdxNVEpnQTZM=
162162
github.com/streadway/amqp v1.1.0/go.mod h1:WYSrTEYHOXHd0nwFeUXAe2G2hRnQT+deZJJf88uS9Bg=
163163
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -197,13 +197,13 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73r
197197
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
198198
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
199199
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
200-
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
201-
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
200+
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
201+
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
202202
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
203203
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
204204
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
205-
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
206-
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
205+
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
206+
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
207207
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
208208
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
209209
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -238,8 +238,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 h1:
238238
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
239239
google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
240240
google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
241-
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
242-
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
241+
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
242+
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
243243
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
244244
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
245245
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎handlers/ironio_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestIronIOHandler(t *testing.T) {
4040
}
4141

4242
func TestIronInvalidToken(t *testing.T) {
43-
os.Setenv("DEBUG", "true")
43+
_ = os.Setenv("DEBUG", "true")
4444

4545
e, teardown := setup(t)
4646
defer teardown()

‎handlers/syslog.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type SyslogHandler struct {
2222

2323
func NewSyslogHandler(token string, pusher queue.Queue) (*SyslogHandler, error) {
2424
if token == "" {
25-
return nil, fmt.Errorf("Missing TOKEN value")
25+
return nil, fmt.Errorf("missing TOKEN value")
2626
}
2727
handler := &SyslogHandler{}
2828
handler.token = token

‎shared/plugin_manager.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (m *PluginManager) Discover() error {
104104
paths, err := plugin.Discover(PluginGlob, dir)
105105
if err != nil {
106106
return fmt.Errorf(
107-
"Error discovering plugins in %s: %s", dir, err)
107+
"error discovering plugins in %s: %s", dir, err)
108108
}
109109

110110
for _, path := range paths {
@@ -158,7 +158,7 @@ func (m *PluginManager) LoadAll() error {
158158
merrLock.Lock()
159159
defer merrLock.Unlock()
160160
merr = multierror.Append(merr, fmt.Errorf(
161-
"Error loading plugin %s: %s",
161+
"error loading plugin %s: %s",
162162
plugin.Path, err))
163163
}
164164
}(plugin)

‎shared/proto/resource.pb_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@ func TestFilter(t *testing.T) {
152152
Message: "foo",
153153
},
154154
}
155-
defer conn.Close()
155+
defer func() {
156+
_ = conn.Close()
157+
}()
156158
client := proto.NewFilterClient(conn)
157159
resp, err := client.Filter(ctx, &proto.FilterRequest{
158160
Resource: resource,

0 commit comments

Comments
 (0)