From 12634ebf17644cb3fcf7ebd87643e3005af96efb Mon Sep 17 00:00:00 2001 From: Henning Perl Date: Mon, 5 Feb 2024 12:53:58 +0100 Subject: [PATCH 1/3] chore: fix tests on master --- .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 c39b51455b2b..035434f253f2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -68,7 +68,7 @@ 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 + oryd/hydra:v2.2.0 serve all --dev docker start hydra docker logs -f hydra &> /tmp/hydra.log & name: Start Hydra From 9b9b8f46e73f411d83f64a1f10243d732f10a0e9 Mon Sep 17 00:00:00 2001 From: Henning Perl Date: Mon, 5 Feb 2024 13:41:48 +0100 Subject: [PATCH 2/3] fix: hydra versions --- .github/workflows/ci.yaml | 2 ++ selfservice/strategy/oidc/strategy_helper_test.go | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 035434f253f2..856d435d75a4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -68,6 +68,8 @@ jobs: -e URLS_SELF_ISSUER=http://localhost:4444/ \ -e URLS_LOGIN=http://localhost:4499/login \ -e URLS_CONSENT=http://localhost:4499/consent \ + -e LOG_LEAK_SENSITIVE_VALUES=true \ + -e SECRETS_SYSTEM=someverylongsecretthatis32byteslong \ oryd/hydra:v2.2.0 serve all --dev docker start hydra docker logs -f hydra &> /tmp/hydra.log & diff --git a/selfservice/strategy/oidc/strategy_helper_test.go b/selfservice/strategy/oidc/strategy_helper_test.go index 37c45bccd8c9..e3c6a75705ca 100644 --- a/selfservice/strategy/oidc/strategy_helper_test.go +++ b/selfservice/strategy/oidc/strategy_helper_test.go @@ -251,12 +251,14 @@ 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", + Tag: "v2.2.0", 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"}, From b2889b59202143020e71cab8c7266c6e4f2c2791 Mon Sep 17 00:00:00 2001 From: Henning Perl Date: Mon, 5 Feb 2024 14:34:53 +0100 Subject: [PATCH 3/3] fix: test with old hydra --- .github/workflows/ci.yaml | 2 +- selfservice/strategy/oidc/strategy_helper_test.go | 3 ++- selfservice/strategy/password/op_helpers_test.go | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 856d435d75a4..9e4a3fd1d947 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -70,7 +70,7 @@ jobs: -e URLS_CONSENT=http://localhost:4499/consent \ -e LOG_LEAK_SENSITIVE_VALUES=true \ -e SECRETS_SYSTEM=someverylongsecretthatis32byteslong \ - oryd/hydra:v2.2.0 serve all --dev + 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 e3c6a75705ca..7b39729cc6af 100644 --- a/selfservice/strategy/oidc/strategy_helper_test.go +++ b/selfservice/strategy/oidc/strategy_helper_test.go @@ -251,7 +251,8 @@ 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.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://localhost:%d/", publicPort), 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),