From 7fe8357d40883f2d6294197bb53b428320fcb401 Mon Sep 17 00:00:00 2001 From: Jose Garcia Date: Tue, 5 Oct 2021 13:30:17 -0400 Subject: [PATCH] Better short name --- internal/codespaces/api/api.go | 6 +++--- internal/codespaces/states.go | 6 +++--- pkg/cmd/codespace/ports.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/codespaces/api/api.go b/internal/codespaces/api/api.go index da155b9ab..72d5cf338 100644 --- a/internal/codespaces/api/api.go +++ b/internal/codespaces/api/api.go @@ -524,14 +524,14 @@ type getCodespaceRepositoryContentsResponse struct { Content string `json:"content"` } -func (a *API) GetCodespaceRepositoryContents(ctx context.Context, codespace *codespace.Codespace, path string) ([]byte, error) { - req, err := http.NewRequest(http.MethodGet, a.githubAPI+"/repos/"+codespace.RepositoryNWO+"/contents/"+path, nil) +func (a *API) GetCodespaceRepositoryContents(ctx context.Context, cs *codespace.Codespace, path string) ([]byte, error) { + req, err := http.NewRequest(http.MethodGet, a.githubAPI+"/repos/"+cs.RepositoryNWO+"/contents/"+path, nil) if err != nil { return nil, fmt.Errorf("error creating request: %w", err) } q := req.URL.Query() - q.Add("ref", codespace.Branch) + q.Add("ref", cs.Branch) req.URL.RawQuery = q.Encode() a.setHeaders(req) diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go index e37b625e3..14c2cc2ea 100644 --- a/internal/codespaces/states.go +++ b/internal/codespaces/states.go @@ -37,13 +37,13 @@ type PostCreateState struct { // PollPostCreateStates watches for state changes in a codespace, // and calls the supplied poller for each batch of state changes. // It runs until it encounters an error, including cancellation of the context. -func PollPostCreateStates(ctx context.Context, log logger, apiClient apiClient, user *api.User, c *codespace.Codespace, poller func([]PostCreateState)) (err error) { - token, err := apiClient.GetCodespaceToken(ctx, user.Login, c.Name) +func PollPostCreateStates(ctx context.Context, log logger, apiClient apiClient, user *api.User, cs *codespace.Codespace, poller func([]PostCreateState)) (err error) { + token, err := apiClient.GetCodespaceToken(ctx, user.Login, cs.Name) if err != nil { return fmt.Errorf("getting codespace token: %w", err) } - session, err := ConnectToLiveshare(ctx, log, apiClient, user.Login, token, c) + session, err := ConnectToLiveshare(ctx, log, apiClient, user.Login, token, cs) if err != nil { return fmt.Errorf("connect to Live Share: %w", err) } diff --git a/pkg/cmd/codespace/ports.go b/pkg/cmd/codespace/ports.go index a535efd12..3c7b2255e 100644 --- a/pkg/cmd/codespace/ports.go +++ b/pkg/cmd/codespace/ports.go @@ -119,10 +119,10 @@ type portAttribute struct { Label string `json:"label"` } -func getDevContainer(ctx context.Context, apiClient apiClient, codespace *codespace.Codespace) <-chan devContainerResult { +func getDevContainer(ctx context.Context, apiClient apiClient, cs *codespace.Codespace) <-chan devContainerResult { ch := make(chan devContainerResult, 1) go func() { - contents, err := apiClient.GetCodespaceRepositoryContents(ctx, codespace, ".devcontainer/devcontainer.json") + contents, err := apiClient.GetCodespaceRepositoryContents(ctx, cs, ".devcontainer/devcontainer.json") if err != nil { ch <- devContainerResult{nil, fmt.Errorf("error getting content: %w", err)} return