fix: export GetSelectedProjectId, remove utils, mod tidy

ory · Jan 20, 2023 · 8d09276 · 8d09276
1 parent 1e2a726
commit 8d09276
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 33 deletions.
diff --git a/cmd/cloudx/accountexperience/accountexperience.go b/cmd/cloudx/accountexperience/accountexperience.go
@@ -13,6 +13,7 @@ import (
 	"github.com/spf13/cobra"
 
 	client "github.com/ory/cli/cmd/cloudx/client"
+	"github.com/ory/cli/cmd/cloudx/project"
 	cloud "github.com/ory/client-go"
 	"github.com/ory/x/cmdx"
 )
@@ -40,7 +41,7 @@ func NewAxCmd(cmd string) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			id, err := getSelectedProjectId(h, args)
+			id, err := project.GetSelectedProjectId(h, args)
 			if err != nil {
 				return cmdx.PrintOpenAPIError(cmd, err)
 			}

diff --git a/cmd/cloudx/accountexperience/utils.go b/cmd/cloudx/accountexperience/utils.go
diff --git a/cmd/cloudx/project/get.go b/cmd/cloudx/project/get.go
@@ -45,7 +45,7 @@ $ ory get project ecaaa3cb-0730-4ee8-a6df-9553cdfeef89 --format json
 				return err
 			}
 
-			id, err := getSelectedProjectId(h, args)
+			id, err := GetSelectedProjectId(h, args)
 			if err != nil {
 				return cmdx.PrintOpenAPIError(cmd, err)
 			}

diff --git a/cmd/cloudx/project/get_identity_config.go b/cmd/cloudx/project/get_identity_config.go
@@ -35,7 +35,7 @@ $ ory get identity-config ecaaa3cb-0730-4ee8-a6df-9553cdfeef89 --format json
 				return err
 			}
 
-			id, err := getSelectedProjectId(h, args)
+			id, err := GetSelectedProjectId(h, args)
 			if err != nil {
 				return cmdx.PrintOpenAPIError(cmd, err)
 			}

diff --git a/cmd/cloudx/project/get_oauth2_config.go b/cmd/cloudx/project/get_oauth2_config.go
@@ -43,7 +43,7 @@ $ ory get oauth2-config ecaaa3cb-0730-4ee8-a6df-9553cdfeef89 --format json
 				return err
 			}
 
-			id, err := getSelectedProjectId(h, args)
+			id, err := GetSelectedProjectId(h, args)
 			if err != nil {
 				return cmdx.PrintOpenAPIError(cmd, err)
 			}

diff --git a/cmd/cloudx/project/get_permission_config.go b/cmd/cloudx/project/get_permission_config.go
@@ -36,7 +36,7 @@ $ ory get permission-config ecaaa3cb-0730-4ee8-a6df-9553cdfeef89 --format json
 				return err
 			}
 
-			id, err := getSelectedProjectId(h, args)
+			id, err := GetSelectedProjectId(h, args)
 			if err != nil {
 				return cmdx.PrintOpenAPIError(cmd, err)
 			}

diff --git a/cmd/cloudx/project/patch.go b/cmd/cloudx/project/patch.go
@@ -81,7 +81,7 @@ func runPatch(patchPrefixer func([]string) []string, filePrefixer func([]json.Ra
 			return err
 		}
 
-		id, err := getSelectedProjectId(h, args)
+		id, err := GetSelectedProjectId(h, args)
 		if err != nil {
 			return cmdx.PrintOpenAPIError(cmd, err)
 		}

diff --git a/cmd/cloudx/project/update.go b/cmd/cloudx/project/update.go
@@ -121,7 +121,7 @@ func runUpdate(filePrefixer func([]json.RawMessage) ([]json.RawMessage, error),
 		if n := cmd.Flags().Lookup("name"); n != nil {
 			name = n.Value.String()
 		}
-		id, err := getSelectedProjectId(h, args)
+		id, err := GetSelectedProjectId(h, args)
 		if err != nil {
 			return cmdx.PrintOpenAPIError(cmd, err)
 		}

diff --git a/cmd/cloudx/project/utils.go b/cmd/cloudx/project/utils.go
@@ -17,7 +17,7 @@ import (
 
 var defaultProjectNotSetError = errors.New("no project was specified")
 
-func getSelectedProjectId(h *client.CommandHelper, args []string) (string, error) {
+func GetSelectedProjectId(h *client.CommandHelper, args []string) (string, error) {
 	if len(args) == 0 {
 		if id := h.GetDefaultProjectID(); id == "" {
 			return "", defaultProjectNotSetError

diff --git a/go.mod b/go.mod
@@ -38,6 +38,7 @@ require (
 	github.com/ory/keto v0.10.0-alpha.0.0.20221026143738-31e323a91b68
 	github.com/ory/kratos v0.10.2-0.20221108163448-d3d148b3a589
 	github.com/ory/x v0.0.511-0.20221108105728-3fed9bc99daf
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/pkg/errors v0.9.1
 	github.com/pquerna/otp v1.3.0
 	github.com/rs/cors v1.8.2
@@ -231,7 +232,6 @@ require (
 	github.com/pborman/uuid v1.2.1 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/philhofer/fwd v1.1.1 // indirect
-	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pkg/profile v1.7.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/pquerna/cachecontrol v0.1.0 // indirect