From 12166b4370d607a069f268227752bb7b18a50b57 Mon Sep 17 00:00:00 2001 From: Henning Perl Date: Mon, 5 Feb 2024 15:17:32 +0100 Subject: [PATCH] test: fix hydra tests on master (#3737) --- .github/workflows/ci.yaml | 4 +++- selfservice/strategy/oidc/strategy_helper_test.go | 5 ++++- selfservice/strategy/password/op_helpers_test.go | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c39b51455b2b..9e4a3fd1d947 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -68,7 +68,9 @@ jobs: -e URLS_SELF_ISSUER=http://localhost:4444/ \ -e URLS_LOGIN=http://localhost:4499/login \ -e URLS_CONSENT=http://localhost:4499/consent \ - oryd/hydra:v2.0.2 serve all --dev + -e LOG_LEAK_SENSITIVE_VALUES=true \ + -e SECRETS_SYSTEM=someverylongsecretthatis32byteslong \ + oryd/hydra:v2.2.0@sha256:6c0f9195fe04ae16b095417b323881f8c9008837361160502e11587663b37c09 serve all --dev docker start hydra docker logs -f hydra &> /tmp/hydra.log & name: Start Hydra diff --git a/selfservice/strategy/oidc/strategy_helper_test.go b/selfservice/strategy/oidc/strategy_helper_test.go index 37c45bccd8c9..7b39729cc6af 100644 --- a/selfservice/strategy/oidc/strategy_helper_test.go +++ b/selfservice/strategy/oidc/strategy_helper_test.go @@ -251,12 +251,15 @@ func newHydra(t *testing.T, subject *string, claims *idTokenClaims, scope *[]str require.NoError(t, err) hydra, err := pool.RunWithOptions(&dockertest.RunOptions{ Repository: "oryd/hydra", - Tag: "v2.0.2", + // Keep tag in sync with the version in ci.yaml + Tag: "v2.2.0@sha256:6c0f9195fe04ae16b095417b323881f8c9008837361160502e11587663b37c09", Env: []string{ "DSN=memory", fmt.Sprintf("URLS_SELF_ISSUER=http://localhost:%d/", publicPort), "URLS_LOGIN=" + hydraIntegrationTSURL + "/login", "URLS_CONSENT=" + hydraIntegrationTSURL + "/consent", + "LOG_LEAK_SENSITIVE_VALUES=true", + "SECRETS_SYSTEM=someverylongsecretthatis32byteslong", }, Cmd: []string{"serve", "all", "--dev"}, ExposedPorts: []string{"4444/tcp", "4445/tcp"}, diff --git a/selfservice/strategy/password/op_helpers_test.go b/selfservice/strategy/password/op_helpers_test.go index 17422063207b..9e42ae471851 100644 --- a/selfservice/strategy/password/op_helpers_test.go +++ b/selfservice/strategy/password/op_helpers_test.go @@ -133,7 +133,8 @@ func newHydra(t *testing.T, loginUI string, consentUI string) (hydraAdmin string hydraResource, err := pool.RunWithOptions(&dockertest.RunOptions{ Repository: "oryd/hydra", - Tag: "v2.2.0", + // Keep tag in sync with the version in ci.yaml + Tag: "v2.2.0@sha256:6c0f9195fe04ae16b095417b323881f8c9008837361160502e11587663b37c09", Env: []string{ "DSN=memory", fmt.Sprintf("URLS_SELF_ISSUER=http://127.0.0.1:%d/", publicPort),