From 2b25af009ef12d2c3c7a67d63de7d1f409ef3f46 Mon Sep 17 00:00:00 2001 From: Jonas Hungershausen Date: Wed, 19 Feb 2025 13:32:19 +0100 Subject: [PATCH 1/3] chore: upgrade to go 1.24 --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/format.yml | 2 +- go.mod | 4 ++-- go.sum | 2 -- persistence/sql/persister_test.go | 4 ++-- selfservice/strategy/oidc/strategy_helper_test.go | 6 +++--- selfservice/strategy/password/op_helpers_test.go | 4 ++-- test/e2e/mock/httptarget/go.mod | 2 +- 8 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fd01491e2a9a..f90f9bed2d53 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -79,7 +79,7 @@ jobs: fetch-depth: 2 - uses: actions/setup-go@v4 with: - go-version: "1.23" + go-version: "1.24" - run: go list -json > go.list - name: Run nancy uses: sonatype-nexus-community/nancy-github-action@v1.0.2 @@ -175,7 +175,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: "1.23" + go-version: "1.24" - name: Install selfservice-ui-react-native uses: actions/checkout@v3 @@ -282,7 +282,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: "1.23" + go-version: "1.24" - run: go build -tags sqlite,json1 . - name: Install selfservice-ui-react-native diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index bb107819d849..49030570d8ee 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: "1.23" + go-version: "1.24" - run: make format - name: Indicate formatting issues run: git diff HEAD --exit-code --color diff --git a/go.mod b/go.mod index 325a5d447573..a5c674749ae5 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/ory/kratos -go 1.23 +go 1.24 -toolchain go1.23.2 +toolchain go1.24.0 replace ( github.com/coreos/go-oidc/v3 => github.com/ory/go-oidc/v3 v3.0.0-20241127113405-e5362711266b diff --git a/go.sum b/go.sum index c6f36f82358f..06051f0dae7f 100644 --- a/go.sum +++ b/go.sum @@ -640,8 +640,6 @@ github.com/ory/pop/v6 v6.2.1-0.20241121111754-e5dfc0f3344b h1:BIzoOe2/wynZBQak1p github.com/ory/pop/v6 v6.2.1-0.20241121111754-e5dfc0f3344b/go.mod h1:okVAYKGtgunD/wbW3NGhZTndJCS+6FqO+cA89rQ4doc= github.com/ory/sessions v1.2.2-0.20220110165800-b09c17334dc2 h1:zm6sDvHy/U9XrGpixwHiuAwpp0Ock6khSVHkrv6lQQU= github.com/ory/sessions v1.2.2-0.20220110165800-b09c17334dc2/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= -github.com/ory/x v0.0.675 h1:K6GpVo99BXBFv2UiwMjySNNNqCFKGswynrt7vWQJFU8= -github.com/ory/x v0.0.675/go.mod h1:zJmnDtKje2FCP4EeFvRsKk94XXiqKCSGJMZcirAfhUs= github.com/ory/x v0.0.689 h1:pMXmnw2aoHiq4jRX9xtGXqX+VU3USEwlUUbwNCxmiZQ= github.com/ory/x v0.0.689/go.mod h1:UpPgjobuyIyHh1pG4LxqmfMpuNOnzf2BzwyouwBeCk4= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= diff --git a/persistence/sql/persister_test.go b/persistence/sql/persister_test.go index 3029cdc51ef0..0f23c07b4a4d 100644 --- a/persistence/sql/persister_test.go +++ b/persistence/sql/persister_test.go @@ -299,7 +299,7 @@ func TestPersister_Transaction(t *testing.T) { errMessage := "failing because why not" err := p.Transaction(context.Background(), func(_ context.Context, connection *pop.Connection) error { require.NoError(t, connection.Create(i)) - return errors.Errorf(errMessage) + return errors.New(errMessage) }) require.Error(t, err) assert.Contains(t, err.Error(), errMessage) @@ -318,7 +318,7 @@ func TestPersister_Transaction(t *testing.T) { ctx := sql.WithTransaction(context.Background(), tx) require.NoError(t, p.CreateLoginFlow(ctx, lr), "%+v", lr) require.NoError(t, getErr(p.GetLoginFlow(ctx, lr.ID)), "%+v", lr) - return errors.Errorf(errMessage) + return errors.New(errMessage) }) require.Error(t, err) assert.Contains(t, err.Error(), errMessage) diff --git a/selfservice/strategy/oidc/strategy_helper_test.go b/selfservice/strategy/oidc/strategy_helper_test.go index 2b542cb20e57..7e0c1f591527 100644 --- a/selfservice/strategy/oidc/strategy_helper_test.go +++ b/selfservice/strategy/oidc/strategy_helper_test.go @@ -303,19 +303,19 @@ func newHydra(t *testing.T, subject *string, claims *idTokenClaims, scope *[]str pr := remotePublic + "/health/ready" res, err := http.DefaultClient.Get(pr) if err != nil || res.StatusCode != 200 { - return errors.Errorf("Hydra public is not ready at " + pr) + return errors.Errorf("Hydra public is not ready at %s", pr) } wellKnown := remotePublic + "/.well-known/openid-configuration" res, err = http.DefaultClient.Get(wellKnown) if err != nil || res.StatusCode != 200 { - return errors.Errorf("Hydra .well-known is not ready at " + wellKnown) + return errors.Errorf("Hydra .well-known is not ready at %s", wellKnown) } ar := remoteAdmin + "/health/ready" res, err = http.DefaultClient.Get(ar) if err != nil && res.StatusCode != 200 { - return errors.Errorf("Hydra admin is not ready at " + ar) + return errors.Errorf("Hydra admin is not ready at %s", ar) } else { return nil } diff --git a/selfservice/strategy/password/op_helpers_test.go b/selfservice/strategy/password/op_helpers_test.go index 6a300807374c..cf56cbf17766 100644 --- a/selfservice/strategy/password/op_helpers_test.go +++ b/selfservice/strategy/password/op_helpers_test.go @@ -176,13 +176,13 @@ func newHydra(t *testing.T, loginUI string, consentUI string) (hydraAdmin string pr := hydraPublic + "/health/ready" res, err := http.DefaultClient.Get(pr) if err != nil || res.StatusCode != 200 { - return errors.Errorf("Hydra public is not ready at " + pr) + return errors.Errorf("Hydra public is not ready at %s", pr) } ar := hydraAdmin + "/health/ready" res, err = http.DefaultClient.Get(ar) if err != nil && res.StatusCode != 200 { - return errors.Errorf("Hydra admin is not ready at " + ar) + return errors.Errorf("Hydra admin is not ready at %s", ar) } else { return nil } diff --git a/test/e2e/mock/httptarget/go.mod b/test/e2e/mock/httptarget/go.mod index a82d636fb196..a1e11720229c 100644 --- a/test/e2e/mock/httptarget/go.mod +++ b/test/e2e/mock/httptarget/go.mod @@ -1,6 +1,6 @@ module github.com/ory/mock -go 1.23.1 +go 1.24.0 require ( github.com/julienschmidt/httprouter v1.3.0 From 43468f320ef07141fea1489e0723bcc84aa6be89 Mon Sep 17 00:00:00 2001 From: Jonas Hungershausen Date: Wed, 19 Feb 2025 14:56:29 +0100 Subject: [PATCH 2/3] chore: u --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f90f9bed2d53..0d13b34edb85 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -96,7 +96,7 @@ jobs: GOGC: 100 with: args: --timeout 10m0s - version: v1.61.0 + version: v1.64.5 - name: Build Kratos run: make install - name: Run go-acc (tests) From 9717cd541c26e2e9ee9d84ffc1222bb914bc84bb Mon Sep 17 00:00:00 2001 From: Jonas Hungershausen Date: Wed, 19 Feb 2025 14:57:37 +0100 Subject: [PATCH 3/3] chore: u --- .docker/Dockerfile-build | 2 +- .docker/Dockerfile-debug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.docker/Dockerfile-build b/.docker/Dockerfile-build index 687d8834012f..1c6bb115df3e 100644 --- a/.docker/Dockerfile-build +++ b/.docker/Dockerfile-build @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1-experimental -FROM golang:1.23-bullseye AS builder +FROM golang:1.24-bullseye AS builder RUN apt-get update && apt-get upgrade -y &&\ mkdir -p /var/lib/sqlite diff --git a/.docker/Dockerfile-debug b/.docker/Dockerfile-debug index 97a0e2b72525..dd6a67538ad6 100644 --- a/.docker/Dockerfile-debug +++ b/.docker/Dockerfile-debug @@ -1,4 +1,4 @@ -FROM golang:1.23-bullseye +FROM golang:1.24-bullseye ENV CGO_ENABLED 1 RUN apt-get update && apt-get install -y --no-install-recommends inotify-tools psmisc