From 009b00cc3322120d56eab4444ebc0bb3622566b5 Mon Sep 17 00:00:00 2001 From: Jonas Hungershausen Date: Thu, 10 Jul 2025 11:34:44 +0200 Subject: [PATCH 1/4] chore: upgrade client-go to v1.20.22 --- go.mod | 10 ++++------ go.sum | 11 ++++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index f798766a..1fac2549 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/ory/cli -go 1.23 - -toolchain go1.23.2 +go 1.24.0 replace ( github.com/gorilla/sessions => github.com/ory/sessions v1.2.2-0.20220110165800-b09c17334dc2 @@ -23,7 +21,7 @@ require ( github.com/gofrs/uuid/v3 v3.1.2 github.com/gomarkdown/markdown v0.0.0-20240730141124-034f12af3bf6 github.com/hashicorp/go-retryablehttp v0.7.7 - github.com/ory/client-go v1.15.10 + github.com/ory/client-go v1.20.22 github.com/ory/gochimp3 v0.0.0-20200417124117-ccd242db3655 github.com/ory/graceful v0.1.4-0.20230301144740-e222150c51d0 github.com/ory/herodot v0.10.3-0.20230807143059-27cd6936499b @@ -40,11 +38,11 @@ require ( github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 github.com/tidwall/gjson v1.18.0 github.com/tidwall/sjson v1.2.5 github.com/urfave/negroni v1.0.0 - golang.org/x/oauth2 v0.24.0 + golang.org/x/oauth2 v0.30.0 golang.org/x/text v0.20.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index 3603a9ad..9c69748d 100644 --- a/go.sum +++ b/go.sum @@ -610,8 +610,8 @@ github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDO github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY= github.com/ory/analytics-go/v5 v5.0.1 h1:LX8T5B9FN8KZXOtxgN+R3I4THRRVB6+28IKgKBpXmAM= github.com/ory/analytics-go/v5 v5.0.1/go.mod h1:lWCiCjAaJkKfgR/BN5DCLMol8BjKS1x+4jxBxff/FF0= -github.com/ory/client-go v1.15.10 h1:d009nseCcvWJt4KcyJUNYTzsWyU7JJ+0fTzE8YWfEd8= -github.com/ory/client-go v1.15.10/go.mod h1:WSa8NSYIoobY1lcSW0pd3k8erI49z15wlQ/GkUhSV+Y= +github.com/ory/client-go v1.20.22 h1:z8iPYxyEnJoTTXNdRiwFvVCJOcV8Fs1VHD75LFLytSY= +github.com/ory/client-go v1.20.22/go.mod h1:qrBblihPToJIwDAOLXRsAn2yLuXVYy4K3tBg2jJoXkI= github.com/ory/dockertest/v3 v3.11.0 h1:OiHcxKAvSDUwsEVh2BjxQQc/5EHz9n0va9awCtNGuyA= github.com/ory/dockertest/v3 v3.11.0/go.mod h1:VIPxS1gwT9NpPOrfD3rACs8Y9Z7yhzO4SB194iUDnUI= github.com/ory/fosite v0.47.1-0.20241101073333-eab241e153a4 h1:1pEVHGC+Dx2xMPMgpRgG3lyejyK8iU9KKfSnLowLYd8= @@ -773,8 +773,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/thales-e-security/pool v0.0.2 h1:RAPs4q2EbWsTit6tpzuvTFlgFRJ3S8Evf5gtvVDbmPg= @@ -984,8 +985,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= -golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= +golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From 1fadff75ab7398ec90ae7a913b99f3e10a30aefc Mon Sep 17 00:00:00 2001 From: Jonas Hungershausen Date: Thu, 14 Aug 2025 07:53:50 -0400 Subject: [PATCH 2/4] chore: upload PW traces on failure --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7c51a7b4..f995189b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,6 +33,7 @@ jobs: ORY_CONSOLE_URL: https://console.staging.ory.dev ORY_ORYAPIS_URL: https://staging.oryapis.dev - uses: actions/upload-artifact@v4 + if: ${{ failure() }} with: name: playwright-traces path: playwright-traces From 5433a6f4f16549dcfddcfc8bc1a75872eb00a29d Mon Sep 17 00:00:00 2001 From: Jonas Hungershausen Date: Tue, 9 Sep 2025 08:43:28 -0400 Subject: [PATCH 3/4] chore: u --- cmd/cloudx/client/project.go | 3 +++ go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmd/cloudx/client/project.go b/cmd/cloudx/client/project.go index 15848f21..32087257 100644 --- a/cmd/cloudx/client/project.go +++ b/cmd/cloudx/client/project.go @@ -267,6 +267,9 @@ func (h *CommandHelper) UpdateProject(ctx context.Context, id string, name strin if _, found := interim["name"]; !found { interim["name"] = "" } + if _, found := interim["organizations"]; !found { + interim["organizations"] = []client.BasicOrganization{} + } var payload client.SetProject var b bytes.Buffer diff --git a/go.mod b/go.mod index 06a69bdd..0a3e6724 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/gofrs/uuid/v3 v3.1.2 github.com/gomarkdown/markdown v0.0.0-20240730141124-034f12af3bf6 github.com/hashicorp/go-retryablehttp v0.7.7 - github.com/ory/client-go v1.20.22 + github.com/ory/client-go v1.22.1 github.com/ory/gochimp3 v0.0.0-20200417124117-ccd242db3655 github.com/ory/graceful v0.1.4-0.20230301144740-e222150c51d0 github.com/ory/herodot v0.10.3-0.20230807143059-27cd6936499b @@ -38,7 +38,7 @@ require ( github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.10.0 + github.com/stretchr/testify v1.11.1 github.com/tidwall/gjson v1.18.0 github.com/tidwall/sjson v1.2.5 github.com/urfave/negroni v1.0.0 diff --git a/go.sum b/go.sum index 151f6d3c..5e8ae05e 100644 --- a/go.sum +++ b/go.sum @@ -612,8 +612,8 @@ github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDO github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY= github.com/ory/analytics-go/v5 v5.0.1 h1:LX8T5B9FN8KZXOtxgN+R3I4THRRVB6+28IKgKBpXmAM= github.com/ory/analytics-go/v5 v5.0.1/go.mod h1:lWCiCjAaJkKfgR/BN5DCLMol8BjKS1x+4jxBxff/FF0= -github.com/ory/client-go v1.20.22 h1:z8iPYxyEnJoTTXNdRiwFvVCJOcV8Fs1VHD75LFLytSY= -github.com/ory/client-go v1.20.22/go.mod h1:qrBblihPToJIwDAOLXRsAn2yLuXVYy4K3tBg2jJoXkI= +github.com/ory/client-go v1.22.1 h1:BI/RwsVnIsSlL1xQ70R54eq0MX1qQI9AzV9h0j+TJgs= +github.com/ory/client-go v1.22.1/go.mod h1:TewDVd7lV6emrrSKQCq4xOzS6J1LYjsN80GO0BJE3fc= github.com/ory/dockertest/v3 v3.11.0 h1:OiHcxKAvSDUwsEVh2BjxQQc/5EHz9n0va9awCtNGuyA= github.com/ory/dockertest/v3 v3.11.0/go.mod h1:VIPxS1gwT9NpPOrfD3rACs8Y9Z7yhzO4SB194iUDnUI= github.com/ory/fosite v0.47.1-0.20241101073333-eab241e153a4 h1:1pEVHGC+Dx2xMPMgpRgG3lyejyK8iU9KKfSnLowLYd8= @@ -776,8 +776,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/thales-e-security/pool v0.0.2 h1:RAPs4q2EbWsTit6tpzuvTFlgFRJ3S8Evf5gtvVDbmPg= From e40cd62552002085338b327f59411d6f0e6c24d6 Mon Sep 17 00:00:00 2001 From: Jonas Hungershausen Date: Tue, 9 Sep 2025 16:29:25 -0400 Subject: [PATCH 4/4] chore: u --- cmd/cloudx/client/project.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/cloudx/client/project.go b/cmd/cloudx/client/project.go index 32087257..a189084d 100644 --- a/cmd/cloudx/client/project.go +++ b/cmd/cloudx/client/project.go @@ -267,7 +267,8 @@ func (h *CommandHelper) UpdateProject(ctx context.Context, id string, name strin if _, found := interim["name"]; !found { interim["name"] = "" } - if _, found := interim["organizations"]; !found { + _, orgsFound := interim["organizations"] + if !orgsFound { interim["organizations"] = []client.BasicOrganization{} } @@ -280,8 +281,8 @@ func (h *CommandHelper) UpdateProject(ctx context.Context, id string, name strin return nil, errors.WithStack(err) } - if payload.Services.Identity == nil && payload.Services.Permission == nil && payload.Services.Oauth2 == nil { - return nil, errors.Errorf("at least one of the keys `services.identity.config` and `services.permission.config` and `services.oauth2.config` is required and can not be empty") + if payload.Services.Identity == nil && payload.Services.Permission == nil && payload.Services.Oauth2 == nil && payload.Services.AccountExperience == nil { + return nil, errors.Errorf("at least one of the keys `services.identity.config` and `services.permission.config` and `services.oauth2.config` and `services.account_experience.config` is required and can not be empty") } if name != "" { payload.Name = name @@ -289,7 +290,7 @@ func (h *CommandHelper) UpdateProject(ctx context.Context, id string, name strin // If either of the CORS keys is not set after the merge, we need to fetch it from the server // If the name is not set, and it was not provided, we need to fetch it from the server - needsBackfill := !corsAdminFound || !corsPublicFound || payload.Name == "" + needsBackfill := !corsAdminFound || !corsPublicFound || payload.Name == "" || !orgsFound if needsBackfill { res, _, err := c.ProjectAPI.GetProject(ctx, id).Execute() @@ -305,6 +306,9 @@ func (h *CommandHelper) UpdateProject(ctx context.Context, id string, name strin if !corsPublicFound { payload.CorsPublic = *res.CorsPublic } + if !orgsFound { + payload.Organizations = res.Organizations + } } res, _, err := c.ProjectAPI.SetProject(ctx, id).SetProject(payload).Execute()