Skip to content

Commit 90340d3

Browse files
stonedu1011stonedu1011
committed
bump to go 1.24
1 parent 7f4af4c commit 90340d3

File tree

9 files changed

+20
-21
lines changed

9 files changed

+20
-21
lines changed

‎cmd/lanai-cli/cmdutils/git.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package cmdutils
1818

1919
import (
2020
"context"
21+
"errors"
2122
"fmt"
2223
"github.com/bmatcuk/doublestar/v4"
2324
"github.com/go-git/go-git/v5"
@@ -148,7 +149,7 @@ func (g *GitUtils) MarkWorktree(tag string, msg string, detach bool, matchers..
148149
if e := g.ResetToCommit(headHash, false); e != nil {
149150
msg := fmt.Sprintf("unable to reset current branch after marking: %v. Worktree need manual clean up", e)
150151
logger.WithContext(g.ctx).Errorf(`Git: %s`, msg)
151-
return fmt.Errorf(msg)
152+
return errors.New(msg)
152153
}
153154

154155
return nil

‎go.mod‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
module github.com/cisco-open/go-lanai
22

3-
go 1.23.8
4-
5-
toolchain go1.24.3
3+
go 1.24
64

75
require (
86
dario.cat/mergo v1.0.2
9-
github.com/IBM/sarama v1.45.1
7+
github.com/IBM/sarama v1.45.2
108
github.com/Masterminds/sprig/v3 v3.3.0
119
github.com/alicebob/miniredis/v2 v2.34.0
1210
github.com/aws/aws-sdk-go-v2 v1.36.3
@@ -120,7 +118,7 @@ require (
120118
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
121119
github.com/go-git/go-billy/v5 v5.6.2 // indirect
122120
github.com/go-ini/ini v1.67.0 // indirect
123-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
121+
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
124122
github.com/go-logr/logr v1.4.2 // indirect
125123
github.com/go-logr/stdr v1.2.2 // indirect
126124
github.com/go-ole/go-ole v1.2.6 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
1010
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
1111
github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
1212
github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
13-
github.com/IBM/sarama v1.45.1 h1:nY30XqYpqyXOXSNoe2XCgjj9jklGM1Ye94ierUb1jQ0=
14-
github.com/IBM/sarama v1.45.1/go.mod h1:qifDhA3VWSrQ1TjSMyxDl3nYL3oX2C83u+G6L79sq4w=
13+
github.com/IBM/sarama v1.45.2 h1:8m8LcMCu3REcwpa7fCP6v2fuPuzVwXDAM2DOv3CBrKw=
14+
github.com/IBM/sarama v1.45.2/go.mod h1:ppaoTcVdGv186/z6MEKsMm70A5fwJfRTpstI37kVn3Y=
1515
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
1616
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
1717
github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
@@ -199,8 +199,8 @@ github.com/go-git/go-git/v5 v5.16.0/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lo
199199
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
200200
github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
201201
github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
202-
github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
203-
github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
202+
github.com/go-jose/go-jose/v4 v4.1.0 h1:cYSYxd3pw5zd2FSXk2vGdn9igQU2PS8MuxrCOCl0FdY=
203+
github.com/go-jose/go-jose/v4 v4.1.0/go.mod h1:GG/vqmYm3Von2nYiB2vGTXzdoNKE5tix5tuc6iAd+sw=
204204
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
205205
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
206206
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=

‎pkg/data/repo/gorm_schema.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ func newGormMetadata(db *gorm.DB, model interface{}) (GormMetadata, error) {
6262
return GormMetadata{}, ErrorInvalidCrudModel.WithMessage("%T is not a valid model for gorm CRUD repository", model)
6363
}
6464

65-
pType := reflect.PtrTo(sType)
65+
pType := reflect.PointerTo(sType)
6666
types := map[reflect.Type]typeKey{
6767
pType: typeModelPtr,
6868
sType: typeModel,
69-
reflect.PtrTo(reflect.SliceOf(sType)): typeModelSlicePtr,
70-
reflect.PtrTo(reflect.SliceOf(pType)): typeModelPtrSlicePtr,
69+
reflect.PointerTo(reflect.SliceOf(sType)): typeModelSlicePtr,
70+
reflect.PointerTo(reflect.SliceOf(pType)): typeModelPtrSlicePtr,
7171
reflect.SliceOf(sType): typeModelSlice,
7272
reflect.SliceOf(pType): typeModelPtrSlice,
7373
reflect.TypeOf(map[string]interface{}{}): typeGenericMap,

‎pkg/kafka/consumer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func (g *saramaGroupConsumer) Start(ctx context.Context) (err error) {
8787
var e error
8888
g.consumer, e = sarama.NewConsumerGroup(g.brokers, g.group, &g.config.sarama)
8989
if e != nil {
90-
err = translateSaramaBindingError(e, e.Error())
90+
err = translateSaramaBindingError(e, "%s", e.Error())
9191
return
9292
}
9393

‎pkg/kafka/encoding.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (enc jsonEncoder) MIMEType() string {
3030

3131
func (enc jsonEncoder) Encode(v interface{}) (bytes []byte, err error) {
3232
if bytes, err = json.Marshal(v); err != nil {
33-
return bytes, ErrorSubTypeEncoding.WithCause(err, err.Error())
33+
return bytes, ErrorSubTypeEncoding.WithCause(err, "%s", err.Error())
3434
}
3535
return
3636
}
@@ -49,7 +49,7 @@ func (enc binaryEncoder) Encode(v interface{}) (bytes []byte, err error) {
4949
return val, nil
5050
case encoding.BinaryMarshaler:
5151
if bytes, err = val.MarshalBinary(); err != nil {
52-
return bytes, ErrorSubTypeEncoding.WithCause(err, err.Error())
52+
return bytes, ErrorSubTypeEncoding.WithCause(err, "%s", err.Error())
5353
}
5454
return
5555
default:

‎pkg/kafka/subscriber.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,19 @@ func (s *saramaSubscriber) Start(ctx context.Context) (err error) {
8282

8383
var e error
8484
if s.consumer, e = sarama.NewConsumer(s.brokers, &s.config.sarama); e != nil {
85-
err = translateSaramaBindingError(e, e.Error())
85+
err = translateSaramaBindingError(e, "%s", e.Error())
8686
return
8787
}
8888

8989
if s.partitions, e = s.consumer.Partitions(s.topic); e != nil {
90-
err = translateSaramaBindingError(e, e.Error())
90+
err = translateSaramaBindingError(e, "%s", e.Error())
9191
return
9292
}
9393

9494
partitionConsumers := make([]sarama.PartitionConsumer, len(s.partitions))
9595
for i, p := range s.partitions {
9696
if partitionConsumers[i], e = s.consumer.ConsumePartition(s.topic, p, sarama.OffsetNewest); e != nil {
97-
err = translateSaramaBindingError(e, e.Error())
97+
err = translateSaramaBindingError(e, "%s", e.Error())
9898
return
9999
}
100100
}

‎pkg/opa/access_partial.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func handlePartialResult(ctx context.Context, result *sdk.PartialResult, rErr er
152152
case sdk.IsUndefinedErr(rErr):
153153
return nil, ErrAccessDenied
154154
case errors.Is(rErr, ErrQueriesNotResolved):
155-
return nil, ErrAccessDenied.WithMessage(rErr.Error())
155+
return nil, ErrAccessDenied.WithMessage("%s", rErr.Error())
156156
default:
157157
return nil, ErrAccessDenied.WithMessage("failed to perform partial evaluation: %v", rErr)
158158
}

‎pkg/security/saml/idp/slo_middleware.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func (mw *SamlSingleLogoutMiddleware) determineSloEndpoint(_ *gin.Context, req *
186186
func (mw *SamlSingleLogoutMiddleware) validateLogoutRequest(_ *gin.Context, req *SamlLogoutRequest, spDetails *SamlSpDetails) error {
187187
if !spDetails.SkipAuthRequestSignatureVerification {
188188
if e := req.VerifySignature(); e != nil {
189-
return ErrorSamlSloResponder.WithMessage(e.Error())
189+
return ErrorSamlSloResponder.WithMessage("%s", e.Error())
190190
}
191191
}
192192
return req.Validate()

0 commit comments

Comments
 (0)