From c1a5cdb2c9e0191f7de9d341bb4446708f1ca4de Mon Sep 17 00:00:00 2001 From: Alec Fong Date: Wed, 6 Nov 2024 19:47:01 +0000 Subject: [PATCH 1/2] add a new path --- pkg/util/util.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/util/util.go b/pkg/util/util.go index eda9851a..15ab3dbb 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -141,6 +141,7 @@ func runVsCodeCommand(vscodepath string, args []string) ([]byte, error) { var commonVSCodePaths = []string{ "code", "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code", + "/mnt/c/Program Files/Microsoft VS Code/bin/code", "/usr/bin/code", "/usr/local/bin/code", "/snap/bin/code", From 5c4177990e9676bd8d3a58dbe70330e0ec40e743 Mon Sep 17 00:00:00 2001 From: Alec Fong Date: Wed, 6 Nov 2024 20:06:58 +0000 Subject: [PATCH 2/2] remove approve cmd --- pkg/cmd/cmd.go | 2 -- pkg/store/user.go | 19 ------------------- pkg/store/user_test.go | 26 -------------------------- 3 files changed, 47 deletions(-) diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go index 99c65767..07ad9b06 100644 --- a/pkg/cmd/cmd.go +++ b/pkg/cmd/cmd.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/brevdev/brev-cli/pkg/auth" - "github.com/brevdev/brev-cli/pkg/cmd/approve" "github.com/brevdev/brev-cli/pkg/cmd/autostop" "github.com/brevdev/brev-cli/pkg/cmd/background" "github.com/brevdev/brev-cli/pkg/cmd/bmon" @@ -246,7 +245,6 @@ func createCmdTree(cmd *cobra.Command, t *terminal.Terminal, loginCmdStore *stor if featureflag.IsDev() { _ = 0 // noop cmd.AddCommand(test.NewCmdTest(t, noLoginCmdStore)) - cmd.AddCommand(approve.NewCmdApprove(t, loginCmdStore)) cmd.AddCommand(clipboard.EstablishConnection(t, loginCmdStore)) cmd.AddCommand(clipboard.SendToClipboard(t, loginCmdStore)) cmd.AddCommand(clipboard.ForwardPort(t, loginCmdStore)) diff --git a/pkg/store/user.go b/pkg/store/user.go index f9e6b11d..435643a1 100644 --- a/pkg/store/user.go +++ b/pkg/store/user.go @@ -111,25 +111,6 @@ func (s AuthHTTPStore) UpdateUser(userID string, updatedUser *entity.UpdateUser) var usersIDPathPattern = fmt.Sprintf("%s/%s", usersPath, "%s") // usersIDPath = fmt.Sprintf(usersIDPathPattern, fmt.Sprintf("{%s}", userIDParamStr)) -// usersApprovePathPattern = fmt.Sprintf("%s/approve", usersIDPathPattern) -// usersApprovePath = fmt.Sprintf(usersApprovePathPattern, userIDParamStr) - -func (s AuthHTTPStore) ApproveUserByID(userID string) (*entity.User, error) { - var result entity.User - res, err := s.authHTTPClient.restyClient.R(). - SetHeader("Content-Type", "application/json"). - // SetPathParam(userIDParamName, userID). - SetResult(&result). - Post(usersPath + "/" + userID + "/approve") - if err != nil { - return nil, breverrors.WrapAndTrace(err) - } - if res.IsError() { - return nil, NewHTTPResponseError(res) - } - - return &result, nil -} func (s AuthHTTPStore) GetUsers(queryParams map[string]string) ([]entity.User, error) { var result []entity.User diff --git a/pkg/store/user_test.go b/pkg/store/user_test.go index dbb4593c..a1ece04e 100644 --- a/pkg/store/user_test.go +++ b/pkg/store/user_test.go @@ -128,29 +128,3 @@ func TestUpdateUser(t *testing.T) { return } } - -func TestApproveUser(t *testing.T) { - s := MakeMockAuthHTTPStore() - httpmock.ActivateNonDefault(s.authHTTPClient.restyClient.GetClient()) - - expected := &entity.User{ - ID: "1", - } - res, err := httpmock.NewJsonResponder(200, expected) - if !assert.Nil(t, err) { - return - } - url := fmt.Sprintf("=~^%s/%s/%s/approve.+", s.authHTTPClient.restyClient.BaseURL, usersPath, expected.ID) - httpmock.RegisterResponder("POST", url, res) - - u, err := s.ApproveUserByID(expected.ID) - if !assert.Nil(t, err) { - return - } - if !assert.NotNil(t, u) { - return - } - if !assert.Equal(t, expected, u) { - return - } -}