Skip to content

Commit d2c5a3e

Browse files
alnrclaude
alnr
and
claude
authored
chore: deflake tests (#425)
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 3a978a3 commit d2c5a3e

6 files changed

Lines changed: 23 additions & 24 deletions

File tree

‎cmd/cloudx/client/command_helper.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ type (
4545
projectID, workspaceID uuid.UUID
4646
configLocation string
4747
noConfirm, isQuiet bool
48+
workspaceFromConfig bool
4849
VerboseErrWriter io.Writer
4950
Stdin *bufio.Reader
5051
openBrowserHook func(string) error
@@ -231,6 +232,7 @@ func (h *CommandHelper) determineWorkspaceID(ctx context.Context, config *Config
231232
workspace = ws
232233
} else if config.SelectedWorkspace != uuid.Nil {
233234
h.workspaceID = config.SelectedWorkspace
235+
h.workspaceFromConfig = true
234236
return nil
235237
}
236238
workspace = strings.TrimSpace(workspace)
@@ -261,9 +263,11 @@ func (h *CommandHelper) determineProjectID(ctx context.Context, config *Config)
261263
if h.projectOverride != nil {
262264
return fmt.Errorf("project API key is set but project flag is also set, please remove one")
263265
}
264-
if h.workspaceID != uuid.Nil {
266+
if h.workspaceID != uuid.Nil && !h.workspaceFromConfig {
265267
return fmt.Errorf("project API key is set but workspace is also set, please remove one")
266268
}
269+
// Clear workspace from config since project API key takes precedence.
270+
h.workspaceID = uuid.Nil
267271
pjs, err := h.ListProjects(ctx, nil)
268272
if err != nil {
269273
return err

‎cmd/cloudx/client/command_helper_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ func TestCommandHelper(t *testing.T) {
372372
assert.Equal(t, tc.project.Id, actual.Id)
373373
assertValidProject(t, tc.project)
374374

375-
actual, err = authenticated.GetProject(ctx, tc.project.Slug[0:4], tc.project.WorkspaceId.Get())
375+
actual, err = authenticated.GetProject(ctx, tc.project.Slug[:8], tc.project.WorkspaceId.Get())
376376
require.NoError(t, err)
377377
assert.Equal(t, tc.project.Id, actual.Id)
378378
})

‎cmd/cloudx/relationtuples/relationtuples_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func TestCRUD(t *testing.T) {
165165
func createLegacyNamespace(t *testing.T, project, rawNamespace string) {
166166
t.Helper()
167167
_, _, err := defaultCmd.Exec(nil, "patch", "permission-config", "--project", project,
168-
"--add", `/namespaces/-=`+rawNamespace)
168+
"--replace", `/namespaces=[`+rawNamespace+`]`)
169169
if err != nil {
170170
t.Fatal(err)
171171
}

‎cmd/root.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"context"
88
"fmt"
99
"os"
10-
"sync"
1110

1211
"github.com/pkg/errors"
1312
"github.com/spf13/cobra"
@@ -19,8 +18,6 @@ import (
1918
"github.com/ory/x/cmdx"
2019
)
2120

22-
var commandTemplatingOnce sync.Once
23-
2421
func NewRootCmd() *cobra.Command {
2522
c := &cobra.Command{
2623
Use: "ory",
@@ -51,9 +48,7 @@ func NewRootCmd() *cobra.Command {
5148
cloudx.NewIsCmd(),
5249
versionCmd,
5350
)
54-
commandTemplatingOnce.Do(func() {
55-
cmdx.EnableUsageTemplating(c)
56-
})
51+
cmdx.EnableUsageTemplating(c)
5752

5853
return c
5954
}

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/ory/hydra/v2 v2.3.1-0.20260324164235-735e0a30f7f2
3030
github.com/ory/jsonschema/v3 v3.0.9-0.20250317235931-280c5fc7bf0e
3131
github.com/ory/keto v0.14.1-0.20260324164236-ccb79cfc480c
32-
github.com/ory/kratos v1.3.1-0.20260324164252-55fe178c4ea9
32+
github.com/ory/kratos v1.3.1-0.20260320110106-9d7085948039
3333
github.com/ory/x v0.0.730-0.20260324164228-9257dfe10938
3434
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
3535
github.com/pkg/errors v0.9.1
@@ -162,7 +162,7 @@ require (
162162
github.com/jackc/pgpassfile v1.0.0 // indirect
163163
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
164164
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
165-
github.com/jackc/pgx/v5 v5.7.5 // indirect
165+
github.com/jackc/pgx/v5 v5.9.2 // indirect
166166
github.com/jackc/puddle/v2 v2.2.2 // indirect
167167
github.com/jaegertracing/jaeger-idl v0.5.0 // indirect
168168
github.com/jmoiron/sqlx v1.4.0 // indirect
@@ -199,8 +199,8 @@ require (
199199
github.com/mitchellh/mapstructure v1.5.0 // indirect
200200
github.com/mitchellh/reflectwalk v1.0.2 // indirect
201201
github.com/moby/docker-image-spec v1.3.1 // indirect
202-
github.com/moby/moby/api v1.54.0 // indirect
203-
github.com/moby/moby/client v0.3.0 // indirect
202+
github.com/moby/moby/api v1.54.1 // indirect
203+
github.com/moby/moby/client v0.4.0 // indirect
204204
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
205205
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
206206
github.com/nyaruka/phonenumbers v1.6.5 // indirect
@@ -211,7 +211,7 @@ require (
211211
github.com/opencontainers/image-spec v1.1.1 // indirect
212212
github.com/openzipkin/zipkin-go v0.4.3 // indirect
213213
github.com/ory/analytics-go/v5 v5.0.1 // indirect
214-
github.com/ory/dockertest/v4 v4.0.0-beta.4 // indirect
214+
github.com/ory/dockertest/v4 v4.0.0 // indirect
215215
github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe // indirect
216216
github.com/ory/go-convenience v0.1.0 // indirect
217217
github.com/ory/keto/proto v0.13.0-alpha.0 // indirect

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,8 @@ github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUO
411411
github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
412412
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
413413
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
414-
github.com/jackc/pgx/v5 v5.7.5 h1:JHGfMnQY+IEtGM63d+NGMjoRpysB2JBwDr5fsngwmJs=
415-
github.com/jackc/pgx/v5 v5.7.5/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M=
414+
github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw=
415+
github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
416416
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
417417
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
418418
github.com/jaegertracing/jaeger-idl v0.5.0 h1:zFXR5NL3Utu7MhPg8ZorxtCBjHrL3ReM1VoB65FOFGE=
@@ -517,10 +517,10 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
517517
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
518518
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
519519
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
520-
github.com/moby/moby/api v1.54.0 h1:7kbUgyiKcoBhm0UrWbdrMs7RX8dnwzURKVbZGy2GnL0=
521-
github.com/moby/moby/api v1.54.0/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=
522-
github.com/moby/moby/client v0.3.0 h1:UUGL5okry+Aomj3WhGt9Aigl3ZOxZGqR7XPo+RLPlKs=
523-
github.com/moby/moby/client v0.3.0/go.mod h1:HJgFbJRvogDQjbM8fqc1MCEm4mIAGMLjXbgwoZp6jCQ=
520+
github.com/moby/moby/api v1.54.1 h1:TqVzuJkOLsgLDDwNLmYqACUuTehOHRGKiPhvH8V3Nn4=
521+
github.com/moby/moby/api v1.54.1/go.mod h1:+RQ6wluLwtYaTd1WnPLykIDPekkuyD/ROWQClE83pzs=
522+
github.com/moby/moby/client v0.4.0 h1:S+2XegzHQrrvTCvF6s5HFzcrywWQmuVnhOXe2kiWjIw=
523+
github.com/moby/moby/client v0.4.0/go.mod h1:QWPbvWchQbxBNdaLSpoKpCdf5E+WxFAgNHogCWDoa7g=
524524
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
525525
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
526526
github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
@@ -556,8 +556,8 @@ github.com/ory/analytics-go/v5 v5.0.1 h1:LX8T5B9FN8KZXOtxgN+R3I4THRRVB6+28IKgKBp
556556
github.com/ory/analytics-go/v5 v5.0.1/go.mod h1:lWCiCjAaJkKfgR/BN5DCLMol8BjKS1x+4jxBxff/FF0=
557557
github.com/ory/client-go v1.22.32 h1:31kLMk6DynhoyjXO7Gx6DRI9VX7RBdCQDxppfCiGtxg=
558558
github.com/ory/client-go v1.22.32/go.mod h1:G1f+5+m/PJVvl40bsRn0QuyVIcXe7EHiWeM7iWpIDjw=
559-
github.com/ory/dockertest/v4 v4.0.0-beta.4 h1:QcrNrobOP+5IjSDmS4//EuBtwiFuznQhi5xTe8oFSoM=
560-
github.com/ory/dockertest/v4 v4.0.0-beta.4/go.mod h1:p9kfE14tzK8+WU4F9YbIZlzhCzQ2pH7H1KIfBKrF3DM=
559+
github.com/ory/dockertest/v4 v4.0.0 h1:i19aFsO/VXE0VrMk4ifnKW4G/KIJ93PCjLOslxXoPME=
560+
github.com/ory/dockertest/v4 v4.0.0/go.mod h1:b5Ofu8VIxWNhXFvQcLu17pRNQdoUBKtXBW74G4Ygzx8=
561561
github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe h1:rvu4obdvqR0fkSIJ8IfgzKOWwZ5kOT2UNfLq81Qk7rc=
562562
github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe/go.mod h1:z4n3u6as84LbV4YmgjHhnwtccQqzf4cZlSk9f1FhygI=
563563
github.com/ory/go-convenience v0.1.0 h1:zouLKfF2GoSGnJwGq+PE/nJAE6dj2Zj5QlTgmMTsTS8=
@@ -578,8 +578,8 @@ github.com/ory/keto v0.14.1-0.20260324164236-ccb79cfc480c h1:IEGOWr24LYYohHhjsBt
578578
github.com/ory/keto v0.14.1-0.20260324164236-ccb79cfc480c/go.mod h1:oWXc/S0SVU/WM5s9lAfc9DidbnQNELFyKU5obZq2WIQ=
579579
github.com/ory/keto/proto v0.13.0-alpha.0.0.20251107121730-f5635433a563 h1:JAnmWvXQ8djHAycZgPfuhFh5yCDohu9x/5P638FnKkg=
580580
github.com/ory/keto/proto v0.13.0-alpha.0.0.20251107121730-f5635433a563/go.mod h1:80XUMndTR7nQxXmxsUx6pNaEp0KEa51wdhIPsIocwng=
581-
github.com/ory/kratos v1.3.1-0.20260324164252-55fe178c4ea9 h1:nQqTDWiJkhVOk5gP6I9GEap4KjK5TuwBsdHjpwNeybM=
582-
github.com/ory/kratos v1.3.1-0.20260324164252-55fe178c4ea9/go.mod h1:xSS7k+KjA6qjxkCmqh1hwnZ9QTDFXXbyyzICB2ZUEko=
581+
github.com/ory/kratos v1.3.1-0.20260320110106-9d7085948039 h1:Vo4Q5OO7mZWJLjyWH541JCBjkgVR3kXdHG4/1O2p0Og=
582+
github.com/ory/kratos v1.3.1-0.20260320110106-9d7085948039/go.mod h1:xSS7k+KjA6qjxkCmqh1hwnZ9QTDFXXbyyzICB2ZUEko=
583583
github.com/ory/kratos-client-go v1.3.8 h1:S4D5dAURq5C6LbOUU+DgE4ZXxp37IlJG2GngemdF9h0=
584584
github.com/ory/kratos-client-go v1.3.8/go.mod h1:Dc+ANapsPxu+CfdC0yk8TxmvceCmrvNozW+ZGS/xq5o=
585585
github.com/ory/mail v2.3.1+incompatible/go.mod h1:87D9/1gB6ewElQoN0lXJ0ayfqcj3cW3qCTXh+5E9mfU=

0 commit comments

Comments
 (0)