chore: deflake tests

Author: alnr

cmd/cloudx/client/command_helper.go

@@ -45,6 +45,7 @@ type (
 		projectID, workspaceID uuid.UUID
 		configLocation         string
 		noConfirm, isQuiet     bool
+		workspaceFromConfig    bool
 		VerboseErrWriter       io.Writer
 		Stdin                  *bufio.Reader
 		openBrowserHook        func(string) error
@@ -231,6 +232,7 @@ func (h *CommandHelper) determineWorkspaceID(ctx context.Context, config *Config
 		workspace = ws
 	} else if config.SelectedWorkspace != uuid.Nil {
 		h.workspaceID = config.SelectedWorkspace
+		h.workspaceFromConfig = true
 		return nil
 	}
 	workspace = strings.TrimSpace(workspace)
@@ -261,9 +263,11 @@ func (h *CommandHelper) determineProjectID(ctx context.Context, config *Config)
 		if h.projectOverride != nil {
 			return fmt.Errorf("project API key is set but project flag is also set, please remove one")
 		}
-		if h.workspaceID != uuid.Nil {
+		if h.workspaceID != uuid.Nil && !h.workspaceFromConfig {
 			return fmt.Errorf("project API key is set but workspace is also set, please remove one")
 		}
+		// Clear workspace from config since project API key takes precedence.
+		h.workspaceID = uuid.Nil
 		pjs, err := h.ListProjects(ctx, nil)
 		if err != nil {
 			return err

cmd/cloudx/client/command_helper_test.go

@@ -372,7 +372,7 @@ func TestCommandHelper(t *testing.T) {
 				assert.Equal(t, tc.project.Id, actual.Id)
 				assertValidProject(t, tc.project)
 
-				actual, err = authenticated.GetProject(ctx, tc.project.Slug[0:4], tc.project.WorkspaceId.Get())
+				actual, err = authenticated.GetProject(ctx, tc.project.Slug[:len(tc.project.Slug)-1], tc.project.WorkspaceId.Get())
 				require.NoError(t, err)
 				assert.Equal(t, tc.project.Id, actual.Id)
 			})

cmd/cloudx/relationtuples/relationtuples_test.go

@@ -165,7 +165,7 @@ func TestCRUD(t *testing.T) {
 func createLegacyNamespace(t *testing.T, project, rawNamespace string) {
 	t.Helper()
 	_, _, err := defaultCmd.Exec(nil, "patch", "permission-config", "--project", project,
-		"--add", `/namespaces/-=`+rawNamespace)
+		"--replace", `/namespaces=[`+rawNamespace+`]`)
 	if err != nil {
 		t.Fatal(err)
 	}

cmd/root.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"sync"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -19,8 +18,6 @@ import (
 	"github.com/ory/x/cmdx"
 )
 
-var commandTemplatingOnce sync.Once
-
 func NewRootCmd() *cobra.Command {
 	c := &cobra.Command{
 		Use:   "ory",
@@ -51,9 +48,7 @@ func NewRootCmd() *cobra.Command {
 		cloudx.NewIsCmd(),
 		versionCmd,
 	)
-	commandTemplatingOnce.Do(func() {
-		cmdx.EnableUsageTemplating(c)
-	})
+	cmdx.EnableUsageTemplating(c)
 
 	return c
 }