From 9ceefef34e6723ffe7ed618acaef22ce83f54474 Mon Sep 17 00:00:00 2001 From: Qiao Han Date: Mon, 21 Apr 2025 15:39:04 +0800 Subject: [PATCH] fix: move services command to local dev group --- cmd/services.go | 2 +- internal/services/services.go | 2 +- internal/utils/access_token.go | 4 ---- internal/utils/api.go | 3 ++- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cmd/services.go b/cmd/services.go index fe298cb437..955f6bc2bd 100644 --- a/cmd/services.go +++ b/cmd/services.go @@ -8,7 +8,7 @@ import ( var ( servicesCmd = &cobra.Command{ - GroupID: groupManagementAPI, + GroupID: groupLocalDev, Use: "services", Short: "Show versions of all Supabase services", RunE: func(cmd *cobra.Command, args []string) error { diff --git a/internal/services/services.go b/internal/services/services.go index ebc08efcac..588dedfbc8 100644 --- a/internal/services/services.go +++ b/internal/services/services.go @@ -19,7 +19,7 @@ func Run(ctx context.Context, fsys afero.Fs) error { if err := flags.LoadProjectRef(fsys); err != nil && !errors.Is(err, utils.ErrNotLinked) { fmt.Fprintln(os.Stderr, err) } - if err := utils.Config.Load("", utils.NewRootFS(fsys)); err != nil && !errors.Is(err, os.ErrNotExist) { + if err := flags.LoadConfig(fsys); err != nil { fmt.Fprintln(os.Stderr, err) } diff --git a/internal/utils/access_token.go b/internal/utils/access_token.go index f7ef90a010..26b3dfddbc 100644 --- a/internal/utils/access_token.go +++ b/internal/utils/access_token.go @@ -20,10 +20,6 @@ var ( const AccessTokenKey = "access-token" -func LoadAccessToken() (string, error) { - return LoadAccessTokenFS(afero.NewOsFs()) -} - func LoadAccessTokenFS(fsys afero.Fs) (string, error) { accessToken, err := loadAccessToken(fsys) if err != nil { diff --git a/internal/utils/api.go b/internal/utils/api.go index ac8cbc0249..c67252b6b6 100644 --- a/internal/utils/api.go +++ b/internal/utils/api.go @@ -10,6 +10,7 @@ import ( "sync" "github.com/go-errors/errors" + "github.com/spf13/afero" "github.com/spf13/viper" "github.com/supabase/cli/internal/utils/cloudflare" supabase "github.com/supabase/cli/pkg/api" @@ -116,7 +117,7 @@ func withFallbackDNS(dialContext DialContextFunc) DialContextFunc { func GetSupabase() *supabase.ClientWithResponses { clientOnce.Do(func() { - token, err := LoadAccessToken() + token, err := LoadAccessTokenFS(afero.NewOsFs()) if err != nil { log.Fatalln(err) }