Merge pull request cli#106 from github/jg/sku-params

josebalius · web-flow · commit ef8dde4d2e4a · 2021-09-01T16:43:02.000-04:00
ghcs create: pass branch for sku selection, pre-select if only one is returned
diff --git a/api/api.go b/api/api.go
@@ -327,14 +327,15 @@ type SKU struct {
 	DisplayName string `json:"display_name"`
 }
 
-func (a *API) GetCodespacesSKUs(ctx context.Context, user *User, repository *Repository, location string) ([]*SKU, error) {
+func (a *API) GetCodespacesSKUs(ctx context.Context, user *User, repository *Repository, branch, location string) ([]*SKU, error) {
 	req, err := http.NewRequest(http.MethodGet, githubAPI+"/vscs_internal/user/"+user.Login+"/skus", nil)
 	if err != nil {
 		return nil, fmt.Errorf("err creating request: %v", err)
 	}
 
 	q := req.URL.Query()
 	q.Add("location", location)
+	q.Add("ref", branch)
 	q.Add("repository_id", strconv.Itoa(repository.ID))
 	req.URL.RawQuery = q.Encode()
 
diff --git a/cmd/ghcs/create.go b/cmd/ghcs/create.go
@@ -77,7 +77,7 @@ func create(opts *createOptions) error {
 		return fmt.Errorf("error getting Codespace user: %v", userResult.Err)
 	}
 
-	machine, err := getMachineName(ctx, opts.machine, userResult.User, repository, locationResult.Location, apiClient)
+	machine, err := getMachineName(ctx, opts.machine, userResult.User, repository, branch, locationResult.Location, apiClient)
 	if err != nil {
 		return fmt.Errorf("error getting machine type: %v", err)
 	}
@@ -225,8 +225,8 @@ func getBranchName(branch string) (string, error) {
 }
 
 // getMachineName prompts the user to select the machine type, or validates the machine if non-empty.
-func getMachineName(ctx context.Context, machine string, user *api.User, repo *api.Repository, location string, apiClient *api.API) (string, error) {
-	skus, err := apiClient.GetCodespacesSKUs(ctx, user, repo, location)
+func getMachineName(ctx context.Context, machine string, user *api.User, repo *api.Repository, branch, location string, apiClient *api.API) (string, error) {
+	skus, err := apiClient.GetCodespacesSKUs(ctx, user, repo, branch, location)
 	if err != nil {
 		return "", fmt.Errorf("error getting Codespace SKUs: %v", err)
 	}
@@ -250,6 +250,10 @@ func getMachineName(ctx context.Context, machine string, user *api.User, repo *a
 		return "", nil
 	}
 
+	if len(skus) == 1 {
+		return skus[0].Name, nil // VS Code does not prompt for SKU if there is only one, this makes us consistent with that behavior
+	}
+
 	skuNames := make([]string, 0, len(skus))
 	skuByName := make(map[string]*api.SKU)
 	for _, sku := range skus {

Original file line number	Diff line number	Diff line change
`@@ -327,14 +327,15 @@ type SKU struct {`
`327`	`327`	DisplayName string `json:"display_name"`
`328`	`328`	`}`
`329`	`329`
`330`		`-func (a API) GetCodespacesSKUs(ctx context.Context, user User, repository Repository, location string) ([]SKU, error) {`
	`330`	`+func (a API) GetCodespacesSKUs(ctx context.Context, user User, repository Repository, branch, location string) ([]SKU, error) {`
`331`	`331`	`req, err := http.NewRequest(http.MethodGet, githubAPI+"/vscs_internal/user/"+user.Login+"/skus", nil)`
`332`	`332`	`if err != nil {`
`333`	`333`	`return nil, fmt.Errorf("err creating request: %v", err)`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`q := req.URL.Query()`
`337`	`337`	`q.Add("location", location)`
	`338`	`+ q.Add("ref", branch)`
`338`	`339`	`q.Add("repository_id", strconv.Itoa(repository.ID))`
`339`	`340`	`req.URL.RawQuery = q.Encode()`
`340`	`341`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func create(opts *createOptions) error {`
`77`	`77`	`return fmt.Errorf("error getting Codespace user: %v", userResult.Err)`
`78`	`78`	`}`
`79`	`79`
`80`		`- machine, err := getMachineName(ctx, opts.machine, userResult.User, repository, locationResult.Location, apiClient)`
	`80`	`+ machine, err := getMachineName(ctx, opts.machine, userResult.User, repository, branch, locationResult.Location, apiClient)`
`81`	`81`	`if err != nil {`
`82`	`82`	`return fmt.Errorf("error getting machine type: %v", err)`
`83`	`83`	`}`
`@@ -225,8 +225,8 @@ func getBranchName(branch string) (string, error) {`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`// getMachineName prompts the user to select the machine type, or validates the machine if non-empty.`
`228`		`-func getMachineName(ctx context.Context, machine string, user api.User, repo api.Repository, location string, apiClient *api.API) (string, error) {`
`229`		`- skus, err := apiClient.GetCodespacesSKUs(ctx, user, repo, location)`
	`228`	`+func getMachineName(ctx context.Context, machine string, user api.User, repo api.Repository, branch, location string, apiClient *api.API) (string, error) {`
	`229`	`+ skus, err := apiClient.GetCodespacesSKUs(ctx, user, repo, branch, location)`
`230`	`230`	`if err != nil {`
`231`	`231`	`return "", fmt.Errorf("error getting Codespace SKUs: %v", err)`
`232`	`232`	`}`
`@@ -250,6 +250,10 @@ func getMachineName(ctx context.Context, machine string, user api.User, repo a`
`250`	`250`	`return "", nil`
`251`	`251`	`}`
`252`	`252`
	`253`	`+ if len(skus) == 1 {`
	`254`	`+ return skus[0].Name, nil // VS Code does not prompt for SKU if there is only one, this makes us consistent with that behavior`
	`255`	`+ }`
	`256`	`+`
`253`	`257`	`skuNames := make([]string, 0, len(skus))`
`254`	`258`	`skuByName := make(map[string]*api.SKU)`
`255`	`259`	`for _, sku := range skus {`