Skip to content

Commit 5a577d3

Browse files
Bump golang from 1.23.6-alpine to 1.24.0-alpine (#3699) (#3721)
* Bump golang from 1.23.6-alpine to 1.24.0-alpine Bumps golang from 1.23.6-alpine to 1.24.0-alpine. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... * update go.mod * fix new requirements --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent a1c9622 commit 5a577d3

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# golang alpine
2-
FROM golang:1.23.6-alpine AS builder
2+
FROM golang:1.24.0-alpine AS builder
33

44
ARG TARGETARCH
55
ARG TARGETOS

auth/services/oauth/authz_server_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,9 @@ func TestService_parseAndValidateJwtBearerToken(t *testing.T) {
574574
})
575575

576576
t.Run("wrong signing algorithm", func(t *testing.T) {
577-
privateKey, _ := rsa.GenerateKey(rand.Reader, 512)
577+
t.Setenv("GODEBUG", "rsa1024min=0") // minimum key-length has changed to 1024 -> https://pkg.go.dev/crypto/rsa#hdr-Minimum_key_size
578+
privateKey, err := rsa.GenerateKey(rand.Reader, 512)
579+
require.NoError(t, err)
578580

579581
keyID := "did:nuts:somedid#key-id"
580582

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/nuts-foundation/nuts-node
22

33
// This is the minimal version, the actual go version is determined by the images in the Dockerfile
44
// This version is used in automated tests such as the 'Scheduled govulncheck' action
5-
go 1.23.6
5+
go 1.24.0
66

77
require (
88
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0

makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ install-tools:
77
go install google.golang.org/protobuf/cmd/[email protected]
88
go install go.uber.org/mock/[email protected]
99
go install google.golang.org/grpc/cmd/[email protected]
10-
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0
10+
go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
1111

1212
gen-mocks:
1313
mockgen -destination=auth/mock.go -package=auth -source=auth/interface.go

network/dag/notifier.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,10 +383,10 @@ func (p *notifier) retry(event Event) {
383383
// logs after every failed attempt
384384
if errors.Is(err, errEventIncomplete) {
385385
// debug level if errEventIncomplete
386-
p.logNotificationResponse(event, err, logrus.DebugLevel, "Retrying event (attempt %d/%d)", n, maxRetries)
386+
p.logNotificationResponse(event, err, logrus.DebugLevel, fmt.Sprintf("Retrying event (attempt %d/%d)", n, maxRetries))
387387
} else {
388388
// error level for all other errors
389-
p.logNotificationResponse(event, err, logrus.ErrorLevel, "Retrying event (attempt %d/%d)", n, maxRetries)
389+
p.logNotificationResponse(event, err, logrus.ErrorLevel, fmt.Sprintf("Retrying event (attempt %d/%d)", n, maxRetries))
390390
}
391391
}),
392392
)
@@ -397,12 +397,12 @@ func (p *notifier) retry(event Event) {
397397
}(p.ctx)
398398
}
399399

400-
func (p *notifier) logNotificationResponse(event Event, err error, level logrus.Level, msg string, args ...interface{}) {
400+
func (p *notifier) logNotificationResponse(event Event, err error, level logrus.Level, msg string) {
401401
log.Logger().
402402
WithError(err).
403403
WithField(core.LogFieldTransactionRef, event.Hash.String()).
404404
WithField(core.LogFieldEventSubscriber, p.name).
405-
Logf(level, msg, args...)
405+
Log(level, msg)
406406
}
407407

408408
var errEventIncomplete = errors.New("receiver did not finish or fail")

0 commit comments

Comments
 (0)