Better short name

josebalius · josebalius · commit 7fe8357d4088 · 2021-10-05T13:30:17.000-04:00
diff --git 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
@@ -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
@@ -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
